release/6.0.0_cvs

17701 files changed, 17787 insertions, 17986 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 94ac0301a00d..d9da8e6e986d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/COPYRIGHT,v 1.6 2005/01/01 07:29:19 sobomax Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 The compilation of software known as FreeBSD is distributed under the
diff --git a/LOCKS b/LOCKS
index 86cc48df2782..b3816112ae5e 100644
--- a/LOCKS
+++ b/LOCKS
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/LOCKS,v 1.2 2005/06/02 22:57:30 peter Exp $
 
 This file documents formal review/approval requirements that have been
 approved by core.
diff --git a/MAINTAINERS b/MAINTAINERS
index 85a9608a9639..0afbe243b9e0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/MAINTAINERS,v 1.121 2005/06/04 16:56:35 imp Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
diff --git a/Makefile b/Makefile
index cede2760ce80..4d375d1b307d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile,v 1.319 2005/06/16 18:16:12 ru Exp $
 #
 # The user-driven targets are:
 #
diff --git a/Makefile.inc1 b/Makefile.inc1
index 13a28a310f04..95b92e7209f4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile.inc1,v 1.499.2.3.2.1 2005/10/16 14:07:43 hrs Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
diff --git a/README b/README
index 70402b9973a9..30638285b53d 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
 was last revised on:
-$FreeBSD$
+$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
diff --git a/UPDATING b/UPDATING
index 148d88058f4f..f4fb6eb9550b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -404,4 +404,4 @@ author a beer.
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD$
+$FreeBSD: src/UPDATING,v 1.416.2.3.2.5 2005/11/01 23:43:49 scottl Exp $
diff --git a/bin/Makefile b/bin/Makefile
index a56de99821b1..18be24c78c30 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile,v 1.25 2005/03/02 11:53:21 trhodes Exp $
 
 SUBDIR= cat \
 	chflags \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index b1f1612afddb..0de675fb1792 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile.inc,v 1.22 2004/12/21 09:59:40 ru Exp $
 
 BINDIR?=	/bin
 WARNS?=		6
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 672a4eeeeff5..aea110c9ddb3 100644
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cat/Makefile,v 1.7 2001/12/04 01:57:37 obrien Exp $
 
 PROG=	cat
 
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index e3c4b7e317bd..892c99087d6a 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cat/cat.1,v 1.25 2005/01/16 16:41:55 ru Exp $
 .\"
 .Dd March 21, 2004
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 9acd68fec4f8..e9339513a842 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
index 4457505380f3..8ac83ed8ea40 100644
--- a/bin/chflags/Makefile
+++ b/bin/chflags/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chflags/Makefile,v 1.19 2005/01/27 13:23:05 delphij Exp $
 
 PROG=	chflags
 
diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index 801e78ae0420..9c847b7ba181 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $
 .\"
 .Dd May 14, 2005
 .Dt CHFLAGS 1
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 273ba4cdc18f..90e6f4f3bcf4 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index 5157f6568a6c..ac01d2fb90c0 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/chio/Makefile,v 1.12 2005/01/27 13:25:09 delphij Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 920c31e81648..eb8e2ede1582 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chio/chio.1,v 1.27 2005/01/16 16:41:55 ru Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index cdfcf829a0b1..082a7b34e96f 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/chio.h> 
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index 8f10c9d9243a..b0fa940750b8 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/defs.h,v 1.5 2005/01/10 08:39:20 imp Exp $	*/
 
 /*-
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index 5b9b1e429dc2..47263c83ffad 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/pathnames.h,v 1.3 2005/01/10 08:39:20 imp Exp $	*/
 
 /*-
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index 71006d00a523..b6c1065b2e44 100644
--- a/bin/chmod/Makefile
+++ b/bin/chmod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chmod/Makefile,v 1.10 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 30984801678b..0f553bd21e96 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.39 2005/02/13 23:45:45 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index e96738898031..caabed1f5ae2 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.33 2005/01/10 08:39:20 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 9180efe26c3f..21fe9d1024d2 100644
--- a/bin/cp/Makefile
+++ b/bin/cp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cp/Makefile,v 1.11 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 91b532fcca5e..ce2e89a062cf 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.33 2005/02/25 00:40:46 trhodes Exp $
 .\"
 .Dd February 23, 2005
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index bbf73cd0abf3..5ea7d11ceaa6 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.51 2005/01/10 08:39:21 imp Exp $");
 
 /*
  * Cp copies source files to target files.
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index a6b53c240d3a..ed4d897dec8d 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/cp/extern.h,v 1.19 2004/04/06 20:06:44 markm Exp $
  */
 
 typedef struct {
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 350522596e4d..412f30b5997d 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.45 2005/02/09 17:37:37 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 8b2ff3822e35..fd794b62670d 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/csh/Makefile,v 1.36 2005/04/24 19:44:43 mp Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 915cb2307f99..1bd4ad809ec4 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.13 2005/01/10 08:39:21 imp Exp $
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2
index 5fbf43c0b72b..584d172f5b07 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.10.2.1 2005/09/24 01:59:34 keramida Exp $
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index 76ee1ebd5d17..45606cf6d693 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.9 2005/01/10 08:39:21 imp Exp $
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index 7ef24dcfe537..9c839b0d0b69 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.7 2005/01/10 08:39:21 imp Exp $
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index 22c8f76b28fe..efd34b0883ec 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.8 2005/01/10 08:39:21 imp Exp $
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index ba1b161ad512..f1980669f3fa 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.9 2005/01/10 08:39:21 imp Exp $
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 196d4371ce28..52670ded9384 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -27,6 +27,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.7 2005/01/10 08:39:21 imp Exp $
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
diff --git a/bin/csh/config.h b/bin/csh/config.h
index 6189e72f73a7..af18b24160eb 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h
index 65b7f6a16bb6..7b5ad36c6e85 100644
--- a/bin/csh/config_p.h
+++ b/bin/csh/config_p.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config_p.h,v 1.11.2.1 2005/09/27 14:49:41 mp Exp $ */
 /*
  * config.h -- configure various defines for tcsh
  *
diff --git a/bin/csh/host.defs b/bin/csh/host.defs
index 5eb251ace0ee..f91b3f438a1a 100644
--- a/bin/csh/host.defs
+++ b/bin/csh/host.defs
@@ -1,6 +1,6 @@
 newcode	:
 /* $Header: /src/pub/tcsh/host.defs,v 1.31 2001/06/10 02:19:11 christos Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/host.defs,v 1.3 2004/04/06 20:06:45 markm Exp $ */
 /*
  * host.defs: Hosttype/Machtype etc.
  */
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 8a1dc8579330..d5ba10f54585 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index a514ffe4a63f..ebcb39bf796c 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/date/date.1,v 1.72 2005/02/13 22:25:09 ru Exp $
 .\"
 .Dd August 9, 2004
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index be296a1f3b34..d330c9d4cf1b 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.47 2005/01/10 08:39:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/extern.h b/bin/date/extern.h
index 76b8d5e16105..fe2baee4effc 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/extern.h,v 1.7 2004/04/06 20:06:45 markm Exp $
  */
 
 int	netsettime(time_t);
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index 77e07882f19c..4f7852a492ee 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.18 2004/04/06 20:06:45 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/vary.c b/bin/date/vary.c
index 5f0123110ee3..82a6cea2ad2d 100644
--- a/bin/date/vary.c
+++ b/bin/date/vary.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/vary.c,v 1.16 2004/08/09 13:43:39 yar Exp $");
 
 #include <err.h>
 #include <time.h>
diff --git a/bin/date/vary.h b/bin/date/vary.h
index b39306a2bb23..27eddf7e74fe 100644
--- a/bin/date/vary.h
+++ b/bin/date/vary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/vary.h,v 1.4 1999/08/27 23:14:00 peter Exp $
  */
 
 struct vary {
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index 3dd185ce8b4a..5b38616f3352 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/dd/Makefile,v 1.18 2004/04/09 07:13:27 njl Exp $
 
 MAINTAINER=	green@FreeBSD.org
 
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 161fbfcb0d48..4e519f9b1329 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.40 2004/08/15 19:10:05 rwatson Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index cd66258c2945..fc17369f6b37 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/conv.c,v 1.19 2004/04/06 20:06:45 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 9bfd10921823..e29abb67bacf 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/conv_tab.c,v 1.12 2004/04/06 20:06:45 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 31a5d3e84b79..a0e86c79613c 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.30.2.1 2005/09/24 01:59:35 keramida Exp $
 .\"
 .Dd August 15, 2004
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 0bb43f789b1a..135fe4b5d8ac 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index ad283fd516a1..cc9e79b115e3 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/dd.h,v 1.22 2004/08/15 19:10:05 rwatson Exp $
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 9c540ad36546..4f4f3150d27e 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/extern.h,v 1.15 2004/08/15 19:10:05 rwatson Exp $
  */
 
 void block(void);
diff --git a/bin/dd/gen.c b/bin/dd/gen.c
index 9c7571a9ab91..67f887f027d3 100644
--- a/bin/dd/gen.c
+++ b/bin/dd/gen.c
@@ -1,7 +1,7 @@
 /*-
  * This program is in the public domain
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/gen.c,v 1.2 2005/01/10 08:39:21 imp Exp $
  */
 
 #include <stdio.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index 4f538bc4bfbd..26f3e21637bb 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/misc.c,v 1.27 2004/04/06 20:06:46 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index a638597707dd..fac9af59506e 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/position.c,v 1.23 2004/04/06 20:06:46 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/mtio.h>
diff --git a/bin/dd/ref.ascii b/bin/dd/ref.ascii
index 7ff13e5a80ed..43f0c4b7cc40 100644
--- a/bin/dd/ref.ascii
+++ b/bin/dd/ref.ascii
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ascii,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 9c 09 86 7f  97 8d 8e 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 9d 85 08 87  18 19 92 8f 1c 1d 1e 1f  |................|
 00000020  80 81 82 83 84 0a 17 1b  88 89 8a 8b 8c 05 06 07  |................|
diff --git a/bin/dd/ref.ebcdic b/bin/dd/ref.ebcdic
index 605716552cab..650e88c09643 100644
--- a/bin/dd/ref.ebcdic
+++ b/bin/dd/ref.ebcdic
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ebcdic,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.ibm b/bin/dd/ref.ibm
index 4836baf221aa..f9f6339f8180 100644
--- a/bin/dd/ref.ibm
+++ b/bin/dd/ref.ibm
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ibm,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.lcase b/bin/dd/ref.lcase
index 9f9567296468..78348e89d493 100644
--- a/bin/dd/ref.lcase
+++ b/bin/dd/ref.lcase
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.lcase,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/dd/ref.oldascii b/bin/dd/ref.oldascii
index bb1ad0a7242b..1006223e6f69 100644
--- a/bin/dd/ref.oldascii
+++ b/bin/dd/ref.oldascii
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldascii,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 9c 09 86 7f  97 8d 8e 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 9d 85 08 87  18 19 92 8f 1c 1d 1e 1f  |................|
 00000020  80 81 82 83 84 0a 17 1b  88 89 8a 8b 8c 05 06 07  |................|
diff --git a/bin/dd/ref.oldebcdic b/bin/dd/ref.oldebcdic
index 4a7fde7e65b6..d72bd11b78dd 100644
--- a/bin/dd/ref.oldebcdic
+++ b/bin/dd/ref.oldebcdic
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldebcdic,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 4f 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@O.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.oldibm b/bin/dd/ref.oldibm
index 4836baf221aa..b439939ed41e 100644
--- a/bin/dd/ref.oldibm
+++ b/bin/dd/ref.oldibm
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldibm,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.pareven b/bin/dd/ref.pareven
index c64e63e30660..b6c3933e24db 100644
--- a/bin/dd/ref.pareven
+++ b/bin/dd/ref.pareven
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.pareven,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  00 81 82 03 84 05 06 87  88 09 0a 8b 0c 8d 8e 0f  |................|
 00000010  90 11 12 93 14 95 96 17  18 99 9a 1b 9c 1d 1e 9f  |................|
 00000020  a0 21 22 a3 24 a5 a6 27  28 a9 aa 2b ac 2d 2e af  |.!".$..'(..+.-..|
diff --git a/bin/dd/ref.parnone b/bin/dd/ref.parnone
index fba31c142448..bd3823f04c38 100644
--- a/bin/dd/ref.parnone
+++ b/bin/dd/ref.parnone
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parnone,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/dd/ref.parodd b/bin/dd/ref.parodd
index f0bc449e3648..f53618bf14b4 100644
--- a/bin/dd/ref.parodd
+++ b/bin/dd/ref.parodd
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parodd,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  80 01 02 83 04 85 86 07  08 89 8a 0b 8c 0d 0e 8f  |................|
 00000010  10 91 92 13 94 15 16 97  98 19 1a 9b 1c 9d 9e 1f  |................|
 00000020  20 a1 a2 23 a4 25 26 a7  a8 29 2a ab 2c ad ae 2f  | ..#.%&..)*.,../|
diff --git a/bin/dd/ref.parset b/bin/dd/ref.parset
index baa1c57163a2..462805e35025 100644
--- a/bin/dd/ref.parset
+++ b/bin/dd/ref.parset
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parset,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  80 81 82 83 84 85 86 87  88 89 8a 8b 8c 8d 8e 8f  |................|
 00000010  90 91 92 93 94 95 96 97  98 99 9a 9b 9c 9d 9e 9f  |................|
 00000020  a0 a1 a2 a3 a4 a5 a6 a7  a8 a9 aa ab ac ad ae af  |................|
diff --git a/bin/dd/ref.swab b/bin/dd/ref.swab
index 79e57b79b738..0836ca7950af 100644
--- a/bin/dd/ref.swab
+++ b/bin/dd/ref.swab
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.swab,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  01 00 03 02 05 04 07 06  09 08 0b 0a 0d 0c 0f 0e  |................|
 00000010  11 10 13 12 15 14 17 16  19 18 1b 1a 1d 1c 1f 1e  |................|
 00000020  21 20 23 22 25 24 27 26  29 28 2b 2a 2d 2c 2f 2e  |! #"%$'&)(+*-,/.|
diff --git a/bin/dd/ref.ucase b/bin/dd/ref.ucase
index 70d8a903c354..7d99f5f0bf37 100644
--- a/bin/dd/ref.ucase
+++ b/bin/dd/ref.ucase
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ucase,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/df/Makefile b/bin/df/Makefile
index df6574ce2adb..767c3f69434f 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
-# $FreeBSD$
+# $FreeBSD: src/bin/df/Makefile,v 1.18 2004/05/24 22:21:49 pjd Exp $
 
 MOUNT=	${.CURDIR}/../../sbin/mount
 .PATH: ${MOUNT}
diff --git a/bin/df/df.1 b/bin/df/df.1
index 749613e91f03..80f36f29cfd2 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/df/df.1,v 1.39 2005/01/16 16:41:56 ru Exp $
 .\"
 .Dd April 22, 2004
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index 008e15c0c55d..23fd9818d149 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.64 2005/01/10 08:39:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 724bd06f6a39..575dac3e0f40 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/domainname/Makefile,v 1.7 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index f12dbc947583..63e884a0cfff 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.18 2005/01/10 08:39:22 imp Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index da3e607c0e14..18369f1a32b4 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -39,7 +39,7 @@ static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.19 2005/01/10 08:39:22 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index d00d4679d7ac..bcb27de4d027 100644
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/echo/Makefile,v 1.8 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 5f7123e9c28a..efd05d665632 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.19 2005/01/16 16:41:56 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index 45d9d7e18c52..629e22f1e09d 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.18 2005/01/10 08:39:22 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 9e6afd7db37a..eb26bdf30196 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/Makefile,v 1.31 2004/12/21 10:15:59 ru Exp $
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index f81bb0ce1a14..0a363d650692 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/POSIX,v 1.8 2000/07/17 10:40:48 sheldonh Exp $
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,
diff --git a/bin/ed/README b/bin/ed/README
index 478e7af07c70..1f50f106fdb5 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/README,v 1.7 1999/08/27 23:14:12 peter Exp $
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index db1f0e981bfb..93c1b92441a8 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/buf.c,v 1.22 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 52e99998d67c..22dd0d25f2a0 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.20 2004/04/06 20:06:47 markm Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 20fc8052cee7..02e265ff27bc 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.35 2005/01/16 16:41:56 ru Exp $
 .Dd July 3, 2004
 .Dt ED 1
 .Os
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 2021232c0490..dbb73c6b8deb 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- * $FreeBSD$
+ * $FreeBSD: src/bin/ed/ed.h,v 1.20 2005/01/10 08:39:22 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 11dcc19fcc85..01594c5b2134 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/glbl.c,v 1.13 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 85ba0de0812e..7a0e7a20adcf 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/io.c,v 1.14 2003/01/01 18:48:39 schweikh Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 807a3cc96bc3..d9dc54c54656 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -35,7 +35,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.28 2005/02/09 17:37:37 ru Exp $");
 
 /*
  * CREDITS
diff --git a/bin/ed/re.c b/bin/ed/re.c
index f89ecf94cd6b..43f67ae50a02 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 1c44328cc79c..f774776ca635 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/sub.c,v 1.15 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index aedfb698f131..c6265ea518a5 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/Makefile,v 1.9 1999/08/27 23:14:17 peter Exp $
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
diff --git a/bin/ed/test/README b/bin/ed/test/README
index 74c4826a269d..e360c4fe86dd 100644
--- a/bin/ed/test/README
+++ b/bin/ed/test/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/README,v 1.7 1999/08/27 23:14:17 peter Exp $
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
index deab47555f7a..2c57449fc3a7 100644
--- a/bin/ed/test/ckscripts.sh
+++ b/bin/ed/test/ckscripts.sh
@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/ckscripts.sh,v 1.6 1999/08/27 23:14:18 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/test/mkscripts.sh b/bin/ed/test/mkscripts.sh
index 1b8b3ee53182..2d1a06f14a7a 100644
--- a/bin/ed/test/mkscripts.sh
+++ b/bin/ed/test/mkscripts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # This script generates ed test scripts (.ed) from .t files
 #	
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/mkscripts.sh,v 1.6 1999/08/27 23:14:20 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 6a8ca9e90137..28374956b723 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/undo.c,v 1.12 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 544853e10a25..7daa1c20d383 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/expr/Makefile,v 1.18 2003/06/13 07:04:02 markm Exp $
 
 PROG=	expr
 SRCS=	expr.y
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 56559a137a95..5fb78b23fd6c 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/expr/expr.1,v 1.28 2005/01/16 16:41:57 ru Exp $
 .\"
 .Dd July 12, 2004
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 787cd85dfbbc..8f5bf37aea9b 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -5,7 +5,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/expr/expr.y,v 1.24 2005/01/10 08:39:22 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile
index b7b5e983a530..f5d942796f50 100644
--- a/bin/getfacl/Makefile
+++ b/bin/getfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/getfacl/Makefile,v 1.6 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	getfacl
 
diff --git a/bin/getfacl/getfacl.1 b/bin/getfacl/getfacl.1
index d74f77ac9229..e8fdd74308a1 100644
--- a/bin/getfacl/getfacl.1
+++ b/bin/getfacl/getfacl.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.9 2005/01/16 16:41:57 ru Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
index 297b41274c63..b5a61a268bb1 100644
--- a/bin/getfacl/getfacl.c
+++ b/bin/getfacl/getfacl.c
@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.10 2005/02/09 17:37:37 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index 3c7997f862fc..95036b30e09c 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/hostname/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 65b4d0513551..e089ef0f47fb 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $
 .\"
 .Dd April 18, 2005
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 512327baf733..09393feaeedc 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.17 2005/01/10 08:39:22 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
index 33a6dfc3bff5..b63400916250 100644
--- a/bin/kenv/Makefile
+++ b/bin/kenv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/kenv/Makefile,v 1.4 2003/06/13 07:04:02 markm Exp $
 
 PROG=	kenv
 
diff --git a/bin/kenv/kenv.1 b/bin/kenv/kenv.1
index d9cdf8b564c5..79cf42d796f5 100644
--- a/bin/kenv/kenv.1
+++ b/bin/kenv/kenv.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.11.2.1 2005/09/20 13:26:21 rwatson Exp $
 .\"
 .Dd July 8, 2000
 .Dt KENV 1
diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
index dc86ba8200a9..372ffb27324c 100644
--- a/bin/kenv/kenv.c
+++ b/bin/kenv/kenv.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.7.2.1 2005/09/20 13:26:21 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 55ef16dfce2c..47b2d5b93442 100644
--- a/bin/kill/Makefile
+++ b/bin/kill/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/kill/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index ee07a84a0f1e..7bb32b94657c 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kill/kill.1,v 1.20 2005/01/16 16:41:57 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index bb9982e33b51..76da199e9f0a 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.20 2005/01/10 08:39:23 imp Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index b541f8bd3be0..072ec41ac051 100644
--- a/bin/ln/Makefile
+++ b/bin/ln/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ln/Makefile,v 1.11 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	ln
 MAN=	ln.1 symlink.7
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index e494d1465f7f..9f85ff9f21ff 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 5609449a4d69..f78742ef4ae8 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index d2e8cbb25e4d..726f583809ac 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/symlink.7,v 1.30 2005/02/13 22:25:09 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 2af1203b1d38..7c835b253d48 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ls/Makefile,v 1.26 2004/05/25 14:53:47 pjd Exp $
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 37b4a750e31f..48466ae531d0 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.17 2005/06/03 11:05:58 dd Exp $");
 
 
 #include <sys/types.h>
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 02a61f5852b2..643f3835eda2 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/extern.h,v 1.24 2005/06/03 11:05:58 dd Exp $
  */
 
 int	 acccmp(const FTSENT *, const FTSENT *);
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index e71486733975..8327415fbf14 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.89.2.1 2005/09/07 16:29:11 garys Exp $
 .\"
 .Dd June 2, 2005
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index d8400eedad45..0978ed40e9df 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.80 2005/06/03 11:05:58 dd Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index d4e5db6ad219..c2fe1777271f 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/ls.h,v 1.21 2005/01/10 08:39:23 imp Exp $
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 185b418afe30..a8a876f6e74b 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.74 2005/01/10 08:39:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 914b030b9f6c..1aaa3c473713 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.38 2005/06/03 11:05:58 dd Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index fadc6b294ef7..943526cce456 100644
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/mkdir/Makefile,v 1.9 2005/01/26 06:48:17 ssouhlal Exp $
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index b43bf0a14475..5bf33523ef3a 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.21 2005/01/16 16:41:57 ru Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 024744c8ccde..152c113fd44a 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 840578276d5a..1530f6169c76 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/bin/mv/Makefile,v 1.8 2001/12/04 01:57:45 obrien Exp $
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 84e6c94db1ac..800903edac71 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.28 2005/01/16 16:41:58 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index e400729a785e..88d1998f3a47 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.45 2005/05/19 21:33:48 mux Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index de76e6cf0754..9923ee714ac4 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pax/Makefile,v 1.12 2004/05/14 13:31:19 cognet Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 3588374257b5..4b2a60ca72e9 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index da275c2dacb0..b44d79ce4f31 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.24 2005/01/12 03:25:55 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 1d01d4e5090a..1e422ddfd5ec 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/buf_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 358707d362c3..c07192e67519 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/cache.c,v 1.21 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 36d59ca7b12c..9d0ddcba0df5 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cache.h,v 1.9 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/cpio.1 b/bin/pax/cpio.1
index 7ff1881229eb..c7ecf66b3e7b 100644
--- a/bin/pax/cpio.1
+++ b/bin/pax/cpio.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: cpio.1,v 1.16 2001/05/01 17:58:01 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/cpio.1,v 1.6 2005/02/09 18:02:29 ru Exp $
 .\"
 .Dd February 16, 1997
 .Dt CPIO 1
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 1909f8eaf712..09ca6a259564 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 2f4c37cb688a..66d3d0d58348 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpio.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cpio.h,v 1.7 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index e7167928e2f9..f6168cc41876 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/extern.h,v 1.16 2005/01/12 03:25:55 brian Exp $
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 79782f46eb9b..1660ea90989b 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index f402c568ddfa..2a5a8ff24b89 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 4538977754e4..fe18dcee9abe 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftree.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/ftree.h,v 1.7 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index ce2041985a1d..7db1d3b6829e 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 1c9f63cfb61d..96b97c3500bc 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.5 2005/01/10 08:39:24 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 6f43940d1e47..c366aa0eedcb 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.31 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.h b/bin/pax/options.h
index 948e012671e8..86351e859c96 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/options.h,v 1.6 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 667aa8f66a24..90433d0630b1 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index 0eedd679caae..325458315053 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pat_rep.h,v 1.6 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 05934044674f..19991ecdeb59 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.35 2005/01/16 16:41:58 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index cb19b99b175e..e043aa2628b5 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index c80ae7e0e11d..e4a6b1912d28 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pax.h,v 1.18 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 98deccd435b1..791f69356dc8 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index eed4641a17d5..32c07b7df4aa 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sel_subs.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/sel_subs.h,v 1.6 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index efdc68b49781..05ea88ca707c 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index ba59f913e7ab..9d0c5d8d72df 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tables.h,v 1.10 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index ff66ccbefa57..955529bd49be 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/tar.1,v 1.11 2005/02/13 22:25:09 ru Exp $
 .\"
 .Dd February 7, 2001
 .Dt TAR 1
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index c23cd5b34f28..d66310a3237a 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.24 2004/11/13 10:56:35 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 856e26c8336a..ae767ba2a3e0 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tar.h,v 1.7 2004/04/06 20:06:49 markm Exp $
  */
 
 /*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index b3d140eb41cc..b6e22d5d88ad 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tty_subs.c,v 1.20 2004/04/06 20:06:49 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index 9be197933ee8..11af373553b7 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ps/Makefile,v 1.27 2005/01/27 13:42:40 delphij Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 08b6d9bce630..526ace98bf41 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $
  */
 
 struct kinfo;
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 1e9fed8710f0..26ba3dc1868e 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.34 2004/06/22 02:18:29 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 564bb31e1222..f77e0d0de6c8 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.72 2005/03/20 10:40:36 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index f5e600b83959..b2fe0cffa92f 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.21 2004/04/06 20:06:49 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 1870c53ca0dd..1d3422ab509c 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 585113b0695b..64b24d249b8f 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.86 2005/04/29 11:10:27 maxim Exp $
 .\"
 .Dd March 20, 2005
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 73a61212a29a..98f5f5b1d27a 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 03adc0a35c18..801801106476 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/ps.h,v 1.19 2004/06/23 23:48:09 gad Exp $
  */
 
 #include <sys/queue.h>
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
index 4a8e66ac8320..aa2f8e79cc9b 100644
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pwd/Makefile,v 1.11 2002/02/11 18:38:54 mike Exp $
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 2b687a5e3b7f..4363e31bde14 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.26 2005/01/16 16:41:58 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 4baf3aa9e3be..4fb2a002424c 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.25 2005/02/09 17:37:38 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 1c156a236d11..26744d32d171 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rcp/Makefile,v 1.23 2004/11/03 18:01:18 ru Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index db69959234a5..62e55b874f67 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/rcp/extern.h,v 1.9 2004/04/06 20:06:50 markm Exp $
  */
 
 typedef struct {
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 374b41b166c2..2feb052616d9 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.21 2005/02/13 22:25:09 ru Exp $
 .\"
 .Dd October 16, 2002
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index d36f3bd41811..6ff135d5df66 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.45 2005/02/09 17:37:38 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 3296fe0cbe96..c016c8d203c2 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rcp/util.c,v 1.17 2004/04/06 20:06:50 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile
index acf62c76cb3a..ce3d8ae718f5 100644
--- a/bin/realpath/Makefile
+++ b/bin/realpath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/realpath/Makefile,v 1.1 2002/02/11 07:32:17 mike Exp $
 
 PROG=	realpath
 
diff --git a/bin/realpath/realpath.1 b/bin/realpath/realpath.1
index 3b395456ce1a..fef2f00240de 100644
--- a/bin/realpath/realpath.1
+++ b/bin/realpath/realpath.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index b0a2c9e35349..5fe90de3b581 100644
--- a/bin/realpath/realpath.c
+++ b/bin/realpath/realpath.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index 7058fa06c98d..ff2f4a529004 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rm/Makefile,v 1.18 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	rm
 
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index f15b9343aa75..63f6cc50414e 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.36.2.1 2005/10/08 17:27:37 dougb Exp $
 .\"
 .Dd September 29, 2005
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index b838fef22ef5..e8353fb76968 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rm.c	8.5 (Berkeley) 4/18/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.52.2.1 2005/10/08 17:27:37 dougb Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index bf65d1c1a507..9782497d091c 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmail/Makefile,v 1.22 2005/06/10 06:12:49 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index c2c7f301ce49..e596b0a84c08 100644
--- a/bin/rmdir/Makefile
+++ b/bin/rmdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmdir/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 565ea7eac4fa..e531aa25c929 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.14 2005/05/31 12:57:44 tjr Exp $
 .\"
 .Dd March 21, 2004
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index f81aaab04d6b..064461e42c7a 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rmdir.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.20 2005/01/26 06:51:28 ssouhlal Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile
index 3f6b78e54e11..eb060104491a 100644
--- a/bin/setfacl/Makefile
+++ b/bin/setfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/setfacl/Makefile,v 1.8 2004/06/13 19:22:53 obrien Exp $
 
 PROG=	setfacl
 SRCS=	file.c mask.c merge.c remove.c setfacl.c util.c
diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c
index 5996d55daf60..dbd80ef6ae8d 100644
--- a/bin/setfacl/file.c
+++ b/bin/setfacl/file.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/file.c,v 1.5 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
index b275893b1f54..fa34c6e1641d 100644
--- a/bin/setfacl/mask.c
+++ b/bin/setfacl/mask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.8 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
index 9f1b5dd48f45..0225267ec716 100644
--- a/bin/setfacl/merge.c
+++ b/bin/setfacl/merge.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.8 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index 23240554a341..fe6352a3f92b 100644
--- a/bin/setfacl/remove.c
+++ b/bin/setfacl/remove.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.6 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index 166328f72ef1..30de982e943b 100644
--- a/bin/setfacl/setfacl.1
+++ b/bin/setfacl/setfacl.1
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.13 2005/02/09 17:37:39 ru Exp $
 .\"
 .Dd January 7, 2001
 .Dt SETFACL 1
diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
index e04feac2e92b..9c293d6779d6 100644
--- a/bin/setfacl/setfacl.c
+++ b/bin/setfacl/setfacl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.11 2005/02/09 17:37:39 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/setfacl/setfacl.h b/bin/setfacl/setfacl.h
index bdf052ba0a81..e8a83e859a2e 100644
--- a/bin/setfacl/setfacl.h
+++ b/bin/setfacl/setfacl.h
@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.5 2005/01/10 08:39:25 imp Exp $
  */
 
 #ifndef _SETFACL_H
diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c
index 46b9abb6ff6b..559409842e67 100644
--- a/bin/setfacl/util.c
+++ b/bin/setfacl/util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.6 2005/01/10 08:39:25 imp Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 7337d98773e9..1c01b55edd4e 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/Makefile,v 1.44 2004/03/18 10:55:47 ru Exp $
 
 PROG=	sh
 INSTALLFLAGS= -S
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index 5a0b76b7ea90..66605d290293 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/TOUR,v 1.6 1999/08/27 23:15:07 peter Exp $
 
 NOTE -- This is the original TOUR paper distributed with ash and
 does not represent the current state of the shell.  It is provided anyway
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index dd613515a2e8..62664aad4451 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.18 2004/04/06 20:06:51 markm Exp $");
 
 #include <stdlib.h>
 #include "shell.h"
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index a6bd23d79caf..2cd73409a769 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/alias.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index 079f957bf6a1..0200dcd501ab 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith.h,v 1.9 2004/04/06 20:06:51 markm Exp $
  */
 
 int arith(char *);
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index a7b514d1b880..e77e284abcda 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.19 2004/05/24 10:11:31 stefanf Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index 4e7b7fbcf857..04ee19177585 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.22 2004/04/06 20:06:51 markm Exp $");
 
 #include <string.h>
 
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index 66c616412e6c..417b6bc000b8 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.13 2004/04/06 20:06:53 markm Exp $
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index 83f233704fd2..6f9eeee089ac 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.2 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/bltin/echo.1,v 1.15 2005/01/10 08:39:25 imp Exp $
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 457a4c7aefc8..5a07a0d12ce6 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.14 2004/04/06 20:06:53 markm Exp $");
 
 /*
  * Echo command.
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index 7bfe5d529cf1..fc636a048da0 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/builtins.def,v 1.15 2005/01/10 08:39:25 imp Exp $
 
 #
 # This file lists all the builtin commands.  The first column is the name
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index 24af3e1bc084..652348e5c45f 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.34 2004/04/06 20:06:51 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 0a2d48999e7b..618236c810ba 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/cd.h,v 1.7 2004/04/06 20:06:51 markm Exp $
  */
 
 char	*getpwd(void);
diff --git a/bin/sh/error.c b/bin/sh/error.c
index c30b1a6db6bc..43ce6020f4a7 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.25 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * Errors and exceptions.
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 4611821644dd..608ecec01f6f 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/error.h,v 1.17 2004/04/06 20:06:51 markm Exp $
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 18bcd1c8e688..377525170fea 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.42 2004/04/06 20:06:51 markm Exp $");
 
 #include <paths.h>
 #include <signal.h>
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index 2f8471ef1c99..8e80b587fa12 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/eval.h,v 1.10 2004/04/06 20:06:51 markm Exp $
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 03c6162b8154..ae314b61343e 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.25 2004/09/27 18:43:18 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 7542a534b4d0..0c48d2bb3060 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/exec.h,v 1.12 2004/04/06 20:06:51 markm Exp $
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index f087f546c509..01f28db977aa 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.47 2005/07/07 18:10:33 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 2b895193d57a..eefdf5538b5c 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/expand.h,v 1.12 2004/04/06 20:06:51 markm Exp $
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index 2b92c60ce217..94cf810d03f6 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/cmv,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index 95f6857dce4c..53c3fb79543d 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/dirs,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill
index 16f0c9b9a95f..617270abf497 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/kill,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # Convert job names to process ids and then run /bin/kill.
 
diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login
index 68802a06d9f8..e28639eb44a7 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/login,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # replaces the login builtin in the BSD shell
 login () exec login "$@"
diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp
index 57ac1cec4cf4..845e30706941 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -32,6 +32,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/newgrp,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index bc1cd5c8fefe..98b8d9fc0bb8 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/popd,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd
index 9e31f2a20f8d..38b8e4b1ba5c 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/pushd,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend
index 81bb53d35edf..15b57c02f970 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/suspend,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 4d7793b1f072..1a8b451d66fb 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.26.8.1 2005/10/09 03:46:26 delphij Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 1ec834374780..83dd62fa65a7 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/init.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 void init(void);
diff --git a/bin/sh/input.c b/bin/sh/input.c
index f4bb7039a158..ad8352a768d6 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.22 2004/04/06 20:06:51 markm Exp $");
 
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
diff --git a/bin/sh/input.h b/bin/sh/input.h
index 0d188c5850dc..0dd8167a72ef 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/input.h,v 1.9 2004/04/06 20:06:51 markm Exp $
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index 8c19d227c845..0c844dd6c39a 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.68 2004/12/02 13:12:43 maxim Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 54894e950e3c..93a4eee520cd 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.18 2004/04/06 20:06:51 markm Exp $
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 3056fad3f3eb..ed4895d42b5b 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.13 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * Routines to check for mail.  (Perhaps make part of main.c?)
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index f88324c628bd..bc4c1de03b24 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mail.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 void chkmail(int);
diff --git a/bin/sh/main.c b/bin/sh/main.c
index cfdfe9db553a..7e68cbb9c047 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.26 2004/04/06 20:06:51 markm Exp $");
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/bin/sh/main.h b/bin/sh/main.h
index 7f8c3940b602..4c707e0dface 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/main.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 60f9203d7da1..83c0790bc52c 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.26 2004/04/06 20:06:51 markm Exp $");
 
 #include <sys/param.h>
 #include "shell.h"
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index 254d27ba44c0..04936c441b97 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/memalloc.h,v 1.9 2004/04/06 20:06:51 markm Exp $
  */
 
 struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 8384b8d56b95..713937bb4d42 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.30 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * Miscellaneous builtins.
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index e05c8d09780c..8b1fccf7ac0a 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.14 2005/01/10 08:39:25 imp Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index 27c97107091c..210d117e3f4e 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mkinit.c,v 1.17 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * This program scans all the source files for code to handle various
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 53086bd44ac8..ac95f25f8590 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.17 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * This program reads the nodetypes file and nodes.c.pat file.  It generates
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 505c359ec457..13473bade8d3 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.23 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * This program creates syntax.h and syntax.c.
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index bdc873e44407..6ac5cc16842f 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mktokens,v 1.10 2005/01/10 08:39:25 imp Exp $
 
 # The following is a list of tokens.  The second column is nonzero if the
 # token marks the end of a list.  The third column is the name to print in
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index 5d96587cdba2..c755798977ea 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/myhistedit.h,v 1.10 2004/04/06 20:06:51 markm Exp $
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 6eaacb35dc9b..37bf6d77e2ae 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mystring.c,v 1.13 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * String functions.
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 1b27a1b008a8..2998c6b84357 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mystring.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 10dab26d2ac8..4bc1747af5a6 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.15 2004/04/06 20:06:51 markm Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index e1e1b04c3286..84ab90e24f43 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/nodetypes,v 1.10 2005/01/10 08:39:25 imp Exp $
 
 # This file describes the nodes used in parse trees.  Unindented lines
 # contain a node type followed by a structure tag.  Subsequent indented
diff --git a/bin/sh/options.c b/bin/sh/options.c
index d2c4a982cf49..ff5b7bc1474b 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.23 2005/05/16 04:32:41 gad Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 3b827d16016d..6adf22a665db 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/options.h,v 1.13 2004/04/06 20:06:51 markm Exp $
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 3550cb7ecb7d..9cd2d0c0adef 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.19 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * Shell output routines.  We use our own output routines because:
diff --git a/bin/sh/output.h b/bin/sh/output.h
index bafd8687b159..dc02c57410d4 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/output.h,v 1.13 2004/04/06 20:06:51 markm Exp $
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 806259d30e52..8dc7c0f9c84d 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.52 2005/03/01 03:35:58 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index b0bd99ec5702..f60975c95b74 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/parser.h,v 1.10 2004/04/06 20:06:51 markm Exp $
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index bc18975c0e93..d0b442fdc480 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.26 2004/04/06 20:06:51 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index ad44c4eddd8c..e2bb74f99b4d 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/redir.h,v 1.10 2004/04/06 20:06:51 markm Exp $
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 2eb49b0f1011..f9a16193b24a 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.102 2005/06/14 08:25:00 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 58a25feb53cf..80190ca567d7 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/shell.h,v 1.17 2004/04/06 20:06:51 markm Exp $
  */
 
 /*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 8cfc35659fd8..4a9a9dd46183 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.21 2004/04/06 20:06:51 markm Exp $");
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/bin/sh/show.h b/bin/sh/show.h
index 83f84afcc8af..6f8d398ccdf5 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)show.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/show.h,v 1.11 2004/04/06 20:06:51 markm Exp $
  */
 
 void showtree(union node *);
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index ca327b26396a..605182af904d 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.29 2004/04/06 20:06:51 markm Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index ccc1ffd4f4d1..35069cfd3d41 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/trap.h,v 1.12 2004/04/06 20:06:51 markm Exp $
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 94d6feeb3ccb..1f0dccbda1cb 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.27 2004/09/27 18:43:18 des Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 90074b941ac0..93bbb049f592 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/var.h,v 1.12 2004/04/06 20:06:51 markm Exp $
  */
 
 /*
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
index 4ff73308c45b..c05223b94e12 100644
--- a/bin/sleep/Makefile
+++ b/bin/sleep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sleep/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index bc56dbf6471b..f5215be1b4da 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.22 2005/01/16 16:41:59 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index f38b183cb2bf..75c881b9e191 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.19.2.1 2005/10/09 04:39:07 delphij Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index 82b15eb7fcae..263322db07fd 100644
--- a/bin/stty/Makefile
+++ b/bin/stty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/stty/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 37617ce83a8d..252a543396c7 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)cchar.c	8.5 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/cchar.c,v 1.14 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index 8d0657cd0a9f..2949b887415f 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/extern.h,v 1.10 2004/04/06 20:06:53 markm Exp $
  */
 
 int	c_cchars(const void *, const void *);
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index c35a6fc4604d..932005da051d 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)gfmt.c	8.6 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/gfmt.c,v 1.20 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 413f4d58dfa9..007f81654aef 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)key.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.20 2004/11/06 13:56:18 ache Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index e72e2dfc3ea5..1236233e42b8 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/modes.c,v 1.13 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index cf24d4f46529..5fa9ea0858bc 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.20 2005/05/26 06:57:57 ache Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index f1f0107bdae7..f8f5219d1fd4 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/stty/stty.1,v 1.33 2005/02/09 17:37:39 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index f6daaf076ad8..84a8389527bb 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/stty.c,v 1.23 2005/02/09 17:37:39 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 77b85225f6cb..64810bf6b67a 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/stty.h,v 1.9 2004/04/06 20:06:53 markm Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index 5a4f0cfa47d0..6f9c0c76cdf9 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/util.c,v 1.11 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sync/Makefile b/bin/sync/Makefile
index 72c664f4afdd..1e24647e9b8b 100644
--- a/bin/sync/Makefile
+++ b/bin/sync/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sync/Makefile,v 1.10 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sync
 MAN=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index cc53e1ae1eb2..1b2a412f0579 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sync/sync.8,v 1.16 2005/01/10 08:39:26 imp Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index d360245973de..2d68997707f9 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sync/sync.c,v 1.16 2005/01/10 08:39:26 imp Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/test/Makefile b/bin/test/Makefile
index 7c64b40347ef..11301f60d03c 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,5 +1,5 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/Makefile,v 1.10 2003/09/07 12:52:17 ru Exp $
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
diff --git a/bin/test/TEST.README b/bin/test/TEST.README
index 4fe352487605..baeefb6f108e 100644
--- a/bin/test/TEST.README
+++ b/bin/test/TEST.README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.README,v 1.5 2004/06/16 12:57:31 maxim Exp $
 
 OS/shell			syntax error	failed
 --------------------------------------------------------------------
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
index afa1c91f158a..f3e0237926d1 100644
--- a/bin/test/TEST.csh
+++ b/bin/test/TEST.csh
@@ -1,5 +1,5 @@
 #	@(#)TEST.csh	5.2 (Berkeley) 4/30/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.csh,v 1.6 1999/08/27 23:15:47 peter Exp $
 
 #alias t '/usr/src/bin/test/obj/test \!*; echo $status'
 alias t '/bin/test \!*; echo $status'
diff --git a/bin/test/TEST.sh b/bin/test/TEST.sh
index bf7f3fdbd14b..754d1672868f 100644
--- a/bin/test/TEST.sh
+++ b/bin/test/TEST.sh
@@ -28,7 +28,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.sh,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # force a specified test program, e.g. `env test=/bin/test sh TEST.sh'
 : ${test=test}		
diff --git a/bin/test/test.1 b/bin/test/test.1
index df6a29021cb2..f6cf6c1b6c24 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/test/test.1,v 1.23 2005/01/10 08:39:26 imp Exp $
 .\"
 .Dd July 3, 2004
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index 35a0cf8d3e4a..9cf4037600b7 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.53 2005/01/10 08:39:26 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/contrib/amd/FREEBSD-Xlist b/contrib/amd/FREEBSD-Xlist
index 474cf53b7d69..dfadcf44bd34 100644
--- a/contrib/amd/FREEBSD-Xlist
+++ b/contrib/amd/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $
 *LSM.am-utils
 *Makefile.*
 *README.autofs
diff --git a/contrib/amd/FREEBSD-upgrade b/contrib/amd/FREEBSD-upgrade
index a8e6d531c7ae..cafb1f6af39d 100644
--- a/contrib/amd/FREEBSD-upgrade
+++ b/contrib/amd/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $
 
 AMD (am-utils) 6.0.9
     originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/
diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index 54b02fd08307..092c2a9a9f29 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.8,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.20.2.1 2005/09/24 01:59:35 keramida Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index f724bd833f12..fc6b3d5d91e8 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: amd.c,v 1.8.2.6 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/amd.c,v 1.10 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/amq_subr.c b/contrib/amd/amd/amq_subr.c
index a5c7f247c68e..49e733bc8ac5 100644
--- a/contrib/amd/amd/amq_subr.c
+++ b/contrib/amd/amd/amq_subr.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: amq_subr.c,v 1.6.2.6 2004/01/19 00:25:55 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/amq_subr.c,v 1.8 2004/07/06 13:16:44 mbr Exp $
  *
  */
 /*
diff --git a/contrib/amd/amd/get_args.c b/contrib/amd/amd/get_args.c
index e5c3edf09359..a278309322c8 100644
--- a/contrib/amd/amd/get_args.c
+++ b/contrib/amd/amd/get_args.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: get_args.c,v 1.7.2.6 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/get_args.c,v 1.8 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/nfs_prot_svc.c b/contrib/amd/amd/nfs_prot_svc.c
index 8d67d1bc14cb..58602a25061d 100644
--- a/contrib/amd/amd/nfs_prot_svc.c
+++ b/contrib/amd/amd/nfs_prot_svc.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_svc.c,v 1.5.2.6 2004/01/21 04:04:58 ib42 Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/nfs_prot_svc.c,v 1.2 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/ops_pcfs.c b/contrib/amd/amd/ops_pcfs.c
index 5552c4302cd1..224d386cc309 100644
--- a/contrib/amd/amd/ops_pcfs.c
+++ b/contrib/amd/amd/ops_pcfs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: ops_pcfs.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/ops_pcfs.c,v 1.2 2004/07/06 13:44:14 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/srvr_nfs.c b/contrib/amd/amd/srvr_nfs.c
index 67d1724707fb..749b3c0ea990 100644
--- a/contrib/amd/amd/srvr_nfs.c
+++ b/contrib/amd/amd/srvr_nfs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: srvr_nfs.c,v 1.7.2.11 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/srvr_nfs.c,v 1.7 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8
index 6f94b1239662..4cbba4dbf602 100644
--- a/contrib/amd/amq/amq.8
+++ b/contrib/amd/amq/amq.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
diff --git a/contrib/amd/amq/amq.c b/contrib/amd/amq/amq.c
index d9828ac74221..36e6ef4517ef 100644
--- a/contrib/amd/amq/amq.c
+++ b/contrib/amd/amq/amq.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/amd/amq/amq.c,v 1.9 2004/07/06 13:16:44 mbr Exp $");
 
 /*
  * Automounter query tool
diff --git a/contrib/amd/amq/pawd.1 b/contrib/amd/amq/pawd.1
index 954bbab47d70..a316b7d5bf5c 100644
--- a/contrib/amd/amq/pawd.1
+++ b/contrib/amd/amq/pawd.1
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: pawd.1,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.7 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd January 6, 1998
 .Dt PAWD 1
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
index 24bc9b37fe4e..aa11ef5a140f 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_freebsd2.h,v 1.3.2.4 2004/01/06 03:15:19 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h,v 1.7 2004/07/06 13:16:45 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
index 27c535db11fa..1fdcc1137555 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h,v 1.13 2004/07/06 13:16:45 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/conf/trap/trap_default.h b/contrib/amd/conf/trap/trap_default.h
index f671c419959e..1ba1b5930305 100644
--- a/contrib/amd/conf/trap/trap_default.h
+++ b/contrib/amd/conf/trap/trap_default.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.3 2004/07/06 14:14:26 mbr Exp $ */
 /* $srcdir/conf/trap/trap_default.h */
 #define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8
index 1e32f1100f03..e573031ffa32 100644
--- a/contrib/amd/fixmount/fixmount.8
+++ b/contrib/amd/fixmount/fixmount.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: fixmount.8,v 1.3.2.6 2004/01/06 03:15:23 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.12 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd February 26, 1993
 .Dt FIXMOUNT 8
diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c
index 3e0078620a4a..5be0aa596b8a 100644
--- a/contrib/amd/fixmount/fixmount.c
+++ b/contrib/amd/fixmount/fixmount.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: fixmount.c,v 1.5.2.4 2004/01/06 03:15:23 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/fixmount/fixmount.c,v 1.8 2004/07/06 13:16:46 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8
index 815ec7db4670..e9ec09c56c94 100644
--- a/contrib/amd/fsinfo/fsinfo.8
+++ b/contrib/amd/fsinfo/fsinfo.8
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.12 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd June 26, 1999
 .Dt FSINFO 8
diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c
index 21f803828007..6f5cc3530de8 100644
--- a/contrib/amd/fsinfo/fsinfo.c
+++ b/contrib/amd/fsinfo/fsinfo.c
@@ -38,7 +38,7 @@
  *
  *
  * $Id: fsinfo.c,v 1.5.2.7 2004/05/12 15:54:31 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/fsinfo/fsinfo.c,v 1.6 2004/07/06 13:16:46 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8
index 9ef049f49b3b..113eae08448c 100644
--- a/contrib/amd/hlfsd/hlfsd.8
+++ b/contrib/amd/hlfsd/hlfsd.8
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hlfsd.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.15 2005/06/16 20:21:02 ru Exp $
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
diff --git a/contrib/amd/hlfsd/hlfsd.c b/contrib/amd/hlfsd/hlfsd.c
index 17ee61f43b9b..5c98f701c394 100644
--- a/contrib/amd/hlfsd/hlfsd.c
+++ b/contrib/amd/hlfsd/hlfsd.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: hlfsd.c,v 1.7.2.9 2004/01/19 00:25:55 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.c,v 1.8 2004/07/06 13:16:46 mbr Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/hlfsd/hlfsd.h b/contrib/amd/hlfsd/hlfsd.h
index ab0a94e9a2df..2cd0c59da48f 100644
--- a/contrib/amd/hlfsd/hlfsd.h
+++ b/contrib/amd/hlfsd/hlfsd.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.4 2004/07/06 13:16:46 mbr Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/hlfsd/homedir.c b/contrib/amd/hlfsd/homedir.c
index eef883a8fd9e..f1fc1e3328a5 100644
--- a/contrib/amd/hlfsd/homedir.c
+++ b/contrib/amd/hlfsd/homedir.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: homedir.c,v 1.5.2.11 2004/01/06 03:15:23 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/homedir.c,v 1.7 2004/07/06 13:16:46 mbr Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h
index 19d2a3bc415e..d98036147019 100644
--- a/contrib/amd/include/am_defs.h
+++ b/contrib/amd/include/am_defs.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: am_defs.h,v 1.15.2.16 2004/05/12 15:54:31 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/include/am_defs.h,v 1.14 2004/07/06 13:16:46 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/libamu/mount_fs.c b/contrib/amd/libamu/mount_fs.c
index e134c901ce62..05cd7758561b 100644
--- a/contrib/amd/libamu/mount_fs.c
+++ b/contrib/amd/libamu/mount_fs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: mount_fs.c,v 1.11.2.12 2004/01/06 03:15:24 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/libamu/mount_fs.c,v 1.7 2004/07/06 13:16:47 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/contrib/amd/mk-amd-map/mk-amd-map.8
index fef0e749ed43..5f2b2202997d 100644
--- a/contrib/amd/mk-amd-map/mk-amd-map.8
+++ b/contrib/amd/mk-amd-map/mk-amd-map.8
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)mk-amd-map.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: mk-amd-map.8,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.8,v 1.7 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd June 28, 1993
 .Dt MK-AMD-MAP 8
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/contrib/amd/mk-amd-map/mk-amd-map.c
index d72850eeba94..6014dfe6a17b 100644
--- a/contrib/amd/mk-amd-map/mk-amd-map.c
+++ b/contrib/amd/mk-amd-map/mk-amd-map.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: mk-amd-map.c,v 1.5.2.6 2004/01/06 03:15:25 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.c,v 1.10 2004/07/06 13:16:49 mbr Exp $
  */
 
 /*
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index fe6858245891..29786a9b686a 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.conf.5,v 1.7.2.10 2004/01/21 04:04:58 ib42 Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.17.2.1 2005/09/24 01:59:35 keramida Exp $
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
diff --git a/contrib/amd/wire-test/wire-test.8 b/contrib/amd/wire-test/wire-test.8
index 2c6a37cead41..f214b5a2c798 100644
--- a/contrib/amd/wire-test/wire-test.8
+++ b/contrib/amd/wire-test/wire-test.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: wire-test.8,v 1.3.2.5 2004/01/06 03:15:25 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/wire-test/wire-test.8,v 1.6 2005/06/16 20:21:03 ru Exp $
 .\"
 .Dd February 26, 1993
 .Dt WIRE-TEST 8
diff --git a/contrib/amd/wire-test/wire-test.c b/contrib/amd/wire-test/wire-test.c
index 593cf4538786..2f5ee1603509 100644
--- a/contrib/amd/wire-test/wire-test.c
+++ b/contrib/amd/wire-test/wire-test.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: wire-test.c,v 1.5.2.4 2004/01/06 03:15:25 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/wire-test/wire-test.c,v 1.8 2004/07/06 13:16:49 mbr Exp $
  *
  */
 
diff --git a/contrib/bc/FREEBSD-upgrade b/contrib/bc/FREEBSD-upgrade
index 0174d7bbbe92..ffbc18ec5c59 100644
--- a/contrib/bc/FREEBSD-upgrade
+++ b/contrib/bc/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bc/FREEBSD-upgrade,v 1.6 2004/02/17 01:04:18 ache Exp $
 
 bc 1.0.5a
 	originals can be found at: ftp://prep.ai.mit.edu/pub/gnu/
diff --git a/contrib/bc/bc/main.c b/contrib/bc/bc/main.c
index 4170bb58b874..f957157684fd 100644
--- a/contrib/bc/bc/main.c
+++ b/contrib/bc/bc/main.c
@@ -26,7 +26,7 @@
                 Western Washington University
                 Bellingham, WA 98226-9062
 
-$FreeBSD$
+$FreeBSD: src/contrib/bc/bc/main.c,v 1.6 2004/02/17 00:53:50 ache Exp $
        
 *************************************************************************/
 
diff --git a/contrib/bc/bc/scan.l b/contrib/bc/bc/scan.l
index 8910c66f4c8a..88c9ae109976 100644
--- a/contrib/bc/bc/scan.l
+++ b/contrib/bc/bc/scan.l
@@ -1,5 +1,5 @@
 %{
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bc/bc/scan.l,v 1.6 2001/04/11 04:07:38 ache Exp $ */
 /* scan.l: the (f)lex description file for the scanner. */
 
 /*  This file is part of GNU bc.
diff --git a/contrib/bc/doc/bc.1 b/contrib/bc/doc/bc.1
index bb19594421f2..0b34d15b722c 100644
--- a/contrib/bc/doc/bc.1
+++ b/contrib/bc/doc/bc.1
@@ -27,7 +27,7 @@
 .\" Western Washington University
 .\" Bellingham, WA 98226-9062
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/bc/doc/bc.1,v 1.6 2001/07/12 07:35:06 ru Exp $
 .\"
 .TH bc 1 .\" "Command Manual" v1.06 "Sept 12, 2000"
 .SH NAME
diff --git a/contrib/bc/doc/dc.1 b/contrib/bc/doc/dc.1
index adaf5d0cc058..d294d062b6ed 100644
--- a/contrib/bc/doc/dc.1
+++ b/contrib/bc/doc/dc.1
@@ -20,7 +20,7 @@
 .\"   59 Temple Place, Suite 330
 .\"   Boston, MA 02111 USA
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/bc/doc/dc.1,v 1.4 2001/02/26 07:17:03 kris Exp $
 .\"
 .TH DC 1 "1997-03-25" "GNU Project"
 .ds dc \fIdc\fP
diff --git a/contrib/bind9/FREEBSD-Upgrade b/contrib/bind9/FREEBSD-Upgrade
index 456df7f3dfaf..ffd81ff0ba32 100644
--- a/contrib/bind9/FREEBSD-Upgrade
+++ b/contrib/bind9/FREEBSD-Upgrade
@@ -114,4 +114,4 @@ C) Commit when everything builds cleanly and works properly.
 					-- des@FreeBSD.org
 					-- dougb@FreeBSD.org
 
-$FreeBSD$
+$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.4.2.1 2005/07/30 07:56:25 des Exp $
diff --git a/contrib/bind9/FREEBSD-Xlist b/contrib/bind9/FREEBSD-Xlist
index e6c1b832a132..135f2a7f8608 100644
--- a/contrib/bind9/FREEBSD-Xlist
+++ b/contrib/bind9/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/bind9/FREEBSD-Xlist,v 1.3 2005/03/17 08:40:11 dougb Exp $
 
 # Misc. stuff
 .cvsignore
diff --git a/contrib/binutils/FREEBSD-Xlist b/contrib/binutils/FREEBSD-Xlist
index af18d97b0967..d0313c85a11c 100644
--- a/contrib/binutils/FREEBSD-Xlist
+++ b/contrib/binutils/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-Xlist,v 1.5 2001/05/28 17:48:04 obrien Exp $
 .cvsignore
 mkdep
 *-hp*
diff --git a/contrib/binutils/FREEBSD-deletelist b/contrib/binutils/FREEBSD-deletelist
index 89020f423b82..bef56a9577a4 100644
--- a/contrib/binutils/FREEBSD-deletelist
+++ b/contrib/binutils/FREEBSD-deletelist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-deletelist,v 1.6 2002/02/22 05:11:49 obrien Exp $
 CVS
 testsuite
 .cvsignore
diff --git a/contrib/binutils/FREEBSD-upgrade b/contrib/binutils/FREEBSD-upgrade
index ab7c24117f74..66212f92714f 100644
--- a/contrib/binutils/FREEBSD-upgrade
+++ b/contrib/binutils/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-upgrade,v 1.10 2002/03/13 07:16:00 obrien Exp $
 
 To get a copy of the Binutils source from the Sourceware CVS repository
 this command line was used:
diff --git a/contrib/binutils/bfd/elf.c b/contrib/binutils/bfd/elf.c
index 2b16f86cd45e..3969528fa855 100644
--- a/contrib/binutils/bfd/elf.c
+++ b/contrib/binutils/bfd/elf.c
@@ -20,7 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/binutils/bfd/elf.c,v 1.19 2004/06/16 06:02:14 obrien Exp $ */
 
 
 /*  SECTION
diff --git a/contrib/binutils/bfd/freebsd.h b/contrib/binutils/bfd/freebsd.h
index 5b0ede1acb56..b845da863e6e 100644
--- a/contrib/binutils/bfd/freebsd.h
+++ b/contrib/binutils/bfd/freebsd.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/binutils/bfd/freebsd.h,v 1.5 2004/06/16 06:13:06 obrien Exp $ */
 
 /* FreeBSD QMAGIC files have the header in the text. */
 #define	N_HEADER_IN_TEXT(x)	1
diff --git a/contrib/binutils/ld/Makefile.in b/contrib/binutils/ld/Makefile.in
index 020064b54c39..3cf8046916fe 100644
--- a/contrib/binutils/ld/Makefile.in
+++ b/contrib/binutils/ld/Makefile.in
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-# $FreeBSD$
+# $FreeBSD: src/contrib/binutils/ld/Makefile.in,v 1.15 2004/06/16 06:03:34 obrien Exp $
 
 
 SHELL = @SHELL@
diff --git a/contrib/binutils/ld/emultempl/elf32.em b/contrib/binutils/ld/emultempl/elf32.em
index 4a31b48f6598..fa89123ad60d 100644
--- a/contrib/binutils/ld/emultempl/elf32.em
+++ b/contrib/binutils/ld/emultempl/elf32.em
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/binutils/ld/emultempl/elf32.em,v 1.14 2004/06/16 06:09:06 obrien Exp $
 
 
 # This shell script emits a C file. -*- C -*-
diff --git a/contrib/bsnmp/FREEBSD-Xlist b/contrib/bsnmp/FREEBSD-Xlist
index 368aee271656..badd52d9b67f 100644
--- a/contrib/bsnmp/FREEBSD-Xlist
+++ b/contrib/bsnmp/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.3 2005/02/28 17:29:10 harti Exp $
 */Makefile.in
 */acinclude.m4
 */aclocal.m4
diff --git a/contrib/bsnmp/FREEBSD-upgrade b/contrib/bsnmp/FREEBSD-upgrade
index 4fb31fd9153c..99dda121b277 100644
--- a/contrib/bsnmp/FREEBSD-upgrade
+++ b/contrib/bsnmp/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bsnmp/FREEBSD-upgrade,v 1.2 2004/01/26 10:28:31 harti Exp $
 
 This is the Begemot micro-SNMP daemon. It is the base for the ILMI daemon
 for ngATM. Be careful to feed changes back to the maintainer
diff --git a/contrib/bzip2/FREEBSD-Xlist b/contrib/bzip2/FREEBSD-Xlist
index 2725621ac285..5f8d149d9df9 100644
--- a/contrib/bzip2/FREEBSD-Xlist
+++ b/contrib/bzip2/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/bzip2/FREEBSD-Xlist,v 1.1 2005/05/16 18:56:30 obrien Exp $
 *README.XML.STUFF
 *bz-common.xsl
 *bz-fo.xsl
diff --git a/contrib/bzip2/FREEBSD-upgrade b/contrib/bzip2/FREEBSD-upgrade
index 58857ca8a871..c413108425a5 100644
--- a/contrib/bzip2/FREEBSD-upgrade
+++ b/contrib/bzip2/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.2 2005/05/16 18:56:30 obrien Exp $
 
 Julian Seward's bzip2
 	originals can be found at: 	http://sources.redhat.com/bzip2/
diff --git a/contrib/bzip2/bzip2.c b/contrib/bzip2/bzip2.c
index 5164e2315d3a..f398c8319103 100644
--- a/contrib/bzip2/bzip2.c
+++ b/contrib/bzip2/bzip2.c
@@ -99,7 +99,7 @@
       give any guarantee of the above statement.
 --*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bzip2/bzip2.c,v 1.2 2005/06/29 21:36:49 simon Exp $ */
 
 
 /*----------------------------------------------------*/
diff --git a/contrib/bzip2/bzlib.c b/contrib/bzip2/bzlib.c
index f365acd68983..24bc130e1841 100644
--- a/contrib/bzip2/bzlib.c
+++ b/contrib/bzip2/bzlib.c
@@ -74,7 +74,7 @@
 --*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.2 2005/05/29 21:56:37 sobomax Exp $");
 
 #include "bzlib_private.h"
 
diff --git a/contrib/com_err/com_err.3 b/contrib/com_err/com_err.3
index e6eeea13b852..7f6685e4a63c 100644
--- a/contrib/com_err/com_err.3
+++ b/contrib/com_err/com_err.3
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/com_err/com_err.3,v 1.1 1999/09/04 09:48:58 markm Exp $
 .\"
 .TH COM_ERR 3 "22 Nov 1988" SIPB
 .SH NAME
diff --git a/contrib/com_err/com_err.c b/contrib/com_err/com_err.c
index f00c602646bb..fe4c09bcef65 100644
--- a/contrib/com_err/com_err.c
+++ b/contrib/com_err/com_err.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_err.c,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/contrib/com_err/com_err.h b/contrib/com_err/com_err.h
index 6c1faa4bd5bd..eeef78e90950 100644
--- a/contrib/com_err/com_err.h
+++ b/contrib/com_err/com_err.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_err.h,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 /* $Id: com_err.h,v 1.9 2001/05/11 20:03:36 assar Exp $ */
 
 /* MIT compatible com_err library */
diff --git a/contrib/com_err/com_right.h b/contrib/com_err/com_right.h
index 09e95fa0251c..b9325c0b829a 100644
--- a/contrib/com_err/com_right.h
+++ b/contrib/com_err/com_right.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: com_right.h,v 1.11 2000/07/31 01:11:08 assar Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_right.h,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #ifndef __COM_RIGHT_H__
 #define __COM_RIGHT_H__
diff --git a/contrib/com_err/compile_et.1 b/contrib/com_err/compile_et.1
index e7c3fb6f0ac4..4e3e5ff675c8 100644
--- a/contrib/com_err/compile_et.1
+++ b/contrib/com_err/compile_et.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.4 2005/06/16 20:51:10 ru Exp $
 .\"
 .Dd November 22, 1988
 .Os
diff --git a/contrib/com_err/compile_et.c b/contrib/com_err/compile_et.c
index 59d9de996d63..8cb8183c9ee8 100644
--- a/contrib/com_err/compile_et.c
+++ b/contrib/com_err/compile_et.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/compile_et.c,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #undef ROKEN_RENAME
 #include "compile_et.h"
diff --git a/contrib/com_err/compile_et.h b/contrib/com_err/compile_et.h
index 35e4863989ff..0d56bfaa5c28 100644
--- a/contrib/com_err/compile_et.h
+++ b/contrib/com_err/compile_et.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: compile_et.h,v 1.6 2000/07/01 20:21:48 assar Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/compile_et.h,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #ifndef __COMPILE_ET_H__
 #define __COMPILE_ET_H__
diff --git a/contrib/com_err/getarg.c b/contrib/com_err/getarg.c
index 80f76ab4a5ec..d2de05ac91e2 100644
--- a/contrib/com_err/getarg.c
+++ b/contrib/com_err/getarg.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/com_err/getarg.c,v 1.2 2003/01/08 17:05:52 peter Exp $
  */
 
 #if 0
diff --git a/contrib/com_err/lex.l b/contrib/com_err/lex.l
index b5f8db1e1e43..27e5b441f736 100644
--- a/contrib/com_err/lex.l
+++ b/contrib/com_err/lex.l
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/lex.l,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 /*
  * This is to handle the definition of this symbol in some AIX
diff --git a/contrib/com_err/parse.y b/contrib/com_err/parse.y
index 960bcfa8f1e4..40e3b4e0adbc 100644
--- a/contrib/com_err/parse.y
+++ b/contrib/com_err/parse.y
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/parse.y,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #include "compile_et.h"
 #include "lex.h"
diff --git a/contrib/cpio/FREEBSD-upgrade b/contrib/cpio/FREEBSD-upgrade
index 949705bb2b23..acccdc0c986f 100644
--- a/contrib/cpio/FREEBSD-upgrade
+++ b/contrib/cpio/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cpio/FREEBSD-upgrade,v 1.4 2004/02/17 01:41:49 ache Exp $
 
 GNU cpio 2.4.2
 	originals can be found at: ftp://prep.ai.mit.edu/pub/gnu
diff --git a/contrib/cpio/copyin.c b/contrib/cpio/copyin.c
index c3cc7997608f..ae1f171927be 100644
--- a/contrib/cpio/copyin.c
+++ b/contrib/cpio/copyin.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-$FreeBSD$
+$FreeBSD: src/contrib/cpio/copyin.c,v 1.7 2001/03/21 21:17:54 ache Exp $
 */
 
 #include <stdio.h>
diff --git a/contrib/cpio/copypass.c b/contrib/cpio/copypass.c
index 993d720456df..4fb8f1124c59 100644
--- a/contrib/cpio/copypass.c
+++ b/contrib/cpio/copypass.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/copypass.c,v 1.3 2003/07/11 02:19:19 green Exp $ */
 /* copypass.c - cpio copy pass sub-function.
    Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc.
 
diff --git a/contrib/cpio/main.c b/contrib/cpio/main.c
index 20829ef50e1a..6309973999e4 100644
--- a/contrib/cpio/main.c
+++ b/contrib/cpio/main.c
@@ -19,7 +19,7 @@
    David MacKenzie <djm@gnu.ai.mit.edu>,
    and John Oleynick <juo@klinzhai.rutgers.edu>.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/main.c,v 1.3 1999/09/15 01:47:13 peter Exp $ */
 
 #include <stdio.h>
 #include <getopt.h>
diff --git a/contrib/cpio/tar.c b/contrib/cpio/tar.c
index 832ad4f37868..864cd6ca8218 100644
--- a/contrib/cpio/tar.c
+++ b/contrib/cpio/tar.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/tar.c,v 1.2 2004/08/28 03:13:05 kientzle Exp $ */
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/contrib/cvs/FREEBSD-Xlist b/contrib/cvs/FREEBSD-Xlist
index 535030f7f7d6..c599c3226163 100644
--- a/contrib/cvs/FREEBSD-Xlist
+++ b/contrib/cvs/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.1 2004/06/09 20:14:53 des Exp $
 
 */*.com
 */*.dep
diff --git a/contrib/cvs/FREEBSD-upgrade b/contrib/cvs/FREEBSD-upgrade
index d884b289228b..5cef883e3ead 100644
--- a/contrib/cvs/FREEBSD-upgrade
+++ b/contrib/cvs/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/contrib/cvs/contrib/sccs2rcs.in b/contrib/cvs/contrib/sccs2rcs.in
index b00ca88373c2..5606bcda2fc4 100755
--- a/contrib/cvs/contrib/sccs2rcs.in
+++ b/contrib/cvs/contrib/sccs2rcs.in
@@ -48,7 +48,7 @@
 #      -Allan G. Schrum schrum@ofsoptics.com agschrum@mindspring.com
 # Fri Sep 26 10:40:40 EDT 2003
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/cvs/contrib/sccs2rcs.in,v 1.5 2004/04/15 01:17:25 peter Exp $
 
 
 #we'll assume the user set up the path correctly
diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c
index 109e66ee021c..7cc66c1b11d0 100644
--- a/contrib/cvs/diff/diff3.c
+++ b/contrib/cvs/diff/diff3.c
@@ -13,7 +13,7 @@
 
    */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/diff/diff3.c,v 1.6 2004/04/15 01:17:26 peter Exp $
  */
 
 /* Written by Randy Smith */
diff --git a/contrib/cvs/lib/md5.h b/contrib/cvs/lib/md5.h
index 3b5ba05891f2..f9d886b61a8c 100644
--- a/contrib/cvs/lib/md5.h
+++ b/contrib/cvs/lib/md5.h
@@ -1,7 +1,7 @@
 /* See md5.c for explanation and copyright information.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/lib/md5.h,v 1.2 1999/12/11 15:10:02 peter Exp $
  */
 
 #ifndef MD5_H
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index f58a31a6d0eb..748592795fb4 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.21.8.1 2005/09/24 01:59:35 keramida Exp $
 .de Id
 .ds Rv \\$3
 .ds Dt \\$4
diff --git a/contrib/cvs/man/cvsbug.8 b/contrib/cvs/man/cvsbug.8
index 460ca4640d95..3f38ed57af7f 100644
--- a/contrib/cvs/man/cvsbug.8
+++ b/contrib/cvs/man/cvsbug.8
@@ -17,7 +17,7 @@
 .\"    General Public License for more details.
 .\"
 .\" ---------------------------------------------------------------------------
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/cvs/man/cvsbug.8,v 1.3 2000/10/02 06:43:55 peter Exp $
 .nh
 .TH CVSBUG 8 xVERSIONx "February 1993"
 .SH NAME
diff --git a/contrib/cvs/src/buffer.c b/contrib/cvs/src/buffer.c
index d53a5c6d61bf..452c59130b1f 100644
--- a/contrib/cvs/src/buffer.c
+++ b/contrib/cvs/src/buffer.c
@@ -1,6 +1,6 @@
 /* Code for the buffer data structure.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cvs/src/buffer.c,v 1.5 2004/04/15 01:17:26 peter Exp $ */
 
 #include <assert.h>
 #include "cvs.h"
diff --git a/contrib/cvs/src/checkout.c b/contrib/cvs/src/checkout.c
index 57933ee02ad6..4efd1755cc12 100644
--- a/contrib/cvs/src/checkout.c
+++ b/contrib/cvs/src/checkout.c
@@ -34,7 +34,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/checkout.c,v 1.5 2004/04/15 01:17:26 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/client.c b/contrib/cvs/src/client.c
index aae404a58488..ec3353e51db1 100644
--- a/contrib/cvs/src/client.c
+++ b/contrib/cvs/src/client.c
@@ -11,7 +11,7 @@
    GNU General Public License for more details.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/client.c,v 1.12 2004/06/10 19:12:50 peter Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/cvs/src/commit.c b/contrib/cvs/src/commit.c
index 1edb95d94c91..2d4958dfe6fd 100644
--- a/contrib/cvs/src/commit.c
+++ b/contrib/cvs/src/commit.c
@@ -12,7 +12,7 @@
  *
  * The call is: cvs commit [options] files...
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/commit.c,v 1.15 2004/06/10 19:12:50 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/cvs.h b/contrib/cvs/src/cvs.h
index c47cdcf335f2..8138ebe199b8 100644
--- a/contrib/cvs/src/cvs.h
+++ b/contrib/cvs/src/cvs.h
@@ -9,7 +9,7 @@
 /*
  * basic information used in all source files
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/cvs.h,v 1.20 2004/06/10 19:12:50 peter Exp $
  */
 
 
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c
index 7faaae86297b..395237c4ba26 100644
--- a/contrib/cvs/src/diff.c
+++ b/contrib/cvs/src/diff.c
@@ -13,7 +13,7 @@
  * Without any file arguments, runs diff against all the currently modified
  * files.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/diff.c,v 1.21 2004/04/15 01:31:28 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/entries.c b/contrib/cvs/src/entries.c
index 1ab7c7e5a5d9..8f6359499c8f 100644
--- a/contrib/cvs/src/entries.c
+++ b/contrib/cvs/src/entries.c
@@ -12,7 +12,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/entries.c,v 1.4 2004/04/15 01:41:05 peter Exp $
  */
 #include "cvs.h"
 #include "getline.h"
diff --git a/contrib/cvs/src/filesubr.c b/contrib/cvs/src/filesubr.c
index b9f9bd5765b1..a2a92685a711 100644
--- a/contrib/cvs/src/filesubr.c
+++ b/contrib/cvs/src/filesubr.c
@@ -18,7 +18,7 @@
    file system semantics.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/filesubr.c,v 1.12 2004/06/10 19:12:50 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/import.c b/contrib/cvs/src/import.c
index b962ebc1257e..f7b536432fa2 100644
--- a/contrib/cvs/src/import.c
+++ b/contrib/cvs/src/import.c
@@ -15,7 +15,7 @@
  *
  * Additional arguments specify more Vendor Release Tags.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/import.c,v 1.12 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/lock.c b/contrib/cvs/src/lock.c
index 36cbf7d3f46f..8159e9613bed 100644
--- a/contrib/cvs/src/lock.c
+++ b/contrib/cvs/src/lock.c
@@ -9,7 +9,7 @@
  * 
  * Lock file support for CVS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/lock.c,v 1.13 2004/04/15 01:17:27 peter Exp $
  */
 
 /* The node Concurrency in doc/cvs.texinfo has a brief introduction to
diff --git a/contrib/cvs/src/log.c b/contrib/cvs/src/log.c
index 88e5bb7672f7..4339e595e53f 100644
--- a/contrib/cvs/src/log.c
+++ b/contrib/cvs/src/log.c
@@ -11,7 +11,7 @@
  * argument, prints the log information for all the files in the directory
  * (recursive by default).
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/log.c,v 1.2 2004/07/06 08:10:38 des Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/login.c b/contrib/cvs/src/login.c
index 86705eab973a..21a4aa2c53e4 100644
--- a/contrib/cvs/src/login.c
+++ b/contrib/cvs/src/login.c
@@ -6,7 +6,7 @@
  * 
  * Allow user to log in for an authenticating server.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/login.c,v 1.9 2005/04/22 17:58:25 simon Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/logmsg.c b/contrib/cvs/src/logmsg.c
index fbbcc3c4061d..08dde145519e 100644
--- a/contrib/cvs/src/logmsg.c
+++ b/contrib/cvs/src/logmsg.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS source distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/logmsg.c,v 1.12 2004/04/15 01:17:27 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/main.c b/contrib/cvs/src/main.c
index 932dbd2af731..33b268d07195 100644
--- a/contrib/cvs/src/main.c
+++ b/contrib/cvs/src/main.c
@@ -10,7 +10,7 @@
  * Credit to Dick Grune, Vrije Universiteit, Amsterdam, for writing
  * the shell-script CVS system that this is based on.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/main.c,v 1.25 2004/07/06 08:10:38 des Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/mkmodules.c b/contrib/cvs/src/mkmodules.c
index 0c913872f0a9..0be25c44885a 100644
--- a/contrib/cvs/src/mkmodules.c
+++ b/contrib/cvs/src/mkmodules.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS kit.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/mkmodules.c,v 1.13 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/parseinfo.c b/contrib/cvs/src/parseinfo.c
index 38a11c6d2c11..46ddb92ad98b 100644
--- a/contrib/cvs/src/parseinfo.c
+++ b/contrib/cvs/src/parseinfo.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS source distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/patch.c b/contrib/cvs/src/patch.c
index 7d99f29a602c..4511587d2b5a 100644
--- a/contrib/cvs/src/patch.c
+++ b/contrib/cvs/src/patch.c
@@ -11,7 +11,7 @@
  * current head of a module, or between two releases.  Can specify the
  * release as either a date or a revision number.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/patch.c,v 1.2 2005/04/22 17:58:25 simon Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/rcs.c b/contrib/cvs/src/rcs.c
index 1d3c1fdbbfac..dfb9f62dcbfe 100644
--- a/contrib/cvs/src/rcs.c
+++ b/contrib/cvs/src/rcs.c
@@ -7,7 +7,7 @@
  * The routines contained in this file do all the rcs file parsing and
  * manipulation
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.28 2005/04/22 17:58:25 simon Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h
index d40d1781b755..6e5be6d8c147 100644
--- a/contrib/cvs/src/rcs.h
+++ b/contrib/cvs/src/rcs.h
@@ -7,7 +7,7 @@
  * 
  * RCS source control definitions needed by rcs.c and friends
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.h,v 1.11 2004/07/06 08:10:38 des Exp $
  */
 
 /* Strings which indicate a conflict if they occur at the start of a line.  */
diff --git a/contrib/cvs/src/rcscmds.c b/contrib/cvs/src/rcscmds.c
index df91ff8498c3..ebaa4165a193 100644
--- a/contrib/cvs/src/rcscmds.c
+++ b/contrib/cvs/src/rcscmds.c
@@ -8,7 +8,7 @@
  * The functions in this file provide an interface for performing 
  * operations directly on RCS files. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcscmds.c,v 1.10 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/recurse.c b/contrib/cvs/src/recurse.c
index 20a0f9b41da8..2f4e50c7914f 100644
--- a/contrib/cvs/src/recurse.c
+++ b/contrib/cvs/src/recurse.c
@@ -6,7 +6,7 @@
  * 
  * General recursion handler
  * 
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/recurse.c,v 1.12 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/server.c b/contrib/cvs/src/server.c
index e186c34becca..2f8591dc91cc 100644
--- a/contrib/cvs/src/server.c
+++ b/contrib/cvs/src/server.c
@@ -9,7 +9,7 @@
    GNU General Public License for more details.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/server.c,v 1.24 2004/06/10 19:12:50 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/tag.c b/contrib/cvs/src/tag.c
index 903f3579078d..af47f934b5d7 100644
--- a/contrib/cvs/src/tag.c
+++ b/contrib/cvs/src/tag.c
@@ -11,7 +11,7 @@
  * Tag uses the checked out revision in the current directory, rtag uses
  * the modules database, if necessary.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/tag.c,v 1.2 2004/08/05 17:47:35 des Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/update.c b/contrib/cvs/src/update.c
index 0ddf3bc41b3f..fb5761ceceba 100644
--- a/contrib/cvs/src/update.c
+++ b/contrib/cvs/src/update.c
@@ -32,7 +32,7 @@
  * directories added to the repository are automatically created and updated
  * as well.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/update.c,v 1.14 2004/06/10 19:12:50 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/update.h b/contrib/cvs/src/update.h
index c886b4c8f1b7..849e942655c3 100644
--- a/contrib/cvs/src/update.h
+++ b/contrib/cvs/src/update.h
@@ -11,7 +11,7 @@
    GNU General Public License for more details.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/update.h,v 1.3 2004/04/15 01:17:28 peter Exp $
  */
 
 int do_update PROTO((int argc, char *argv[], char *xoptions, char *xtag,
diff --git a/contrib/diff/FREEBSD-upgrade b/contrib/diff/FREEBSD-upgrade
index 198c1d237146..fdabac0a1c3b 100644
--- a/contrib/diff/FREEBSD-upgrade
+++ b/contrib/diff/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/diff/FREEBSD-upgrade,v 1.2 2004/02/16 22:54:45 ache Exp $
 Import of GNU diff 2.7
 
 Original source available as ftp://prep.ai.mit.edu/pub/gnu/diffutils-2.7.tar.gz
diff --git a/contrib/diff/diff.c b/contrib/diff/diff.c
index 1f5f842d2e93..d63d6a91d68d 100644
--- a/contrib/diff/diff.c
+++ b/contrib/diff/diff.c
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* GNU DIFF was written by Mike Haertel, David Hayes,
    Richard Stallman, Len Tower, and Paul Eggert.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/diff.c,v 1.5 2005/06/03 06:46:56 obrien Exp $ */
 
 #define GDIFF_MAIN
 #include "diff.h"
diff --git a/contrib/diff/diff.h b/contrib/diff/diff.h
index 9a92e0d9f184..562f4e547766 100644
--- a/contrib/diff/diff.h
+++ b/contrib/diff/diff.h
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU DIFF; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/diff.h,v 1.3 2004/02/16 22:54:45 ache Exp $ */
 
 #include "system.h"
 #include <stdio.h>
diff --git a/contrib/diff/prepend_args.c b/contrib/diff/prepend_args.c
index 5dee55efccc1..7bbeab5d40da 100644
--- a/contrib/diff/prepend_args.c
+++ b/contrib/diff/prepend_args.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/prepend_args.c,v 1.2 2003/01/08 06:40:35 peter Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/diff/prepend_args.h b/contrib/diff/prepend_args.h
index 3f72cc2fd112..a46de62ff1eb 100644
--- a/contrib/diff/prepend_args.h
+++ b/contrib/diff/prepend_args.h
@@ -16,6 +16,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/prepend_args.h,v 1.1 1999/11/26 02:51:44 obrien Exp $ */
 
 void prepend_default_options PARAMS ((char const *, int *, char ***));
diff --git a/contrib/diff/sdiff.c b/contrib/diff/sdiff.c
index 5b5759ededcd..828f734d24cc 100644
--- a/contrib/diff/sdiff.c
+++ b/contrib/diff/sdiff.c
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* GNU SDIFF was written by Thomas Lord. */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/diff/sdiff.c,v 1.4 2002/01/29 17:40:45 nectar Exp $");
 
 #include "system.h"
 #include <stdio.h>
diff --git a/contrib/diff/util.c b/contrib/diff/util.c
index 35b28eae7f40..8a0a71544890 100644
--- a/contrib/diff/util.c
+++ b/contrib/diff/util.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GNU DIFF; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/util.c,v 1.6 2003/11/03 12:41:27 harti Exp $ */
 
 #include "diff.h"
 
diff --git a/contrib/expat/FREEBSD-upgrade b/contrib/expat/FREEBSD-upgrade
index 8fd9a57804ff..025df2f9a8b0 100644
--- a/contrib/expat/FREEBSD-upgrade
+++ b/contrib/expat/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/expat/FREEBSD-upgrade,v 1.1.1.1 2002/10/02 07:16:04 phk Exp $
 
 eXpat from www.libexpat.org
 
diff --git a/contrib/file/.cvsignore b/contrib/file/.cvsignore
deleted file mode 100644
index d89921897ae6..000000000000
--- a/contrib/file/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-autom4te.cache
diff --git a/contrib/file/FREEBSD-upgrade b/contrib/file/FREEBSD-upgrade
index ac3290c68c81..0f43028f0450 100644
--- a/contrib/file/FREEBSD-upgrade
+++ b/contrib/file/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.4 2002/09/16 06:02:55 obrien Exp $
 
 Christos Zoulas `file'
 	originals can be found at: ftp://ftp.astron.com/pub/file/
diff --git a/contrib/gcc/FREEBSD-Xlist b/contrib/gcc/FREEBSD-Xlist
index 96080bc59e23..336210a13784 100644
--- a/contrib/gcc/FREEBSD-Xlist
+++ b/contrib/gcc/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/gcc/FREEBSD-Xlist,v 1.3 2004/02/17 03:22:34 ache Exp $
 *.brik
 *FAQ
 *contrib
diff --git a/contrib/gcc/FREEBSD-deletelist b/contrib/gcc/FREEBSD-deletelist
index f5bc81750db9..a058b972f45f 100644
--- a/contrib/gcc/FREEBSD-deletelist
+++ b/contrib/gcc/FREEBSD-deletelist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gcc/FREEBSD-deletelist,v 1.5 2004/02/17 03:22:34 ache Exp $
 CVS
 .cvsignore
 ABOUT*NLS
diff --git a/contrib/gcc/FREEBSD-libiberty b/contrib/gcc/FREEBSD-libiberty
index 1b8c24940c4b..e6683dc7c1ab 100644
--- a/contrib/gcc/FREEBSD-libiberty
+++ b/contrib/gcc/FREEBSD-libiberty
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/contrib/gcc/FREEBSD-libiberty,v 1.2 2002/05/10 05:21:15 obrien Exp $
 
 for F in \
 	choose-temp.c	\
diff --git a/contrib/gcc/FREEBSD-upgrade b/contrib/gcc/FREEBSD-upgrade
index 922f8eb4d0d0..b8378da44bdd 100644
--- a/contrib/gcc/FREEBSD-upgrade
+++ b/contrib/gcc/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gcc/FREEBSD-upgrade,v 1.3 2002/05/10 05:21:15 obrien Exp $
 
 tar -xvjf gcc-3.0.2.tar.bz2 -X FREEBSD-Xlist
 
diff --git a/contrib/gcc/c-decl.c b/contrib/gcc/c-decl.c
index 26431d0e4836..1e53e246dae9 100644
--- a/contrib/gcc/c-decl.c
+++ b/contrib/gcc/c-decl.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.12.2.1 2005/09/12 10:22:53 scottl Exp $ */
 
 /* Process declarations and symbol lookup for C front end.
    Also constructs types; the standard scalar types at initialization,
diff --git a/contrib/gcc/c-format.c b/contrib/gcc/c-format.c
index 34327a93087c..3b036f4e6306 100644
--- a/contrib/gcc/c-format.c
+++ b/contrib/gcc/c-format.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-format.c,v 1.10 2005/06/03 04:02:19 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/c-opts.c b/contrib/gcc/c-opts.c
index 84f86cb3b71b..4aedb1b2d7f2 100644
--- a/contrib/gcc/c-opts.c
+++ b/contrib/gcc/c-opts.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-opts.c,v 1.3 2005/06/03 04:02:19 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/c.opt b/contrib/gcc/c.opt
index 0568463e68fb..10e2787d6f83 100644
--- a/contrib/gcc/c.opt
+++ b/contrib/gcc/c.opt
@@ -59,7 +59,7 @@
 
 ; Please try to keep this file in ASCII collating order.
 
-; $FreeBSD$
+; $FreeBSD: src/contrib/gcc/c.opt,v 1.3 2005/06/03 04:02:19 kan Exp $
 
 Language
 C
diff --git a/contrib/gcc/cccp.1 b/contrib/gcc/cccp.1
index 442f0ab748e9..a056a7e10f64 100644
--- a/contrib/gcc/cccp.1
+++ b/contrib/gcc/cccp.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/gcc/cccp.1,v 1.3 1999/09/19 08:18:18 obrien Exp $
 .\" Copyright (c) 1991, 1992, 1993 Free Software Foundation       \-*-Text-*-
 .\" See section COPYING for conditions for redistribution
 .TH cpp 1 "April 30, 1993" "FreeBSD" "GNU Tools"
diff --git a/contrib/gcc/choose-temp.c b/contrib/gcc/choose-temp.c
index 7f33f83ff600..3f20d913dc6f 100644
--- a/contrib/gcc/choose-temp.c
+++ b/contrib/gcc/choose-temp.c
@@ -17,7 +17,7 @@ License along with libiberty; see the file COPYING.LIB.  If not,
 write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/choose-temp.c,v 1.4 2002/05/09 21:15:23 obrien Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/contrib/gcc/config/alpha/elf.h b/contrib/gcc/config/alpha/elf.h
index 97b15fe1eeeb..4bc9c30fef43 100644
--- a/contrib/gcc/config/alpha/elf.h
+++ b/contrib/gcc/config/alpha/elf.h
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/alpha/elf.h,v 1.11 2004/07/28 04:35:51 kan Exp $ */
 
 #undef OBJECT_FORMAT_COFF
 #undef EXTENDED_COFF
diff --git a/contrib/gcc/config/alpha/freebsd.h b/contrib/gcc/config/alpha/freebsd.h
index b00798936dba..7a0d55a2b2d6 100644
--- a/contrib/gcc/config/alpha/freebsd.h
+++ b/contrib/gcc/config/alpha/freebsd.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/alpha/freebsd.h,v 1.19 2004/07/28 04:39:15 kan Exp $ */
 
 #undef  SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS \
diff --git a/contrib/gcc/config/freebsd-spec.h b/contrib/gcc/config/freebsd-spec.h
index e0a5b6640f0c..7064442f6940 100644
--- a/contrib/gcc/config/freebsd-spec.h
+++ b/contrib/gcc/config/freebsd-spec.h
@@ -18,7 +18,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.19 2005/06/03 04:02:20 kan Exp $ */
 
 /* Common FreeBSD configuration. 
    All FreeBSD architectures should include this file, which will specify
diff --git a/contrib/gcc/config/freebsd.h b/contrib/gcc/config/freebsd.h
index 9a9ec96c64ef..d3e780193df1 100644
--- a/contrib/gcc/config/freebsd.h
+++ b/contrib/gcc/config/freebsd.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
    Further work by David O'Brien <obrien@FreeBSD.org> and
    Loren J. Rittle <ljrittle@acm.org>.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.40 2005/06/03 17:35:13 kan Exp $ */
 
 /* In case we need to know.  */
 #define USING_CONFIG_FREEBSD 1
diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h
index 1bfde2fe60a1..d79ab71a1ff8 100644
--- a/contrib/gcc/config/i386/freebsd.h
+++ b/contrib/gcc/config/i386/freebsd.h
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.72 2005/06/03 05:58:56 kan Exp $ */
 
 #undef  CC1_SPEC
 #define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
diff --git a/contrib/gcc/config/i386/freebsd64.h b/contrib/gcc/config/i386/freebsd64.h
index 473ef2f22b1b..bf35da46ca97 100644
--- a/contrib/gcc/config/i386/freebsd64.h
+++ b/contrib/gcc/config/i386/freebsd64.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.9 2004/07/28 04:44:23 kan Exp $ */
 
 
 #undef  TARGET_VERSION
diff --git a/contrib/gcc/config/i386/i386.c b/contrib/gcc/config/i386/i386.c
index d0040fb591d3..937c0c5af020 100644
--- a/contrib/gcc/config/i386/i386.c
+++ b/contrib/gcc/config/i386/i386.c
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.22 2005/06/03 04:02:20 kan Exp $ */
 
 
 #include "config.h"
diff --git a/contrib/gcc/config/i386/x86-64.h b/contrib/gcc/config/i386/x86-64.h
index 6d1b811806e0..1f9fb1c6e179 100644
--- a/contrib/gcc/config/i386/x86-64.h
+++ b/contrib/gcc/config/i386/x86-64.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/x86-64.h,v 1.4 2004/07/28 04:56:54 kan Exp $ */
 
 #undef ASM_COMMENT_START
 #define ASM_COMMENT_START "#"
diff --git a/contrib/gcc/config/sparc/freebsd.h b/contrib/gcc/config/sparc/freebsd.h
index b0774236441a..65c26273e737 100644
--- a/contrib/gcc/config/sparc/freebsd.h
+++ b/contrib/gcc/config/sparc/freebsd.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.9 2004/07/28 05:00:13 kan Exp $ */
 
 #undef  SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS \
diff --git a/contrib/gcc/cp/ptree.c b/contrib/gcc/cp/ptree.c
index 057add68a862..b7f7e184e6de 100644
--- a/contrib/gcc/cp/ptree.c
+++ b/contrib/gcc/cp/ptree.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/cp/ptree.c,v 1.8 2004/07/28 05:06:59 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/cppinit.c b/contrib/gcc/cppinit.c
index 6ea1ca21d224..792b8bc1af43 100644
--- a/contrib/gcc/cppinit.c
+++ b/contrib/gcc/cppinit.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/cppinit.c,v 1.8 2004/07/28 03:36:14 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/f/g77spec.c b/contrib/gcc/f/g77spec.c
index 10b7d1f4358f..e263b419899a 100644
--- a/contrib/gcc/f/g77spec.c
+++ b/contrib/gcc/f/g77spec.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/f/g77spec.c,v 1.4 2004/07/28 05:08:31 kan Exp $ */
 
 /* This file contains a filter for the main `gcc' driver, which is
    replicated for the `g77' driver by adding this filter.  The purpose
diff --git a/contrib/gcc/function.c b/contrib/gcc/function.c
index 4ff8f6a1d015..fef02645c725 100644
--- a/contrib/gcc/function.c
+++ b/contrib/gcc/function.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/function.c,v 1.22 2005/06/03 04:02:19 kan Exp $ */
 
 /* This file handles the generation of rtl code from tree structure
    at the level of the function as a whole.
diff --git a/contrib/gcc/gcc.1 b/contrib/gcc/gcc.1
index b510409537fa..2687a152c479 100644
--- a/contrib/gcc/gcc.1
+++ b/contrib/gcc/gcc.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.21 2004/11/11 07:50:09 obrien Exp $
 .\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation    -*-Text-*-
 .\" See section COPYING for conditions for redistribution
 .\"
diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c
index bc83fa9ef0c6..c6ad595a3aee 100644
--- a/contrib/gcc/gcc.c
+++ b/contrib/gcc/gcc.c
@@ -22,7 +22,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 This paragraph is here to try to keep Sun CC from dying.
 The number of chars here seems crucial!!!!  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.40 2005/06/03 04:02:20 kan Exp $ */
 
 /* This program is the user interface to the C compiler and possibly to
 other compilers.  It is used because compilation is a complicated procedure
diff --git a/contrib/gcc/make-temp-file.c b/contrib/gcc/make-temp-file.c
index 563bd46c91ee..2b3cbb66a97c 100644
--- a/contrib/gcc/make-temp-file.c
+++ b/contrib/gcc/make-temp-file.c
@@ -17,7 +17,7 @@ License along with libiberty; see the file COPYING.LIB.  If not,
 write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/make-temp-file.c,v 1.2 2002/05/14 00:33:44 obrien Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/contrib/gcc/opts.c b/contrib/gcc/opts.c
index 4fbec2896b94..0b6ac37f55b6 100644
--- a/contrib/gcc/opts.c
+++ b/contrib/gcc/opts.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.2 2004/07/28 04:23:38 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/pexecute.c b/contrib/gcc/pexecute.c
index 0f232ca703d7..48334bf74c23 100644
--- a/contrib/gcc/pexecute.c
+++ b/contrib/gcc/pexecute.c
@@ -18,7 +18,7 @@ License along with libiberty; see the file COPYING.LIB.  If not,
 write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/pexecute.c,v 1.4 2002/05/09 22:04:44 obrien Exp $ */
 
 /* This file exports two functions: pexecute and pwait.  */
 
diff --git a/contrib/gcc/toplev.c b/contrib/gcc/toplev.c
index acb44f6952d1..e523417fb311 100644
--- a/contrib/gcc/toplev.c
+++ b/contrib/gcc/toplev.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/toplev.c,v 1.25 2005/06/03 04:02:20 kan Exp $ */
 
 /* This is the top level of cc1/c++.
    It parses command args, opens files, invokes the various passes
diff --git a/contrib/gcc/version.c b/contrib/gcc/version.c
index 00f84e6429b8..762ca924a3f4 100644
--- a/contrib/gcc/version.c
+++ b/contrib/gcc/version.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/version.c,v 1.12 2005/06/03 03:52:25 kan Exp $ */
 #include "version.h"
 
 /* This is the string reported as the version number by all components
diff --git a/contrib/gdb/FREEBSD-Xlist b/contrib/gdb/FREEBSD-Xlist
index 4dce63deaf03..9bd4a3a5f806 100644
--- a/contrib/gdb/FREEBSD-Xlist
+++ b/contrib/gdb/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.6 2004/06/20 19:15:58 marcel Exp $
 gdb-6.1.1/bfd/*
 gdb-6.1.1/config/*
 gdb-6.1.1/etc/*
diff --git a/contrib/gdb/FREEBSD-upgrade b/contrib/gdb/FREEBSD-upgrade
index ac98f9c8f7fc..c0e4feca4cbb 100644
--- a/contrib/gdb/FREEBSD-upgrade
+++ b/contrib/gdb/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gdb/FREEBSD-upgrade,v 1.3 2004/06/25 05:04:09 marcel Exp $
 
 To strip down a new version of gdb for import, extract the files like this:
 
diff --git a/contrib/gdtoa/gdtoaimp.h b/contrib/gdtoa/gdtoaimp.h
index 143c2ce9b9c2..7f3d70e4698c 100644
--- a/contrib/gdtoa/gdtoaimp.h
+++ b/contrib/gdtoa/gdtoaimp.h
@@ -26,7 +26,7 @@ THIS SOFTWARE.
 
 ****************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.7 2005/01/18 18:56:18 das Exp $ */
 
 /* This is a variation on dtoa.c that converts arbitary binary
    floating-point formats to and from decimal notation.  It uses
diff --git a/contrib/gnu-sort/FREEBSD-upgrade b/contrib/gnu-sort/FREEBSD-upgrade
index 5cb5371d0b1f..113295b75b6d 100644
--- a/contrib/gnu-sort/FREEBSD-upgrade
+++ b/contrib/gnu-sort/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gnu-sort/FREEBSD-upgrade,v 1.4 2004/07/06 00:33:52 ache Exp $
 
 GNU Sort
 	originals can be found at:      ftp://ftp.gnu.org/gnu/coreutils/
diff --git a/contrib/gnu-sort/lib/hard-locale.c b/contrib/gnu-sort/lib/hard-locale.c
index 45b7d05dded0..3b2d4cd3e2d2 100644
--- a/contrib/gnu-sort/lib/hard-locale.c
+++ b/contrib/gnu-sort/lib/hard-locale.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/lib/hard-locale.c,v 1.5 2004/08/12 05:46:04 tjr Exp $ */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/contrib/gnu-sort/lib/version-etc.c b/contrib/gnu-sort/lib/version-etc.c
index ccc135be8cb8..7c29e680e0a8 100644
--- a/contrib/gnu-sort/lib/version-etc.c
+++ b/contrib/gnu-sort/lib/version-etc.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/lib/version-etc.c,v 1.4 2004/08/27 03:52:29 kientzle Exp $ */
 
 /* Written by Jim Meyering. */
 
diff --git a/contrib/gnu-sort/src/sort.c b/contrib/gnu-sort/src/sort.c
index 0b9d33fcf4c6..2c42d2ec9f78 100644
--- a/contrib/gnu-sort/src/sort.c
+++ b/contrib/gnu-sort/src/sort.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/src/sort.c,v 1.4 2004/08/12 05:46:04 tjr Exp $ */
 /* sort - sort lines of text (with all kinds of options).
    Copyright (C) 88, 1991-2004 Free Software Foundation, Inc.
 
diff --git a/contrib/gperf/FREEBSD-Xlist b/contrib/gperf/FREEBSD-Xlist
index 393d55c838d2..1e73580c2ce9 100644
--- a/contrib/gperf/FREEBSD-Xlist
+++ b/contrib/gperf/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gperf/FREEBSD-Xlist,v 1.2 2004/02/17 01:51:07 ache Exp $
 */*.dvi
 */*.html
 */*.info
diff --git a/contrib/groff/FREEBSD-Xlist b/contrib/groff/FREEBSD-Xlist
index 4549878106ea..4ef31c9a836d 100644
--- a/contrib/groff/FREEBSD-Xlist
+++ b/contrib/groff/FREEBSD-Xlist
@@ -1,3 +1,3 @@
-$FreeBSD$
+$FreeBSD: src/contrib/groff/FREEBSD-Xlist,v 1.4 2004/02/25 03:10:14 ache Exp $
 */arch
 */src/libs/snprintf
diff --git a/contrib/groff/FREEBSD-upgrade b/contrib/groff/FREEBSD-upgrade
index 65154f14a29a..35d73f42a9fc 100644
--- a/contrib/groff/FREEBSD-upgrade
+++ b/contrib/groff/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/groff/FREEBSD-upgrade,v 1.5 2003/05/01 21:28:49 ru Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/groff/src/devices/grotty/grotty.man b/contrib/groff/src/devices/grotty/grotty.man
index 7e59569db77f..2f1b7c04a509 100644
--- a/contrib/groff/src/devices/grotty/grotty.man
+++ b/contrib/groff/src/devices/grotty/grotty.man
@@ -1,5 +1,5 @@
 .ig
-$FreeBSD$
+$FreeBSD: src/contrib/groff/src/devices/grotty/grotty.man,v 1.8 2003/09/08 17:46:32 ru Exp $
 Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
diff --git a/contrib/groff/src/libs/libgroff/cmap.cpp b/contrib/groff/src/libs/libgroff/cmap.cpp
index a6379913b832..5d1ed7798cf4 100644
--- a/contrib/groff/src/libs/libgroff/cmap.cpp
+++ b/contrib/groff/src/libs/libgroff/cmap.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/cmap.cpp,v 1.2 2003/05/01 13:18:55 ru Exp $ */
 
 #include <ctype.h>
 #ifdef __FreeBSD__
diff --git a/contrib/groff/src/libs/libgroff/cset.cpp b/contrib/groff/src/libs/libgroff/cset.cpp
index 68564c4a02cc..61fa4009305f 100644
--- a/contrib/groff/src/libs/libgroff/cset.cpp
+++ b/contrib/groff/src/libs/libgroff/cset.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/cset.cpp,v 1.2 2003/05/01 13:18:55 ru Exp $ */
 
 #include <ctype.h>
 #ifdef __FreeBSD__
diff --git a/contrib/groff/src/libs/libgroff/invalid.cpp b/contrib/groff/src/libs/libgroff/invalid.cpp
index 63b3cc2d8af6..d0cc474a78a2 100644
--- a/contrib/groff/src/libs/libgroff/invalid.cpp
+++ b/contrib/groff/src/libs/libgroff/invalid.cpp
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/invalid.cpp,v 1.2 2003/05/01 13:18:55 ru Exp $ */
 
 #include "lib.h"
 
diff --git a/contrib/groff/src/preproc/eqn/neqn.sh b/contrib/groff/src/preproc/eqn/neqn.sh
index dcea2ff3e7b3..5cca3bfe89f4 100644
--- a/contrib/groff/src/preproc/eqn/neqn.sh
+++ b/contrib/groff/src/preproc/eqn/neqn.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Provision of this shell script should not be taken to imply that use of
 # GNU eqn with groff -Tascii|-Tlatin1|-Tkoi8-r|-Tutf8|-Tcp1047 is supported.
-# $FreeBSD$
+# $FreeBSD: src/contrib/groff/src/preproc/eqn/neqn.sh,v 1.10 2003/05/01 13:18:28 ru Exp $
 
 # Default device.
 case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
diff --git a/contrib/groff/src/roff/groff/groff.man b/contrib/groff/src/roff/groff/groff.man
index 347fec2f96e3..5b3701915884 100644
--- a/contrib/groff/src/roff/groff/groff.man
+++ b/contrib/groff/src/roff/groff/groff.man
@@ -15,7 +15,7 @@ Front-Cover Texts, and with no Back-Cover Texts.
 A copy of the Free Documentation License is included as a file called
 FDL in the main directory of the groff source package.
 
-$FreeBSD$
+$FreeBSD: src/contrib/groff/src/roff/groff/groff.man,v 1.9 2003/05/01 13:18:29 ru Exp $
 
 ..
 .
diff --git a/contrib/groff/src/roff/nroff/nroff.man b/contrib/groff/src/roff/nroff/nroff.man
index 4b81a784f3a2..a251494f16ae 100644
--- a/contrib/groff/src/roff/nroff/nroff.man
+++ b/contrib/groff/src/roff/nroff/nroff.man
@@ -16,7 +16,7 @@ versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
 
-	$FreeBSD$
+	$FreeBSD: src/contrib/groff/src/roff/nroff/nroff.man,v 1.11 2003/11/02 07:27:40 ru Exp $
 
 ..
 .TH @G@NROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh
index e8feb045def0..97f015ebc325 100755
--- a/contrib/groff/src/roff/nroff/nroff.sh
+++ b/contrib/groff/src/roff/nroff/nroff.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Emulate nroff with groff.
-# $FreeBSD$
+# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.17 2003/11/02 07:27:40 ru Exp $
 
 prog="$0"
 # Default device.
diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index e23db463a68c..20677da6bc32 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -1,5 +1,5 @@
 .\" Startup file for eqn.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/eqnrc,v 1.6 2003/09/08 17:46:32 ru Exp $
 .EQ
 sdefine << %{ < back 20 < }%
 sdefine >> %{ > back 20 > }%
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 231a66c76645..57b51b73940b 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -1,5 +1,5 @@
 .\" Startup file for troff.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.16 2003/09/08 17:46:32 ru Exp $
 .
 .\" This is tested by pic.
 .nr 0p 0
diff --git a/contrib/hostapd/FREEBSD-Xlist b/contrib/hostapd/FREEBSD-Xlist
index cba8df0ea7bd..ed3b4487fcec 100644
--- a/contrib/hostapd/FREEBSD-Xlist
+++ b/contrib/hostapd/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.1 2005/06/05 22:36:46 sam Exp $
 .cvsignore
 driver.c
 driver_bsd.c
diff --git a/contrib/hostapd/FREEBSD-upgrade b/contrib/hostapd/FREEBSD-upgrade
index 5efe2f50c64f..09eec69cc2ba 100644
--- a/contrib/hostapd/FREEBSD-upgrade
+++ b/contrib/hostapd/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.1 2005/06/05 22:36:46 sam Exp $
 
 WPA/802.1x Authenticator
 	originals can be found at: http://hostap.epitest.fi/releases/
diff --git a/contrib/hostapd/eap.c b/contrib/hostapd/eap.c
index 1897856e8820..8e7e6c4c04c8 100644
--- a/contrib/hostapd/eap.c
+++ b/contrib/hostapd/eap.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/eap.c,v 1.2 2005/06/05 22:41:14 sam Exp $
  */
 
 #include <stdlib.h>
diff --git a/contrib/hostapd/eap.h b/contrib/hostapd/eap.h
index c79bffece50f..aac265a4684e 100644
--- a/contrib/hostapd/eap.h
+++ b/contrib/hostapd/eap.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/hostapd/eap.h,v 1.2 2005/06/05 22:41:14 sam Exp $ */
 
 #ifndef EAP_H
 #define EAP_H
diff --git a/contrib/hostapd/eapol_sm.c b/contrib/hostapd/eapol_sm.c
index 50c645aab348..5a591318cec2 100644
--- a/contrib/hostapd/eapol_sm.c
+++ b/contrib/hostapd/eapol_sm.c
@@ -12,7 +12,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/eapol_sm.c,v 1.3 2005/06/13 17:07:31 sam Exp $
  */
 
 #include <stdlib.h>
diff --git a/contrib/hostapd/ieee802_1x.c b/contrib/hostapd/ieee802_1x.c
index ef1bde47fda0..6a05d428079c 100644
--- a/contrib/hostapd/ieee802_1x.c
+++ b/contrib/hostapd/ieee802_1x.c
@@ -12,7 +12,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.3 2005/06/13 17:07:31 sam Exp $
  */
 
 #include <stdlib.h>
diff --git a/contrib/hostapd/ieee802_1x.h b/contrib/hostapd/ieee802_1x.h
index 9d2567a5b667..8ca6f97a6745 100644
--- a/contrib/hostapd/ieee802_1x.h
+++ b/contrib/hostapd/ieee802_1x.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/hostapd/ieee802_1x.h,v 1.2 2005/06/05 22:41:14 sam Exp $ */
 
 #ifndef IEEE802_1X_H
 #define IEEE802_1X_H
diff --git a/contrib/hostapd/wpa.c b/contrib/hostapd/wpa.c
index c0948e8bed19..e67cd2c810c6 100644
--- a/contrib/hostapd/wpa.c
+++ b/contrib/hostapd/wpa.c
@@ -12,7 +12,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.3 2005/06/13 17:07:31 sam Exp $
  */
 
 #include <stdlib.h>
diff --git a/contrib/ipfilter/.cvsignore b/contrib/ipfilter/.cvsignore
deleted file mode 100644
index 616828f4144d..000000000000
--- a/contrib/ipfilter/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-ipf
-sparcv7
-sparcv9
-h
-ipf-darren
-bugs
-ipftest
-patches
-state
-cbits
-CVS
-old
-new
-netinet
-import
-bak
-streams
-cvs.diff
-threads
-glibc
-hp
-windows
-ipnat
-opt_inet6.h
-ippool
-ipmon
-ip_rules.c
-ip_rules.h
diff --git a/contrib/ipfilter/BSD/.cvsignore b/contrib/ipfilter/BSD/.cvsignore
deleted file mode 100644
index c149a0043f45..000000000000
--- a/contrib/ipfilter/BSD/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-ipf
-ipfs
-ipfstat
-ipftest
-ipmon
-ipnat
-ipresend
-ipsend
-iptest
-vnode_if.h
-if_ipl
-i386
-amiga
-FreeBSD*
-BSDOS*
-NetBSD*
-OpenBSD*
-*_lex_var.h
-*_y.c
-*_l.c
-*_y.h
-ip_rules.*
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
index 149580135216..3d7d8438cc78 100755
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sun Feb 13 14:32:01 2000
 --- ip6_input.c	Wed Apr 26 22:31:34 2000
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
index 2e1d7e80673f..db3f0e521bf6 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sat Jul 15 07:14:34 2000
 --- ip6_input.c	Thu Oct 19 17:14:37 2000
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
index 2e1d7e80673f..0432d2990a1b 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sat Jul 15 07:14:34 2000
 --- ip6_input.c	Thu Oct 19 17:14:37 2000
diff --git a/contrib/ipfilter/INST.FreeBSD-2.2 b/contrib/ipfilter/INST.FreeBSD-2.2
index d668c39f7b58..21a41daddc0d 100644
--- a/contrib/ipfilter/INST.FreeBSD-2.2
+++ b/contrib/ipfilter/INST.FreeBSD-2.2
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/INST.FreeBSD-2.2,v 1.2 2005/04/25 18:20:08 darrenr Exp $
 .\"
 
 To build a kernel for use with the loadable kernel module, follow these
diff --git a/contrib/ipfilter/INSTALL.xBSD b/contrib/ipfilter/INSTALL.xBSD
index 2f933ffc7018..bbf9320d2dbd 100644
--- a/contrib/ipfilter/INSTALL.xBSD
+++ b/contrib/ipfilter/INSTALL.xBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/INSTALL.xBSD,v 1.3 2000/07/19 23:10:29 darrenr Exp $
 
 To build a kernel for use with the loadable kernel module, follow these
 steps:
diff --git a/contrib/ipfilter/Makefile b/contrib/ipfilter/Makefile
index 7b1d7d302e4c..3ac04b52c177 100644
--- a/contrib/ipfilter/Makefile
+++ b/contrib/ipfilter/Makefile
@@ -5,7 +5,7 @@
 # provided that this notice is preserved and due credit is given
 # to the original author and the contributors.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.4 2005/04/25 18:20:08 darrenr Exp $
 # Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp
 #
 SHELL=/bin/sh
diff --git a/contrib/ipfilter/bpf-ipf.h b/contrib/ipfilter/bpf-ipf.h
index dc2b660e2eee..4576b76dac75 100644
--- a/contrib/ipfilter/bpf-ipf.h
+++ b/contrib/ipfilter/bpf-ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/bpf-ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/bpf_filter.c b/contrib/ipfilter/bpf_filter.c
index f5cc58821c80..5ef41a792286 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/contrib/ipfilter/bpf_filter.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/ip_fil.c b/contrib/ipfilter/ip_fil.c
index a4ec02c3dc51..eca26fd47a3f 100644
--- a/contrib/ipfilter/ip_fil.c
+++ b/contrib/ipfilter/ip_fil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/ip_msnrpc_pxy.c b/contrib/ipfilter/ip_msnrpc_pxy.c
index 40bc084cbb5d..adbf977fa24f 100644
--- a/contrib/ipfilter/ip_msnrpc_pxy.c
+++ b/contrib/ipfilter/ip_msnrpc_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_msnrpc_pxy.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed
diff --git a/contrib/ipfilter/ipf.h b/contrib/ipfilter/ipf.h
index 60a2013ac3af..d0fad83fc3ed 100644
--- a/contrib/ipfilter/ipf.h
+++ b/contrib/ipfilter/ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/.cvsignore b/contrib/ipfilter/iplang/.cvsignore
deleted file mode 100644
index 68b5b4e4e985..000000000000
--- a/contrib/ipfilter/iplang/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-y.tab.h
-y.output
-lex.yy.c
-y.tab.c
-y.tab.o
-lex.yy.o
-iplang_y.output
-iplang_y.tab.c
-iplang_y.tab.h
diff --git a/contrib/ipfilter/iplang/iplang.h b/contrib/ipfilter/iplang/iplang.h
index 2b2d1db5a6e2..cc91e52f97e2 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/contrib/ipfilter/iplang/iplang.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/contrib/ipfilter/iplang/iplang_l.l
index 71e478b05a0c..e31a345b9a33 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/contrib/ipfilter/iplang/iplang_l.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang_l.l,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 %{
 /*
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index 22ea40bd19be..88da7233f8b3 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/contrib/ipfilter/iplang/iplang_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.6 2005/04/25 18:20:10 darrenr Exp $	*/
 
 %{
 /*
@@ -7,7 +7,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * Id: iplang_y.y,v 2.9.2.2 2004/12/09 19:41:10 darrenr Exp
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.6 2005/04/25 18:20:10 darrenr Exp $
  */
 
 #include <stdio.h>
diff --git a/contrib/ipfilter/ipmon.h b/contrib/ipfilter/ipmon.h
index 6d14e52251c8..821dc508df4e 100644
--- a/contrib/ipfilter/ipmon.h
+++ b/contrib/ipfilter/ipmon.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/Celler/ip_compat.h b/contrib/ipfilter/ipsd/Celler/ip_compat.h
index 57937763a5a9..63d82019aa93 100644
--- a/contrib/ipfilter/ipsd/Celler/ip_compat.h
+++ b/contrib/ipfilter/ipsd/Celler/ip_compat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/Celler/ip_compat.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.c b/contrib/ipfilter/ipsd/ipsd.c
index 970b47ef26d2..486533fb23ae 100644
--- a/contrib/ipfilter/ipsd/ipsd.c
+++ b/contrib/ipfilter/ipsd/ipsd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsd.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.h b/contrib/ipfilter/ipsd/ipsd.h
index f898c9995c35..24a96eb5109a 100644
--- a/contrib/ipfilter/ipsd/ipsd.h
+++ b/contrib/ipfilter/ipsd/ipsd.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsd.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/contrib/ipfilter/ipsd/ipsdr.c
index df8b9a88afa5..f198e8635116 100644
--- a/contrib/ipfilter/ipsd/ipsdr.c
+++ b/contrib/ipfilter/ipsd/ipsdr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsdr.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/linux.h b/contrib/ipfilter/ipsd/linux.h
index 88eb67aa4cbb..5159688c2a8d 100644
--- a/contrib/ipfilter/ipsd/linux.h
+++ b/contrib/ipfilter/ipsd/linux.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/linux.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/contrib/ipfilter/ipsd/sbpf.c
index 6d4f83d2bbf6..1bd0bed6f7b7 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/contrib/ipfilter/ipsd/sbpf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/sdlpi.c b/contrib/ipfilter/ipsd/sdlpi.c
index b7515f1dbac0..783ca86eb704 100644
--- a/contrib/ipfilter/ipsd/sdlpi.c
+++ b/contrib/ipfilter/ipsd/sdlpi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/sdlpi.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/slinux.c b/contrib/ipfilter/ipsd/slinux.c
index c0847951cd66..2f3e164e507d 100644
--- a/contrib/ipfilter/ipsd/slinux.c
+++ b/contrib/ipfilter/ipsd/slinux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/slinux.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/snit.c b/contrib/ipfilter/ipsd/snit.c
index 0d5a52a1cee4..bca508115d7a 100644
--- a/contrib/ipfilter/ipsd/snit.c
+++ b/contrib/ipfilter/ipsd/snit.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/snit.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/.OLD/ip_compat.h b/contrib/ipfilter/ipsend/.OLD/ip_compat.h
index b5b8f0741c25..a433eda79631 100644
--- a/contrib/ipfilter/ipsend/.OLD/ip_compat.h
+++ b/contrib/ipfilter/ipsend/.OLD/ip_compat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/.OLD/ip_compat.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/.cvsignore b/contrib/ipfilter/ipsend/.cvsignore
deleted file mode 100644
index b7aea24eb881..000000000000
--- a/contrib/ipfilter/ipsend/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ipsend
-ipresend
-iptest
diff --git a/contrib/ipfilter/ipsend/44arp.c b/contrib/ipfilter/ipsend/44arp.c
index 1063d3a752e0..e1aae0ef30f4 100644
--- a/contrib/ipfilter/ipsend/44arp.c
+++ b/contrib/ipfilter/ipsend/44arp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Based upon 4.4BSD's /usr/sbin/arp
diff --git a/contrib/ipfilter/ipsend/arp.c b/contrib/ipfilter/ipsend/arp.c
index f90fc3cea1fd..d634abede63d 100644
--- a/contrib/ipfilter/ipsend/arp.c
+++ b/contrib/ipfilter/ipsend/arp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/arp.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * arp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/dlcommon.c b/contrib/ipfilter/ipsend/dlcommon.c
index c6b6e8a4858f..ed0b5802fc63 100644
--- a/contrib/ipfilter/ipsend/dlcommon.c
+++ b/contrib/ipfilter/ipsend/dlcommon.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/dlcommon.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Common (shared) DLPI test routines.
diff --git a/contrib/ipfilter/ipsend/dltest.h b/contrib/ipfilter/ipsend/dltest.h
index 086782c1fbb7..aa28c3b6b168 100644
--- a/contrib/ipfilter/ipsend/dltest.h
+++ b/contrib/ipfilter/ipsend/dltest.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/dltest.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Common DLPI Test Suite header file
diff --git a/contrib/ipfilter/ipsend/hpux.c b/contrib/ipfilter/ipsend/hpux.c
index 9cc72995f26b..6d3ca855a824 100644
--- a/contrib/ipfilter/ipsend/hpux.c
+++ b/contrib/ipfilter/ipsend/hpux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/hpux.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1997-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/in_var.h b/contrib/ipfilter/ipsend/in_var.h
index 3523f77051fc..3cbd2a4ed321 100644
--- a/contrib/ipfilter/ipsend/in_var.h
+++ b/contrib/ipfilter/ipsend/in_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/in_var.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*	@(#)in_var.h 1.3 88/08/19 SMI; from UCB 7.1 6/5/86	*/
 
diff --git a/contrib/ipfilter/ipsend/ip.c b/contrib/ipfilter/ipsend/ip.c
index cc9f6b9a5e1f..a1501aba82f0 100644
--- a/contrib/ipfilter/ipsend/ip.c
+++ b/contrib/ipfilter/ipsend/ip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ip.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * ip.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ip_var.h b/contrib/ipfilter/ipsend/ip_var.h
index ab9813ec828e..c720ea92d30c 100644
--- a/contrib/ipfilter/ipsend/ip_var.h
+++ b/contrib/ipfilter/ipsend/ip_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ip_var.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*	@(#)ip_var.h 1.11 88/08/19 SMI; from UCB 7.1 6/5/86	*/
 
diff --git a/contrib/ipfilter/ipsend/ipresend.1 b/contrib/ipfilter/ipsend/ipresend.1
index 6761a183caea..497855a960c2 100644
--- a/contrib/ipfilter/ipsend/ipresend.1
+++ b/contrib/ipfilter/ipsend/ipresend.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/ipresend.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 .TH IPRESEND 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/ipresend.c b/contrib/ipfilter/ipsend/ipresend.c
index 3a11d83242e8..bfce110fbf30 100644
--- a/contrib/ipfilter/ipsend/ipresend.c
+++ b/contrib/ipfilter/ipsend/ipresend.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipresend.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * ipresend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsend.1 b/contrib/ipfilter/ipsend/ipsend.1
index 7f0a8e39538a..000f67260051 100644
--- a/contrib/ipfilter/ipsend/ipsend.1
+++ b/contrib/ipfilter/ipsend/ipsend.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/ipsend.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 .TH IPSEND 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/contrib/ipfilter/ipsend/ipsend.5
index cd5842cbba18..6686b40b882a 100644
--- a/contrib/ipfilter/ipsend/ipsend.5
+++ b/contrib/ipfilter/ipsend/ipsend.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.5,v 1.4 2005/04/25 18:20:10 darrenr Exp $
 .TH IPSEND 5
 .SH NAME
 ipsend \- IP packet description language
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/contrib/ipfilter/ipsend/ipsend.c
index 06be7115d951..fac0e249a91c 100644
--- a/contrib/ipfilter/ipsend/ipsend.c
+++ b/contrib/ipfilter/ipsend/ipsend.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.12 2005/04/25 18:20:11 darrenr Exp $ */
 /*
  * ipsend.c (C) 1995-1998 Darren Reed
  *
diff --git a/contrib/ipfilter/ipsend/ipsend.h b/contrib/ipfilter/ipsend/ipsend.h
index 91cfa6c085ed..94ec7ba508e7 100644
--- a/contrib/ipfilter/ipsend/ipsend.h
+++ b/contrib/ipfilter/ipsend/ipsend.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipsend.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * ipsend.h (C) 1997-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsopt.c b/contrib/ipfilter/ipsend/ipsopt.c
index a85f1629713a..d8a767b7bbc9 100644
--- a/contrib/ipfilter/ipsend/ipsopt.c
+++ b/contrib/ipfilter/ipsend/ipsopt.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipsopt.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/iptest.1 b/contrib/ipfilter/ipsend/iptest.1
index 8f25f4abf256..a5956289552b 100644
--- a/contrib/ipfilter/ipsend/iptest.1
+++ b/contrib/ipfilter/ipsend/iptest.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/iptest.1,v 1.4 2005/04/25 18:20:11 darrenr Exp $
 .\"
 .TH IPTEST 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/iptest.c b/contrib/ipfilter/ipsend/iptest.c
index 0e81ec5b6f86..23462a631fda 100644
--- a/contrib/ipfilter/ipsend/iptest.c
+++ b/contrib/ipfilter/ipsend/iptest.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptest.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * ipsend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c
index 51715d87e87c..2da91dfd7d95 100644
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/contrib/ipfilter/ipsend/iptests.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.10 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/larp.c b/contrib/ipfilter/ipsend/larp.c
index 1e0b1697f93f..515bc4d785f1 100644
--- a/contrib/ipfilter/ipsend/larp.c
+++ b/contrib/ipfilter/ipsend/larp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/larp.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * larp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/linux.h b/contrib/ipfilter/ipsend/linux.h
index a36d1bfb6a6a..449a95a0079b 100644
--- a/contrib/ipfilter/ipsend/linux.h
+++ b/contrib/ipfilter/ipsend/linux.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/linux.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/lsock.c b/contrib/ipfilter/ipsend/lsock.c
index 8c6616db986d..e83e2e5aa112 100644
--- a/contrib/ipfilter/ipsend/lsock.c
+++ b/contrib/ipfilter/ipsend/lsock.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * lsock.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/resend.c b/contrib/ipfilter/ipsend/resend.c
index fb2d8bd50ac3..da8a3d34b2d0 100644
--- a/contrib/ipfilter/ipsend/resend.c
+++ b/contrib/ipfilter/ipsend/resend.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * resend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index c25a4232a467..19c8ef6742c3 100644
--- a/contrib/ipfilter/ipsend/sbpf.c
+++ b/contrib/ipfilter/ipsend/sbpf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sbpf.c,v 1.6 2005/04/25 18:20:11 darrenr Exp $ */
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
  *
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/contrib/ipfilter/ipsend/sdlpi.c
index 3ff9d4b3c82c..400501755498 100644
--- a/contrib/ipfilter/ipsend/sdlpi.c
+++ b/contrib/ipfilter/ipsend/sdlpi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sdlpi.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sirix.c b/contrib/ipfilter/ipsend/sirix.c
index 5057c4f2c871..4bebe3cb0478 100644
--- a/contrib/ipfilter/ipsend/sirix.c
+++ b/contrib/ipfilter/ipsend/sirix.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sirix.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/slinux.c b/contrib/ipfilter/ipsend/slinux.c
index 1021acf6d3c0..af505edddf8c 100644
--- a/contrib/ipfilter/ipsend/slinux.c
+++ b/contrib/ipfilter/ipsend/slinux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/slinux.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/snit.c b/contrib/ipfilter/ipsend/snit.c
index b57609b0240c..5c0c7778ceb4 100644
--- a/contrib/ipfilter/ipsend/snit.c
+++ b/contrib/ipfilter/ipsend/snit.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/snit.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index 5020a4aaf234..2bdcf7fd8af8 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/contrib/ipfilter/ipsend/sock.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.15 2005/04/25 18:20:11 darrenr Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
diff --git a/contrib/ipfilter/ipsend/sockraw.c b/contrib/ipfilter/ipsend/sockraw.c
index c9232273ee86..a4156469ad02 100644
--- a/contrib/ipfilter/ipsend/sockraw.c
+++ b/contrib/ipfilter/ipsend/sockraw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sockraw.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 2000 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/tcpip.h b/contrib/ipfilter/ipsend/tcpip.h
index c6094343fc2e..ce33df8f57db 100644
--- a/contrib/ipfilter/ipsend/tcpip.h
+++ b/contrib/ipfilter/ipsend/tcpip.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/tcpip.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
diff --git a/contrib/ipfilter/ipt.h b/contrib/ipfilter/ipt.h
index 57d8b46e5048..cbf752ae82c6 100644
--- a/contrib/ipfilter/ipt.h
+++ b/contrib/ipfilter/ipt.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipt.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/kmem.h b/contrib/ipfilter/kmem.h
index 38b97b453735..4b2fc6372582 100644
--- a/contrib/ipfilter/kmem.h
+++ b/contrib/ipfilter/kmem.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/kmem.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/l4check/l4check.c b/contrib/ipfilter/l4check/l4check.c
index 5c44a3703e52..3dd0675bd5eb 100644
--- a/contrib/ipfilter/l4check/l4check.c
+++ b/contrib/ipfilter/l4check/l4check.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * (C)Copyright March, 2000 - Darren Reed.
diff --git a/contrib/ipfilter/lib/addicmp.c b/contrib/ipfilter/lib/addicmp.c
index eb6e8a7afa59..8e2ec422742f 100644
--- a/contrib/ipfilter/lib/addicmp.c
+++ b/contrib/ipfilter/lib/addicmp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/addicmp.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/addipopt.c b/contrib/ipfilter/lib/addipopt.c
index e775184777f0..3a3ca8c9d6a9 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/contrib/ipfilter/lib/addipopt.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/addipopt.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/addkeep.c b/contrib/ipfilter/lib/addkeep.c
index 5765c52731ad..c470708da5e3 100644
--- a/contrib/ipfilter/lib/addkeep.c
+++ b/contrib/ipfilter/lib/addkeep.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/addkeep.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/contrib/ipfilter/lib/bcopywrap.c
index 4c689309a6b9..0252028271eb 100644
--- a/contrib/ipfilter/lib/bcopywrap.c
+++ b/contrib/ipfilter/lib/bcopywrap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/bcopywrap.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/binprint.c b/contrib/ipfilter/lib/binprint.c
index 6d992182dbc5..a2090747358e 100644
--- a/contrib/ipfilter/lib/binprint.c
+++ b/contrib/ipfilter/lib/binprint.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/binprint.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/buildopts.c b/contrib/ipfilter/lib/buildopts.c
index 92686f60b86a..2facf34f615e 100644
--- a/contrib/ipfilter/lib/buildopts.c
+++ b/contrib/ipfilter/lib/buildopts.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/buildopts.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/checkrev.c b/contrib/ipfilter/lib/checkrev.c
index 882aeb7d58ad..220dfbe3e698 100644
--- a/contrib/ipfilter/lib/checkrev.c
+++ b/contrib/ipfilter/lib/checkrev.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/checkrev.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count4bits.c b/contrib/ipfilter/lib/count4bits.c
index 56b4c86aea0e..e70157fd8970 100644
--- a/contrib/ipfilter/lib/count4bits.c
+++ b/contrib/ipfilter/lib/count4bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/count4bits.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count6bits.c b/contrib/ipfilter/lib/count6bits.c
index fe1bf4b33b4c..78c21049cbab 100644
--- a/contrib/ipfilter/lib/count6bits.c
+++ b/contrib/ipfilter/lib/count6bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/count6bits.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/debug.c b/contrib/ipfilter/lib/debug.c
index 58974c1ea7dd..5dd879864cc1 100644
--- a/contrib/ipfilter/lib/debug.c
+++ b/contrib/ipfilter/lib/debug.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/debug.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/extras.c b/contrib/ipfilter/lib/extras.c
index 5d3c8dcaf3f5..ca90bf340a32 100644
--- a/contrib/ipfilter/lib/extras.c
+++ b/contrib/ipfilter/lib/extras.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/extras.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.c b/contrib/ipfilter/lib/facpri.c
index 4637916a8be0..213c474ad8e4 100644
--- a/contrib/ipfilter/lib/facpri.c
+++ b/contrib/ipfilter/lib/facpri.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/facpri.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.h b/contrib/ipfilter/lib/facpri.h
index c902086f4797..e742f055b29b 100644
--- a/contrib/ipfilter/lib/facpri.h
+++ b/contrib/ipfilter/lib/facpri.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/facpri.h,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1999-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/fill6bits.c b/contrib/ipfilter/lib/fill6bits.c
index 12e657989e4a..cbc459e01777 100644
--- a/contrib/ipfilter/lib/fill6bits.c
+++ b/contrib/ipfilter/lib/fill6bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/fill6bits.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/flags.c b/contrib/ipfilter/lib/flags.c
index 543d61b18622..57814dba40c0 100644
--- a/contrib/ipfilter/lib/flags.c
+++ b/contrib/ipfilter/lib/flags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/flags.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/genmask.c b/contrib/ipfilter/lib/genmask.c
index 178c466ff290..8d14469cf279 100644
--- a/contrib/ipfilter/lib/genmask.c
+++ b/contrib/ipfilter/lib/genmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/genmask.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/gethost.c b/contrib/ipfilter/lib/gethost.c
index f9034ccbbee5..e099a431ff2e 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/contrib/ipfilter/lib/gethost.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/gethost.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/getifname.c b/contrib/ipfilter/lib/getifname.c
index 35acb32a62c7..6bf8dda4ae12 100644
--- a/contrib/ipfilter/lib/getifname.c
+++ b/contrib/ipfilter/lib/getifname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getifname.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/getline.c b/contrib/ipfilter/lib/getline.c
index 137068fa0296..b51de18a3f59 100644
--- a/contrib/ipfilter/lib/getline.c
+++ b/contrib/ipfilter/lib/getline.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getline.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getnattype.c b/contrib/ipfilter/lib/getnattype.c
index 90d7ba400405..562341cf75af 100644
--- a/contrib/ipfilter/lib/getnattype.c
+++ b/contrib/ipfilter/lib/getnattype.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getnattype.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getport.c b/contrib/ipfilter/lib/getport.c
index 99e1d4f62600..e301c047c0ea 100644
--- a/contrib/ipfilter/lib/getport.c
+++ b/contrib/ipfilter/lib/getport.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getport.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/getportproto.c b/contrib/ipfilter/lib/getportproto.c
index 02e3c2041288..93ebc9f2f565 100644
--- a/contrib/ipfilter/lib/getportproto.c
+++ b/contrib/ipfilter/lib/getportproto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getportproto.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include <ctype.h>
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/getproto.c b/contrib/ipfilter/lib/getproto.c
index 2581e283765b..eec60b68809e 100644
--- a/contrib/ipfilter/lib/getproto.c
+++ b/contrib/ipfilter/lib/getproto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getproto.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/getsumd.c b/contrib/ipfilter/lib/getsumd.c
index 44ff3aa6f331..a78e60bb5d24 100644
--- a/contrib/ipfilter/lib/getsumd.c
+++ b/contrib/ipfilter/lib/getsumd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getsumd.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/hexdump.c b/contrib/ipfilter/lib/hexdump.c
index f6cc156910c8..46b962b386b9 100644
--- a/contrib/ipfilter/lib/hexdump.c
+++ b/contrib/ipfilter/lib/hexdump.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/hexdump.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include <ctype.h>
 
diff --git a/contrib/ipfilter/lib/hostmask.c b/contrib/ipfilter/lib/hostmask.c
index b6ea5ad8ec83..57438100c8c9 100644
--- a/contrib/ipfilter/lib/hostmask.c
+++ b/contrib/ipfilter/lib/hostmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/hostmask.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/hostname.c b/contrib/ipfilter/lib/hostname.c
index c4950e9ab9e8..062bb2998630 100644
--- a/contrib/ipfilter/lib/hostname.c
+++ b/contrib/ipfilter/lib/hostname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/hostname.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/hostnum.c b/contrib/ipfilter/lib/hostnum.c
index f517860b2fd3..feb85384c579 100644
--- a/contrib/ipfilter/lib/hostnum.c
+++ b/contrib/ipfilter/lib/hostnum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/hostnum.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/icmpcode.c b/contrib/ipfilter/lib/icmpcode.c
index c458d284487d..48e80cb7624b 100644
--- a/contrib/ipfilter/lib/icmpcode.c
+++ b/contrib/ipfilter/lib/icmpcode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/icmpcode.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/inet_addr.c b/contrib/ipfilter/lib/inet_addr.c
index 287e5ff319e6..e5760e514e0f 100644
--- a/contrib/ipfilter/lib/inet_addr.c
+++ b/contrib/ipfilter/lib/inet_addr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/inet_addr.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1990, 1993
diff --git a/contrib/ipfilter/lib/initparse.c b/contrib/ipfilter/lib/initparse.c
index 1f565d259126..3d56672b4e57 100644
--- a/contrib/ipfilter/lib/initparse.c
+++ b/contrib/ipfilter/lib/initparse.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/initparse.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ionames.c b/contrib/ipfilter/lib/ionames.c
index 0f7060b2b958..b1d63e01ac8a 100644
--- a/contrib/ipfilter/lib/ionames.c
+++ b/contrib/ipfilter/lib/ionames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ionames.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c
index 3f146d7bb520..b9a3e8634b8b 100644
--- a/contrib/ipfilter/lib/ipf_dotuning.c
+++ b/contrib/ipfilter/lib/ipf_dotuning.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipf_dotuning.c,v 1.4 2005/06/23 14:19:02 darrenr Exp $	*/
 
 #include "ipf.h"
 #include "netinet/ipl.h"
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/contrib/ipfilter/lib/ipft_ef.c
index b9a7054d3d73..f0a8c182a92a 100644
--- a/contrib/ipfilter/lib/ipft_ef.c
+++ b/contrib/ipfilter/lib/ipft_ef.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_ef.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/contrib/ipfilter/lib/ipft_hx.c
index 4e0f98ea2ca5..bbdc0504a6cf 100644
--- a/contrib/ipfilter/lib/ipft_hx.c
+++ b/contrib/ipfilter/lib/ipft_hx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_hx.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/contrib/ipfilter/lib/ipft_pc.c
index 9b7da653e5ed..eb653028f43a 100644
--- a/contrib/ipfilter/lib/ipft_pc.c
+++ b/contrib/ipfilter/lib/ipft_pc.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_pc.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/contrib/ipfilter/lib/ipft_sn.c
index 61ce875f5736..5d057175be3c 100644
--- a/contrib/ipfilter/lib/ipft_sn.c
+++ b/contrib/ipfilter/lib/ipft_sn.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_sn.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_td.c b/contrib/ipfilter/lib/ipft_td.c
index e6367ff741dd..6fe4d4057e9d 100644
--- a/contrib/ipfilter/lib/ipft_td.c
+++ b/contrib/ipfilter/lib/ipft_td.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_td.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/contrib/ipfilter/lib/ipft_tx.c
index 2f9cff93caa2..29416f30da07 100644
--- a/contrib/ipfilter/lib/ipft_tx.c
+++ b/contrib/ipfilter/lib/ipft_tx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.3 2005/04/26 14:27:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/contrib/ipfilter/lib/ipoptsec.c
index 24a58ac4e5ba..49e8fef3692b 100644
--- a/contrib/ipfilter/lib/ipoptsec.c
+++ b/contrib/ipfilter/lib/ipoptsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipoptsec.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c
index 789219eeacd8..2425b8c68aaf 100644
--- a/contrib/ipfilter/lib/kmem.c
+++ b/contrib/ipfilter/lib/kmem.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmem.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.h b/contrib/ipfilter/lib/kmem.h
index dc29a5290233..1299402e3a2a 100644
--- a/contrib/ipfilter/lib/kmem.h
+++ b/contrib/ipfilter/lib/kmem.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmem.h,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/contrib/ipfilter/lib/kmemcpywrap.c
index 4eeb62d17c42..8f2d0c0dbdf5 100644
--- a/contrib/ipfilter/lib/kmemcpywrap.c
+++ b/contrib/ipfilter/lib/kmemcpywrap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmemcpywrap.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 #include "kmem.h"
diff --git a/contrib/ipfilter/lib/kvatoname.c b/contrib/ipfilter/lib/kvatoname.c
index a3764e46fd27..245022a3d9d1 100644
--- a/contrib/ipfilter/lib/kvatoname.c
+++ b/contrib/ipfilter/lib/kvatoname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kvatoname.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/load_hash.c b/contrib/ipfilter/lib/load_hash.c
index 4a13624db2bc..6c9964467c31 100644
--- a/contrib/ipfilter/lib/load_hash.c
+++ b/contrib/ipfilter/lib/load_hash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_hash.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/contrib/ipfilter/lib/load_hashnode.c
index cf422805ea43..c18bab7d37b4 100644
--- a/contrib/ipfilter/lib/load_hashnode.c
+++ b/contrib/ipfilter/lib/load_hashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_hashnode.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_pool.c b/contrib/ipfilter/lib/load_pool.c
index 65ea05d64528..2d06661c4a99 100644
--- a/contrib/ipfilter/lib/load_pool.c
+++ b/contrib/ipfilter/lib/load_pool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_pool.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/contrib/ipfilter/lib/load_poolnode.c
index eb1748122e87..306b7cbd7e15 100644
--- a/contrib/ipfilter/lib/load_poolnode.c
+++ b/contrib/ipfilter/lib/load_poolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_poolnode.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/loglevel.c b/contrib/ipfilter/lib/loglevel.c
index 4dc875f73517..945572926bac 100644
--- a/contrib/ipfilter/lib/loglevel.c
+++ b/contrib/ipfilter/lib/loglevel.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/loglevel.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/make_range.c b/contrib/ipfilter/lib/make_range.c
index ae576dfde310..20b5d7aef443 100644
--- a/contrib/ipfilter/lib/make_range.c
+++ b/contrib/ipfilter/lib/make_range.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/make_range.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/contrib/ipfilter/lib/mutex_emul.c
index 10472e589f65..0d2dceb82f38 100644
--- a/contrib/ipfilter/lib/mutex_emul.c
+++ b/contrib/ipfilter/lib/mutex_emul.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/mutex_emul.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/nametokva.c b/contrib/ipfilter/lib/nametokva.c
index b2854d6d7f87..5ed0c56576d4 100644
--- a/contrib/ipfilter/lib/nametokva.c
+++ b/contrib/ipfilter/lib/nametokva.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/nametokva.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/contrib/ipfilter/lib/nat_setgroupmap.c
index 5c732b1b1439..bb2e8ec78ead 100644
--- a/contrib/ipfilter/lib/nat_setgroupmap.c
+++ b/contrib/ipfilter/lib/nat_setgroupmap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/nat_setgroupmap.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/natparse.c b/contrib/ipfilter/lib/natparse.c
index de5b3887df4b..9fdd70dcb33c 100644
--- a/contrib/ipfilter/lib/natparse.c
+++ b/contrib/ipfilter/lib/natparse.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/natparse.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ntomask.c b/contrib/ipfilter/lib/ntomask.c
index c95f78fe79ae..cb51ada17f4e 100644
--- a/contrib/ipfilter/lib/ntomask.c
+++ b/contrib/ipfilter/lib/ntomask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ntomask.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/optname.c b/contrib/ipfilter/lib/optname.c
index d56c4d57c303..00b7c5b10b73 100644
--- a/contrib/ipfilter/lib/optname.c
+++ b/contrib/ipfilter/lib/optname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optname.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprint.c b/contrib/ipfilter/lib/optprint.c
index 890eb537c6cc..f598afa00081 100644
--- a/contrib/ipfilter/lib/optprint.c
+++ b/contrib/ipfilter/lib/optprint.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optprint.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprintv6.c b/contrib/ipfilter/lib/optprintv6.c
index 8f3330582459..2d5b209cd589 100644
--- a/contrib/ipfilter/lib/optprintv6.c
+++ b/contrib/ipfilter/lib/optprintv6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optprintv6.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optvalue.c b/contrib/ipfilter/lib/optvalue.c
index b30e030f3af6..1f225e481dd5 100644
--- a/contrib/ipfilter/lib/optvalue.c
+++ b/contrib/ipfilter/lib/optvalue.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optvalue.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/parse.c b/contrib/ipfilter/lib/parse.c
index 30fc117f3fad..c449b38c1cdb 100644
--- a/contrib/ipfilter/lib/parse.c
+++ b/contrib/ipfilter/lib/parse.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/parse.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/portname.c b/contrib/ipfilter/lib/portname.c
index 0709fc5766ec..1d1bf2f994bf 100644
--- a/contrib/ipfilter/lib/portname.c
+++ b/contrib/ipfilter/lib/portname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/portname.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/portnum.c b/contrib/ipfilter/lib/portnum.c
index c290c93fb412..8b4ad35fe4cc 100644
--- a/contrib/ipfilter/lib/portnum.c
+++ b/contrib/ipfilter/lib/portnum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/portnum.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ports.c b/contrib/ipfilter/lib/ports.c
index deee05ea96a3..2e2c28437539 100644
--- a/contrib/ipfilter/lib/ports.c
+++ b/contrib/ipfilter/lib/ports.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ports.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/print_toif.c b/contrib/ipfilter/lib/print_toif.c
index be6eaec7a565..365f595618b7 100644
--- a/contrib/ipfilter/lib/print_toif.c
+++ b/contrib/ipfilter/lib/print_toif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/print_toif.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printactivenat.c b/contrib/ipfilter/lib/printactivenat.c
index 78b0ed91d215..08ebe34a0775 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/contrib/ipfilter/lib/printactivenat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printactivenat.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printaps.c b/contrib/ipfilter/lib/printaps.c
index df69a7b0e25d..137af241724f 100644
--- a/contrib/ipfilter/lib/printaps.c
+++ b/contrib/ipfilter/lib/printaps.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printaps.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printbuf.c b/contrib/ipfilter/lib/printbuf.c
index fa24fbe1620a..93b760e0ffd0 100644
--- a/contrib/ipfilter/lib/printbuf.c
+++ b/contrib/ipfilter/lib/printbuf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printbuf.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfr.c b/contrib/ipfilter/lib/printfr.c
index a7ab1d217303..81d889e7c432 100644
--- a/contrib/ipfilter/lib/printfr.c
+++ b/contrib/ipfilter/lib/printfr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printfr.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/contrib/ipfilter/lib/printfraginfo.c
index 461d49748d49..8248860f60d3 100644
--- a/contrib/ipfilter/lib/printfraginfo.c
+++ b/contrib/ipfilter/lib/printfraginfo.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printfraginfo.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhash.c b/contrib/ipfilter/lib/printhash.c
index fab0659281d8..5cacacc820fd 100644
--- a/contrib/ipfilter/lib/printhash.c
+++ b/contrib/ipfilter/lib/printhash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhash.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhashnode.c b/contrib/ipfilter/lib/printhashnode.c
index b5eda15e0b93..023acb7b951b 100644
--- a/contrib/ipfilter/lib/printhashnode.c
+++ b/contrib/ipfilter/lib/printhashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhashnode.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmap.c b/contrib/ipfilter/lib/printhostmap.c
index d4ffd443d47b..593581a85f46 100644
--- a/contrib/ipfilter/lib/printhostmap.c
+++ b/contrib/ipfilter/lib/printhostmap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhostmap.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c
index 05121c3c7975..72dae1c53070 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/contrib/ipfilter/lib/printhostmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhostmask.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printifname.c b/contrib/ipfilter/lib/printifname.c
index 8726e625d5bd..02a6dc5d6595 100644
--- a/contrib/ipfilter/lib/printifname.c
+++ b/contrib/ipfilter/lib/printifname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printifname.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printip.c b/contrib/ipfilter/lib/printip.c
index 01b06bd004bc..e5ca2f89d0e4 100644
--- a/contrib/ipfilter/lib/printip.c
+++ b/contrib/ipfilter/lib/printip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printip.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printlog.c b/contrib/ipfilter/lib/printlog.c
index c255cf1a65f5..bcba50d3d482 100644
--- a/contrib/ipfilter/lib/printlog.c
+++ b/contrib/ipfilter/lib/printlog.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printlog.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printmask.c b/contrib/ipfilter/lib/printmask.c
index a477c66c79f0..ee8ecb2880b5 100644
--- a/contrib/ipfilter/lib/printmask.c
+++ b/contrib/ipfilter/lib/printmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printmask.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printnat.c b/contrib/ipfilter/lib/printnat.c
index 09056b110709..d4553e6f0fff 100644
--- a/contrib/ipfilter/lib/printnat.c
+++ b/contrib/ipfilter/lib/printnat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket.c b/contrib/ipfilter/lib/printpacket.c
index 4791b08e84c0..1c78a79b09f1 100644
--- a/contrib/ipfilter/lib/printpacket.c
+++ b/contrib/ipfilter/lib/printpacket.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpacket.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket6.c b/contrib/ipfilter/lib/printpacket6.c
index 2ddffed67276..542e2115ef63 100644
--- a/contrib/ipfilter/lib/printpacket6.c
+++ b/contrib/ipfilter/lib/printpacket6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpacket6.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/printpool.c b/contrib/ipfilter/lib/printpool.c
index 4bd48aa6bf73..cd860acab92e 100644
--- a/contrib/ipfilter/lib/printpool.c
+++ b/contrib/ipfilter/lib/printpool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpool.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/contrib/ipfilter/lib/printpoolnode.c
index ec8ac3e9fffa..7ef2e6bf4000 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/contrib/ipfilter/lib/printpoolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpoolnode.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printportcmp.c b/contrib/ipfilter/lib/printportcmp.c
index 14854be5254a..c204b187c2ba 100644
--- a/contrib/ipfilter/lib/printportcmp.c
+++ b/contrib/ipfilter/lib/printportcmp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printportcmp.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printsbuf.c b/contrib/ipfilter/lib/printsbuf.c
index cfa9171d1f4a..48d208a5408a 100644
--- a/contrib/ipfilter/lib/printsbuf.c
+++ b/contrib/ipfilter/lib/printsbuf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printsbuf.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #ifdef	IPFILTER_SCAN
 
diff --git a/contrib/ipfilter/lib/printstate.c b/contrib/ipfilter/lib/printstate.c
index 26920523ac7f..6001358cebbd 100644
--- a/contrib/ipfilter/lib/printstate.c
+++ b/contrib/ipfilter/lib/printstate.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printstate.c,v 1.3 2005/04/28 21:36:30 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printtunable.c b/contrib/ipfilter/lib/printtunable.c
index 12e019dbc6c1..2be91f9ea969 100644
--- a/contrib/ipfilter/lib/printtunable.c
+++ b/contrib/ipfilter/lib/printtunable.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printtunable.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/ratoi.c b/contrib/ipfilter/lib/ratoi.c
index f6f70811cf2c..1323cbdae310 100644
--- a/contrib/ipfilter/lib/ratoi.c
+++ b/contrib/ipfilter/lib/ratoi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ratoi.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ratoui.c b/contrib/ipfilter/lib/ratoui.c
index 0a54cebbabbf..77cfebccd568 100644
--- a/contrib/ipfilter/lib/ratoui.c
+++ b/contrib/ipfilter/lib/ratoui.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ratoui.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hash.c b/contrib/ipfilter/lib/remove_hash.c
index fc52a0a71370..f099f107352c 100644
--- a/contrib/ipfilter/lib/remove_hash.c
+++ b/contrib/ipfilter/lib/remove_hash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_hash.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/contrib/ipfilter/lib/remove_hashnode.c
index 271c853c116b..1d7627f5adcd 100644
--- a/contrib/ipfilter/lib/remove_hashnode.c
+++ b/contrib/ipfilter/lib/remove_hashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_hashnode.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_pool.c b/contrib/ipfilter/lib/remove_pool.c
index 2663cb828a26..43d51bcf65db 100644
--- a/contrib/ipfilter/lib/remove_pool.c
+++ b/contrib/ipfilter/lib/remove_pool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_pool.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/contrib/ipfilter/lib/remove_poolnode.c
index 5a1d6394c642..8b5f32cef2cc 100644
--- a/contrib/ipfilter/lib/remove_poolnode.c
+++ b/contrib/ipfilter/lib/remove_poolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_poolnode.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/resetlexer.c b/contrib/ipfilter/lib/resetlexer.c
index 19eb161460a7..2fefcbddf046 100644
--- a/contrib/ipfilter/lib/resetlexer.c
+++ b/contrib/ipfilter/lib/resetlexer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/resetlexer.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/contrib/ipfilter/lib/rwlock_emul.c
index d3beb6037b74..2b7eba4d3ce9 100644
--- a/contrib/ipfilter/lib/rwlock_emul.c
+++ b/contrib/ipfilter/lib/rwlock_emul.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/rwlock_emul.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/contrib/ipfilter/lib/tcp_flags.c
index 7a57124b8acb..0b4eb316ce40 100644
--- a/contrib/ipfilter/lib/tcp_flags.c
+++ b/contrib/ipfilter/lib/tcp_flags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcp_flags.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpflags.c b/contrib/ipfilter/lib/tcpflags.c
index 2e65bdb3d395..c4771e98f8ba 100644
--- a/contrib/ipfilter/lib/tcpflags.c
+++ b/contrib/ipfilter/lib/tcpflags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcpflags.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/contrib/ipfilter/lib/tcpoptnames.c
index 7f2dfb628292..afedfe055280 100644
--- a/contrib/ipfilter/lib/tcpoptnames.c
+++ b/contrib/ipfilter/lib/tcpoptnames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcpoptnames.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/to_interface.c b/contrib/ipfilter/lib/to_interface.c
index fb97cee4b99c..133d7f695340 100644
--- a/contrib/ipfilter/lib/to_interface.c
+++ b/contrib/ipfilter/lib/to_interface.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/to_interface.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6ionames.c b/contrib/ipfilter/lib/v6ionames.c
index a2ce683e8fa5..47ecd3af941c 100644
--- a/contrib/ipfilter/lib/v6ionames.c
+++ b/contrib/ipfilter/lib/v6ionames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/v6ionames.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/contrib/ipfilter/lib/v6optvalue.c
index b81ed7a74f6b..900b00193fdc 100644
--- a/contrib/ipfilter/lib/v6optvalue.c
+++ b/contrib/ipfilter/lib/v6optvalue.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/v6optvalue.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/var.c b/contrib/ipfilter/lib/var.c
index 5f3e0150fba5..76c7e7b68c8e 100644
--- a/contrib/ipfilter/lib/var.c
+++ b/contrib/ipfilter/lib/var.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/var.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 #include <ctype.h>
 
diff --git a/contrib/ipfilter/lib/verbose.c b/contrib/ipfilter/lib/verbose.c
index cc81516f491c..665a3f6d509c 100644
--- a/contrib/ipfilter/lib/verbose.c
+++ b/contrib/ipfilter/lib/verbose.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/verbose.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/man/ipf.4 b/contrib/ipfilter/man/ipf.4
index dfef858d5dd8..381c8b357458 100644
--- a/contrib/ipfilter/man/ipf.4
+++ b/contrib/ipfilter/man/ipf.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.4,v 1.7 2005/04/25 18:20:14 darrenr Exp $
 .TH IPF 4
 .SH NAME
 ipf \- packet filtering kernel interface
diff --git a/contrib/ipfilter/man/ipf.5 b/contrib/ipfilter/man/ipf.5
index d6b6ac1f8a0c..65199077e6ad 100644
--- a/contrib/ipfilter/man/ipf.5
+++ b/contrib/ipfilter/man/ipf.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.5,v 1.9 2005/04/25 18:20:14 darrenr Exp $
 .TH IPF 5
 .SH NAME
 ipf, ipf.conf, ipf6.conf \- IP packet filter rule syntax
diff --git a/contrib/ipfilter/man/ipf.8 b/contrib/ipfilter/man/ipf.8
index bcf9307e0d91..b495cbedcd8a 100644
--- a/contrib/ipfilter/man/ipf.8
+++ b/contrib/ipfilter/man/ipf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.7 2005/04/25 18:20:14 darrenr Exp $
 .TH IPF 8
 .SH NAME
 ipf \- alters packet filtering lists for IP packet input and output
diff --git a/contrib/ipfilter/man/ipfilter.4 b/contrib/ipfilter/man/ipfilter.4
index 09eb4db8f1af..731db249296c 100644
--- a/contrib/ipfilter/man/ipfilter.4
+++ b/contrib/ipfilter/man/ipfilter.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipfilter.4,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IP\ FILTER 4
 .SH NAME
diff --git a/contrib/ipfilter/man/ipfilter.5 b/contrib/ipfilter/man/ipfilter.5
index 97e504df15fa..e1f5446444ab 100644
--- a/contrib/ipfilter/man/ipfilter.5
+++ b/contrib/ipfilter/man/ipfilter.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfilter.5,v 1.4 2002/03/19 11:48:16 darrenr Exp $
 .TH IPFILTER 1
 .SH NAME
 IP Filter
diff --git a/contrib/ipfilter/man/ipfs.8 b/contrib/ipfilter/man/ipfs.8
index 01d0c707d60c..38007a729aa6 100644
--- a/contrib/ipfilter/man/ipfs.8
+++ b/contrib/ipfilter/man/ipfs.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipfs.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPFS 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ipfstat.8 b/contrib/ipfilter/man/ipfstat.8
index d0cb2a932b44..a01088e499d1 100644
--- a/contrib/ipfilter/man/ipfstat.8
+++ b/contrib/ipfilter/man/ipfstat.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.10 2005/05/27 01:09:42 eivind Exp $
 .TH ipfstat 8
 .SH NAME
 ipfstat \- reports on packet filter statistics and filter list
diff --git a/contrib/ipfilter/man/ipftest.1 b/contrib/ipfilter/man/ipftest.1
index df8320af63a8..f8c18727f998 100644
--- a/contrib/ipfilter/man/ipftest.1
+++ b/contrib/ipfilter/man/ipftest.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipftest.1,v 1.6 2005/04/25 18:20:14 darrenr Exp $
 .TH ipftest 1
 .SH NAME
 ipftest \- test packet filter rules with arbitrary input.
diff --git a/contrib/ipfilter/man/ipl.4 b/contrib/ipfilter/man/ipl.4
index da1d9e61ce0f..626212adb1bf 100644
--- a/contrib/ipfilter/man/ipl.4
+++ b/contrib/ipfilter/man/ipl.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipl.4,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPL 4
 .SH NAME
diff --git a/contrib/ipfilter/man/ipmon.5 b/contrib/ipfilter/man/ipmon.5
index 081fc0856bc1..fbb9c9918433 100644
--- a/contrib/ipfilter/man/ipmon.5
+++ b/contrib/ipfilter/man/ipmon.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipmon.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPMON 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index 48b2a4122941..173aa85791b2 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/contrib/ipfilter/man/ipmon.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.15 2005/04/25 18:20:14 darrenr Exp $
 .TH ipmon 8
 .SH NAME
 ipmon \- monitors /dev/ipl for logged packets
diff --git a/contrib/ipfilter/man/ipnat.4 b/contrib/ipfilter/man/ipnat.4
index 095e4e5e1904..94d1a727364f 100644
--- a/contrib/ipfilter/man/ipnat.4
+++ b/contrib/ipfilter/man/ipnat.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipnat.4,v 1.5 2000/10/26 12:47:40 darrenr Exp $
 .TH IPNAT 4
 .SH NAME
 ipnat \- Network Address Translation kernel interface
diff --git a/contrib/ipfilter/man/ipnat.5 b/contrib/ipfilter/man/ipnat.5
index 210f09abca07..7abd0a7a952d 100644
--- a/contrib/ipfilter/man/ipnat.5
+++ b/contrib/ipfilter/man/ipnat.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipnat.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPNAT 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipnat.8 b/contrib/ipfilter/man/ipnat.8
index 87f2da5723db..2f0e5b30beb3 100644
--- a/contrib/ipfilter/man/ipnat.8
+++ b/contrib/ipfilter/man/ipnat.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipnat.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPNAT 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ippool.5 b/contrib/ipfilter/man/ippool.5
index 974a0e8981fb..77912ad0c040 100644
--- a/contrib/ipfilter/man/ippool.5
+++ b/contrib/ipfilter/man/ippool.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ippool.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPPOOL 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ippool.8 b/contrib/ipfilter/man/ippool.8
index 986812a14077..05fbe4546619 100644
--- a/contrib/ipfilter/man/ippool.8
+++ b/contrib/ipfilter/man/ippool.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ippool.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPPOOL 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ipscan.5 b/contrib/ipfilter/man/ipscan.5
index 91bf9b0f5ebe..32c63710390c 100644
--- a/contrib/ipfilter/man/ipscan.5
+++ b/contrib/ipfilter/man/ipscan.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipscan.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPSCAN 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipscan.8 b/contrib/ipfilter/man/ipscan.8
index 513dc94a8050..e5af001c85e1 100644
--- a/contrib/ipfilter/man/ipscan.8
+++ b/contrib/ipfilter/man/ipscan.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipscan.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPSCAN 8
 .SH NAME
diff --git a/contrib/ipfilter/man/mkfilters.1 b/contrib/ipfilter/man/mkfilters.1
index 89a8d47e0214..b2d03b107e2f 100644
--- a/contrib/ipfilter/man/mkfilters.1
+++ b/contrib/ipfilter/man/mkfilters.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/mkfilters.1,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH MKFILTERS 1
 .SH NAME
diff --git a/contrib/ipfilter/md5.c b/contrib/ipfilter/md5.c
index 63dd4b415745..c1a6e3d54e71 100644
--- a/contrib/ipfilter/md5.c
+++ b/contrib/ipfilter/md5.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/md5.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 
 
diff --git a/contrib/ipfilter/md5.h b/contrib/ipfilter/md5.h
index 82705312fbed..635c7b216992 100644
--- a/contrib/ipfilter/md5.h
+++ b/contrib/ipfilter/md5.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/md5.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  ***********************************************************************
diff --git a/contrib/ipfilter/mlf_ipl.c b/contrib/ipfilter/mlf_ipl.c
index ca79596e3844..e6271dc49035 100644
--- a/contrib/ipfilter/mlf_ipl.c
+++ b/contrib/ipfilter/mlf_ipl.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlf_ipl.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlf_rule.c b/contrib/ipfilter/mlf_rule.c
index 8b7b9d3a9409..5692ec9aed8d 100644
--- a/contrib/ipfilter/mlf_rule.c
+++ b/contrib/ipfilter/mlf_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlf_rule.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlfk_rule.c b/contrib/ipfilter/mlfk_rule.c
index b5aa0baa9745..681f4626c8a1 100644
--- a/contrib/ipfilter/mlfk_rule.c
+++ b/contrib/ipfilter/mlfk_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlfk_rule.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/mlh_rule.c b/contrib/ipfilter/mlh_rule.c
index dd350dfb7b4f..a869aab12ac1 100644
--- a/contrib/ipfilter/mlh_rule.c
+++ b/contrib/ipfilter/mlh_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlh_rule.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/net/.cvsignore b/contrib/ipfilter/net/.cvsignore
deleted file mode 100644
index 19f86f493ab1..000000000000
--- a/contrib/ipfilter/net/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-done
diff --git a/contrib/ipfilter/opts.h b/contrib/ipfilter/opts.h
index 6a9494a9edcc..90f2773cdfab 100644
--- a/contrib/ipfilter/opts.h
+++ b/contrib/ipfilter/opts.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/opts.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/pcap-bpf.h b/contrib/ipfilter/pcap-bpf.h
index 51002a3c2bea..2ad4d3ccaf8f 100644
--- a/contrib/ipfilter/pcap-bpf.h
+++ b/contrib/ipfilter/pcap-bpf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/pcap-bpf.h,v 1.1 2005/05/16 16:22:55 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/pcap-ipf.h b/contrib/ipfilter/pcap-ipf.h
index 71250ad61389..211ad52c34ca 100644
--- a/contrib/ipfilter/pcap-ipf.h
+++ b/contrib/ipfilter/pcap-ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/pcap-ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/radix.c b/contrib/ipfilter/radix.c
index 8bef078dc050..7eee9d7835ad 100644
--- a/contrib/ipfilter/radix.c
+++ b/contrib/ipfilter/radix.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/radix.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/radix_ipf.h b/contrib/ipfilter/radix_ipf.h
index cc046fedb986..5ec3ba8c726b 100644
--- a/contrib/ipfilter/radix_ipf.h
+++ b/contrib/ipfilter/radix_ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/radix_ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/rules/.cvsignore b/contrib/ipfilter/rules/.cvsignore
deleted file mode 100644
index 3e757656cf36..000000000000
--- a/contrib/ipfilter/rules/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-new
diff --git a/contrib/ipfilter/rules/example.1 b/contrib/ipfilter/rules/example.1
index 3da9f3ccab5c..646dc88e40e5 100644
--- a/contrib/ipfilter/rules/example.1
+++ b/contrib/ipfilter/rules/example.1
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.1,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
 #
 # block all incoming TCP packets on le0 from host 10.1.1.1 to any destination.
 #
diff --git a/contrib/ipfilter/rules/example.10 b/contrib/ipfilter/rules/example.10
index f7a0b011e144..fb44d4bb57c7 100644
--- a/contrib/ipfilter/rules/example.10
+++ b/contrib/ipfilter/rules/example.10
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.10,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
 #
 # pass ack packets (ie established connection)
 #
diff --git a/contrib/ipfilter/rules/example.11 b/contrib/ipfilter/rules/example.11
index 1cefa9a3b35d..ee1ecc3ad76e 100644
--- a/contrib/ipfilter/rules/example.11
+++ b/contrib/ipfilter/rules/example.11
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.11,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
 #
 # allow any TCP packets from the same subnet as foo is on through to host
 # 10.1.1.2 if they are destined for port 6667.
diff --git a/contrib/ipfilter/rules/example.12 b/contrib/ipfilter/rules/example.12
index 6dbaef58c561..b60c6f20a3a6 100644
--- a/contrib/ipfilter/rules/example.12
+++ b/contrib/ipfilter/rules/example.12
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.12,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
 #
 # get rid of all short IP fragments (too small for valid comparison)
 #
diff --git a/contrib/ipfilter/rules/example.13 b/contrib/ipfilter/rules/example.13
index ca741148931e..3f4f8c0b78ff 100644
--- a/contrib/ipfilter/rules/example.13
+++ b/contrib/ipfilter/rules/example.13
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.13,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
 #
 # Log all short TCP packets to qe3, with 10.3.3.3 as the intended
 # destination for the packet.
diff --git a/contrib/ipfilter/rules/example.2 b/contrib/ipfilter/rules/example.2
index 81e7d25c7c71..bcf297594f8e 100644
--- a/contrib/ipfilter/rules/example.2
+++ b/contrib/ipfilter/rules/example.2
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.2,v 1.1.1.4 2005/04/25 17:31:24 darrenr Exp $
 #
 # block all outgoing TCP packets on le0 from any host to port 23 of
 # host 10.1.1.2
diff --git a/contrib/ipfilter/rules/example.3 b/contrib/ipfilter/rules/example.3
index c5b4344f91ce..4b439d64a669 100644
--- a/contrib/ipfilter/rules/example.3
+++ b/contrib/ipfilter/rules/example.3
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.3,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
 #
 # block all inbound packets.
 #
diff --git a/contrib/ipfilter/rules/example.4 b/contrib/ipfilter/rules/example.4
index f18dcdd0cd27..78e0c962904d 100644
--- a/contrib/ipfilter/rules/example.4
+++ b/contrib/ipfilter/rules/example.4
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.4,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
 #
 # block all ICMP packets.
 #
diff --git a/contrib/ipfilter/rules/example.5 b/contrib/ipfilter/rules/example.5
index 959dfb836371..ae8ec6158ce1 100644
--- a/contrib/ipfilter/rules/example.5
+++ b/contrib/ipfilter/rules/example.5
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.5,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
 #
 # test ruleset
 #
diff --git a/contrib/ipfilter/rules/example.6 b/contrib/ipfilter/rules/example.6
index e9ce23ac27e6..271f88eddad5 100644
--- a/contrib/ipfilter/rules/example.6
+++ b/contrib/ipfilter/rules/example.6
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.6,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
 #
 # block all TCP packets with only the SYN flag set (this is the first
 # packet sent to establish a connection) out of the SYN-ACK pair.
diff --git a/contrib/ipfilter/rules/example.7 b/contrib/ipfilter/rules/example.7
index 0ddd7f77628b..a9a2d3cfe551 100644
--- a/contrib/ipfilter/rules/example.7
+++ b/contrib/ipfilter/rules/example.7
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.7,v 1.1.1.2 2005/04/25 17:31:25 darrenr Exp $
 # block all ICMP packets.
 #
 block in proto icmp all
diff --git a/contrib/ipfilter/rules/example.8 b/contrib/ipfilter/rules/example.8
index 2276b525b17d..5f8924f148c9 100644
--- a/contrib/ipfilter/rules/example.8
+++ b/contrib/ipfilter/rules/example.8
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.8,v 1.1.1.2 2005/04/25 17:31:25 darrenr Exp $
 #
 # block all incoming TCP connections but send back a TCP-RST for ones to
 # the ident port
diff --git a/contrib/ipfilter/rules/example.9 b/contrib/ipfilter/rules/example.9
index 50bb46a672d8..34400b5d8fc9 100644
--- a/contrib/ipfilter/rules/example.9
+++ b/contrib/ipfilter/rules/example.9
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.9,v 1.1.1.3 2005/04/25 17:31:25 darrenr Exp $
 #
 # drop all packets without IP security options
 #
diff --git a/contrib/ipfilter/rules/example.sr b/contrib/ipfilter/rules/example.sr
index 46fb6f14aaf6..b8cedba4eba8 100644
--- a/contrib/ipfilter/rules/example.sr
+++ b/contrib/ipfilter/rules/example.sr
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/contrib/ipfilter/rules/example.sr,v 1.1.1.2 2005/04/25 17:31:25 darrenr Exp $
 #
 # log all inbound packet on le0 which has IP options present
 #
diff --git a/contrib/ipfilter/samples/.cvsignore b/contrib/ipfilter/samples/.cvsignore
deleted file mode 100644
index 4d38251c2f4f..000000000000
--- a/contrib/ipfilter/samples/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-userauth
-proxy
-relay
-trans_relay
diff --git a/contrib/ipfilter/samples/proxy.c b/contrib/ipfilter/samples/proxy.c
index c1854b512804..3d740cec1715 100644
--- a/contrib/ipfilter/samples/proxy.c
+++ b/contrib/ipfilter/samples/proxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/proxy.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Sample transparent proxy program.
diff --git a/contrib/ipfilter/samples/relay.c b/contrib/ipfilter/samples/relay.c
index f775cbdc410e..90b0e064457e 100644
--- a/contrib/ipfilter/samples/relay.c
+++ b/contrib/ipfilter/samples/relay.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/relay.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $	*/
 
 /*
  * Sample program to be used as a transparent proxy.
diff --git a/contrib/ipfilter/samples/userauth.c b/contrib/ipfilter/samples/userauth.c
index 620bd7220057..94ec70fff07f 100644
--- a/contrib/ipfilter/samples/userauth.c
+++ b/contrib/ipfilter/samples/userauth.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/userauth.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/ipfilter/snoop.h b/contrib/ipfilter/snoop.h
index 97fa767eac38..84a634f0ec35 100644
--- a/contrib/ipfilter/snoop.h
+++ b/contrib/ipfilter/snoop.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/snoop.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/test/.cvsignore b/contrib/ipfilter/test/.cvsignore
deleted file mode 100644
index 5825abcde9c7..000000000000
--- a/contrib/ipfilter/test/.cvsignore
+++ /dev/null
@@ -1,87 +0,0 @@
-results
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-i1
-i2
-i3
-i4
-i5
-i6
-i7
-i8
-i9
-i10
-i11
-f1
-f2
-f3
-f4
-f5
-f6
-f7
-f8
-f9
-f10
-f11
-f12
-f13
-f14
-n1
-n2
-n3
-n4
-n5
-n6
-n7
-f15
-f16
-ipv6.1
-ipv6.2
-l1
-ni1
-ni2
-ni3
-ni4
-f17
-in1
-in2
-in3
-in4
-p1
-p2
-i12
-ip1
-p3
-i13
-ni5
-ni6
-i14
-in5
-ipv6.3
-n8
-n9
-n10
-n11
-ni7
-ni8
-ni9
-ni10
-ni11
-ni12
-n12
-in6
-i15
-ni13
-ni14
-ni15
-ni16
diff --git a/contrib/ipfilter/test/logtest b/contrib/ipfilter/test/logtest
index 1c8ac5bca2c3..146702a93416 100755
--- a/contrib/ipfilter/test/logtest
+++ b/contrib/ipfilter/test/logtest
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/test/logtest,v 1.4 2005/04/25 18:20:15 darrenr Exp $
 format=$2
 mkdir -p results
 if [ -f /usr/ucb/touch ] ; then
diff --git a/contrib/ipfilter/tools/ipf.c b/contrib/ipfilter/tools/ipf.c
index e9af9443754b..0f539678873e 100644
--- a/contrib/ipfilter/tools/ipf.c
+++ b/contrib/ipfilter/tools/ipf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipf.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipf_y.y b/contrib/ipfilter/tools/ipf_y.y
index 47113c79f017..e4608c26765b 100644
--- a/contrib/ipfilter/tools/ipf_y.y
+++ b/contrib/ipfilter/tools/ipf_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipf_y.y,v 1.3 2005/05/16 16:22:55 darrenr Exp $	*/
 
 %{
 #include "ipf.h"
diff --git a/contrib/ipfilter/tools/ipfcomp.c b/contrib/ipfilter/tools/ipfcomp.c
index de60f6901315..93044f675bdf 100644
--- a/contrib/ipfilter/tools/ipfcomp.c
+++ b/contrib/ipfilter/tools/ipfcomp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfcomp.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfs.c b/contrib/ipfilter/tools/ipfs.c
index a587a4261628..aa66f9ade131 100644
--- a/contrib/ipfilter/tools/ipfs.c
+++ b/contrib/ipfilter/tools/ipfs.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfs.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1999-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfstat.c b/contrib/ipfilter/tools/ipfstat.c
index 0ce970cb22a2..95e3e05d4085 100644
--- a/contrib/ipfilter/tools/ipfstat.c
+++ b/contrib/ipfilter/tools/ipfstat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipftest.c b/contrib/ipfilter/tools/ipftest.c
index 6dbf21fc336c..f2afbe9e7237 100644
--- a/contrib/ipfilter/tools/ipftest.c
+++ b/contrib/ipfilter/tools/ipftest.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipftest.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon.c b/contrib/ipfilter/tools/ipmon.c
index 06ade23a83ee..8e0de6b60fe7 100644
--- a/contrib/ipfilter/tools/ipmon.c
+++ b/contrib/ipfilter/tools/ipmon.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipmon.c,v 1.4 2005/05/24 21:25:32 cognet Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon_y.y b/contrib/ipfilter/tools/ipmon_y.y
index e1aa81204607..7bebe5dcdddf 100644
--- a/contrib/ipfilter/tools/ipmon_y.y
+++ b/contrib/ipfilter/tools/ipmon_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipmon_y.y,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 %{
 #include "ipf.h"
diff --git a/contrib/ipfilter/tools/ipnat.c b/contrib/ipfilter/tools/ipnat.c
index 7b002812e669..7b199549b964 100644
--- a/contrib/ipfilter/tools/ipnat.c
+++ b/contrib/ipfilter/tools/ipnat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipnat.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/contrib/ipfilter/tools/ipnat_y.y
index 5f7ec8cf42f1..41dd481e5339 100644
--- a/contrib/ipfilter/tools/ipnat_y.y
+++ b/contrib/ipfilter/tools/ipnat_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipnat_y.y,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 %{
 #ifdef  __FreeBSD__
diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c
index 5cefc66fd80a..03e2d8b801c3 100644
--- a/contrib/ipfilter/tools/ippool.c
+++ b/contrib/ipfilter/tools/ippool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ippool.c,v 1.3 2005/04/28 16:26:33 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool_y.y b/contrib/ipfilter/tools/ippool_y.y
index f0ba451a2003..546411e71c73 100644
--- a/contrib/ipfilter/tools/ippool_y.y
+++ b/contrib/ipfilter/tools/ippool_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ippool_y.y,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 %{
 #include <sys/types.h>
diff --git a/contrib/ipfilter/tools/ipscan_y.y b/contrib/ipfilter/tools/ipscan_y.y
index af360d446400..4fa6297ae5bb 100644
--- a/contrib/ipfilter/tools/ipscan_y.y
+++ b/contrib/ipfilter/tools/ipscan_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipscan_y.y,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 %{
 #include <sys/types.h>
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/contrib/ipfilter/tools/ipsyncm.c
index da9065ecd1d8..9a5890b714e8 100644
--- a/contrib/ipfilter/tools/ipsyncm.c
+++ b/contrib/ipfilter/tools/ipsyncm.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipsyncm.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/contrib/ipfilter/tools/ipsyncs.c
index cd79e1ac3b48..6a75c1cfb2d4 100644
--- a/contrib/ipfilter/tools/ipsyncs.c
+++ b/contrib/ipfilter/tools/ipsyncs.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipsyncs.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lex_var.h b/contrib/ipfilter/tools/lex_var.h
index 547ebf310cf3..5bdd6d038548 100644
--- a/contrib/ipfilter/tools/lex_var.h
+++ b/contrib/ipfilter/tools/lex_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lex_var.h,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 
 extern	long		string_start;
diff --git a/contrib/ipfilter/tools/lexer.c b/contrib/ipfilter/tools/lexer.c
index 14882e4e5066..db2bad31f998 100644
--- a/contrib/ipfilter/tools/lexer.c
+++ b/contrib/ipfilter/tools/lexer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lexer.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.h b/contrib/ipfilter/tools/lexer.h
index b172c9351866..5e62ac331bc3 100644
--- a/contrib/ipfilter/tools/lexer.h
+++ b/contrib/ipfilter/tools/lexer.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lexer.h,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 
 typedef	struct	wordtab	{
diff --git a/contrib/less/command.c b/contrib/less/command.c
index 9bc966c7a97d..3a915629e1e9 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/command.c,v 1.5 2004/04/17 07:24:09 tjr Exp $ */
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
  *
diff --git a/contrib/less/forwback.c b/contrib/less/forwback.c
index ebad6ae09e61..3a8af666a8bb 100644
--- a/contrib/less/forwback.c
+++ b/contrib/less/forwback.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/forwback.c,v 1.4 2004/04/17 07:24:09 tjr Exp $ */
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
  *
diff --git a/contrib/less/less.h b/contrib/less/less.h
index 9747520b4eab..f6445fe57c19 100644
--- a/contrib/less/less.h
+++ b/contrib/less/less.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/less.h,v 1.5 2004/04/17 07:24:09 tjr Exp $ */
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
  *
diff --git a/contrib/less/main.c b/contrib/less/main.c
index 18353db36b67..7419208bf799 100644
--- a/contrib/less/main.c
+++ b/contrib/less/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/main.c,v 1.4 2004/04/17 07:24:09 tjr Exp $ */
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
  *
diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c
index c745603b8021..4ff0047e248a 100644
--- a/contrib/less/prompt.c
+++ b/contrib/less/prompt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/prompt.c,v 1.4 2004/04/17 07:24:09 tjr Exp $ */
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
  *
diff --git a/contrib/less/screen.c b/contrib/less/screen.c
index df478fb134e4..8ca4adca10be 100644
--- a/contrib/less/screen.c
+++ b/contrib/less/screen.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/screen.c,v 1.4 2004/04/17 07:24:09 tjr Exp $ */
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
  *
diff --git a/contrib/less/search.c b/contrib/less/search.c
index 1645a5503163..b62c7a99f2bb 100644
--- a/contrib/less/search.c
+++ b/contrib/less/search.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/search.c,v 1.5 2004/04/17 07:24:09 tjr Exp $ */
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
  *
diff --git a/contrib/less/signal.c b/contrib/less/signal.c
index c32e7a11ae73..ca1e349006be 100644
--- a/contrib/less/signal.c
+++ b/contrib/less/signal.c
@@ -8,7 +8,7 @@
  * contact the author, see the README file.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/signal.c,v 1.3 2004/04/17 07:24:09 tjr Exp $ */
 
 /*
  * Routines dealing with signals.
diff --git a/contrib/libf2c/FREEBSD-upgrade b/contrib/libf2c/FREEBSD-upgrade
index e919f546f552..448db9023401 100644
--- a/contrib/libf2c/FREEBSD-upgrade
+++ b/contrib/libf2c/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/libf2c/FREEBSD-upgrade,v 1.4 1999/11/01 07:25:20 obrien Exp $
 
 For the import of lib{f,g}2c, files were pruned by:
 
diff --git a/contrib/libpcap/.cvsignore b/contrib/libpcap/.cvsignore
deleted file mode 100644
index 138c28814a08..000000000000
--- a/contrib/libpcap/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-config.log
-config.cache
-config.status
-config.h
-.devel
-stamp-h
-stamp-h.in
-Makefile
-scanner.c
-grammar.c
-tokdefs.h
-version.c
-version.h
diff --git a/contrib/libpcap/FREEBSD-upgrade b/contrib/libpcap/FREEBSD-upgrade
index 78d134cfe52b..98abbe87c3da 100644
--- a/contrib/libpcap/FREEBSD-upgrade
+++ b/contrib/libpcap/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.5 2002/02/08 19:45:58 obrien Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index 8830fcbf4325..be8faa817b05 100644
--- a/contrib/libpcap/gencode.c
+++ b/contrib/libpcap/gencode.c
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.c,v 1.15 2005/07/11 03:43:25 sam Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h
index d6dbd003f5b1..6736751f104c 100644
--- a/contrib/libpcap/gencode.h
+++ b/contrib/libpcap/gencode.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.h,v 1.8 2005/07/11 03:43:25 sam Exp $
  * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.5 2005/06/20 21:30:17 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index 3e40006a5f7a..0d01433ec7bc 100644
--- a/contrib/libpcap/grammar.y
+++ b/contrib/libpcap/grammar.y
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/grammar.y,v 1.10 2005/07/11 03:43:25 sam Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index fe4c582a6d95..18a8a85c7a90 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -21,7 +21,7 @@
  * Name to id translation routines used by the scanner.
  * These functions are not time critical.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nametoaddr.c,v 1.12 2005/07/11 03:43:25 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libpcap/nlpid.h b/contrib/libpcap/nlpid.h
index 7ea2963f108d..e5ff50c4333e 100644
--- a/contrib/libpcap/nlpid.h
+++ b/contrib/libpcap/nlpid.h
@@ -15,7 +15,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nlpid.h,v 1.3 2004/03/31 09:13:37 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/nlpid.h,v 1.2 2002/12/06 00:01:34 hannes Exp $ (Juniper)
  */
 
diff --git a/contrib/libpcap/pcap-int.h b/contrib/libpcap/pcap-int.h
index 01fe105ae7b9..943154e5f234 100644
--- a/contrib/libpcap/pcap-int.h
+++ b/contrib/libpcap/pcap-int.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-int.h,v 1.11 2005/07/11 03:43:25 sam Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.2 2005/05/03 18:54:36 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h
index bbd06b0f58a8..f5780e173924 100644
--- a/contrib/libpcap/pcap-namedb.h
+++ b/contrib/libpcap/pcap-namedb.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-namedb.h,v 1.6 2005/07/11 03:43:25 sam Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.10 2005/03/17 07:02:32 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap.3 b/contrib/libpcap/pcap.3
index adf572947224..bcdc09ef78c2 100644
--- a/contrib/libpcap/pcap.3
+++ b/contrib/libpcap/pcap.3
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/libpcap/pcap.3,v 1.14 2005/07/11 03:43:25 sam Exp $
 .\"
 .TH PCAP 3 "27 February 2004"
 .SH NAME
diff --git a/contrib/libpcap/pcap.h b/contrib/libpcap/pcap.h
index a302ac78d469..1d1dd027aa5d 100644
--- a/contrib/libpcap/pcap.h
+++ b/contrib/libpcap/pcap.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.11 2005/07/11 03:43:25 sam Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52 2004/12/18 08:52:11 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index 2bed45b0e730..56481ac0c003 100644
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/scanner.l,v 1.12 2005/07/11 03:43:25 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libreadline/FREEBSD-upgrade b/contrib/libreadline/FREEBSD-upgrade
index c2c4982888cc..289e8dbad54a 100644
--- a/contrib/libreadline/FREEBSD-upgrade
+++ b/contrib/libreadline/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.6 2004/10/18 07:15:43 ache Exp $
 #
 # Official patches 001-005 imported as v5_0_p1_p5
 #
diff --git a/contrib/libreadline/complete.c b/contrib/libreadline/complete.c
index 158de12df462..1c332b993b09 100644
--- a/contrib/libreadline/complete.c
+++ b/contrib/libreadline/complete.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.11 2004/10/21 23:45:57 ache Exp $ */
 
 /* complete.c -- filename completion for readline. */
 
diff --git a/contrib/libreadline/display.c b/contrib/libreadline/display.c
index d0577bac7724..e9722139ce99 100644
--- a/contrib/libreadline/display.c
+++ b/contrib/libreadline/display.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/display.c,v 1.8 2004/10/21 23:45:57 ache Exp $ */
 
 /* display.c -- readline redisplay facility. */
 
diff --git a/contrib/libreadline/doc/readline.3 b/contrib/libreadline/doc/readline.3
index 37a1d115ee4d..ff99f76377dd 100644
--- a/contrib/libreadline/doc/readline.3
+++ b/contrib/libreadline/doc/readline.3
@@ -12,7 +12,7 @@
 .\"
 .\" File Name macro.  This used to be `.PN', for Path Name,
 .\" but Sun doesn't seem to like that very much.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/libreadline/doc/readline.3,v 1.10 2004/10/21 23:45:57 ache Exp $
 .\"
 .de FN
 \fI\|\\$1\|\fP
diff --git a/contrib/libreadline/readline.h b/contrib/libreadline/readline.h
index 82676b609f93..15a023b9a5a9 100644
--- a/contrib/libreadline/readline.h
+++ b/contrib/libreadline/readline.h
@@ -20,7 +20,7 @@
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.16 2004/10/18 07:25:32 ache Exp $ */
 #if !defined (_READLINE_H_)
 #define _READLINE_H_
 
diff --git a/contrib/libreadline/rlconf.h b/contrib/libreadline/rlconf.h
index 537ec0fcaf2c..dc96ab7c2846 100644
--- a/contrib/libreadline/rlconf.h
+++ b/contrib/libreadline/rlconf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/rlconf.h,v 1.7 2004/10/21 23:45:57 ache Exp $ */
 
 /* rlconf.h -- readline configuration definitions */
 
diff --git a/contrib/libreadline/shell.c b/contrib/libreadline/shell.c
index e2a01a43e796..3b6e5ca3d6b9 100644
--- a/contrib/libreadline/shell.c
+++ b/contrib/libreadline/shell.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/shell.c,v 1.9 2004/10/21 23:45:57 ache Exp $ */
 
 /* shell.c -- readline utility functions that are normally provided by
 	      bash when readline is linked as part of the shell. */
diff --git a/contrib/libreadline/terminal.c b/contrib/libreadline/terminal.c
index 1c291088acda..91aac6188cc4 100644
--- a/contrib/libreadline/terminal.c
+++ b/contrib/libreadline/terminal.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/terminal.c,v 1.7 2004/10/21 23:45:57 ache Exp $ */
 
 /* terminal.c -- controlling the terminal with termcap. */
 
diff --git a/contrib/libreadline/util.c b/contrib/libreadline/util.c
index 4cbd9efbe8ff..13454001afb4 100644
--- a/contrib/libreadline/util.c
+++ b/contrib/libreadline/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/util.c,v 1.10 2004/10/21 23:45:57 ache Exp $ */
 
 /* util.c -- readline utility functions */
 
diff --git a/contrib/libreadline/vi_mode.c b/contrib/libreadline/vi_mode.c
index 13fcc6f6155b..dac22f993e77 100644
--- a/contrib/libreadline/vi_mode.c
+++ b/contrib/libreadline/vi_mode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.4 2004/10/21 23:45:57 ache Exp $ */
 
 /* vi_mode.c -- A vi emulation mode for Bash.
    Derived from code written by Jeff Sparkes (jsparkes@bnr.ca).  */
diff --git a/contrib/lukemftpd/src/ftpd.c b/contrib/lukemftpd/src/ftpd.c
index 858036efe12e..ca91f8d7a321 100644
--- a/contrib/lukemftpd/src/ftpd.c
+++ b/contrib/lukemftpd/src/ftpd.c
@@ -108,7 +108,7 @@ static char sccsid[] = "@(#)ftpd.c	8.5 (Berkeley) 4/28/95";
 __RCSID("$NetBSD: ftpd.c,v 1.158 2004-08-09 12:56:47 lukem Exp $");
 #endif
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.4 2004/08/18 06:34:20 obrien Exp $");
 
 /*
  * FTP server.
diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c
index 7e08fc034e86..e0e4c7a0435f 100644
--- a/contrib/ncurses/ncurses/tinfo/comp_scan.c
+++ b/contrib/ncurses/ncurses/tinfo/comp_scan.c
@@ -31,7 +31,7 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/comp_scan.c,v 1.6 2002/05/21 05:38:04 peter Exp $ */
 
 /*
  *	comp_scan.c --- Lexical scanner for terminfo compiler.
diff --git a/contrib/ncurses/ncurses/tinfo/lib_raw.c b/contrib/ncurses/ncurses/tinfo/lib_raw.c
index 2269b5bdb76e..5303b06a58a7 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_raw.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_raw.c
@@ -31,7 +31,7 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/lib_raw.c,v 1.6 2002/05/21 05:38:04 peter Exp $ */
 
 /*
  *	raw.c
diff --git a/contrib/ncurses/ncurses/tinfo/lib_termcap.c b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
index 911f89c73636..9df30936cb6e 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_termcap.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
@@ -34,7 +34,7 @@
  * Magnus Bengtsson, d6mbeng@dtek.chalmers.se (Nov'93)                      *
  ****************************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/lib_termcap.c,v 1.11 2002/06/20 19:44:40 peter Exp $ */
 
 #define __INTERNAL_CAPS_VISIBLE
 #include <curses.priv.h>
diff --git a/contrib/netcat/FREEBSD-Xlist b/contrib/netcat/FREEBSD-Xlist
index b69f5e4de371..a13fc8b711d6 100644
--- a/contrib/netcat/FREEBSD-Xlist
+++ b/contrib/netcat/FREEBSD-Xlist
@@ -1,3 +1,3 @@
-$FreeBSD$
+$FreeBSD: src/contrib/netcat/FREEBSD-Xlist,v 1.1 2005/02/06 15:26:44 delphij Exp $
 
 Makefile
diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade
index 5cba52bd65b2..7076e61d8ac6 100644
--- a/contrib/netcat/FREEBSD-upgrade
+++ b/contrib/netcat/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.1 2005/02/06 15:26:44 delphij Exp $
 
 1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
 2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1
index 42bd791f7aa3..37e7bc14ad8c 100644
--- a/contrib/netcat/nc.1
+++ b/contrib/netcat/nc.1
@@ -25,7 +25,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/contrib/netcat/nc.1,v 1.4 2005/06/27 07:07:55 ru Exp $
 .\"
 .Dd January 30, 2005
 .Dt NC 1
diff --git a/contrib/netcat/netcat.c b/contrib/netcat/netcat.c
index 53e55ed0a771..a216c0bac227 100644
--- a/contrib/netcat/netcat.c
+++ b/contrib/netcat/netcat.c
@@ -25,7 +25,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/contrib/netcat/netcat.c,v 1.3 2005/02/07 05:34:35 delphij Exp $
  */
 
 /*
diff --git a/contrib/ngatm/FREEBSD-Xlist b/contrib/ngatm/FREEBSD-Xlist
index 32e28ddb55fb..6646b935d09c 100644
--- a/contrib/ngatm/FREEBSD-Xlist
+++ b/contrib/ngatm/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/contrib/ngatm/FREEBSD-Xlist,v 1.1 2004/08/11 12:19:32 harti Exp $
 */VERSION
 */README
 */Makefile.in
diff --git a/contrib/ngatm/FREEBSD-upgrade b/contrib/ngatm/FREEBSD-upgrade
index 4557bf72bad2..610aedb32b6e 100644
--- a/contrib/ngatm/FREEBSD-upgrade
+++ b/contrib/ngatm/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/ngatm/FREEBSD-upgrade,v 1.1 2003/10/22 09:28:49 harti Exp $
 
 This is the user part of the NgATM stuff. Be careful to feed changes
 back to the maintainer <harti@freebsd.org>, because the code here is
diff --git a/contrib/ntp/FREEBSD-upgrade b/contrib/ntp/FREEBSD-upgrade
index feea46704643..7921072262a9 100644
--- a/contrib/ntp/FREEBSD-upgrade
+++ b/contrib/ntp/FREEBSD-upgrade
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ntp/FREEBSD-upgrade,v 1.5 2004/07/20 15:25:19 roberto Exp $
 
 NTP 4.2.0
 	originals can be found on ftp://ftp.udel.edu/pub/ntp/ntp4/
diff --git a/contrib/ntp/libntp/random.c b/contrib/ntp/libntp/random.c
index 713685799c9c..7005c1f23d24 100644
--- a/contrib/ntp/libntp/random.c
+++ b/contrib/ntp/libntp/random.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ntp/libntp/random.c,v 1.1.1.1 2001/08/29 14:35:11 roberto Exp $
  *
  */
 
diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c
index cbcc83755676..05d00e3d5cbe 100644
--- a/contrib/ntp/ntpd/ntp_control.c
+++ b/contrib/ntp/ntpd/ntp_control.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ntp/ntpd/ntp_control.c,v 1.9 2004/07/20 15:51:00 roberto Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/nvi/cl/cl_screen.c b/contrib/nvi/cl/cl_screen.c
index 7f28aaaf6670..9710d2e53acd 100644
--- a/contrib/nvi/cl/cl_screen.c
+++ b/contrib/nvi/cl/cl_screen.c
@@ -6,7 +6,7 @@
  *
  * See the LICENSE file for redistribution information.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.2 2001/11/09 02:23:05 rwatson Exp $
  */
 
 #include "config.h"
diff --git a/contrib/nvi/common/exf.c b/contrib/nvi/common/exf.c
index e332f4700e71..b4c5beac4b44 100644
--- a/contrib/nvi/common/exf.c
+++ b/contrib/nvi/common/exf.c
@@ -15,7 +15,7 @@
 static const char sccsid[] = "@(#)exf.c	10.49 (Berkeley) 10/10/96";
 #endif
 static const char rcsid[] = 
-  "$FreeBSD$";
+  "$FreeBSD: src/contrib/nvi/common/exf.c,v 1.5 2001/10/26 08:25:32 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/contrib/nvi/docs/USD.doc/vi.man/vi.1 b/contrib/nvi/docs/USD.doc/vi.man/vi.1
index 4d8c08db54ff..3c57fb4b3548 100644
--- a/contrib/nvi/docs/USD.doc/vi.man/vi.1
+++ b/contrib/nvi/docs/USD.doc/vi.man/vi.1
@@ -9,7 +9,7 @@
 .\" See the LICENSE file for redistribution information.
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/nvi/docs/USD.doc/vi.man/vi.1,v 1.5 2001/01/03 18:32:10 ben Exp $
 .\"
 .TH VI 1 "October 10, 1996"
 .UC
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref b/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
index 12a483f1edb1..f172c319a132 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
+++ b/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
@@ -10,7 +10,7 @@
 .\"
 .\"     @(#)vi.ref	8.88 (Berkeley) 10/19/96
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/nvi/docs/USD.doc/vi.ref/vi.ref,v 1.1.1.1.40.1 2005/08/19 02:53:00 cperciva Exp $
 .\"
 .so ref.so
 .tp
diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c
index ecdae4b86934..714b23a3932a 100644
--- a/contrib/nvi/ex/ex.c
+++ b/contrib/nvi/ex/ex.c
@@ -7,7 +7,7 @@
  * See the LICENSE file for redistribution information.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/nvi/ex/ex.c,v 1.2 1999/09/14 14:34:58 ru Exp $ */
 
 #include "config.h"
 
diff --git a/contrib/nvi/perl_api/perl.xs b/contrib/nvi/perl_api/perl.xs
index 3b89ea44cc92..45b93ba1db64 100644
--- a/contrib/nvi/perl_api/perl.xs
+++ b/contrib/nvi/perl_api/perl.xs
@@ -10,7 +10,7 @@
  *
  * See the LICENSE file for redistribution information.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/nvi/perl_api/perl.xs,v 1.3 2000/12/01 12:11:24 sheldonh Exp $
  */
 
 #include "config.h"
diff --git a/contrib/nvi/vi/vs_line.c b/contrib/nvi/vi/vs_line.c
index 495e75e8f1b6..abcd6e379915 100644
--- a/contrib/nvi/vi/vs_line.c
+++ b/contrib/nvi/vi/vs_line.c
@@ -14,7 +14,7 @@
 static const char sccsid[] = "@(#)vs_line.c	10.19 (Berkeley) 9/26/96";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/contrib/nvi/vi/vs_line.c,v 1.5 2002/01/31 14:23:49 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/contrib/nvi/vi/vs_refresh.c b/contrib/nvi/vi/vs_refresh.c
index f69d3820db7f..9671317ba8ad 100644
--- a/contrib/nvi/vi/vs_refresh.c
+++ b/contrib/nvi/vi/vs_refresh.c
@@ -14,7 +14,7 @@
 static const char sccsid[] = "@(#)vs_refresh.c	10.44 (Berkeley) 10/13/96";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/contrib/nvi/vi/vs_refresh.c,v 1.3 2001/07/19 11:02:11 dd Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/contrib/one-true-awk/FREEBSD-upgrade b/contrib/one-true-awk/FREEBSD-upgrade
index 716d19b47d35..ab564dbd78f0 100644
--- a/contrib/one-true-awk/FREEBSD-upgrade
+++ b/contrib/one-true-awk/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.9 2005/05/16 19:19:32 ru Exp $
 
 Import of the 2005/04/24 version of the "one true awk", as described
 in "The AWK Programming Language", by Al Aho, Brian Kernighan, and
diff --git a/contrib/opie/ftpcmd.y b/contrib/opie/ftpcmd.y
index abcffdc69568..1002be143739 100644
--- a/contrib/opie/ftpcmd.y
+++ b/contrib/opie/ftpcmd.y
@@ -23,7 +23,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 	Modified at NRL for OPIE 2.0.
 	Originally from BSD.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/ftpcmd.y,v 1.4 2002/03/21 23:42:52 markm Exp $
 */
 /*
  * Copyright (c) 1985, 1988 Regents of the University of California.
diff --git a/contrib/opie/libopie/challenge.c b/contrib/opie/libopie/challenge.c
index fc836aa6cc5d..f2fcca95125c 100644
--- a/contrib/opie/libopie/challenge.c
+++ b/contrib/opie/libopie/challenge.c
@@ -21,7 +21,7 @@ License Agreement applies to this software.
 	Modified by cmetz for OPIE 2.2. Use FUNCTION declaration et al.
         Created at NRL for OPIE 2.2 from opiesubr2.c
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/challenge.c,v 1.3 2002/03/21 23:42:52 markm Exp $
 
 */
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/generator.c b/contrib/opie/libopie/generator.c
index d4888f990e3b..4a7fbdf5e4a6 100644
--- a/contrib/opie/libopie/generator.c
+++ b/contrib/opie/libopie/generator.c
@@ -29,7 +29,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 		Bug fixes.
 	Created at NRL for OPIE 2.2.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/generator.c,v 1.5 2002/03/21 23:42:52 markm Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/hash.c b/contrib/opie/libopie/hash.c
index babcbfae3aa9..cffe2aa9218c 100644
--- a/contrib/opie/libopie/hash.c
+++ b/contrib/opie/libopie/hash.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
               they killed thread-safety.
         Created by cmetz for OPIE 2.3 using the old hash.c as a guide.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/hash.c,v 1.6 2002/03/21 23:42:52 markm Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/hashlen.c b/contrib/opie/libopie/hashlen.c
index 29d855deaa3b..cff9748edc72 100644
--- a/contrib/opie/libopie/hashlen.c
+++ b/contrib/opie/libopie/hashlen.c
@@ -11,7 +11,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 	Modified by cmetz for OPIE 2.4. Use struct opie_otpkey, isolate variables.
 	Created by cmetz for OPIE 2.3.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/hashlen.c,v 1.6 2002/03/21 23:42:52 markm Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/insecure.c b/contrib/opie/libopie/insecure.c
index bc61c5457ea3..e3de96999754 100644
--- a/contrib/opie/libopie/insecure.c
+++ b/contrib/opie/libopie/insecure.c
@@ -28,7 +28,7 @@ License Agreement applies to this software.
         Created at NRL for OPIE 2.2 from opiesubr.c. Fixed pointer
              assignment that should have been a comparison.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/insecure.c,v 1.3 2002/03/21 23:42:52 markm Exp $
 
 */
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/lock.c b/contrib/opie/libopie/lock.c
index 865d270bb527..e1022f7dde95 100644
--- a/contrib/opie/libopie/lock.c
+++ b/contrib/opie/libopie/lock.c
@@ -29,7 +29,7 @@ License Agreement applies to this software.
             Avoid NULL.
         Created at NRL for OPIE 2.2 from opiesubr2.c
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/lock.c,v 1.3 2002/03/21 23:42:52 markm Exp $
 */
 #include "opie_cfg.h"
 #if HAVE_STRING_H
diff --git a/contrib/opie/libopie/newseed.c b/contrib/opie/libopie/newseed.c
index 2965b0efc6a7..38683d60f0d8 100644
--- a/contrib/opie/libopie/newseed.c
+++ b/contrib/opie/libopie/newseed.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 	Modified by cmetz for OPIE 2.31. Added time.h.
 	Created by cmetz for OPIE 2.22.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/newseed.c,v 1.5 2003/01/22 10:55:36 des Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/opie.4 b/contrib/opie/opie.4
index 3ac19324a39d..c86ee0364667 100644
--- a/contrib/opie/opie.4
+++ b/contrib/opie/opie.4
@@ -21,7 +21,7 @@
 .\"	Definition of "seed" written by Neil Haller of Bellcore
 .\"	Written at NRL for OPIE 2.0.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opie.4,v 1.8 2002/03/21 23:42:52 markm Exp $
 .\"
 .TH OPIE 4 "January 10, 1995"
 .SH NAME
diff --git a/contrib/opie/opie.h b/contrib/opie/opie.h
index be508c77f73d..a3fe84f28b4c 100644
--- a/contrib/opie/opie.h
+++ b/contrib/opie/opie.h
@@ -37,7 +37,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(skey.h).
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opie.h,v 1.8 2002/03/21 23:42:52 markm Exp $
 */
 #ifndef _OPIE_H
 #define _OPIE_H 1
diff --git a/contrib/opie/opie_cfg.h b/contrib/opie/opie_cfg.h
index bd000ae60a33..1ae098acf094 100644
--- a/contrib/opie/opie_cfg.h
+++ b/contrib/opie/opie_cfg.h
@@ -48,7 +48,7 @@ License Agreement applies to this software.
 		Gutted for autoconf. Split up for autoconf.
 	Written at NRL for OPIE 2.0.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opie_cfg.h,v 1.5 2002/03/21 23:42:52 markm Exp $
 */
 
 #ifndef _OPIE_CFG_H
diff --git a/contrib/opie/opieaccess.5 b/contrib/opie/opieaccess.5
index 41b1ec0e03b7..f0c7d9e86dfe 100644
--- a/contrib/opie/opieaccess.5
+++ b/contrib/opie/opieaccess.5
@@ -13,7 +13,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)opieaccess.5	2.0 (NRL) 1/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opieaccess.5,v 1.3 2002/03/21 23:42:52 markm Exp $
 .\"
 .lt 6.0i
 .TH OPIEACCESS 5 "January 10, 1995"
diff --git a/contrib/opie/opieftpd.c b/contrib/opie/opieftpd.c
index eb6015f4130e..943d9c5c88d7 100644
--- a/contrib/opie/opieftpd.c
+++ b/contrib/opie/opieftpd.c
@@ -48,7 +48,7 @@ License Agreement applies to this software.
 
 	        There is some really, really ugly code in here.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opieftpd.c,v 1.5 2002/03/21 23:42:52 markm Exp $
 */
 /*
  * Copyright (c) 1985, 1988, 1990 Regents of the University of California.
diff --git a/contrib/opie/opieinfo.1 b/contrib/opie/opieinfo.1
index 41cdebe8dec4..b5fc7ad82b76 100644
--- a/contrib/opie/opieinfo.1
+++ b/contrib/opie/opieinfo.1
@@ -19,7 +19,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinfo.1).
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opieinfo.1,v 1.5 2002/03/21 23:42:52 markm Exp $
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff --git a/contrib/opie/opieinfo.c b/contrib/opie/opieinfo.c
index 09f9784241d8..04a0b8887528 100644
--- a/contrib/opie/opieinfo.c
+++ b/contrib/opie/opieinfo.c
@@ -30,7 +30,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(keyinfo)
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opieinfo.c,v 1.4 2002/03/21 23:42:52 markm Exp $
 
 */
 
diff --git a/contrib/opie/opiekey.1 b/contrib/opie/opiekey.1
index 1f6e35ec02ff..609af9beb68c 100644
--- a/contrib/opie/opiekey.1
+++ b/contrib/opie/opiekey.1
@@ -25,7 +25,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(key.1).
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opiekey.1,v 1.6 2002/03/21 23:42:52 markm Exp $
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff --git a/contrib/opie/opiekey.c b/contrib/opie/opiekey.c
index 20ba658710ee..48bb250d7b89 100644
--- a/contrib/opie/opiekey.c
+++ b/contrib/opie/opiekey.c
@@ -37,7 +37,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(skey.c).
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opiekey.c,v 1.4 2002/03/21 23:42:52 markm Exp $
 
 */
 #include "opie_cfg.h"
diff --git a/contrib/opie/opiekeys.5 b/contrib/opie/opiekeys.5
index 26f08ed06ff8..72b492b133fc 100644
--- a/contrib/opie/opiekeys.5
+++ b/contrib/opie/opiekeys.5
@@ -14,7 +14,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)opiekeys.5	2.0 (NRL) 1/10/95
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opiekeys.5,v 1.4 2000/04/10 11:18:48 kris Exp $
 .\"
 .lt 6.0i
 .TH OPIEKEYS 5 "January 10, 1995"
diff --git a/contrib/opie/opiepasswd.1 b/contrib/opie/opiepasswd.1
index 5ce6cb010b4f..3333923c2e47 100644
--- a/contrib/opie/opiepasswd.1
+++ b/contrib/opie/opiepasswd.1
@@ -22,7 +22,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinit.1).
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opiepasswd.1,v 1.5 2002/03/21 23:42:52 markm Exp $
 .ll 6i 
 .pl 10.5i 
 .lt 6.0i
diff --git a/contrib/opie/opiepasswd.c b/contrib/opie/opiepasswd.c
index 2e2358ada07a..63619c77c1dd 100644
--- a/contrib/opie/opiepasswd.c
+++ b/contrib/opie/opiepasswd.c
@@ -44,7 +44,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(skeyinit.c).
 
- $FreeBSD$
+ $FreeBSD: src/contrib/opie/opiepasswd.c,v 1.3 2002/03/21 23:42:52 markm Exp $
 */
 #include "opie_cfg.h"
 
diff --git a/contrib/opie/popen.c b/contrib/opie/popen.c
index 99aad17025a6..833ee798059a 100644
--- a/contrib/opie/popen.c
+++ b/contrib/opie/popen.c
@@ -23,7 +23,7 @@ License Agreement applies to this software.
 	Modified at NRL for OPIE 2.0.
 	Originally from BSD.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/popen.c,v 1.2 2003/07/13 05:59:50 kris Exp $
 */
 /*
  * Copyright (c) 1988, 1993, 1994
diff --git a/contrib/pf/authpf/authpf.c b/contrib/pf/authpf/authpf.c
index af75027c4235..9cdc1953d049 100644
--- a/contrib/pf/authpf/authpf.c
+++ b/contrib/pf/authpf/authpf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.6 2005/05/03 16:55:19 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.8 b/contrib/pf/ftp-proxy/ftp-proxy.8
index 125c5e894800..5ffa98a4ecce 100644
--- a/contrib/pf/ftp-proxy/ftp-proxy.8
+++ b/contrib/pf/ftp-proxy/ftp-proxy.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.8,v 1.4 2005/05/03 16:55:19 mlaier Exp $
 .\"
 .Dd August 17, 2001
 .Dt FTP-PROXY 8
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.c b/contrib/pf/ftp-proxy/ftp-proxy.c
index ea4245a182ce..2f0a2eee6809 100644
--- a/contrib/pf/ftp-proxy/ftp-proxy.c
+++ b/contrib/pf/ftp-proxy/ftp-proxy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.c,v 1.6 2005/05/03 16:55:19 mlaier Exp $");
 
 /*
  * ftp proxy, Originally based on juniper_ftp_proxy from the Obtuse
diff --git a/contrib/pf/man/pf.4 b/contrib/pf/man/pf.4
index a78f8b319298..7e03096e0053 100644
--- a/contrib/pf/man/pf.4
+++ b/contrib/pf/man/pf.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pf.4,v 1.7 2005/05/03 16:55:20 mlaier Exp $
 .\"
 .Dd February 7, 2005
 .Dt PF 4
diff --git a/contrib/pf/man/pf.conf.5 b/contrib/pf/man/pf.conf.5
index d7d5d821d661..d08c3788343f 100644
--- a/contrib/pf/man/pf.conf.5
+++ b/contrib/pf/man/pf.conf.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.8 2005/05/03 16:55:20 mlaier Exp $
 .\"	$OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
diff --git a/contrib/pf/man/pflog.4 b/contrib/pf/man/pflog.4
index 3040139b3ce8..d5ff5a35c93f 100644
--- a/contrib/pf/man/pflog.4
+++ b/contrib/pf/man/pflog.4
@@ -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/contrib/pf/man/pflog.4,v 1.4.2.1 2005/07/17 15:03:34 brueffer Exp $
 .\"
 .Dd December 10, 2001
 .Dt PFLOG 4
diff --git a/contrib/pf/man/pfsync.4 b/contrib/pf/man/pfsync.4
index abc81af4c5a9..0af93fae7ab4 100644
--- a/contrib/pf/man/pfsync.4
+++ b/contrib/pf/man/pfsync.4
@@ -24,7 +24,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/contrib/pf/man/pfsync.4,v 1.5.2.3 2005/10/08 03:32:53 yar Exp $
 .\"
 .Dd February 23, 2005
 .Dt PFSYNC 4
diff --git a/contrib/pf/pfctl/parse.y b/contrib/pf/pfctl/parse.y
index a06a5decc31f..cc98f9d26eff 100644
--- a/contrib/pf/pfctl/parse.y
+++ b/contrib/pf/pfctl/parse.y
@@ -28,7 +28,7 @@
  */
 %{
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.7 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/pf/pfctl/pf_print_state.c b/contrib/pf/pfctl/pf_print_state.c
index 1205547ade02..1d93dc916b96 100644
--- a/contrib/pf/pfctl/pf_print_state.c
+++ b/contrib/pf/pfctl/pf_print_state.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pf_print_state.c,v 1.3 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/pf/pfctl/pfctl.8 b/contrib/pf/pfctl/pfctl.8
index f7b663b6ba8d..185b8d1dcc0b 100644
--- a/contrib/pf/pfctl/pfctl.8
+++ b/contrib/pf/pfctl/pfctl.8
@@ -24,7 +24,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/contrib/pf/pfctl/pfctl.8,v 1.1.1.3.2.1 2005/07/17 15:03:34 brueffer Exp $
 .\"
 .Dd November 20, 2002
 .Dt PFCTL 8
diff --git a/contrib/pf/pfctl/pfctl.c b/contrib/pf/pfctl/pfctl.c
index bc4c96ededdc..e978e5179586 100644
--- a/contrib/pf/pfctl/pfctl.c
+++ b/contrib/pf/pfctl/pfctl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl.c,v 1.6 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl.h b/contrib/pf/pfctl/pfctl.h
index 94c6fc8945fd..5fb4051b5648 100644
--- a/contrib/pf/pfctl/pfctl.h
+++ b/contrib/pf/pfctl/pfctl.h
@@ -28,7 +28,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pf/pfctl/pfctl.h,v 1.6 2005/05/03 16:55:20 mlaier Exp $
  */
 
 #ifndef _PFCTL_H_
diff --git a/contrib/pf/pfctl/pfctl_altq.c b/contrib/pf/pfctl/pfctl_altq.c
index 384d1a20df85..b9bdab9c5888 100644
--- a/contrib/pf/pfctl/pfctl_altq.c
+++ b/contrib/pf/pfctl/pfctl_altq.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.7 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_optimize.c b/contrib/pf/pfctl/pfctl_optimize.c
index 111dc320f0e6..b1619bf35f7a 100644
--- a/contrib/pf/pfctl/pfctl_optimize.c
+++ b/contrib/pf/pfctl/pfctl_optimize.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_optimize.c,v 1.2 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_parser.c b/contrib/pf/pfctl/pfctl_parser.c
index 2cf82b499b57..82d352e5adaf 100644
--- a/contrib/pf/pfctl/pfctl_parser.c
+++ b/contrib/pf/pfctl/pfctl_parser.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.7 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_parser.h b/contrib/pf/pfctl/pfctl_parser.h
index 1c075ef0a8bc..b45d1434125c 100644
--- a/contrib/pf/pfctl/pfctl_parser.h
+++ b/contrib/pf/pfctl/pfctl_parser.h
@@ -28,7 +28,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.h,v 1.6 2005/05/03 16:55:20 mlaier Exp $
  */
 
 #ifndef _PFCTL_PARSER_H_
diff --git a/contrib/pf/pfctl/pfctl_qstats.c b/contrib/pf/pfctl/pfctl_qstats.c
index 28535c2410fb..3eb2987fec02 100644
--- a/contrib/pf/pfctl/pfctl_qstats.c
+++ b/contrib/pf/pfctl/pfctl_qstats.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_table.c b/contrib/pf/pfctl/pfctl_table.c
index ecdd7e2b806d..9b4accbfa1d2 100644
--- a/contrib/pf/pfctl/pfctl_table.c
+++ b/contrib/pf/pfctl/pfctl_table.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_table.c,v 1.7 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pflogd.8 b/contrib/pf/pflogd/pflogd.8
index 0eef77b5674c..3d816d7192da 100644
--- a/contrib/pf/pflogd/pflogd.8
+++ b/contrib/pf/pflogd/pflogd.8
@@ -24,7 +24,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/contrib/pf/pflogd/pflogd.8,v 1.1.1.3.2.2 2005/09/24 01:59:35 keramida Exp $
 .\"
 .Dd July 9, 2001
 .Dt PFLOGD 8
diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c
index 6ef6a778df86..f31094384703 100644
--- a/contrib/pf/pflogd/pflogd.c
+++ b/contrib/pf/pflogd/pflogd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.8.2.1 2005/09/29 23:50:29 csjp Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pidfile.c b/contrib/pf/pflogd/pidfile.c
index db6007f1f339..83cb4b590fcf 100644
--- a/contrib/pf/pflogd/pidfile.c
+++ b/contrib/pf/pflogd/pidfile.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 
diff --git a/contrib/pf/pflogd/privsep.c b/contrib/pf/pflogd/privsep.c
index ac64ebe18db0..10cf509b4cda 100644
--- a/contrib/pf/pflogd/privsep.c
+++ b/contrib/pf/pflogd/privsep.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/privsep.c,v 1.3 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/contrib/pnpinfo/pnpinfo.8 b/contrib/pnpinfo/pnpinfo.8
index 5b6746c6d2da..2eff5c406970 100644
--- a/contrib/pnpinfo/pnpinfo.8
+++ b/contrib/pnpinfo/pnpinfo.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.6 2005/06/16 20:51:10 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt PNPINFO 8
diff --git a/contrib/pnpinfo/pnpinfo.c b/contrib/pnpinfo/pnpinfo.c
index 8bf6fa4f2326..d45510832ad1 100644
--- a/contrib/pnpinfo/pnpinfo.c
+++ b/contrib/pnpinfo/pnpinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.9 2004/01/04 11:11:02 charnier Exp $");
 
 #include <sys/time.h>
 
diff --git a/contrib/pnpinfo/pnpinfo.h b/contrib/pnpinfo/pnpinfo.h
index abe14271d9d9..6cb8dc3939ba 100644
--- a/contrib/pnpinfo/pnpinfo.h
+++ b/contrib/pnpinfo/pnpinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pnpinfo/pnpinfo.h,v 1.2 1999/09/05 17:27:05 peter Exp $
  */
 
 
diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade
index 2024da8863c2..72b6b6b73e3c 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.28 2005/06/07 04:22:21 gshapiro Exp $
 
 sendmail 8.13.4
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4
index dc1d8ba65614..eef2e346c8b6 100644
--- a/contrib/sendmail/cf/m4/cfhead.m4
+++ b/contrib/sendmail/cf/m4/cfhead.m4
@@ -9,7 +9,7 @@
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/sendmail/cf/m4/cfhead.m4,v 1.17 2004/08/01 01:16:14 gshapiro Exp $
 #
 
 ######################################################################
diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh
index e7b0cd101fce..3eee645842e5 100644
--- a/contrib/sendmail/cf/sh/makeinfo.sh
+++ b/contrib/sendmail/cf/sh/makeinfo.sh
@@ -13,7 +13,7 @@
 #
 #	$Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/sendmail/cf/sh/makeinfo.sh,v 1.7 2002/06/11 21:16:35 gshapiro Exp $
 #
 
 usewhoami=0
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8
index 7811451c5c30..c0d819bc8f58 100644
--- a/contrib/sendmail/mail.local/mail.local.8
+++ b/contrib/sendmail/mail.local/mail.local.8
@@ -161,4 +161,4 @@ appeared in
 Version 7 AT&T UNIX 
 as the program
 .BR mail .
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/mail.local/mail.local.8,v 1.13 2004/08/01 01:16:15 gshapiro Exp $
diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c
index b5ccd5b9ed37..0749ef7b901c 100644
--- a/contrib/sendmail/mail.local/mail.local.c
+++ b/contrib/sendmail/mail.local/mail.local.c
@@ -8,7 +8,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/mail.local/mail.local.c,v 1.26 2005/02/14 02:39:14 gshapiro Exp $
  *
  */
 
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c
index 5cdc9bb14213..10770848545f 100644
--- a/contrib/sendmail/rmail/rmail.c
+++ b/contrib/sendmail/rmail/rmail.c
@@ -8,7 +8,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/rmail/rmail.c,v 1.13 2002/08/28 18:12:09 gshapiro Exp $
  *
  */
 
diff --git a/contrib/sendmail/smrsh/smrsh.8 b/contrib/sendmail/smrsh/smrsh.8
index f0ed01c0a8cb..4a877d587824 100644
--- a/contrib/sendmail/smrsh/smrsh.8
+++ b/contrib/sendmail/smrsh/smrsh.8
@@ -95,4 +95,4 @@ to change the default program directory
 
 .SH SEE ALSO
 sendmail(8)
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/smrsh/smrsh.8,v 1.13 2005/02/14 02:39:14 gshapiro Exp $
diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c
index 69234b7bb913..633de8cd2761 100644
--- a/contrib/sendmail/smrsh/smrsh.c
+++ b/contrib/sendmail/smrsh/smrsh.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/smrsh/smrsh.c,v 1.19 2005/02/14 02:39:14 gshapiro Exp $
  */
 
 #include <sm/gen.h>
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index 381ca0a8e384..a4c599c4c591 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/src/conf.c,v 1.28 2005/06/07 04:17:21 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c
index ec0d376b98ea..d7a8a02e10f5 100644
--- a/contrib/sendmail/src/headers.c
+++ b/contrib/sendmail/src/headers.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/src/headers.c,v 1.21 2005/02/14 02:39:14 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index d3cbce61ce36..dde90c4f097c 100644
--- a/contrib/sendmail/src/mci.c
+++ b/contrib/sendmail/src/mci.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/src/mci.c,v 1.20 2005/06/07 04:17:21 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8
index 65d37b0b86a2..fd080b976b99 100644
--- a/contrib/sendmail/src/sendmail.8
+++ b/contrib/sendmail/src/sendmail.8
@@ -746,4 +746,4 @@ The
 .B sendmail
 command appeared in
 4.2BSD.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/src/sendmail.8,v 1.13 2004/08/01 01:16:16 gshapiro Exp $
diff --git a/contrib/smbfs/FREEBSD-upgrade b/contrib/smbfs/FREEBSD-upgrade
index 6fad7c6d729e..ce75fcb7cf32 100644
--- a/contrib/smbfs/FREEBSD-upgrade
+++ b/contrib/smbfs/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/smbfs/FREEBSD-upgrade,v 1.1 2001/12/14 11:11:31 sheldonh Exp $
 
 The smbfs distribution was written with FreeBSD in mind, so the only
 change required before an import is:
diff --git a/contrib/smbfs/examples/dot.nsmbrc b/contrib/smbfs/examples/dot.nsmbrc
index d92d8e44e593..fa2c4ec43334 100644
--- a/contrib/smbfs/examples/dot.nsmbrc
+++ b/contrib/smbfs/examples/dot.nsmbrc
@@ -1,5 +1,5 @@
 # $Id: dot.nsmbrc,v 1.7 2002/04/10 04:21:11 bp Exp $
-# $FreeBSD$
+# $FreeBSD: src/contrib/smbfs/examples/dot.nsmbrc,v 1.2 2004/07/17 14:38:42 bp Exp $
 #
 # Example for .nsmbrc file
 #
diff --git a/contrib/smbfs/lib/smb/ctx.c b/contrib/smbfs/lib/smb/ctx.c
index 530cbb827311..0666f88ecfb7 100644
--- a/contrib/smbfs/lib/smb/ctx.c
+++ b/contrib/smbfs/lib/smb/ctx.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ctx.c,v 1.24 2002/04/13 14:35:28 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/ctx.c,v 1.4 2005/05/04 15:05:46 takawata Exp $
  */
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/contrib/smbfs/lib/smb/file.c b/contrib/smbfs/lib/smb/file.c
index 2ac3300155c7..2ed78d2e83aa 100644
--- a/contrib/smbfs/lib/smb/file.c
+++ b/contrib/smbfs/lib/smb/file.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: file.c,v 1.2 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/file.c,v 1.2 2004/07/28 05:33:58 kan Exp $
  */
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/contrib/smbfs/lib/smb/kiconv.c b/contrib/smbfs/lib/smb/kiconv.c
index d84d9091fd36..dbac66072c49 100644
--- a/contrib/smbfs/lib/smb/kiconv.c
+++ b/contrib/smbfs/lib/smb/kiconv.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.3.2.1 2005/09/08 15:46:38 imura Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/smbfs/lib/smb/mbuf.c b/contrib/smbfs/lib/smb/mbuf.c
index 4980575e969d..882181d6698d 100644
--- a/contrib/smbfs/lib/smb/mbuf.c
+++ b/contrib/smbfs/lib/smb/mbuf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.2 2004/10/19 17:44:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/mchain.h>
diff --git a/contrib/smbfs/lib/smb/nb_net.c b/contrib/smbfs/lib/smb/nb_net.c
index 62390efbc66f..24a4e8c95c3b 100644
--- a/contrib/smbfs/lib/smb/nb_net.c
+++ b/contrib/smbfs/lib/smb/nb_net.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: nb_net.c,v 1.4 2001/02/16 02:46:12 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/nb_net.c,v 1.3 2004/02/26 08:49:19 tjr Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/contrib/smbfs/lib/smb/nls.c b/contrib/smbfs/lib/smb/nls.c
index 32744288a8c1..b36f0cab325e 100644
--- a/contrib/smbfs/lib/smb/nls.c
+++ b/contrib/smbfs/lib/smb/nls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nls.c,v 1.2 2004/10/19 17:39:15 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/iconv.h>
diff --git a/contrib/smbfs/lib/smb/rap.c b/contrib/smbfs/lib/smb/rap.c
index e595bc1e1c28..b48f9d69d3b1 100644
--- a/contrib/smbfs/lib/smb/rap.c
+++ b/contrib/smbfs/lib/smb/rap.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.4 2004/06/19 19:03:01 le Exp $
  *
  * This is very simple implementation of RAP protocol.
  */
diff --git a/contrib/smbfs/lib/smb/rcfile.c b/contrib/smbfs/lib/smb/rcfile.c
index 5f92c8a311f4..5b8eb41415c7 100644
--- a/contrib/smbfs/lib/smb/rcfile.c
+++ b/contrib/smbfs/lib/smb/rcfile.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/rcfile.c,v 1.2 2004/10/19 17:44:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/contrib/smbfs/lib/smb/rq.c b/contrib/smbfs/lib/smb/rq.c
index 7ecbb36406ee..5bb33aca9001 100644
--- a/contrib/smbfs/lib/smb/rq.c
+++ b/contrib/smbfs/lib/smb/rq.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rq.c,v 1.7 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.3 2004/10/19 17:44:31 obrien Exp $
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.8 b/contrib/smbfs/mount_smbfs/mount_smbfs.8
index 41e12a24c581..662448d937ba 100644
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.8
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.8
@@ -1,5 +1,5 @@
 .\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.8,v 1.2 2003/07/31 11:50:01 simon Exp $
 .Dd March 10, 2000
 .Dt MOUNT_SMBFS 8
 .Os
diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.c b/contrib/smbfs/mount_smbfs/mount_smbfs.c
index 487e9cd72da6..279ee0f68059 100644
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.c
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.5 2004/09/05 06:42:51 tjr Exp $
  */
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/contrib/smbfs/smbutil/common.h b/contrib/smbfs/smbutil/common.h
index 00843943600c..869d6225dbeb 100644
--- a/contrib/smbfs/smbutil/common.h
+++ b/contrib/smbfs/smbutil/common.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/smbfs/smbutil/common.h,v 1.3 2003/08/23 13:05:13 tjr Exp $ */
 
 #define iprintf(ident,args...)	do { printf("%-" # ident "s", ""); \
 				printf(args);}while(0)
diff --git a/contrib/smbfs/smbutil/dumptree.c b/contrib/smbfs/smbutil/dumptree.c
index 74a97f3a114b..e0e4e79c6423 100644
--- a/contrib/smbfs/smbutil/dumptree.c
+++ b/contrib/smbfs/smbutil/dumptree.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/smbfs/smbutil/dumptree.c,v 1.1.1.2.14.1 2005/07/29 16:06:33 imura Exp $ */
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/contrib/tar/FREEBSD-Xlist b/contrib/tar/FREEBSD-Xlist
index a5afe0887b1e..0872bd4716e3 100644
--- a/contrib/tar/FREEBSD-Xlist
+++ b/contrib/tar/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/tar/FREEBSD-Xlist,v 1.2 2004/02/18 18:53:13 ache Exp $
 */Makefile*
 */aclocal.m4
 */config*
diff --git a/contrib/tar/FREEBSD-upgrade b/contrib/tar/FREEBSD-upgrade
index b319f706d639..a333e9401743 100644
--- a/contrib/tar/FREEBSD-upgrade
+++ b/contrib/tar/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tar/FREEBSD-upgrade,v 1.1 2002/06/04 11:08:12 sobomax Exp $
 
 GNU Tar
 	originals can be found at: 	ftp://alpha.gnu.org/gnu/tar/
diff --git a/contrib/tar/lib/error.c b/contrib/tar/lib/error.c
index f0e60308e48b..e9a76233042b 100644
--- a/contrib/tar/lib/error.c
+++ b/contrib/tar/lib/error.c
@@ -19,7 +19,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/lib/error.c,v 1.3 2002/07/14 13:25:51 sobomax Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/contrib/tar/src/buffer.c b/contrib/tar/src/buffer.c
index ae6eb5d9f1b5..eb05de5c858e 100644
--- a/contrib/tar/src/buffer.c
+++ b/contrib/tar/src/buffer.c
@@ -19,7 +19,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */
 
 #include "system.h"
 
diff --git a/contrib/tar/src/common.h b/contrib/tar/src/common.h
index 40e0ab61d78f..e6dc4b201932 100644
--- a/contrib/tar/src/common.h
+++ b/contrib/tar/src/common.h
@@ -17,7 +17,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/common.h,v 1.2 2002/06/04 17:31:15 sobomax Exp $ */
 
 /* Declare the GNU tar archive format.  */
 #include "tar.h"
diff --git a/contrib/tar/src/compare.c b/contrib/tar/src/compare.c
index da9dc33b3569..aede172ae43c 100644
--- a/contrib/tar/src/compare.c
+++ b/contrib/tar/src/compare.c
@@ -19,7 +19,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/compare.c,v 1.3 2002/07/03 13:01:40 sobomax Exp $ */
 
 #include "system.h"
 
diff --git a/contrib/tar/src/create.c b/contrib/tar/src/create.c
index e1f2dda2daf3..6f0076c97693 100644
--- a/contrib/tar/src/create.c
+++ b/contrib/tar/src/create.c
@@ -16,7 +16,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/create.c,v 1.2 2002/06/04 17:31:15 sobomax Exp $ */
 
 #include "system.h"
 
diff --git a/contrib/tar/src/extract.c b/contrib/tar/src/extract.c
index 3032da06ceb3..9a37016f2c98 100644
--- a/contrib/tar/src/extract.c
+++ b/contrib/tar/src/extract.c
@@ -19,7 +19,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/extract.c,v 1.6 2002/10/19 09:32:03 sobomax Exp $ */
 
 #include "system.h"
 #include <quotearg.h>
diff --git a/contrib/tar/src/list.c b/contrib/tar/src/list.c
index 9c68ae985147..1ae79f29334d 100644
--- a/contrib/tar/src/list.c
+++ b/contrib/tar/src/list.c
@@ -19,7 +19,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/list.c,v 1.2 2002/06/04 17:31:15 sobomax Exp $ */
 
 /* Define to non-zero for forcing old ctime format instead of ISO format.  */
 #undef USE_OLD_CTIME
diff --git a/contrib/tar/src/misc.c b/contrib/tar/src/misc.c
index 8ece9c6ffd3f..60fac61fc14d 100644
--- a/contrib/tar/src/misc.c
+++ b/contrib/tar/src/misc.c
@@ -17,7 +17,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/misc.c,v 1.3 2002/10/19 09:32:03 sobomax Exp $ */
 
 #include "system.h"
 #include "rmt.h"
diff --git a/contrib/tar/src/names.c b/contrib/tar/src/names.c
index 26425159fe60..c6793838ef4a 100644
--- a/contrib/tar/src/names.c
+++ b/contrib/tar/src/names.c
@@ -17,7 +17,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/names.c,v 1.2 2002/06/04 17:31:16 sobomax Exp $ */
 
 #include "system.h"
 
diff --git a/contrib/tar/src/rtapelib.c b/contrib/tar/src/rtapelib.c
index 295974ed7a57..a81c5f071bd6 100644
--- a/contrib/tar/src/rtapelib.c
+++ b/contrib/tar/src/rtapelib.c
@@ -32,7 +32,7 @@
    into macros for speed by Jay Fenlason.  Use -DWITH_REXEC for rexec
    code, courtesy of Dan Kegel.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/rtapelib.c,v 1.2 2002/06/04 17:31:16 sobomax Exp $ */
 
 #include "system.h"
 
diff --git a/contrib/tar/src/tar.c b/contrib/tar/src/tar.c
index 7d872faf11a3..f0cb915996be 100644
--- a/contrib/tar/src/tar.c
+++ b/contrib/tar/src/tar.c
@@ -19,7 +19,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.3 2003/07/24 00:04:01 peter Exp $ */
 
 #include "system.h"
 
diff --git a/contrib/tcp_wrappers/Makefile b/contrib/tcp_wrappers/Makefile
index 10ede819e4de..bc3cddbcd7d7 100644
--- a/contrib/tcp_wrappers/Makefile
+++ b/contrib/tcp_wrappers/Makefile
@@ -1,5 +1,5 @@
 # @(#) Makefile 1.23 97/03/21 19:27:20
-# $FreeBSD$
+# $FreeBSD: src/contrib/tcp_wrappers/Makefile,v 1.2 2000/02/03 10:26:57 shin Exp $
 
 what:
 	@echo
diff --git a/contrib/tcp_wrappers/fix_options.c b/contrib/tcp_wrappers/fix_options.c
index 4983a55a47a1..0a5ce2cbeaaf 100644
--- a/contrib/tcp_wrappers/fix_options.c
+++ b/contrib/tcp_wrappers/fix_options.c
@@ -4,7 +4,7 @@
   *
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/fix_options.c,v 1.2 2000/02/03 10:26:57 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/hosts_access.5 b/contrib/tcp_wrappers/hosts_access.5
index 27ab2ae648b6..7c67a4e5208b 100644
--- a/contrib/tcp_wrappers/hosts_access.5
+++ b/contrib/tcp_wrappers/hosts_access.5
@@ -396,4 +396,4 @@ Eindhoven University of Technology
 Den Dolech 2, P.O. Box 513, 
 5600 MB Eindhoven, The Netherlands
 \" @(#) hosts_access.5 1.20 95/01/30 19:51:46
-\" $FreeBSD$
+\" $FreeBSD: src/contrib/tcp_wrappers/hosts_access.5,v 1.3 2000/02/03 10:26:57 shin Exp $
diff --git a/contrib/tcp_wrappers/hosts_access.c b/contrib/tcp_wrappers/hosts_access.c
index 8220e6497065..da274f8f7fe2 100644
--- a/contrib/tcp_wrappers/hosts_access.c
+++ b/contrib/tcp_wrappers/hosts_access.c
@@ -16,7 +16,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/hosts_access.c,v 1.5 2005/05/13 16:31:08 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/inetcf.c b/contrib/tcp_wrappers/inetcf.c
index 1ace3527fc7c..49910d862e14 100644
--- a/contrib/tcp_wrappers/inetcf.c
+++ b/contrib/tcp_wrappers/inetcf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcp_wrappers/inetcf.c,v 1.3 2003/01/08 07:02:07 peter Exp $ */
  /*
   * Routines to parse an inetd.conf or tlid.conf file. This would be a great
   * job for a PERL script.
diff --git a/contrib/tcp_wrappers/misc.c b/contrib/tcp_wrappers/misc.c
index 8f04f870e1b4..4f80679166cb 100644
--- a/contrib/tcp_wrappers/misc.c
+++ b/contrib/tcp_wrappers/misc.c
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/misc.c,v 1.2 2000/02/03 10:26:58 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/options.c b/contrib/tcp_wrappers/options.c
index 97d312703924..ca93ce09282a 100644
--- a/contrib/tcp_wrappers/options.c
+++ b/contrib/tcp_wrappers/options.c
@@ -27,7 +27,7 @@
   * such options should clear the "dry_run" flag to inform the caller of this
   * course of action.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/options.c,v 1.2 2001/01/14 23:00:59 dwmalone Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/refuse.c b/contrib/tcp_wrappers/refuse.c
index fd04e08ae9bf..af5ee6d7c8b5 100644
--- a/contrib/tcp_wrappers/refuse.c
+++ b/contrib/tcp_wrappers/refuse.c
@@ -6,7 +6,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/refuse.c,v 1.2 2000/02/03 10:26:58 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/rfc931.c b/contrib/tcp_wrappers/rfc931.c
index e7fb3d1d1294..03dde995a97a 100644
--- a/contrib/tcp_wrappers/rfc931.c
+++ b/contrib/tcp_wrappers/rfc931.c
@@ -8,7 +8,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/rfc931.c,v 1.3 2000/07/14 15:07:37 dwmalone Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/scaffold.c b/contrib/tcp_wrappers/scaffold.c
index 8da9df0c6861..b01b52a3a1ed 100644
--- a/contrib/tcp_wrappers/scaffold.c
+++ b/contrib/tcp_wrappers/scaffold.c
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/scaffold.c,v 1.3 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/scaffold.h b/contrib/tcp_wrappers/scaffold.h
index ea568b722507..044af6db3743 100644
--- a/contrib/tcp_wrappers/scaffold.h
+++ b/contrib/tcp_wrappers/scaffold.h
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/scaffold.h,v 1.2 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifdef INET6
diff --git a/contrib/tcp_wrappers/socket.c b/contrib/tcp_wrappers/socket.c
index ed959ac8fb90..792d471731c2 100644
--- a/contrib/tcp_wrappers/socket.c
+++ b/contrib/tcp_wrappers/socket.c
@@ -14,7 +14,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.8 2005/05/13 16:31:08 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tcpd.c b/contrib/tcp_wrappers/tcpd.c
index 55c6853c1881..8d0696c947c8 100644
--- a/contrib/tcp_wrappers/tcpd.c
+++ b/contrib/tcp_wrappers/tcpd.c
@@ -9,7 +9,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpd.c,v 1.2 2000/02/03 10:26:59 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tcpd.h b/contrib/tcp_wrappers/tcpd.h
index fec20a262baf..07ef87ef1d82 100644
--- a/contrib/tcp_wrappers/tcpd.h
+++ b/contrib/tcp_wrappers/tcpd.h
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpd.h,v 1.2 2000/02/03 10:26:59 shin Exp $
   */
 
 /* Structure to describe one communications endpoint. */
diff --git a/contrib/tcp_wrappers/tcpdchk.c b/contrib/tcp_wrappers/tcpdchk.c
index 99ec49525300..73351d5cda62 100644
--- a/contrib/tcp_wrappers/tcpdchk.c
+++ b/contrib/tcp_wrappers/tcpdchk.c
@@ -13,7 +13,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpdchk.c,v 1.4 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tcpdmatch.c b/contrib/tcp_wrappers/tcpdmatch.c
index 94f3e7009606..f6e49ca00d62 100644
--- a/contrib/tcp_wrappers/tcpdmatch.c
+++ b/contrib/tcp_wrappers/tcpdmatch.c
@@ -12,7 +12,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpdmatch.c,v 1.3 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tli.c b/contrib/tcp_wrappers/tli.c
index 36d6f7eff398..1efd807c8f71 100644
--- a/contrib/tcp_wrappers/tli.c
+++ b/contrib/tcp_wrappers/tli.c
@@ -13,7 +13,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tli.c,v 1.2 2000/02/03 10:27:00 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/update.c b/contrib/tcp_wrappers/update.c
index b612d5e02466..8ba12653c2cc 100644
--- a/contrib/tcp_wrappers/update.c
+++ b/contrib/tcp_wrappers/update.c
@@ -12,7 +12,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/update.c,v 1.2 2000/02/03 10:27:00 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/workarounds.c b/contrib/tcp_wrappers/workarounds.c
index 1ad2c6471ef3..e1aa5c504c45 100644
--- a/contrib/tcp_wrappers/workarounds.c
+++ b/contrib/tcp_wrappers/workarounds.c
@@ -6,7 +6,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/workarounds.c,v 1.2 2000/02/03 10:27:01 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcpdump/.cvsignore b/contrib/tcpdump/.cvsignore
deleted file mode 100644
index 791f14cdb7cf..000000000000
--- a/contrib/tcpdump/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-version.c
-Makefile
-Makefile-devel.in
-config.status
-config.log
-config.cache
-config.h
-.devel
-stamp-h
-stamp-h.in
-tcpdump
-autom4te.cache
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index bb0f2f531f93..9aeadae0febe 100644
--- a/contrib/tcpdump/addrtoname.c
+++ b/contrib/tcpdump/addrtoname.c
@@ -21,7 +21,7 @@
  *  Internet, ethernet, port, and protocol string to address
  *  and address to string conversion routines
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/addrtoname.c,v 1.14 2005/07/11 04:14:01 sam Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h
index 808cdcf69b88..75d3aafc1452 100644
--- a/contrib/tcpdump/ethertype.h
+++ b/contrib/tcpdump/ethertype.h
@@ -20,7 +20,7 @@
  *
  *
  * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24 2004/10/07 16:04:07 hannes Exp $ (LBL)
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ethertype.h,v 1.9 2005/05/29 19:09:27 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/ieee802_11_radio.h b/contrib/tcpdump/ieee802_11_radio.h
index c56be0183fc1..ec0ecd0ef2e5 100644
--- a/contrib/tcpdump/ieee802_11_radio.h
+++ b/contrib/tcpdump/ieee802_11_radio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/ieee802_11_radio.h,v 1.1.1.1 2005/05/29 18:16:31 sam Exp $ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.3 2003/11/16 09:02:42 dyoung Exp $ */
 /* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.1 2004/09/23 21:33:10 dyoung Exp $ */
 
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h
index 3fb09b46e159..ff5053e5f913 100644
--- a/contrib/tcpdump/interface.h
+++ b/contrib/tcpdump/interface.h
@@ -20,7 +20,7 @@
  *
  *
  * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.244 2005/04/06 21:33:27 mcr Exp $ (LBL)
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/interface.h,v 1.11 2005/07/11 04:14:01 sam Exp $
  */
 
 #ifndef tcpdump_interface_h
diff --git a/contrib/tcpdump/ipproto.h b/contrib/tcpdump/ipproto.h
index aa37ef8a2dba..6449343a4e47 100644
--- a/contrib/tcpdump/ipproto.h
+++ b/contrib/tcpdump/ipproto.h
@@ -34,7 +34,7 @@
  *
  * From:
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ipproto.h,v 1.1.1.3 2005/07/11 03:53:32 sam Exp $
  */
 
 extern struct tok ipproto_values[];
diff --git a/contrib/tcpdump/nfs.h b/contrib/tcpdump/nfs.h
index 82c8dd3f1f95..3d7ba2d1ef1a 100644
--- a/contrib/tcpdump/nfs.h
+++ b/contrib/tcpdump/nfs.h
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/nfs.h,v 1.4 2004/03/31 14:57:24 bms Exp $
  *	@(#)nfsproto.h	8.2 (Berkeley) 3/30/95
  */
 
diff --git a/contrib/tcpdump/nfsfh.h b/contrib/tcpdump/nfsfh.h
index 8a337ba156ec..c4b67931efd3 100644
--- a/contrib/tcpdump/nfsfh.h
+++ b/contrib/tcpdump/nfsfh.h
@@ -39,7 +39,7 @@
  * Jeffrey C. Mogul
  * Digital Equipment Corporation
  * Western Research Laboratory
- *	$FreeBSD$
+ *	$FreeBSD: src/contrib/tcpdump/nfsfh.h,v 1.8 2004/03/31 14:57:24 bms Exp $
  *	$NetBSD: nfsfh.h,v 1.1.1.2 1997/10/03 17:25:13 christos Exp $
  */
 
diff --git a/contrib/tcpdump/parsenfsfh.c b/contrib/tcpdump/parsenfsfh.c
index 2e3da026b8f8..c6883ca916bd 100644
--- a/contrib/tcpdump/parsenfsfh.c
+++ b/contrib/tcpdump/parsenfsfh.c
@@ -39,7 +39,7 @@
  * Digital Equipment Corporation
  * Western Research Laboratory
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/parsenfsfh.c,v 1.9 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/pmap_prot.h b/contrib/tcpdump/pmap_prot.h
index 17cb92ff9a78..5cc11cc8533f 100644
--- a/contrib/tcpdump/pmap_prot.h
+++ b/contrib/tcpdump/pmap_prot.h
@@ -29,7 +29,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/pmap_prot.h,v 1.1.1.2 2005/07/11 03:53:37 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/ppp.h b/contrib/tcpdump/ppp.h
index 484ea46aa3a6..bf2e337b3ac6 100644
--- a/contrib/tcpdump/ppp.h
+++ b/contrib/tcpdump/ppp.h
@@ -15,7 +15,7 @@
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ppp.h,v 1.7 2005/05/29 19:09:27 sam Exp $
  */
 #define PPP_HDRLEN	4	/* length of PPP header */
 
diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index 3dc289466a84..bd8c350e77e9 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/contrib/tcpdump/print-arp.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-arp.c,v 1.10 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-atalk.c b/contrib/tcpdump/print-atalk.c
index 1d575a67177d..3b1498942b14 100644
--- a/contrib/tcpdump/print-atalk.c
+++ b/contrib/tcpdump/print-atalk.c
@@ -20,7 +20,7 @@
  *
  * Format and print AppleTalk packets.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-atalk.c,v 1.13 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
index 4e061b0a27d3..d1df790316b1 100644
--- a/contrib/tcpdump/print-atm.c
+++ b/contrib/tcpdump/print-atm.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-atm.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c
index 844aecca479d..192409608738 100644
--- a/contrib/tcpdump/print-bootp.c
+++ b/contrib/tcpdump/print-bootp.c
@@ -20,7 +20,7 @@
  *
  * Format and print bootp packets.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-bootp.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c
index 08b5cea2a22c..346287e65465 100644
--- a/contrib/tcpdump/print-domain.c
+++ b/contrib/tcpdump/print-domain.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-domain.c,v 1.12 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index a82fc930594d..809a26e526a2 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/contrib/tcpdump/print-ether.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ether.c,v 1.16 2005/07/11 04:14:02 sam Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-fddi.c b/contrib/tcpdump/print-fddi.c
index acb68a90acfc..999b91e444e1 100644
--- a/contrib/tcpdump/print-fddi.c
+++ b/contrib/tcpdump/print-fddi.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-fddi.c,v 1.10 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c
index 6e5798f7b397..f1fb0de3f84c 100644
--- a/contrib/tcpdump/print-fr.c
+++ b/contrib/tcpdump/print-fr.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-fr.c,v 1.6 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-icmp.c b/contrib/tcpdump/print-icmp.c
index 1ef5a683a66f..6c364ffd6f5a 100644
--- a/contrib/tcpdump/print-icmp.c
+++ b/contrib/tcpdump/print-icmp.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-icmp.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c
index 9773c2991e61..7079ef9f941b 100644
--- a/contrib/tcpdump/print-ip.c
+++ b/contrib/tcpdump/print-ip.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ip.c,v 1.13 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c
index cdf2f2a062cd..a973ff4d848c 100644
--- a/contrib/tcpdump/print-ip6.c
+++ b/contrib/tcpdump/print-ip6.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ip6.c,v 1.7 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c
index 4afc4b3e5384..f204723d72a2 100644
--- a/contrib/tcpdump/print-ipx.c
+++ b/contrib/tcpdump/print-ipx.c
@@ -21,7 +21,7 @@
  * Format and print Novell IPX packets.
  * Contributed by Brad Parker (brad@fcr.com).
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ipx.c,v 1.9 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
index ccfabc7a3b61..ad9a99f78ee0 100644
--- a/contrib/tcpdump/print-isoclns.c
+++ b/contrib/tcpdump/print-isoclns.c
@@ -23,7 +23,7 @@
  * Extensively modified by Hannes Gredler (hannes@juniper.net) for more
  * complete IS-IS & CLNP support.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-isoclns.c,v 1.15 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-llc.c b/contrib/tcpdump/print-llc.c
index cc665f582e9a..755f6c8b42c3 100644
--- a/contrib/tcpdump/print-llc.c
+++ b/contrib/tcpdump/print-llc.c
@@ -21,7 +21,7 @@
  * Code by Matt Thomas, Digital Equipment Corporation
  *	with an awful lot of hacking by Jeffrey Mogul, DECWRL
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-llc.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c
index 8929d735542b..dc26d7ee5fd8 100644
--- a/contrib/tcpdump/print-nfs.c
+++ b/contrib/tcpdump/print-nfs.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-nfs.c,v 1.12 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c
index 9e8ccfa4f3d0..883fdf3f64eb 100644
--- a/contrib/tcpdump/print-ntp.c
+++ b/contrib/tcpdump/print-ntp.c
@@ -22,7 +22,7 @@
  *	By Jeffrey Mogul/DECWRL
  *	loosely based on print-bootp.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ntp.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c
index 04254d222e95..515382426a42 100644
--- a/contrib/tcpdump/print-null.c
+++ b/contrib/tcpdump/print-null.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-null.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-pim.c b/contrib/tcpdump/print-pim.c
index d4bafe42e2b0..d4d8c11b7f58 100644
--- a/contrib/tcpdump/print-pim.c
+++ b/contrib/tcpdump/print-pim.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-pim.c,v 1.8 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index 3c48c788bcd7..370e810fafa9 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -21,7 +21,7 @@
  * Extensively modified by Motonori Shindo (mshindo@mshindo.net) for more
  * complete PPP support.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.16 2005/07/11 04:14:02 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c
index 97389d8c3779..13ee3cf41d32 100644
--- a/contrib/tcpdump/print-sl.c
+++ b/contrib/tcpdump/print-sl.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-sl.c,v 1.9 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
index 420ec360f38e..8728f2358a84 100644
--- a/contrib/tcpdump/print-sunrpc.c
+++ b/contrib/tcpdump/print-sunrpc.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-sunrpc.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-token.c b/contrib/tcpdump/print-token.c
index 3f8e215c64e4..c7ccf2dd682b 100644
--- a/contrib/tcpdump/print-token.c
+++ b/contrib/tcpdump/print-token.c
@@ -23,7 +23,7 @@
  * Further tweaked to more closely resemble print-fddi.c
  *	Guy Harris <guy@alum.mit.edu>
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-token.c,v 1.7 2005/05/29 19:09:28 sam Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-udp.c b/contrib/tcpdump/print-udp.c
index 089da1a70e1b..20f254f50800 100644
--- a/contrib/tcpdump/print-udp.c
+++ b/contrib/tcpdump/print-udp.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-udp.c,v 1.9 2005/05/29 19:09:28 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/rpc_auth.h b/contrib/tcpdump/rpc_auth.h
index 2b8ddc10164b..6f99f6dd8a10 100644
--- a/contrib/tcpdump/rpc_auth.h
+++ b/contrib/tcpdump/rpc_auth.h
@@ -29,7 +29,7 @@
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/rpc_auth.h,v 1.1.1.2 2005/07/11 03:54:15 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/rpc_msg.h b/contrib/tcpdump/rpc_msg.h
index 01185de1ca15..94953a1fb917 100644
--- a/contrib/tcpdump/rpc_msg.h
+++ b/contrib/tcpdump/rpc_msg.h
@@ -29,7 +29,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/rpc_msg.h,v 1.1.1.2 2005/07/11 03:54:15 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/tcpdump-stdinc.h b/contrib/tcpdump/tcpdump-stdinc.h
index 6591183e11a5..30bf8a18e715 100644
--- a/contrib/tcpdump/tcpdump-stdinc.h
+++ b/contrib/tcpdump/tcpdump-stdinc.h
@@ -31,7 +31,7 @@
  *
  * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12 2005/03/27 01:35:45 guy Exp $ (LBL)
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/tcpdump-stdinc.h,v 1.3 2005/07/11 04:14:02 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/tcpdump.1 b/contrib/tcpdump/tcpdump.1
index 5a009acaed0c..5432c9a29e51 100644
--- a/contrib/tcpdump/tcpdump.1
+++ b/contrib/tcpdump/tcpdump.1
@@ -22,7 +22,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/tcpdump/tcpdump.1,v 1.15 2005/07/11 04:14:02 sam Exp $
 .\"
 .TH TCPDUMP 1  "18 April 2005"
 .SH NAME
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index 3263824f779a..b0ebb34d5134 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/contrib/tcpdump/tcpdump.c
@@ -33,7 +33,7 @@ static const char rcsid[] _U_ =
     "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.8 2005/07/05 21:09:05 mcr Exp $ (LBL)";
 #endif
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.10 2005/07/11 04:14:02 sam Exp $ */
 
 /*
  * tcpdump - monitor tcp/ip traffic on an ethernet.
diff --git a/contrib/tcpdump/token.h b/contrib/tcpdump/token.h
index e466c843630f..4765cd28b7d8 100644
--- a/contrib/tcpdump/token.h
+++ b/contrib/tcpdump/token.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/token.h,v 1.4 2004/03/31 14:57:24 bms Exp $
  */
 
 #define TOKEN_HDRLEN		14
diff --git a/contrib/tcsh/FREEBSD-Xlist b/contrib/tcsh/FREEBSD-Xlist
index daed825b1d63..c5d9af989a8b 100644
--- a/contrib/tcsh/FREEBSD-Xlist
+++ b/contrib/tcsh/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tcsh/FREEBSD-Xlist,v 1.2 2004/07/11 02:20:52 mp Exp $
 */BUGS
 */config/a*
 */config/bs2000
diff --git a/contrib/tcsh/FREEBSD-upgrade b/contrib/tcsh/FREEBSD-upgrade
index b7fbfe84761d..dc4f4a8f2190 100644
--- a/contrib/tcsh/FREEBSD-upgrade
+++ b/contrib/tcsh/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tcsh/FREEBSD-upgrade,v 1.1 2002/07/24 16:42:58 mp Exp $
 
 Christos Zoulas `tcsh'
 	originals can be found at: ftp://ftp.astron.com/pub/tcsh/
diff --git a/contrib/telnet/arpa/telnet.h b/contrib/telnet/arpa/telnet.h
index c937f03eacde..b15260186161 100644
--- a/contrib/telnet/arpa/telnet.h
+++ b/contrib/telnet/arpa/telnet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/arpa/telnet.h,v 1.9 2003/01/18 06:10:21 billf Exp $
  */
 
 #ifndef _ARPA_TELNET_H_
diff --git a/contrib/telnet/libtelnet/auth-proto.h b/contrib/telnet/libtelnet/auth-proto.h
index 6d3ba7f07493..dace1797f63e 100644
--- a/contrib/telnet/libtelnet/auth-proto.h
+++ b/contrib/telnet/libtelnet/auth-proto.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)auth-proto.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/auth-proto.h,v 1.7 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/auth.c b/contrib/telnet/libtelnet/auth.c
index 46426559e088..a39588ed5ad9 100644
--- a/contrib/telnet/libtelnet/auth.c
+++ b/contrib/telnet/libtelnet/auth.c
@@ -38,7 +38,7 @@ static const char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $");
 
 
 /*
diff --git a/contrib/telnet/libtelnet/auth.h b/contrib/telnet/libtelnet/auth.h
index a8ee04831d67..edd47083d350 100644
--- a/contrib/telnet/libtelnet/auth.h
+++ b/contrib/telnet/libtelnet/auth.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)auth.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/auth.h,v 1.3 2001/11/30 21:06:34 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/enc-proto.h b/contrib/telnet/libtelnet/enc-proto.h
index 46663c7789e2..3f6626be3e48 100644
--- a/contrib/telnet/libtelnet/enc-proto.h
+++ b/contrib/telnet/libtelnet/enc-proto.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)enc-proto.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/enc-proto.h,v 1.7 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c
index 2f7fe6e74402..f727c2e75587 100644
--- a/contrib/telnet/libtelnet/enc_des.c
+++ b/contrib/telnet/libtelnet/enc_des.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $");
 
 #ifdef	ENCRYPTION
 # ifdef	AUTHENTICATION
diff --git a/contrib/telnet/libtelnet/encrypt.c b/contrib/telnet/libtelnet/encrypt.c
index 8bdf672ab3ba..7227006ceb52 100644
--- a/contrib/telnet/libtelnet/encrypt.c
+++ b/contrib/telnet/libtelnet/encrypt.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/encrypt.c,v 1.9 2002/06/26 17:06:14 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/encrypt.h b/contrib/telnet/libtelnet/encrypt.h
index eda8d57e0328..afe05eb50568 100644
--- a/contrib/telnet/libtelnet/encrypt.h
+++ b/contrib/telnet/libtelnet/encrypt.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)encrypt.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/encrypt.h,v 1.6 2001/11/30 21:06:34 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/genget.c b/contrib/telnet/libtelnet/genget.c
index e24bb4458455..f740c7a45dfc 100644
--- a/contrib/telnet/libtelnet/genget.c
+++ b/contrib/telnet/libtelnet/genget.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/genget.c,v 1.7 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/getent.c b/contrib/telnet/libtelnet/getent.c
index d6e8d9c88475..8f4a3978fe4f 100644
--- a/contrib/telnet/libtelnet/getent.c
+++ b/contrib/telnet/libtelnet/getent.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/getent.c,v 1.7 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/kerberos.c b/contrib/telnet/libtelnet/kerberos.c
index 2380c27daa5e..c941fdeb127d 100644
--- a/contrib/telnet/libtelnet/kerberos.c
+++ b/contrib/telnet/libtelnet/kerberos.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/kerberos.c,v 1.8 2003/01/29 18:14:28 nectar Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/kerberos5.c b/contrib/telnet/libtelnet/kerberos5.c
index ab7b2dce47b8..7c6bd7f22555 100644
--- a/contrib/telnet/libtelnet/kerberos5.c
+++ b/contrib/telnet/libtelnet/kerberos5.c
@@ -53,7 +53,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/kerberos5.c,v 1.7 2003/03/06 13:41:53 nectar Exp $");
 
 #ifdef	KRB5
 
diff --git a/contrib/telnet/libtelnet/key-proto.h b/contrib/telnet/libtelnet/key-proto.h
index 2f3f3466daa5..ba80d42bcf5e 100644
--- a/contrib/telnet/libtelnet/key-proto.h
+++ b/contrib/telnet/libtelnet/key-proto.h
@@ -52,7 +52,7 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/key-proto.h,v 1.2 2001/11/30 21:06:34 markm Exp $
  */
 
 #ifndef	__KEY_PROTO__
diff --git a/contrib/telnet/libtelnet/krb4encpwd.c b/contrib/telnet/libtelnet/krb4encpwd.c
index e0530f6e63c3..95ef529c1882 100644
--- a/contrib/telnet/libtelnet/krb4encpwd.c
+++ b/contrib/telnet/libtelnet/krb4encpwd.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/krb4encpwd.c,v 1.7 2001/11/30 22:28:07 markm Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/misc-proto.h b/contrib/telnet/libtelnet/misc-proto.h
index aea753c3ff93..c3f0a838379a 100644
--- a/contrib/telnet/libtelnet/misc-proto.h
+++ b/contrib/telnet/libtelnet/misc-proto.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)misc-proto.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/misc-proto.h,v 1.4 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/misc.c b/contrib/telnet/libtelnet/misc.c
index 97299ad53b77..ac958849ad74 100644
--- a/contrib/telnet/libtelnet/misc.c
+++ b/contrib/telnet/libtelnet/misc.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/misc.c,v 1.8 2002/06/26 17:05:08 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/pk.c b/contrib/telnet/libtelnet/pk.c
index 044e9b9e8ffa..b7a0773d01ef 100644
--- a/contrib/telnet/libtelnet/pk.c
+++ b/contrib/telnet/libtelnet/pk.c
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/pk.c,v 1.10 2002/08/22 06:19:07 nsayer Exp $");
 
 /* public key routines */
 /* functions:
diff --git a/contrib/telnet/libtelnet/pk.h b/contrib/telnet/libtelnet/pk.h
index 555d8ebdeb78..7827c001bca7 100644
--- a/contrib/telnet/libtelnet/pk.h
+++ b/contrib/telnet/libtelnet/pk.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/pk.h,v 1.6 2001/11/30 21:06:34 markm Exp $
  */
 
 /* header for the des routines that we will use */
diff --git a/contrib/telnet/libtelnet/read_password.c b/contrib/telnet/libtelnet/read_password.c
index badf21417dcc..d479589ae6f3 100644
--- a/contrib/telnet/libtelnet/read_password.c
+++ b/contrib/telnet/libtelnet/read_password.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/read_password.c,v 1.5 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/rsaencpwd.c b/contrib/telnet/libtelnet/rsaencpwd.c
index fba0c6b61735..aad79b8ec608 100644
--- a/contrib/telnet/libtelnet/rsaencpwd.c
+++ b/contrib/telnet/libtelnet/rsaencpwd.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/rsaencpwd.c,v 1.3 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)rsaencpwd.c	8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/sra.c b/contrib/telnet/libtelnet/sra.c
index 194048532b4e..8104aaee08cd 100644
--- a/contrib/telnet/libtelnet/sra.c
+++ b/contrib/telnet/libtelnet/sra.c
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/sra.c,v 1.16 2002/05/06 09:48:02 markm Exp $");
 
 #ifdef	SRA
 #ifdef	ENCRYPTION
diff --git a/contrib/telnet/telnet/authenc.c b/contrib/telnet/telnet/authenc.c
index 85f389b2e55d..8d1ab6348d16 100644
--- a/contrib/telnet/telnet/authenc.c
+++ b/contrib/telnet/telnet/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $");
 
 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c
index a64d763b64ac..c69b54c53aa8 100644
--- a/contrib/telnet/telnet/commands.c
+++ b/contrib/telnet/telnet/commands.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/commands.c,v 1.35 2005/02/28 12:46:52 tobez Exp $");
 
 #include <sys/param.h>
 #include <sys/un.h>
diff --git a/contrib/telnet/telnet/defines.h b/contrib/telnet/telnet/defines.h
index 840666deacb6..d49cb2d0a07c 100644
--- a/contrib/telnet/telnet/defines.h
+++ b/contrib/telnet/telnet/defines.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defines.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnet/defines.h,v 1.2 2001/11/30 21:06:35 markm Exp $
  */
 
 #define	settimer(x)	clocks.x = clocks.system++
diff --git a/contrib/telnet/telnet/externs.h b/contrib/telnet/telnet/externs.h
index e9be27e1634f..86babbb9377b 100644
--- a/contrib/telnet/telnet/externs.h
+++ b/contrib/telnet/telnet/externs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)externs.h	8.3 (Berkeley) 5/30/95
- *	$FreeBSD$
+ *	$FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.10 2003/05/11 18:17:00 markm Exp $
  */
 
 #ifndef	BSD
diff --git a/contrib/telnet/telnet/main.c b/contrib/telnet/telnet/main.c
index f6eb1ffb08ef..fd01a30aa63d 100644
--- a/contrib/telnet/telnet/main.c
+++ b/contrib/telnet/telnet/main.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/main.c,v 1.20 2005/01/09 10:24:45 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/contrib/telnet/telnet/network.c b/contrib/telnet/telnet/network.c
index bb75d6309f90..e93345fa6801 100644
--- a/contrib/telnet/telnet/network.c
+++ b/contrib/telnet/telnet/network.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/telnet/telnet/ring.c b/contrib/telnet/telnet/ring.c
index 6c2b7efc5a51..07061338865b 100644
--- a/contrib/telnet/telnet/ring.c
+++ b/contrib/telnet/telnet/ring.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
 
 /*
  * This defines a structure for a ring buffer.
diff --git a/contrib/telnet/telnet/ring.h b/contrib/telnet/telnet/ring.h
index 516b7a5d806a..6b8d11d2c603 100644
--- a/contrib/telnet/telnet/ring.h
+++ b/contrib/telnet/telnet/ring.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ring.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnet/ring.h,v 1.4 2001/11/30 22:28:07 markm Exp $
  */
 
 #if defined(P)
diff --git a/contrib/telnet/telnet/sys_bsd.c b/contrib/telnet/telnet/sys_bsd.c
index 45ef1e2aa3cd..cd6f8545066b 100644
--- a/contrib/telnet/telnet/sys_bsd.c
+++ b/contrib/telnet/telnet/sys_bsd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $");
 
 /*
  * The following routines try to encapsulate what is system dependent
diff --git a/contrib/telnet/telnet/telnet.1 b/contrib/telnet/telnet/telnet.1
index 2e0181cb224d..41d8bc2cc396 100644
--- a/contrib/telnet/telnet/telnet.1
+++ b/contrib/telnet/telnet/telnet.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.6 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.18 2005/02/28 12:46:52 tobez Exp $
 .\"
 .Dd January 27, 2000
 .Dt TELNET 1
diff --git a/contrib/telnet/telnet/telnet.c b/contrib/telnet/telnet/telnet.c
index 28237bdf9d07..c62cc4d0a413 100644
--- a/contrib/telnet/telnet/telnet.c
+++ b/contrib/telnet/telnet/telnet.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/telnet.c,v 1.16 2005/03/28 14:45:12 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/contrib/telnet/telnet/terminal.c b/contrib/telnet/telnet/terminal.c
index 3dda1c5bf886..c1c88daa74b0 100644
--- a/contrib/telnet/telnet/terminal.c
+++ b/contrib/telnet/telnet/terminal.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
 
 #include <arpa/telnet.h>
 #include <sys/types.h>
diff --git a/contrib/telnet/telnet/utilities.c b/contrib/telnet/telnet/utilities.c
index b0cfe37bbabd..d5fa43a9d9fb 100644
--- a/contrib/telnet/telnet/utilities.c
+++ b/contrib/telnet/telnet/utilities.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $");
 
 #define	TELOPTS
 #define	TELCMDS
diff --git a/contrib/telnet/telnetd/authenc.c b/contrib/telnet/telnetd/authenc.c
index 9377b522c972..7c42dd959692 100644
--- a/contrib/telnet/telnetd/authenc.c
+++ b/contrib/telnet/telnetd/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $");
 
 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
diff --git a/contrib/telnet/telnetd/defs.h b/contrib/telnet/telnetd/defs.h
index d727f367c045..31ef2fb0a958 100644
--- a/contrib/telnet/telnetd/defs.h
+++ b/contrib/telnet/telnetd/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/defs.h,v 1.2 2001/08/29 14:16:15 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/telnetd/ext.h b/contrib/telnet/telnetd/ext.h
index 448ba68b92fd..4e45206b8155 100644
--- a/contrib/telnet/telnetd/ext.h
+++ b/contrib/telnet/telnetd/ext.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ext.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/ext.h,v 1.11 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/telnetd/global.c b/contrib/telnet/telnetd/global.c
index 2ed82d0b6aee..eefd1294c732 100644
--- a/contrib/telnet/telnetd/global.c
+++ b/contrib/telnet/telnetd/global.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $");
 
 /*
  * Allocate global variables.  We do this
diff --git a/contrib/telnet/telnetd/pathnames.h b/contrib/telnet/telnetd/pathnames.h
index ed8ee887a39e..43fce7e40006 100644
--- a/contrib/telnet/telnetd/pathnames.h
+++ b/contrib/telnet/telnetd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/pathnames.h,v 1.3 2001/08/20 12:28:40 markm Exp $
  */
 
 #if BSD > 43
diff --git a/contrib/telnet/telnetd/slc.c b/contrib/telnet/telnetd/slc.c
index ad034418d313..a3b6cd614350 100644
--- a/contrib/telnet/telnetd/slc.c
+++ b/contrib/telnet/telnetd/slc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)slc.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $");
 
 #include "telnetd.h"
 
diff --git a/contrib/telnet/telnetd/state.c b/contrib/telnet/telnetd/state.c
index 9db4516096a0..64cdddaa0add 100644
--- a/contrib/telnet/telnetd/state.c
+++ b/contrib/telnet/telnetd/state.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)state.c	8.5 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $");
 
 #include <stdarg.h>
 #include "telnetd.h"
diff --git a/contrib/telnet/telnetd/sys_term.c b/contrib/telnet/telnetd/sys_term.c
index 151c5b45215d..bbdd14b581f8 100644
--- a/contrib/telnet/telnetd/sys_term.c
+++ b/contrib/telnet/telnetd/sys_term.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_term.c	8.4+1 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/tty.h>
diff --git a/contrib/telnet/telnetd/telnetd.8 b/contrib/telnet/telnetd/telnetd.8
index 15ac8a95ea2c..08c0e5b06a5b 100644
--- a/contrib/telnet/telnetd/telnetd.8
+++ b/contrib/telnet/telnetd/telnetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.4 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/telnet/telnetd/telnetd.8,v 1.21 2005/01/21 21:57:05 ru Exp $
 .\"
 .Dd January 9, 2005
 .Dt TELNETD 8
diff --git a/contrib/telnet/telnetd/telnetd.c b/contrib/telnet/telnetd/telnetd.c
index f5000887bed1..d678bffadf6f 100644
--- a/contrib/telnet/telnetd/telnetd.c
+++ b/contrib/telnet/telnetd/telnetd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnetd.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.28 2005/05/21 15:28:42 ume Exp $");
 
 #include "telnetd.h"
 #include "pathnames.h"
diff --git a/contrib/telnet/telnetd/telnetd.h b/contrib/telnet/telnetd/telnetd.h
index 5bfc572f518d..e99a7c93efd1 100644
--- a/contrib/telnet/telnetd/telnetd.h
+++ b/contrib/telnet/telnetd/telnetd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnetd.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/telnetd.h,v 1.2 2001/11/30 21:06:38 markm Exp $
  */
 
 
diff --git a/contrib/telnet/telnetd/termstat.c b/contrib/telnet/telnetd/termstat.c
index 88425206da56..533eb1554576 100644
--- a/contrib/telnet/telnetd/termstat.c
+++ b/contrib/telnet/telnetd/termstat.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)termstat.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/termstat.c,v 1.13 2004/07/28 05:37:18 kan Exp $");
 
 #include "telnetd.h"
 
diff --git a/contrib/telnet/telnetd/utility.c b/contrib/telnet/telnetd/utility.c
index 54e23270be18..c360834b84b1 100644
--- a/contrib/telnet/telnetd/utility.c
+++ b/contrib/telnet/telnetd/utility.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utility.c	8.4 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $");
 
 #ifdef __FreeBSD__
 #include <locale.h>
diff --git a/contrib/texinfo/FREEBSD-Xlist b/contrib/texinfo/FREEBSD-Xlist
index 702690cc397c..d1c91f38a3d2 100644
--- a/contrib/texinfo/FREEBSD-Xlist
+++ b/contrib/texinfo/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/texinfo/FREEBSD-Xlist,v 1.6 2005/05/23 10:55:29 ru Exp $
 */ABOUT-NLS
 */INSTALL.generic
 */Makefile.am
diff --git a/contrib/texinfo/FREEBSD-upgrade b/contrib/texinfo/FREEBSD-upgrade
index 7f1111672715..0600df71f879 100644
--- a/contrib/texinfo/FREEBSD-upgrade
+++ b/contrib/texinfo/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/texinfo/FREEBSD-upgrade,v 1.6 2005/05/23 10:55:29 ru Exp $
 
 GNU Texinfo 4.8
 	originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/
diff --git a/contrib/texinfo/config.h b/contrib/texinfo/config.h
index ad0a116dfa6d..e673c4190e73 100644
--- a/contrib/texinfo/config.h
+++ b/contrib/texinfo/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/texinfo/config.h,v 1.7 2005/05/23 10:52:06 ru Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
 
diff --git a/contrib/texinfo/util/install-info.c b/contrib/texinfo/util/install-info.c
index 50ed3d46f944..55ccbc336af5 100644
--- a/contrib/texinfo/util/install-info.c
+++ b/contrib/texinfo/util/install-info.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/texinfo/util/install-info.c,v 1.16 2005/05/23 10:50:48 ru Exp $ */
 /* install-info -- create Info directory entry(ies) for an Info file.
    $Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp $
 
diff --git a/contrib/top/commands.c b/contrib/top/commands.c
index 200f0cc3cb04..5625e48b6644 100644
--- a/contrib/top/commands.c
+++ b/contrib/top/commands.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/commands.c,v 1.12 2005/05/18 13:30:08 keramida Exp $
  */
 
 /*
diff --git a/contrib/top/display.c b/contrib/top/display.c
index 9de895200644..bdc167988228 100644
--- a/contrib/top/display.c
+++ b/contrib/top/display.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $
  */
 
 /*
diff --git a/contrib/top/machine.h b/contrib/top/machine.h
index 17e48cd8181b..a905179c5dd4 100644
--- a/contrib/top/machine.h
+++ b/contrib/top/machine.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/machine.h,v 1.7 2005/05/18 13:30:08 keramida Exp $
  */
 
 /*
diff --git a/contrib/top/screen.c b/contrib/top/screen.c
index 348304cc2836..a3f19a36201c 100644
--- a/contrib/top/screen.c
+++ b/contrib/top/screen.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/screen.c,v 1.3 2000/09/16 19:36:18 peter Exp $
  */
 
 /*  This file contains the routines that interface to termcap and stty/gtty.
diff --git a/contrib/top/top.X b/contrib/top/top.X
index 8dfc94906009..1196f6f95ad4 100644
--- a/contrib/top/top.X
+++ b/contrib/top/top.X
@@ -1,6 +1,6 @@
 .\" NOTE:  changes to the manual page for "top" should be made in the
 .\"        file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/top/top.X,v 1.12 2005/03/13 13:37:02 brueffer Exp $
 .nr N %topn%
 .nr D %delay%
 .TH TOP 1 Local
diff --git a/contrib/top/top.c b/contrib/top/top.c
index 00acd85181ac..d11f03396279 100644
--- a/contrib/top/top.c
+++ b/contrib/top/top.c
@@ -13,7 +13,7 @@ char *copyright =
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/top.c,v 1.17 2005/05/18 13:30:08 keramida Exp $
  */
 
 /*
diff --git a/contrib/top/top.h b/contrib/top/top.h
index 59cdeed2d7d7..db89760aa510 100644
--- a/contrib/top/top.h
+++ b/contrib/top/top.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/top.h,v 1.3 2004/07/01 09:12:38 alfred Exp $
  */
 /*
  *  Top - a top users display for Berkeley Unix
diff --git a/contrib/top/username.c b/contrib/top/username.c
index 23591866eb83..2cc45ed1db66 100644
--- a/contrib/top/username.c
+++ b/contrib/top/username.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/username.c,v 1.3 2002/06/09 19:29:55 mike Exp $
  */
 
 /*
diff --git a/contrib/top/utils.c b/contrib/top/utils.c
index 906170ad67a3..93a4ae782077 100644
--- a/contrib/top/utils.c
+++ b/contrib/top/utils.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/utils.c,v 1.4 2002/01/24 17:58:42 dwmalone Exp $
  */
 
 /*
diff --git a/contrib/traceroute/FREEBSD-upgrade b/contrib/traceroute/FREEBSD-upgrade
index bc4918eb146f..b0b42ef8ddea 100644
--- a/contrib/traceroute/FREEBSD-upgrade
+++ b/contrib/traceroute/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.3 2002/07/28 02:26:31 fenner Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/traceroute/VERSION b/contrib/traceroute/VERSION
index 26e2f7609197..b2ba46879efe 100644
--- a/contrib/traceroute/VERSION
+++ b/contrib/traceroute/VERSION
@@ -1,2 +1,2 @@
 1.4a12+FreeBSD
-$FreeBSD$
+$FreeBSD: src/contrib/traceroute/VERSION,v 1.3 2002/07/28 02:26:31 fenner Exp $
diff --git a/contrib/traceroute/findsaddr-socket.c b/contrib/traceroute/findsaddr-socket.c
index 00af84366c52..7a3d5d3e31e6 100644
--- a/contrib/traceroute/findsaddr-socket.c
+++ b/contrib/traceroute/findsaddr-socket.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/traceroute/findsaddr-socket.c,v 1.3 2004/07/28 14:21:25 mux Exp $
  */
 
 /* XXX Yes this is WAY too complicated */
diff --git a/contrib/traceroute/traceroute.8 b/contrib/traceroute/traceroute.8
index 0955e23af91d..26d96c13aa80 100644
--- a/contrib/traceroute/traceroute.8
+++ b/contrib/traceroute/traceroute.8
@@ -14,7 +14,7 @@
 .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	$Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/traceroute/traceroute.8,v 1.11 2005/04/12 15:16:32 thomas Exp $
 .\"
 .TH TRACEROUTE 8 "21 September 2000"
 .UC 6
diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c
index 3c40b6d4d8d7..11fd87b9ee63 100644
--- a/contrib/traceroute/traceroute.c
+++ b/contrib/traceroute/traceroute.c
@@ -28,7 +28,7 @@ static const char rcsid[] =
     "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
 #endif
 static const char rcsid[] =
-    "$FreeBSD$";
+    "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.26.8.1 2005/08/29 17:57:36 andre Exp $";
 #endif
 
 /*
diff --git a/contrib/wpa_supplicant/FREEBSD-Xlist b/contrib/wpa_supplicant/FREEBSD-Xlist
index d2f169790480..8eb3c02c7f31 100644
--- a/contrib/wpa_supplicant/FREEBSD-Xlist
+++ b/contrib/wpa_supplicant/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.1 2005/06/05 20:55:01 sam Exp $
 .cvsignore
 README-Windows.txt
 driver_atmel.c
diff --git a/contrib/wpa_supplicant/FREEBSD-upgrade b/contrib/wpa_supplicant/FREEBSD-upgrade
index f8ef0f001379..c9df8d456095 100644
--- a/contrib/wpa_supplicant/FREEBSD-upgrade
+++ b/contrib/wpa_supplicant/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.1 2005/06/05 20:55:01 sam Exp $
 
 WPA Supplicant
 	originals can be found at: http://hostap.epitest.fi/releases/
diff --git a/contrib/wpa_supplicant/common.h b/contrib/wpa_supplicant/common.h
index a075e51373a9..2c307754ee40 100644
--- a/contrib/wpa_supplicant/common.h
+++ b/contrib/wpa_supplicant/common.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/wpa_supplicant/common.h,v 1.2 2005/06/07 23:33:13 sam Exp $ */
 
 #ifndef COMMON_H
 #define COMMON_H
diff --git a/contrib/wpa_supplicant/wpa_ctrl.c b/contrib/wpa_supplicant/wpa_ctrl.c
index 3c79fc43c101..2d807baa2c9e 100644
--- a/contrib/wpa_supplicant/wpa_ctrl.c
+++ b/contrib/wpa_supplicant/wpa_ctrl.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/wpa_supplicant/wpa_ctrl.c,v 1.3 2005/06/13 16:54:21 sam Exp $
  */
 
 #include <stdlib.h>
diff --git a/contrib/wpa_supplicant/wpa_supplicant.c b/contrib/wpa_supplicant/wpa_supplicant.c
index a1524ab90737..e125369f0a13 100644
--- a/contrib/wpa_supplicant/wpa_supplicant.c
+++ b/contrib/wpa_supplicant/wpa_supplicant.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/wpa_supplicant/wpa_supplicant.c,v 1.1.1.3.2.1 2005/07/30 01:19:09 sam Exp $
  */
 
 #include <stdlib.h>
diff --git a/crypto/README b/crypto/README
index a3c5ccf50a1c..d385e8b8aa75 100644
--- a/crypto/README
+++ b/crypto/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/README,v 1.6 2001/02/10 04:47:47 kris Exp $
 
 This directory is for the EXACT same use as src/contrib, except it
 holds crypto sources.  In other words, this holds raw sources obtained
diff --git a/crypto/heimdal/FREEBSD-Xlist b/crypto/heimdal/FREEBSD-Xlist
index 669591896990..793b485480bd 100644
--- a/crypto/heimdal/FREEBSD-Xlist
+++ b/crypto/heimdal/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/heimdal/FREEBSD-Xlist,v 1.2 2005/02/24 22:17:13 nectar Exp $
 TODO*
 *.info*
 *.cat[0-9]
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h
index cf6a6f3548da..69805faf5bc1 100644
--- a/crypto/heimdal/admin/ktutil_locl.h
+++ b/crypto/heimdal/admin/ktutil_locl.h
@@ -33,7 +33,7 @@
 
 /* 
  * $Id: ktutil_locl.h,v 1.18 2002/09/10 20:03:45 joda Exp $
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/admin/ktutil_locl.h,v 1.7 2002/09/16 21:07:08 nectar Exp $
  */
 
 #ifndef __KTUTIL_LOCL_H__
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
index f371ca1e1edf..d6d88b727c6d 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
+++ b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: ftp_locl.h,v 1.37 2002/09/10 20:03:46 joda Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h,v 1.6 2002/09/16 21:07:10 nectar Exp $ */
 
 #ifndef __FTP_LOCL_H__
 #define __FTP_LOCL_H__
diff --git a/crypto/heimdal/appl/rcp/extern.h b/crypto/heimdal/appl/rcp/extern.h
index a98456d305e2..6ec00c410508 100644
--- a/crypto/heimdal/appl/rcp/extern.h
+++ b/crypto/heimdal/appl/rcp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/appl/rcp/extern.h,v 1.1.1.1 2001/02/13 16:44:17 assar Exp $
  */
 
 typedef struct {
diff --git a/crypto/heimdal/appl/rcp/util.c b/crypto/heimdal/appl/rcp/util.c
index 3621d307a425..619a40f68050 100644
--- a/crypto/heimdal/appl/rcp/util.c
+++ b/crypto/heimdal/appl/rcp/util.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/crypto/heimdal/appl/rcp/util.c,v 1.1.1.2 2002/02/19 15:46:05 nectar Exp $";
 #endif /* not lint */
 #endif
 
diff --git a/crypto/heimdal/appl/su/Makefile.am b/crypto/heimdal/appl/su/Makefile.am
index 86e8533f7bd5..799a7306144d 100644
--- a/crypto/heimdal/appl/su/Makefile.am
+++ b/crypto/heimdal/appl/su/Makefile.am
@@ -1,5 +1,5 @@
 # $Id: Makefile.am,v 1.7 2001/08/28 08:31:22 assar Exp $
-# $FreeBSD$
+# $FreeBSD: src/crypto/heimdal/appl/su/Makefile.am,v 1.2 2005/07/07 14:16:37 kensmith Exp $
 
 include $(top_srcdir)/Makefile.am.common
 
diff --git a/crypto/heimdal/appl/su/su.c b/crypto/heimdal/appl/su/su.c
index d44cf1b70dab..1987e12fa49f 100644
--- a/crypto/heimdal/appl/su/su.c
+++ b/crypto/heimdal/appl/su/su.c
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/appl/su/su.c,v 1.2 2005/07/07 14:16:37 kensmith Exp $
  */
 
 #include <config.h>
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h
index 0b36127db0d5..55b0112062de 100644
--- a/crypto/heimdal/kadmin/kadmin_locl.h
+++ b/crypto/heimdal/kadmin/kadmin_locl.h
@@ -33,7 +33,7 @@
 
 /* 
  * $Id: kadmin_locl.h,v 1.41 2002/09/10 20:04:45 joda Exp $
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/kadmin/kadmin_locl.h,v 1.7 2002/09/16 21:07:10 nectar Exp $
  */
 
 #ifndef __ADMIN_LOCL_H__
diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h
index 96db9248bebb..dd7f88622909 100644
--- a/crypto/heimdal/kdc/headers.h
+++ b/crypto/heimdal/kdc/headers.h
@@ -33,7 +33,7 @@
 
 /* 
  * $Id: headers.h,v 1.15 2002/09/10 20:04:46 joda Exp $ 
- * $FreeBSD$ 
+ * $FreeBSD: src/crypto/heimdal/kdc/headers.h,v 1.7 2002/09/16 21:07:11 nectar Exp $ 
  */
 
 #ifndef __HEADERS_H__
diff --git a/crypto/heimdal/lib/hdb/hdb_locl.h b/crypto/heimdal/lib/hdb/hdb_locl.h
index c4f1ea2d30f1..e1834683a572 100644
--- a/crypto/heimdal/lib/hdb/hdb_locl.h
+++ b/crypto/heimdal/lib/hdb/hdb_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: hdb_locl.h,v 1.18.4.1 2003/09/10 22:04:39 lha Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/lib/hdb/hdb_locl.h,v 1.8 2004/04/03 21:31:09 nectar Exp $ */
 
 #ifndef __HDB_LOCL_H__
 #define __HDB_LOCL_H__
diff --git a/crypto/heimdal/lib/krb5/crypto.c b/crypto/heimdal/lib/krb5/crypto.c
index d1c1c9d3d79f..50165e6ce579 100644
--- a/crypto/heimdal/lib/krb5/crypto.c
+++ b/crypto/heimdal/lib/krb5/crypto.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 RCSID("$Id: crypto.c,v 1.73.2.4 2004/03/06 16:38:00 lha Exp $");
-/* RCSID("$FreeBSD$"); */
+/* RCSID("$FreeBSD: src/crypto/heimdal/lib/krb5/crypto.c,v 1.10 2004/04/03 21:31:09 nectar Exp $"); */
 
 #undef CRYPTO_DEBUG
 #ifdef CRYPTO_DEBUG
diff --git a/crypto/heimdal/lib/krb5/krb5_locl.h b/crypto/heimdal/lib/krb5/krb5_locl.h
index be7997e28c90..f4258ab01b86 100644
--- a/crypto/heimdal/lib/krb5/krb5_locl.h
+++ b/crypto/heimdal/lib/krb5/krb5_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: krb5_locl.h,v 1.71 2002/09/10 20:10:45 joda Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/lib/krb5/krb5_locl.h,v 1.9 2002/09/16 21:07:11 nectar Exp $ */
 
 #ifndef __KRB5_LOCL_H__
 #define __KRB5_LOCL_H__
diff --git a/crypto/openssh/FREEBSD-Xlist b/crypto/openssh/FREEBSD-Xlist
index 6d8ac040866f..5064ba5271e0 100644
--- a/crypto/openssh/FREEBSD-Xlist
+++ b/crypto/openssh/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/openssh/FREEBSD-Xlist,v 1.3 2004/02/26 10:37:34 des Exp $
 *.0
 */.cvsignore
 .cvsignore
diff --git a/crypto/openssh/FREEBSD-tricks b/crypto/openssh/FREEBSD-tricks
index fc0e1e768f3d..25b708f7660c 100644
--- a/crypto/openssh/FREEBSD-tricks
+++ b/crypto/openssh/FREEBSD-tricks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.5.2.1 2005/09/11 16:50:33 des Exp $
 
 # Shell code to remove FreeBSD tags before merging
 grep -rl '\$Fre[e]BSD:' . | grep -v FREEBSD >tags
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 757d9e8e04ca..ee21d3a2fd57 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -126,4 +126,4 @@ Suzanne Vega, and a Sanford's #69 Deluxe Marker.
 
 					-- des@FreeBSD.org
 
-$FreeBSD$
+$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.10 2005/06/05 15:43:57 des Exp $
diff --git a/crypto/openssh/acconfig.h b/crypto/openssh/acconfig.h
index 338aa7a5fcc2..6c9131c887cf 100644
--- a/crypto/openssh/acconfig.h
+++ b/crypto/openssh/acconfig.h
@@ -1,5 +1,5 @@
 /* $Id: acconfig.h,v 1.183 2005/07/07 10:33:36 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/acconfig.h,v 1.11.2.1 2005/09/11 16:50:33 des Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
diff --git a/crypto/openssh/auth-chall.c b/crypto/openssh/auth-chall.c
index 248aca99fa96..0fee1fde703c 100644
--- a/crypto/openssh/auth-chall.c
+++ b/crypto/openssh/auth-chall.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth-chall.c,v 1.9 2003/11/03 09:03:37 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-chall.c,v 1.9 2005/06/05 15:46:07 des Exp $");
 
 #include "auth.h"
 #include "log.h"
diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c
index 7e5a6140b4be..bf5921146b2d 100644
--- a/crypto/openssh/auth-krb5.c
+++ b/crypto/openssh/auth-krb5.c
@@ -29,7 +29,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth-krb5.c,v 1.15 2003/11/21 11:57:02 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.19.2.1 2005/09/11 16:50:33 des Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c
index ef87bfbfa039..2e410efcdb4a 100644
--- a/crypto/openssh/auth-pam.c
+++ b/crypto/openssh/auth-pam.c
@@ -48,7 +48,7 @@
 /* Based on $xFreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
 RCSID("$Id: auth-pam.c,v 1.126 2005/07/17 07:18:50 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-pam.c,v 1.16.2.1 2005/09/11 16:50:33 des Exp $");
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
diff --git a/crypto/openssh/auth-pam.h b/crypto/openssh/auth-pam.h
index afdc66e819c5..dfdce585d502 100644
--- a/crypto/openssh/auth-pam.h
+++ b/crypto/openssh/auth-pam.h
@@ -1,5 +1,5 @@
 /* $Id: auth-pam.h,v 1.27 2004/09/11 12:17:26 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/auth-pam.h,v 1.11 2005/06/05 15:46:07 des Exp $ */
 
 /*
  * Copyright (c) 2000 Damien Miller.  All rights reserved.
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c
index c5d52b26e6ce..9bdcb150093c 100644
--- a/crypto/openssh/auth-passwd.c
+++ b/crypto/openssh/auth-passwd.c
@@ -37,7 +37,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth-passwd.c,v 1.34 2005/07/19 15:32:26 otto Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-passwd.c,v 1.19.2.1 2005/09/11 16:50:33 des Exp $");
 
 #include "packet.h"
 #include "buffer.h"
diff --git a/crypto/openssh/auth-skey.c b/crypto/openssh/auth-skey.c
index c37eba54876e..8be059567866 100644
--- a/crypto/openssh/auth-skey.c
+++ b/crypto/openssh/auth-skey.c
@@ -23,7 +23,7 @@
  */
 #include "includes.h"
 RCSID("$OpenBSD: auth-skey.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-skey.c,v 1.15.8.1 2005/09/11 16:50:34 des Exp $");
 
 #ifdef SKEY
 
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c
index 228fe42b0eac..911aa849d04f 100644
--- a/crypto/openssh/auth.c
+++ b/crypto/openssh/auth.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth.c,v 1.60 2005/06/17 02:44:32 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth.c,v 1.17.2.1 2005/09/11 16:50:34 des Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
diff --git a/crypto/openssh/auth.h b/crypto/openssh/auth.h
index 41eb4a3c8c88..a0fd4fbcb682 100644
--- a/crypto/openssh/auth.h
+++ b/crypto/openssh/auth.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: auth.h,v 1.51 2005/06/06 11:20:36 djm Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/auth.h,v 1.15.2.1 2005/09/11 16:50:34 des Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/auth1.c b/crypto/openssh/auth1.c
index 6440c49cf8da..c9f2db8e3f8f 100644
--- a/crypto/openssh/auth1.c
+++ b/crypto/openssh/auth1.c
@@ -11,7 +11,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth1.c,v 1.62 2005/07/16 01:35:24 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth1.c,v 1.32.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c
index 95709a0b7324..7da331833a4e 100644
--- a/crypto/openssh/auth2-chall.c
+++ b/crypto/openssh/auth2-chall.c
@@ -24,7 +24,7 @@
  */
 #include "includes.h"
 RCSID("$OpenBSD: auth2-chall.c,v 1.24 2005/07/17 07:17:54 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2-chall.c,v 1.10.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include "ssh2.h"
 #include "auth.h"
diff --git a/crypto/openssh/auth2-kbdint.c b/crypto/openssh/auth2-kbdint.c
index 878a21dfcadf..b516a48990ed 100644
--- a/crypto/openssh/auth2-kbdint.c
+++ b/crypto/openssh/auth2-kbdint.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth2-kbdint.c,v 1.2 2002/05/31 11:35:15 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2-kbdint.c,v 1.3 2005/06/05 15:46:07 des Exp $");
 
 #include "packet.h"
 #include "auth.h"
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c
index 4a578c47d593..e8713928c442 100644
--- a/crypto/openssh/auth2.c
+++ b/crypto/openssh/auth2.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth2.c,v 1.107 2004/07/28 09:40:29 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.25.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include "canohost.h"
 #include "ssh2.h"
diff --git a/crypto/openssh/bufaux.c b/crypto/openssh/bufaux.c
index 53cfb8c15678..5162b4df0f13 100644
--- a/crypto/openssh/bufaux.c
+++ b/crypto/openssh/bufaux.c
@@ -38,7 +38,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: bufaux.c,v 1.36 2005/06/17 02:44:32 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/bufaux.c,v 1.16.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
diff --git a/crypto/openssh/compat.c b/crypto/openssh/compat.c
index 37a892bc34d4..8f6205db17ad 100644
--- a/crypto/openssh/compat.c
+++ b/crypto/openssh/compat.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: compat.c,v 1.71 2005/03/01 10:09:52 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/compat.c,v 1.12 2005/06/05 15:46:07 des Exp $");
 
 #include "buffer.h"
 #include "packet.h"
diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
index 036c54feca6f..2ed7e9cb68ea 100644
--- a/crypto/openssh/config.h
+++ b/crypto/openssh/config.h
@@ -1,7 +1,7 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 /* $Id: acconfig.h,v 1.183 2005/07/07 10:33:36 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/config.h,v 1.11.2.1 2005/09/11 16:50:34 des Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac
index 5258d634fe5d..c634e3566064 100644
--- a/crypto/openssh/configure.ac
+++ b/crypto/openssh/configure.ac
@@ -1,5 +1,5 @@
 # $Id: configure.ac,v 1.292 2005/08/31 16:59:49 tim Exp $
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/configure.ac,v 1.11.2.1 2005/09/11 16:50:34 des Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h
index f4ab0a39d98b..ecb023afeba0 100644
--- a/crypto/openssh/includes.h
+++ b/crypto/openssh/includes.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: includes.h,v 1.19 2005/05/19 02:42:26 djm Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/includes.h,v 1.19.2.1 2005/09/11 16:50:34 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h
index ec64752dab58..325ae1c4e6bf 100644
--- a/crypto/openssh/log.h
+++ b/crypto/openssh/log.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: log.h,v 1.11 2004/06/21 22:02:58 djm Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/log.h,v 1.6 2004/10/28 16:11:28 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/loginrec.c b/crypto/openssh/loginrec.c
index afc83484f922..a987bcd4368d 100644
--- a/crypto/openssh/loginrec.c
+++ b/crypto/openssh/loginrec.c
@@ -166,7 +166,7 @@
 #endif
 
 RCSID("$Id: loginrec.c,v 1.70 2005/07/17 07:26:44 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.9.2.1 2005/09/11 16:50:34 des Exp $");
 
 /**
  ** prototypes for helper functions in this file
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c
index 561f8d8c99e1..27a2aacd5e2a 100644
--- a/crypto/openssh/monitor.c
+++ b/crypto/openssh/monitor.c
@@ -26,7 +26,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: monitor.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.17.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include <openssl/dh.h>
 
diff --git a/crypto/openssh/monitor.h b/crypto/openssh/monitor.h
index 46adeb094614..9990b43383b4 100644
--- a/crypto/openssh/monitor.h
+++ b/crypto/openssh/monitor.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: monitor.h,v 1.13 2003/11/17 11:06:07 markus Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/monitor.h,v 1.6 2005/06/05 15:46:07 des Exp $	*/
 
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/crypto/openssh/monitor_wrap.c b/crypto/openssh/monitor_wrap.c
index 5457c3074643..ad0f8951ec50 100644
--- a/crypto/openssh/monitor_wrap.c
+++ b/crypto/openssh/monitor_wrap.c
@@ -26,7 +26,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: monitor_wrap.c,v 1.40 2005/05/24 17:32:43 avsm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/monitor_wrap.c,v 1.10.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
diff --git a/crypto/openssh/monitor_wrap.h b/crypto/openssh/monitor_wrap.h
index c2f1f3736c66..c77a246848ca 100644
--- a/crypto/openssh/monitor_wrap.h
+++ b/crypto/openssh/monitor_wrap.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: monitor_wrap.h,v 1.14 2004/06/21 17:36:31 avsm Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/monitor_wrap.h,v 1.8 2005/06/05 15:46:07 des Exp $	*/
 
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/crypto/openssh/myproposal.h b/crypto/openssh/myproposal.h
index 8beb4e2bd860..5d820334e477 100644
--- a/crypto/openssh/myproposal.h
+++ b/crypto/openssh/myproposal.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: myproposal.h,v 1.18 2005/07/25 11:59:39 markus Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/myproposal.h,v 1.7.2.1 2005/09/11 16:50:34 des Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/openbsd-compat/fake-rfc2553.h b/crypto/openssh/openbsd-compat/fake-rfc2553.h
index dd998c5bf2a3..c9b40199b8f7 100644
--- a/crypto/openssh/openbsd-compat/fake-rfc2553.h
+++ b/crypto/openssh/openbsd-compat/fake-rfc2553.h
@@ -1,5 +1,5 @@
 /* $Id: fake-rfc2553.h,v 1.12 2005/08/03 05:36:21 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/openbsd-compat/fake-rfc2553.h,v 1.6.2.1 2005/09/11 16:50:37 des Exp $ */
 
 /*
  * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 2a7962b89498..32e63a751fe0 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -13,7 +13,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: readconf.c,v 1.143 2005/07/30 02:03:47 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/readconf.c,v 1.25.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 466f897038c6..2b125e001c43 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -11,7 +11,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: servconf.c,v 1.144 2005/08/06 10:03:12 dtucker Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.46.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include "ssh.h"
 #include "log.h"
diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h
index 20d468f4a346..8ab2f59fe16f 100644
--- a/crypto/openssh/servconf.h
+++ b/crypto/openssh/servconf.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: servconf.h,v 1.71 2004/12/23 23:11:00 djm Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/crypto/openssh/servconf.h,v 1.17 2005/06/05 15:46:07 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 50521effa830..18945f98f76f 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -34,7 +34,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: session.c,v 1.186 2005/07/25 11:59:40 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.46.2.1 2005/09/11 16:50:34 des Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c
index 99ec904b6992..4593b19a5ffb 100644
--- a/crypto/openssh/ssh-agent.c
+++ b/crypto/openssh/ssh-agent.c
@@ -36,7 +36,7 @@
 #include "includes.h"
 #include "openbsd-compat/sys-queue.h"
 RCSID("$OpenBSD: ssh-agent.c,v 1.122 2004/10/29 22:53:56 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/ssh-agent.c,v 1.24 2005/06/05 15:46:07 des Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1
index 92c4f59b93c8..4aec0fd997d8 100644
--- a/crypto/openssh/ssh.1
+++ b/crypto/openssh/ssh.1
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh.1,v 1.209 2005/07/06 09:33:05 dtucker Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.31.2.1 2005/09/11 16:50:35 des Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index 57c62745699a..b042737c9c0e 100644
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -41,7 +41,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: ssh.c,v 1.249 2005/07/30 01:26:16 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/ssh.c,v 1.28.2.1 2005/09/11 16:50:35 des Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index b917b644fa65..8d2e68f9d32d 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -1,5 +1,5 @@
 #	$OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.27.2.1 2005/09/11 16:50:35 des Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index 77014210e037..f421184238de 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh_config.5,v 1.61 2005/07/08 12:53:10 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.17.2.1 2005/09/11 16:50:35 des Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index bced2875510d..a870d879c85f 100644
--- a/crypto/openssh/sshd.8
+++ b/crypto/openssh/sshd.8
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd.8,v 1.208 2005/06/08 03:50:00 djm Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.31.2.1 2005/09/11 16:50:35 des Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index cf30bd6cb616..5a92ad45e9f6 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -43,7 +43,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: sshd.c,v 1.312 2005/07/25 11:59:40 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.39.2.1 2005/09/11 16:50:35 des Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 8a9386f73898..0dfd7e27d95e 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -1,5 +1,5 @@
 #	$OpenBSD: sshd_config,v 1.72 2005/07/25 11:59:40 markus Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/crypto/openssh/sshd_config,v 1.42.2.1 2005/09/11 16:50:35 des Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 413a994f5e62..476ed0fa8453 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd_config.5,v 1.44 2005/07/25 11:59:40 markus Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.23.2.1 2005/09/11 16:50:35 des Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index bcfb720c7068..8d0bfc3b8929 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: version.h,v 1.45 2005/08/31 09:28:42 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/version.h,v 1.30.2.1 2005/09/11 16:50:35 des Exp $ */
 
 #ifndef SSH_VERSION
 
diff --git a/crypto/openssl/FREEBSD-Xlist b/crypto/openssl/FREEBSD-Xlist
index d3df074a2d31..015678df670f 100644
--- a/crypto/openssl/FREEBSD-Xlist
+++ b/crypto/openssl/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.6 2005/02/25 05:31:23 nectar Exp $
 INSTALL.DJGPP
 INSTALL.MacOS
 INSTALL.OS2
diff --git a/crypto/openssl/apps/openssl.cnf b/crypto/openssl/apps/openssl.cnf
index 79fd4711ea40..ae0aca588168 100644
--- a/crypto/openssl/apps/openssl.cnf
+++ b/crypto/openssl/apps/openssl.cnf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssl/apps/openssl.cnf,v 1.7 2005/02/25 05:49:43 nectar Exp $
 #
 # OpenSSL example configuration file.
 # This is mostly being used for generation of certificate requests.
diff --git a/crypto/openssl/crypto/rsa/rsa.h b/crypto/openssl/crypto/rsa/rsa.h
index c82363ee1392..7983c35fe00d 100644
--- a/crypto/openssl/crypto/rsa/rsa.h
+++ b/crypto/openssl/crypto/rsa/rsa.h
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa.h,v 1.11 2005/02/25 05:49:43 nectar Exp $ */
 
 #ifndef HEADER_RSA_H
 #define HEADER_RSA_H
diff --git a/crypto/openssl/crypto/rsa/rsa_eay.c b/crypto/openssl/crypto/rsa/rsa_eay.c
index 0d17acb87b9c..bb8920e5a09f 100644
--- a/crypto/openssl/crypto/rsa/rsa_eay.c
+++ b/crypto/openssl/crypto/rsa/rsa_eay.c
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa_eay.c,v 1.13 2005/02/25 05:49:43 nectar Exp $ */
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/openssl/crypto/rsa/rsa_lib.c b/crypto/openssl/crypto/rsa/rsa_lib.c
index 1ed3b3bc0a06..2397171a6d25 100644
--- a/crypto/openssl/crypto/rsa/rsa_lib.c
+++ b/crypto/openssl/crypto/rsa/rsa_lib.c
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa_lib.c,v 1.10 2003/10/01 12:37:50 nectar Exp $ */
 
 #include <stdio.h>
 #include <openssl/crypto.h>
diff --git a/crypto/openssl/util/pl/Mingw32.pl b/crypto/openssl/util/pl/Mingw32.pl
index ba00305032b5..921ec2e8c81c 100644
--- a/crypto/openssl/util/pl/Mingw32.pl
+++ b/crypto/openssl/util/pl/Mingw32.pl
@@ -1,5 +1,5 @@
 #!/usr/local/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssl/util/pl/Mingw32.pl,v 1.7 2005/02/25 05:49:44 nectar Exp $
 #
 # Mingw32.pl -- Mingw
 #
diff --git a/etc/Makefile b/etc/Makefile
index 98acfeffc389..4f9e7bd07da1 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD$
+# $FreeBSD: src/etc/Makefile,v 1.343.2.2 2005/09/01 01:24:42 imp Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
diff --git a/etc/amd.map b/etc/amd.map
index d34adc969790..4fbd9c691258 100644
--- a/etc/amd.map
+++ b/etc/amd.map
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/amd.map,v 1.9 2002/05/15 22:24:29 obrien Exp $
 #
 /defaults       type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key}
 *               opts:=rw,grpid,resvport,vers=3,proto=udp,nosuid,nodev
diff --git a/etc/apmd.conf b/etc/apmd.conf
index be4a6c3ddd4c..052279375824 100644
--- a/etc/apmd.conf
+++ b/etc/apmd.conf
@@ -1,6 +1,6 @@
 # apmd Configuration File
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/apmd.conf,v 1.9 2003/12/30 17:40:28 njl Exp $
 #
 
 apm_event SUSPENDREQ {
diff --git a/etc/auth.conf b/etc/auth.conf
index 08b6f7a3271f..989c42b03304 100644
--- a/etc/auth.conf
+++ b/etc/auth.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/auth.conf,v 1.6 2003/07/28 02:28:51 rwatson Exp $
 #
 # Configure some authentication-related defaults.  This file is being
 # gradually subsumed by user class and PAM configuration.
diff --git a/etc/bluetooth/Makefile b/etc/bluetooth/Makefile
index 540dcd5701d9..df128020983e 100644
--- a/etc/bluetooth/Makefile
+++ b/etc/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/10/21 22:22:27 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/Makefile,v 1.1 2003/10/26 19:09:11 emax Exp $
 
 FILESDIR=		/etc/bluetooth
 FILES=			hcsecd.conf hosts protocols
diff --git a/etc/bluetooth/hcsecd.conf b/etc/bluetooth/hcsecd.conf
index 71a22d45655b..70a7ed1027f1 100644
--- a/etc/bluetooth/hcsecd.conf
+++ b/etc/bluetooth/hcsecd.conf
@@ -1,5 +1,5 @@
 # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.2 2004/06/06 11:46:28 schweikh Exp $
 #
 # HCI security daemon configuration file
 #
diff --git a/etc/bluetooth/hosts b/etc/bluetooth/hosts
index 4ad0a0484b90..b3607c79ee70 100644
--- a/etc/bluetooth/hosts
+++ b/etc/bluetooth/hosts
@@ -1,5 +1,5 @@
 # $Id: hosts,v 1.1 2003/05/21 17:48:40 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/hosts,v 1.1 2003/10/12 22:04:18 emax Exp $
 #
 # Bluetooth Host Database
 #
diff --git a/etc/bluetooth/protocols b/etc/bluetooth/protocols
index 222798bb28f1..2a188c330bc8 100644
--- a/etc/bluetooth/protocols
+++ b/etc/bluetooth/protocols
@@ -1,5 +1,5 @@
 # $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/protocols,v 1.1 2003/10/12 22:04:18 emax Exp $
 #
 # Bluetooth Protocol/Service Multiplexor (PSM) names and numbers
 #
diff --git a/etc/crontab b/etc/crontab
index 2e538a823e55..9f5e75c3b659 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,6 +1,6 @@
 # /etc/crontab - root's crontab for FreeBSD
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/crontab,v 1.32 2002/11/22 16:13:39 tom Exp $
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
diff --git a/etc/csh.cshrc b/etc/csh.cshrc
index f4f775ae6ada..14d67e11932a 100644
--- a/etc/csh.cshrc
+++ b/etc/csh.cshrc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $
 #
 # System-wide .cshrc file for csh(1).
diff --git a/etc/csh.login b/etc/csh.login
index 62deb32f86de..9e96c4e04711 100644
--- a/etc/csh.login
+++ b/etc/csh.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.login,v 1.21 2004/06/06 11:46:27 schweikh Exp $
 #
 # System-wide .login file for csh(1).
 # Uncomment this to give you the default 4.2 behavior, where disk
diff --git a/etc/csh.logout b/etc/csh.logout
index 6b0584f49984..7255a0076adb 100644
--- a/etc/csh.logout
+++ b/etc/csh.logout
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.logout,v 1.3 1999/08/27 23:23:41 peter Exp $
 #
 # System-wide .logout file for csh(1).
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile
index 3c613fbfda37..e27ac2bb484a 100644
--- a/etc/defaults/Makefile
+++ b/etc/defaults/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/Makefile,v 1.5 2004/12/21 08:46:49 ru Exp $
 
 FILES=	devfs.rules pccard.conf periodic.conf rc.conf
 NO_OBJ=
diff --git a/etc/defaults/devfs.rules b/etc/defaults/devfs.rules
index d8a77519dd25..675a4e9bb694 100644
--- a/etc/defaults/devfs.rules
+++ b/etc/defaults/devfs.rules
@@ -13,7 +13,7 @@
 # references must include a dollar sign '$' in-front of the
 # name to be expanded properly.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/devfs.rules,v 1.3 2004/01/22 20:53:15 cperciva Exp $
 #
 
 # Very basic and secure ruleset: Hide everything.
diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index b9681c49f7a9..adf4c120693d 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -1,7 +1,7 @@
 #
 # Default PCCARD configuration file
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/pccard.conf,v 1.272 2005/01/11 00:40:00 imp Exp $
 #
 # Please send new entries for this file to imp@freebsd.org.  He likes to
 # review them before they are committed to make sure they are correct for
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index fd0cd1a3959e..76a0055bd900 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -13,7 +13,7 @@
 # For a more detailed explanation of all the periodic.conf variables, please
 # refer to the periodic.conf(5) manual page.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33 2005/01/24 22:21:13 keramida Exp $
 #
 
 # What files override these defaults ?
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index c87751bc0a8d..1e438d80ceb0 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.4 2005/10/08 03:32:53 yar Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
diff --git a/etc/devd.conf b/etc/devd.conf
index 3cd9eee98957..e9073cb3603a 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/devd.conf,v 1.26.2.1 2005/09/03 22:49:22 sam Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
diff --git a/etc/devfs.conf b/etc/devfs.conf
index f7869fe894bb..f32c00252b1b 100644
--- a/etc/devfs.conf
+++ b/etc/devfs.conf
@@ -22,7 +22,7 @@
 #  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #  SUCH DAMAGE.
 #
-#  $FreeBSD$
+#  $FreeBSD: src/etc/devfs.conf,v 1.2 2004/06/06 11:46:27 schweikh Exp $
 
 # These are examples of how to configure devices using /etc/rc.d/devfs.
 # The first parameter is always the action to take, the second is always the
diff --git a/etc/dhclient.conf b/etc/dhclient.conf
index a7639d904aad..5bdbb8b9e875 100644
--- a/etc/dhclient.conf
+++ b/etc/dhclient.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/dhclient.conf,v 1.3 2001/10/27 03:14:37 rwatson Exp $
 #
 #	This file is required by the ISC DHCP client.
 #	See ``man 5 dhclient.conf'' for details.
diff --git a/etc/disktab b/etc/disktab
index 8f002996c13c..85ec02bc0cd8 100644
--- a/etc/disktab
+++ b/etc/disktab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $
 #
 # Disk geometry and partition layout tables.
 # Key:
diff --git a/etc/etc.alpha/ttys b/etc/etc.alpha/ttys
index 0a6551460ae6..59592586a5ce 100644
--- a/etc/etc.alpha/ttys
+++ b/etc/etc.alpha/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.alpha/ttys,v 1.11 2003/10/24 15:44:07 simokawa Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index fe6a7b1c9bed..bc291275cea2 100644
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.amd64/ttys,v 1.10 2003/10/24 15:44:07 simokawa Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.arm/ttys b/etc/etc.arm/ttys
index a1af405acf2c..9c0103de4648 100644
--- a/etc/etc.arm/ttys
+++ b/etc/etc.arm/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.arm/ttys,v 1.2 2004/09/24 12:51:15 cognet Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index fe6a7b1c9bed..ec01a3d6b92b 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.i386/ttys,v 1.10 2003/10/24 15:44:08 simokawa Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.ia64/ttys b/etc/etc.ia64/ttys
index 3eede3b4143e..7bd13f19d982 100644
--- a/etc/etc.ia64/ttys
+++ b/etc/etc.ia64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.ia64/ttys,v 1.5 2004/10/17 22:20:39 marcel Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.powerpc/ttys b/etc/etc.powerpc/ttys
index 0ba19199f6d2..0c7f6925bd00 100644
--- a/etc/etc.powerpc/ttys
+++ b/etc/etc.powerpc/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.1.8.2 2005/09/13 05:59:07 grehan Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.sparc64/ttys b/etc/etc.sparc64/ttys
index 3102486c2342..f80d9d67acc2 100644
--- a/etc/etc.sparc64/ttys
+++ b/etc/etc.sparc64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.11 2005/06/10 23:06:14 marius Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/fbtab b/etc/fbtab
index 83ac65ddcdb8..06d2d61271cb 100644
--- a/etc/fbtab
+++ b/etc/fbtab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/fbtab,v 1.3 1999/09/13 17:09:07 peter Exp $
 #
 #/dev/ttyv0	0600	/dev/console
 #/dev/ttyv0	0600	/dev/pcaudio:/dev/pcaudioctl
diff --git a/etc/ftpusers b/etc/ftpusers
index 064282805580..28c4b63c5767 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/ftpusers,v 1.14 2005/06/07 03:41:19 maxim Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
diff --git a/etc/gettytab b/etc/gettytab
index ed667505f87b..0dc16695e41c 100644
--- a/etc/gettytab
+++ b/etc/gettytab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/gettytab,v 1.22 2004/06/06 11:46:27 schweikh Exp $
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 # Most of the table entries here are just copies of the old getty table,
diff --git a/etc/group b/etc/group
index 99c142e2c458..39f9e36e82da 100644
--- a/etc/group
+++ b/etc/group
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/group,v 1.32 2005/06/06 20:19:56 brooks Exp $
 #
 wheel:*:0:root
 daemon:*:1:
diff --git a/etc/hosts b/etc/hosts
index 2690a9ad48e1..3b84faae084e 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts,v 1.16 2003/01/28 21:29:23 dbaker Exp $
 #
 # Host Database
 #
diff --git a/etc/hosts.allow b/etc/hosts.allow
index 47d57d11f2ac..953f5ea22cc5 100644
--- a/etc/hosts.allow
+++ b/etc/hosts.allow
@@ -1,6 +1,6 @@
 #
 # hosts.allow access control file for "tcp wrapped" applications.
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.allow,v 1.19 2004/08/03 08:58:34 ume Exp $
 #
 # NOTE: The hosts.deny file is deprecated.
 #       Place both 'allow' and 'deny' rules in the hosts.allow file.
diff --git a/etc/hosts.equiv b/etc/hosts.equiv
index d8a71c1ebc7f..7b7adb0e2959 100644
--- a/etc/hosts.equiv
+++ b/etc/hosts.equiv
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.equiv,v 1.4 1999/08/27 23:23:41 peter Exp $
 #
 #localhost
 #my_very_good_friend.domain
diff --git a/etc/hosts.lpd b/etc/hosts.lpd
index b53202ab18e5..7e0233257008 100644
--- a/etc/hosts.lpd
+++ b/etc/hosts.lpd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.lpd,v 1.4 1999/08/27 23:23:42 peter Exp $
 #
 # See lpd(8)
 #machine.domain
diff --git a/etc/inetd.conf b/etc/inetd.conf
index 34e7fc39d1ca..50915970f00b 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/inetd.conf,v 1.70 2005/06/10 20:52:35 nectar Exp $
 #
 # Internet server configuration database
 #
diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile
index d40ef477722c..0b10d1b6c1ab 100644
--- a/etc/isdn/Makefile
+++ b/etc/isdn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/Makefile,v 1.13 2004/12/21 08:46:50 ru Exp $
 
 NO_OBJ=
 
diff --git a/etc/isdn/answer b/etc/isdn/answer
index d39a98331206..36c212f5c4c2 100755
--- a/etc/isdn/answer
+++ b/etc/isdn/answer
@@ -4,7 +4,7 @@
 #	answer script for i4b isdnd
 #	---------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/answer,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:44:38 1999]
 #
diff --git a/etc/isdn/holidays.D b/etc/isdn/holidays.D
index 80b725910846..7a55a2969f77 100644
--- a/etc/isdn/holidays.D
+++ b/etc/isdn/holidays.D
@@ -15,7 +15,7 @@
 #	support for this tariff, see output of "man isdnd.rc" and
 #	search for keyword "valid".
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/holidays.D,v 1.3 2002/04/13 12:23:38 hm Exp $
 #
 #---------------------------------------------------------------------------
 #
diff --git a/etc/isdn/isdnd.rates.A b/etc/isdn/isdnd.rates.A
index fa25b22e9e49..67e3e81c397d 100644
--- a/etc/isdn/isdnd.rates.A
+++ b/etc/isdn/isdnd.rates.A
@@ -5,7 +5,7 @@
 #
 #	$Id: isdnd.rates.A,v 1.2 1999/12/13 21:25:24 hm Exp $
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.A,v 1.1 1999/12/14 21:14:27 hm Exp $
 #
 #	last edit-date: [Mon Dec 13 21:42:02 1999]
 #
diff --git a/etc/isdn/isdnd.rates.D b/etc/isdn/isdnd.rates.D
index 388770ea0770..a8a5bbd3ec0f 100644
--- a/etc/isdn/isdnd.rates.D
+++ b/etc/isdn/isdnd.rates.D
@@ -3,7 +3,7 @@
 #	i4b - Deutsche Telekom charging rates config file
 #	-------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.4 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Sun Jan 17 18:38:29 1999]
 #
diff --git a/etc/isdn/isdnd.rates.F b/etc/isdn/isdnd.rates.F
index 6a73b75f2c42..308cb72ee77e 100644
--- a/etc/isdn/isdnd.rates.F
+++ b/etc/isdn/isdnd.rates.F
@@ -3,7 +3,7 @@
 #	i4b - Tarifs France Telecom
 #	---------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.4 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Thu Mar 19 20:05:18 1998]
 #
diff --git a/etc/isdn/isdnd.rates.L b/etc/isdn/isdnd.rates.L
index d3992b052d38..c7e96f72442f 100644
--- a/etc/isdn/isdnd.rates.L
+++ b/etc/isdn/isdnd.rates.L
@@ -5,7 +5,7 @@
 #
 #	$Id: isdnd.rates.L,v 1.2 1999/12/13 21:25:24 hm Exp $
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.2 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Mon Dec 13 21:42:33 1999]
 #
diff --git a/etc/isdn/isdnd.rates.UK.BT b/etc/isdn/isdnd.rates.UK.BT
index c4d34ec3a6d6..f73bb9c69c70 100644
--- a/etc/isdn/isdnd.rates.UK.BT
+++ b/etc/isdn/isdnd.rates.UK.BT
@@ -3,7 +3,7 @@
 #	i4b - BT charges
 #	-------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.UK.BT,v 1.2 1999/09/13 17:09:08 peter Exp $
 #
 #	Barry A. Scott barry@scottb.demon.co.uk
 #
diff --git a/etc/isdn/isdnd.rc.sample b/etc/isdn/isdnd.rc.sample
index 3878e7c80f06..78a6d41d479b 100644
--- a/etc/isdn/isdnd.rc.sample
+++ b/etc/isdn/isdnd.rc.sample
@@ -3,7 +3,7 @@
 #	example of a configuration file for the isdn daemon
 #	---------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.4 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Sun May 27 09:33:59 2001]
 #
diff --git a/etc/isdn/isdntel.alias.sample b/etc/isdn/isdntel.alias.sample
index c06bc1942a08..bd8178a26fb3 100644
--- a/etc/isdn/isdntel.alias.sample
+++ b/etc/isdn/isdntel.alias.sample
@@ -3,7 +3,7 @@
 #	alias file for the isdntel(1) application
 #	-----------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdntel.alias.sample,v 1.2 1999/08/27 23:23:58 peter Exp $
 #
 #	last edit-date: [Fri Dec 18 18:06:03 1998]
 #
diff --git a/etc/isdn/isdntel.sh b/etc/isdn/isdntel.sh
index 14f528a80927..5ed5fcb331a7 100755
--- a/etc/isdn/isdntel.sh
+++ b/etc/isdn/isdntel.sh
@@ -4,7 +4,7 @@
 #	isdn telephone answering
 #	-------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdntel.sh,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:45:04 1999]
 #
diff --git a/etc/isdn/record b/etc/isdn/record
index 61591fbfe6e6..aec785b895c7 100755
--- a/etc/isdn/record
+++ b/etc/isdn/record
@@ -4,7 +4,7 @@
 #	answer and record message script for i4b isdnd
 #	----------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/record,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:45:10 1999]
 #
diff --git a/etc/isdn/tell b/etc/isdn/tell
index 047c834b51f6..82db77fdd2d9 100755
--- a/etc/isdn/tell
+++ b/etc/isdn/tell
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/tell,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:45:15 1999]
 #
diff --git a/etc/isdn/tell-record b/etc/isdn/tell-record
index ae4c8176de1a..f8e14c691ac6 100755
--- a/etc/isdn/tell-record
+++ b/etc/isdn/tell-record
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/tell-record,v 1.5 2000/10/31 10:00:51 hm Exp $
 #
 #	last edit-date: [Tue Oct 31 10:59:49 2000]
 #
diff --git a/etc/isdn/unknown_incoming b/etc/isdn/unknown_incoming
index 5debe21fe0e0..0ad9aa9fc579 100755
--- a/etc/isdn/unknown_incoming
+++ b/etc/isdn/unknown_incoming
@@ -4,7 +4,7 @@
 #	unknown_incoming - script for isdnd
 #	-----------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/unknown_incoming,v 1.3 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Wed Jan 10 13:40:36 2001]
 #
diff --git a/etc/login.access b/etc/login.access
index ffe5fff0abea..55d031a2afcd 100644
--- a/etc/login.access
+++ b/etc/login.access
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/login.access,v 1.4 2004/06/06 11:46:27 schweikh Exp $
 #
 # Login access control table.
 #
diff --git a/etc/login.conf b/etc/login.conf
index 75cecc82a046..7613c6ed97a9 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -7,7 +7,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/login.conf,v 1.49.8.1 2005/10/08 17:37:29 delphij Exp $
 #
 
 # Default settings effectively disable resource limits, see the
diff --git a/etc/mac.conf b/etc/mac.conf
index 2e1b9a24cf7d..2ada6dd0fbb1 100644
--- a/etc/mac.conf
+++ b/etc/mac.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/mac.conf,v 1.5 2003/11/15 02:08:01 rwatson Exp $
 #
 # TrustedBSD MAC userland policy configuration file.  Kernel modules
 # export label information, and mac.conf indicates to userland
diff --git a/etc/mail/Makefile b/etc/mail/Makefile
index 3f085cc2d780..8604fcb779c3 100644
--- a/etc/mail/Makefile
+++ b/etc/mail/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/Makefile,v 1.36 2004/06/06 17:28:31 gshapiro Exp $
 #
 # This Makefile provides an easy way to generate the configuration
 # file and database maps for the sendmail(8) daemon.
diff --git a/etc/mail/README b/etc/mail/README
index fd7c8f6ed812..d10884995a60 100644
--- a/etc/mail/README
+++ b/etc/mail/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/README,v 1.16 2002/05/22 16:37:29 gshapiro Exp $
 
 		Sendmail Processes
 
diff --git a/etc/mail/access.sample b/etc/mail/access.sample
index 81c7c3f85237..15382b904b15 100644
--- a/etc/mail/access.sample
+++ b/etc/mail/access.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/access.sample,v 1.3 2000/11/02 23:40:40 dirk Exp $
 #
 # Mail relay access control list.  Default is to reject mail unless the
 # destination is local, or listed in /etc/mail/local-host-names
diff --git a/etc/mail/aliases b/etc/mail/aliases
index 682f878f53a8..5eaee62e6364 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/aliases,v 1.21 2005/06/07 03:41:20 maxim Exp $
 #	@(#)aliases	5.3 (Berkeley) 5/24/90
 #
 #  Aliases in this file will NOT be expanded in the header from
diff --git a/etc/mail/mailer.conf b/etc/mail/mailer.conf
index 3fa69223046c..6f63b9008a91 100644
--- a/etc/mail/mailer.conf
+++ b/etc/mail/mailer.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/mailer.conf,v 1.3 2002/04/05 04:25:12 gshapiro Exp $
 #
 # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
 #
diff --git a/etc/mail/mailertable.sample b/etc/mail/mailertable.sample
index d2c45e09c36e..bce93827249a 100644
--- a/etc/mail/mailertable.sample
+++ b/etc/mail/mailertable.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/mailertable.sample,v 1.2 2000/03/18 06:38:22 rwatson Exp $
 #
 # List of domains (possibly wildcarded) and destination mailers
 #
diff --git a/etc/mail/virtusertable.sample b/etc/mail/virtusertable.sample
index 43e2bbbe4103..fb6162ed9c56 100644
--- a/etc/mail/virtusertable.sample
+++ b/etc/mail/virtusertable.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/virtusertable.sample,v 1.3 2000/11/02 23:32:31 dirk Exp $
 #
 # Map one or all usernames at a source hostname to a specific (or the same)
 # username at another target hostname.  Remember to add the source hostname
diff --git a/etc/man.alias b/etc/man.alias
index 0268403efffc..36a2d6246270 100644
--- a/etc/man.alias
+++ b/etc/man.alias
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/man.alias,v 1.2 2001/06/26 00:41:07 ache Exp $
 
 en.ISO8859-15   en.ISO8859-1
 
diff --git a/etc/master.passwd b/etc/master.passwd
index 9af31d13e55a..22a25f9a150f 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/master.passwd,v 1.40 2005/06/06 20:19:56 brooks Exp $
 #
 root::0:0::0:0:Charlie &:/root:/bin/csh
 toor:*:0:0::0:0:Bourne-again Superuser:/root:
diff --git a/etc/mtree/BIND.chroot.dist b/etc/mtree/BIND.chroot.dist
index e41a369a4262..c66788b60d12 100644
--- a/etc/mtree/BIND.chroot.dist
+++ b/etc/mtree/BIND.chroot.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.6 2004/11/04 05:24:29 gshapiro Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BIND.include.dist b/etc/mtree/BIND.include.dist
index 534794af5eb5..b36b416e9150 100644
--- a/etc/mtree/BIND.include.dist
+++ b/etc/mtree/BIND.include.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BIND.include.dist,v 1.1 2004/09/27 08:16:29 dougb Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 64313033c23c..125648642916 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.100.2.1 2005/08/05 20:02:45 pjd Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 966fc028e07a..a9b2880770f4 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.117 2005/06/10 20:14:38 ache Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist
index 952aacea6a94..6b864f04e224 100644
--- a/etc/mtree/BSD.release.dist
+++ b/etc/mtree/BSD.release.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.release.dist,v 1.8 2001/06/26 13:50:32 nik Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index fef6584dbb4d..8408932b73fd 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.74 2005/05/30 20:51:13 rwatson Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.sendmail.dist b/etc/mtree/BSD.sendmail.dist
index 138606b7c44d..a3dc4c62a066 100644
--- a/etc/mtree/BSD.sendmail.dist
+++ b/etc/mtree/BSD.sendmail.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.sendmail.dist,v 1.2 2003/11/29 18:22:01 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 9ecabfa07c19..d6ae1e957e8c 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.312 2005/03/04 14:24:30 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 7586b2aae276..d76066372d71 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.71.2.1 2005/08/15 20:24:07 cperciva Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.x11-4.dist b/etc/mtree/BSD.x11-4.dist
index c324ee6c0448..37a4c8377edc 100644
--- a/etc/mtree/BSD.x11-4.dist
+++ b/etc/mtree/BSD.x11-4.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.27 2005/06/15 02:27:41 lesi Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index ef3378153cba..b878ddd0704d 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.x11.dist,v 1.17 2002/01/22 15:15:38 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 10816e4e7b61..ddfce68b8a39 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/Makefile,v 1.5 2004/12/21 08:46:50 ru Exp $
 
 FILES=	${_BIND.chroot.dist} \
 	${_BIND.include.dist} \
diff --git a/etc/mtree/README b/etc/mtree/README
index 0e803a000c5e..5a88abc81cbb 100644
--- a/etc/mtree/README
+++ b/etc/mtree/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/etc/mtree/README,v 1.7 2002/05/18 12:37:19 ru Exp $
 
 Note: If you modify these files, please keep hier(7) updated!
 
diff --git a/etc/namedb/Makefile b/etc/namedb/Makefile
index 1d240f6a0b72..c509ee9a8d7f 100644
--- a/etc/namedb/Makefile
+++ b/etc/namedb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/namedb/Makefile,v 1.4 2004/12/21 08:46:50 ru Exp $
 
 FILES=	PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
 	make-localhost
diff --git a/etc/namedb/PROTO.localhost-v6.rev b/etc/namedb/PROTO.localhost-v6.rev
index 1616771235d5..4289a4a7fc97 100644
--- a/etc/namedb/PROTO.localhost-v6.rev
+++ b/etc/namedb/PROTO.localhost-v6.rev
@@ -1,5 +1,5 @@
 ;	From: @(#)localhost.rev	5.1 (Berkeley) 6/30/90
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/PROTO.localhost-v6.rev,v 1.1 2002/01/22 17:22:41 ume Exp $
 ;
 ; This file is automatically edited by the `make-localhost' script in
 ; the /etc/namedb directory.
diff --git a/etc/namedb/PROTO.localhost.rev b/etc/namedb/PROTO.localhost.rev
index 046868305455..0bece5c7aaa4 100644
--- a/etc/namedb/PROTO.localhost.rev
+++ b/etc/namedb/PROTO.localhost.rev
@@ -1,5 +1,5 @@
 ;	From: @(#)localhost.rev	5.1 (Berkeley) 6/30/90
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/PROTO.localhost.rev,v 1.6 2000/01/10 15:31:40 peter Exp $
 ;
 ; This file is automatically edited by the `make-localhost' script in
 ; the /etc/namedb directory.
diff --git a/etc/namedb/make-localhost b/etc/namedb/make-localhost
index 60fbe49441ab..aca16abd8030 100755
--- a/etc/namedb/make-localhost
+++ b/etc/namedb/make-localhost
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/namedb/make-localhost,v 1.7 2004/09/28 09:46:00 dougb Exp $
 #
 # make-localhost - edit the appropriate local information into
 # /etc/namedb/localhost.rev
diff --git a/etc/namedb/named.conf b/etc/namedb/named.conf
index 4a7772fe13b0..dfa1874b10d5 100644
--- a/etc/namedb/named.conf
+++ b/etc/namedb/named.conf
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/etc/namedb/named.conf,v 1.21.2.1 2005/09/10 08:27:27 dougb Exp $
 //
 // Refer to the named.conf(5) and named(8) man pages, and the documentation
 // in /usr/share/doc/bind9 for more details.
diff --git a/etc/namedb/named.root b/etc/namedb/named.root
index a6cd043d466c..bcf7e27764d0 100644
--- a/etc/namedb/named.root
+++ b/etc/namedb/named.root
@@ -1,5 +1,5 @@
 ;
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/named.root,v 1.12 2004/06/06 11:46:29 schweikh Exp $
 ;
 
 ;       This file holds the information on root name servers needed to
diff --git a/etc/netconfig b/etc/netconfig
index 109f2e36ad43..4dc463654a12 100644
--- a/etc/netconfig
+++ b/etc/netconfig
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/netconfig,v 1.3 2002/12/16 22:24:25 mbr Exp $
 #
 # The network configuration file. This file is currently only used in
 # conjunction with the (TI-) RPC code in the C library, unlike its
diff --git a/etc/netstart b/etc/netstart
index f5c3878833f9..9b4116f34014 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/netstart,v 1.65 2005/03/26 20:10:24 cperciva Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 #
 
diff --git a/etc/network.subr b/etc/network.subr
index d5a1703670e5..d36c811c02c5 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/network.subr,v 1.164.2.1 2005/09/10 17:05:03 brooks Exp $
 #
 
 #
diff --git a/etc/networks b/etc/networks
index a6b15d4519b7..92982b5b2e10 100644
--- a/etc/networks
+++ b/etc/networks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/networks,v 1.3 1999/08/27 23:23:42 peter Exp $
 #	@(#)networks	5.1 (Berkeley) 6/30/90
 #
 # Your Local Networks Database
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index a1c5f98e9639..575982ee23f1 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -1,5 +1,5 @@
 # configuration file for newsyslog
-# $FreeBSD$
+# $FreeBSD: src/etc/newsyslog.conf,v 1.50 2005/03/02 00:40:55 brooks Exp $
 #
 # Entries which do not specify the '/pid_file' field will cause the
 # syslogd process to be signalled when that log file is rotated.  This
diff --git a/etc/nls.alias b/etc/nls.alias
index 805c34ab6b8a..a13c121394cc 100644
--- a/etc/nls.alias
+++ b/etc/nls.alias
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/nls.alias,v 1.5 2003/06/10 01:22:30 ache Exp $
 
 POSIX                   C
 en_US.US-ASCII          C
diff --git a/etc/nsmb.conf b/etc/nsmb.conf
index e5f225849191..d6f8c224dd19 100644
--- a/etc/nsmb.conf
+++ b/etc/nsmb.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/nsmb.conf,v 1.4 2002/04/22 16:18:36 sheldonh Exp $
 #
 # smbfs lookups configuration files in next order:
 #	1. ~/.nsmbrc
diff --git a/etc/opieaccess b/etc/opieaccess
index ed57ef13a33a..b30bf78df836 100644
--- a/etc/opieaccess
+++ b/etc/opieaccess
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/opieaccess,v 1.4 2003/02/16 13:04:27 des Exp $
 #
 # This file controls whether UNIX passwords are to be permitted.  Rules
 # are matched in order, and the search terminates when the first matching
diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index 19337889af24..1d1f02a10f7b 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/Makefile,v 1.13 2005/06/10 20:52:36 nectar Exp $
 
 NO_OBJ=
 FILES=	README ftpd gdm imap kde login other passwd pop3 \
diff --git a/etc/pam.d/README b/etc/pam.d/README
index 7b8f9582124e..f83dda74b111 100644
--- a/etc/pam.d/README
+++ b/etc/pam.d/README
@@ -59,4 +59,4 @@ particular service and module type may result in surprising behaviour.
 To get the intended semantics, add a "required" entry listing the
 pam_deny module at the end of the chain.
 
-$FreeBSD$
+$FreeBSD: src/etc/pam.d/README,v 1.5 2004/06/06 11:46:29 schweikh Exp $
diff --git a/etc/pam.d/convert.pl b/etc/pam.d/convert.pl
index f4c0676e1c4a..e505237de887 100644
--- a/etc/pam.d/convert.pl
+++ b/etc/pam.d/convert.pl
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/convert.pl,v 1.6 2004/06/06 11:46:29 schweikh Exp $
 #
 
 use strict;
diff --git a/etc/pam.d/ftpd b/etc/pam.d/ftpd
index d248f00ad86f..4234d8aad231 100644
--- a/etc/pam.d/ftpd
+++ b/etc/pam.d/ftpd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "ftpd" service
 #
diff --git a/etc/pam.d/gdm b/etc/pam.d/gdm
index 08391e68a949..f9252f89cd5a 100644
--- a/etc/pam.d/gdm
+++ b/etc/pam.d/gdm
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "gdm" service
 #
diff --git a/etc/pam.d/imap b/etc/pam.d/imap
index cba8af9f9d87..acb76e04171d 100644
--- a/etc/pam.d/imap
+++ b/etc/pam.d/imap
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/imap,v 1.5 2003/03/08 09:50:11 markm Exp $
 #
 # PAM configuration for the "imap" service
 #
diff --git a/etc/pam.d/kde b/etc/pam.d/kde
index 539018363f11..92937c6fdff6 100644
--- a/etc/pam.d/kde
+++ b/etc/pam.d/kde
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "kde" service
 #
diff --git a/etc/pam.d/login b/etc/pam.d/login
index a4c66285adb5..5b67c8e310b9 100644
--- a/etc/pam.d/login
+++ b/etc/pam.d/login
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/login,v 1.16 2003/06/14 12:35:05 des Exp $
 #
 # PAM configuration for the "login" service
 #
diff --git a/etc/pam.d/other b/etc/pam.d/other
index e4ddf7ee4a9f..55eccf68e4f5 100644
--- a/etc/pam.d/other
+++ b/etc/pam.d/other
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "other" service
 #
diff --git a/etc/pam.d/passwd b/etc/pam.d/passwd
index e65508326ab2..37b681f0cfa5 100644
--- a/etc/pam.d/passwd
+++ b/etc/pam.d/passwd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/passwd,v 1.3 2003/04/24 12:22:42 des Exp $
 #
 # PAM configuration for the "passwd" service
 #
diff --git a/etc/pam.d/pop3 b/etc/pam.d/pop3
index 34d6cc055fe9..cdd04631a48d 100644
--- a/etc/pam.d/pop3
+++ b/etc/pam.d/pop3
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/pop3,v 1.5 2003/03/08 09:50:11 markm Exp $
 #
 # PAM configuration for the "pop3" service
 #
diff --git a/etc/pam.d/rsh b/etc/pam.d/rsh
index 02c0048eabf1..a0f7bd959c4e 100644
--- a/etc/pam.d/rsh
+++ b/etc/pam.d/rsh
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/rsh,v 1.5 2003/02/10 00:50:03 des Exp $
 #
 # PAM configuration for the "rsh" service
 #
diff --git a/etc/pam.d/sshd b/etc/pam.d/sshd
index cf3e0f0acd75..e1ba2971dacd 100644
--- a/etc/pam.d/sshd
+++ b/etc/pam.d/sshd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "sshd" service
 #
diff --git a/etc/pam.d/su b/etc/pam.d/su
index 834c27e08b8e..babd642980e5 100644
--- a/etc/pam.d/su
+++ b/etc/pam.d/su
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/su,v 1.16 2003/07/09 18:40:49 des Exp $
 #
 # PAM configuration for the "su" service
 #
diff --git a/etc/pam.d/system b/etc/pam.d/system
index c2f4d8b3fdac..a4ac703d02b3 100644
--- a/etc/pam.d/system
+++ b/etc/pam.d/system
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/system,v 1.1 2003/06/14 12:35:05 des Exp $
 #
 # System-wide defaults
 #
diff --git a/etc/pam.d/telnetd b/etc/pam.d/telnetd
index 3ebee202accb..c0e987b766fe 100644
--- a/etc/pam.d/telnetd
+++ b/etc/pam.d/telnetd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "telnetd" service
 #
diff --git a/etc/pam.d/xdm b/etc/pam.d/xdm
index 0a1c78e148c9..96e5d5e0ced3 100644
--- a/etc/pam.d/xdm
+++ b/etc/pam.d/xdm
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $
 #
 # PAM configuration for the "xdm" service
 #
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 04c6f76f6616..9fcdb4839334 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pccard_ether,v 1.45.2.1 2005/09/10 17:05:04 brooks Exp $
 #
 # pccard_ether interfacename [start|stop]
 #
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile
index 8fb56dff051a..2427cedd2f3c 100644
--- a/etc/periodic/Makefile
+++ b/etc/periodic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/Makefile,v 1.3 2001/12/07 23:57:38 cjc Exp $
 
 SUBDIR=	daily security weekly monthly
 
diff --git a/etc/periodic/Makefile.inc b/etc/periodic/Makefile.inc
index a05341cd8f0b..c57af9abb153 100644
--- a/etc/periodic/Makefile.inc
+++ b/etc/periodic/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.7 2004/12/21 08:46:50 ru Exp $
 
 BINDIR=	/etc/periodic/${.CURDIR:T}
 NO_OBJ=
diff --git a/etc/periodic/daily/100.clean-disks b/etc/periodic/daily/100.clean-disks
index 5884664cd3b3..4494ff2ec94a 100755
--- a/etc/periodic/daily/100.clean-disks
+++ b/etc/periodic/daily/100.clean-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/100.clean-disks,v 1.9 2001/04/25 12:11:54 ru Exp $
 #
 # Remove garbage files more than $daily_clean_disks_days days old
 #
diff --git a/etc/periodic/daily/110.clean-tmps b/etc/periodic/daily/110.clean-tmps
index eef3bc6545b5..611d635e3e07 100755
--- a/etc/periodic/daily/110.clean-tmps
+++ b/etc/periodic/daily/110.clean-tmps
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/110.clean-tmps,v 1.13 2004/02/28 04:58:40 ache Exp $
 #
 # Perform temporary directory cleaning so that long-lived systems
 # don't end up with excessively old files there.
diff --git a/etc/periodic/daily/120.clean-preserve b/etc/periodic/daily/120.clean-preserve
index d5b34a12c385..1e2fef247fd6 100755
--- a/etc/periodic/daily/120.clean-preserve
+++ b/etc/periodic/daily/120.clean-preserve
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/120.clean-preserve,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 # Remove stale files in /var/preserve
 #
diff --git a/etc/periodic/daily/130.clean-msgs b/etc/periodic/daily/130.clean-msgs
index b7890db6d954..cda67e509531 100755
--- a/etc/periodic/daily/130.clean-msgs
+++ b/etc/periodic/daily/130.clean-msgs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/130.clean-msgs,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 # Remove system	messages
 #
diff --git a/etc/periodic/daily/140.clean-rwho b/etc/periodic/daily/140.clean-rwho
index 9645d7e60bf7..753219b5d531 100755
--- a/etc/periodic/daily/140.clean-rwho
+++ b/etc/periodic/daily/140.clean-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/140.clean-rwho,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 # Remove stale files in /var/rwho
 #
diff --git a/etc/periodic/daily/150.clean-hoststat b/etc/periodic/daily/150.clean-hoststat
index 460d1a267908..c330e34c9240 100755
--- a/etc/periodic/daily/150.clean-hoststat
+++ b/etc/periodic/daily/150.clean-hoststat
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.8 2004/01/02 18:50:22 gshapiro Exp $
 #
 # Remove stale persistent host status files
 #
diff --git a/etc/periodic/daily/200.backup-passwd b/etc/periodic/daily/200.backup-passwd
index 5c585aff5f3c..875c4784eeaf 100755
--- a/etc/periodic/daily/200.backup-passwd
+++ b/etc/periodic/daily/200.backup-passwd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/200.backup-passwd,v 1.10 2001/11/14 09:30:01 cjc Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/210.backup-aliases b/etc/periodic/daily/210.backup-aliases
index fe170389ef03..118572cdd759 100755
--- a/etc/periodic/daily/210.backup-aliases
+++ b/etc/periodic/daily/210.backup-aliases
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/210.backup-aliases,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/300.calendar b/etc/periodic/daily/300.calendar
index cc12097162e5..0be139edc4c6 100755
--- a/etc/periodic/daily/300.calendar
+++ b/etc/periodic/daily/300.calendar
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5 2000/09/14 17:19:10 brian Exp $
 #
 # `calendar -a' needs to die. Why? Because it's a bad idea, particular
 # with networked home directories, but also in general.  If you want the
diff --git a/etc/periodic/daily/310.accounting b/etc/periodic/daily/310.accounting
index ceb140c76b9a..f3337e8044f1 100755
--- a/etc/periodic/daily/310.accounting
+++ b/etc/periodic/daily/310.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/310.accounting,v 1.8 2001/05/30 20:23:42 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/330.news b/etc/periodic/daily/330.news
index ec064376d78f..39c727cde8a8 100755
--- a/etc/periodic/daily/330.news
+++ b/etc/periodic/daily/330.news
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/330.news,v 1.4 2000/09/14 17:19:10 brian Exp $
 #
 # Expire news articles
 # (This is present only for backwards compatibility, usually the news
diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks
index 63b2b6bef676..2c79c47b3ab9 100755
--- a/etc/periodic/daily/400.status-disks
+++ b/etc/periodic/daily/400.status-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/400.status-disks,v 1.6 2002/02/13 19:10:07 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/405.status-ata-raid b/etc/periodic/daily/405.status-ata-raid
index f2178390e76c..71c73175b2f4 100644
--- a/etc/periodic/daily/405.status-ata-raid
+++ b/etc/periodic/daily/405.status-ata-raid
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/405.status-ata-raid,v 1.1 2003/10/27 20:14:53 jesper Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/420.status-network b/etc/periodic/daily/420.status-network
index 8399cf720eff..c5b480cd68c3 100755
--- a/etc/periodic/daily/420.status-network
+++ b/etc/periodic/daily/420.status-network
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/420.status-network,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-rwho
index 44761368c933..7cb6eac1c10f 100755
--- a/etc/periodic/daily/430.status-rwho
+++ b/etc/periodic/daily/430.status-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/430.status-rwho,v 1.5 2000/09/14 17:19:10 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/440.status-mailq b/etc/periodic/daily/440.status-mailq
index 0aad05359ebf..f24f0ac2cbe1 100755
--- a/etc/periodic/daily/440.status-mailq
+++ b/etc/periodic/daily/440.status-mailq
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/440.status-mailq,v 1.9 2002/12/07 23:37:44 keramida Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security
index c0eb46c43024..56980fa0b486 100755
--- a/etc/periodic/daily/450.status-security
+++ b/etc/periodic/daily/450.status-security
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/450.status-security,v 1.10 2002/05/17 11:31:45 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/460.status-mail-rejects b/etc/periodic/daily/460.status-mail-rejects
index 2ff96010d140..7a50d80f2b65 100755
--- a/etc/periodic/daily/460.status-mail-rejects
+++ b/etc/periodic/daily/460.status-mail-rejects
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/470.status-named b/etc/periodic/daily/470.status-named
index 5607bfb97bfc..179bf304d4af 100755
--- a/etc/periodic/daily/470.status-named
+++ b/etc/periodic/daily/470.status-named
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/470.status-named,v 1.6 2003/11/07 21:55:35 ru Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/500.queuerun b/etc/periodic/daily/500.queuerun
index f46c24614b2c..24db8c1d3418 100755
--- a/etc/periodic/daily/500.queuerun
+++ b/etc/periodic/daily/500.queuerun
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/500.queuerun,v 1.2 2002/04/10 03:58:39 gshapiro Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/999.local b/etc/periodic/daily/999.local
index 317347526e79..6725009ea061 100755
--- a/etc/periodic/daily/999.local
+++ b/etc/periodic/daily/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/999.local,v 1.5 2001/06/01 16:40:55 dougb Exp $
 #
 # Run the old /etc/daily.local script.  This is really for backwards
 # compatibility more than anything else.
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 04ea0e8a3788..ecc165e71a90 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.12 2003/10/27 20:14:53 jesper Exp $
 
 FILES=	100.clean-disks \
 	110.clean-tmps \
diff --git a/etc/periodic/monthly/200.accounting b/etc/periodic/monthly/200.accounting
index 0be8c326abf5..06e069de8f88 100755
--- a/etc/periodic/monthly/200.accounting
+++ b/etc/periodic/monthly/200.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.10 2002/09/24 18:53:46 ache Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/monthly/999.local b/etc/periodic/monthly/999.local
index 4e7c2b991b90..36b6a1acc47d 100755
--- a/etc/periodic/monthly/999.local
+++ b/etc/periodic/monthly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/999.local,v 1.5 2001/06/01 16:40:57 dougb Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
index c21323058fd2..510affba0552 100644
--- a/etc/periodic/monthly/Makefile
+++ b/etc/periodic/monthly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/Makefile,v 1.3 2002/07/18 12:32:57 ru Exp $
 
 FILES=	200.accounting \
 	999.local
diff --git a/etc/periodic/security/100.chksetuid b/etc/periodic/security/100.chksetuid
index 789914afb303..8daef0343d87 100755
--- a/etc/periodic/security/100.chksetuid
+++ b/etc/periodic/security/100.chksetuid
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8 2005/01/13 15:07:35 glebius Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/200.chkmounts b/etc/periodic/security/200.chkmounts
index 3b72c5282b5a..d7c672e4b2fb 100755
--- a/etc/periodic/security/200.chkmounts
+++ b/etc/periodic/security/200.chkmounts
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $
 #
 
 # Show changes in the way filesystems are mounted
diff --git a/etc/periodic/security/300.chkuid0 b/etc/periodic/security/300.chkuid0
index 32cc16c846c3..0dc38a4a8742 100755
--- a/etc/periodic/security/300.chkuid0
+++ b/etc/periodic/security/300.chkuid0
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/300.chkuid0,v 1.1 2001/12/07 23:57:38 cjc Exp $
 #
 
 
diff --git a/etc/periodic/security/400.passwdless b/etc/periodic/security/400.passwdless
index 42ece0453ccd..21ca29781210 100755
--- a/etc/periodic/security/400.passwdless
+++ b/etc/periodic/security/400.passwdless
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/400.passwdless,v 1.1 2001/12/07 23:57:38 cjc Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/500.ipfwdenied b/etc/periodic/security/500.ipfwdenied
index 6a6fb8b4f6a6..4b76adf2f828 100755
--- a/etc/periodic/security/500.ipfwdenied
+++ b/etc/periodic/security/500.ipfwdenied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.6 2005/02/23 15:07:36 ssouhlal Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/510.ipfdenied b/etc/periodic/security/510.ipfdenied
index 2058d2b1cb94..c420293ecce8 100644
--- a/etc/periodic/security/510.ipfdenied
+++ b/etc/periodic/security/510.ipfdenied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.2 2003/06/30 22:06:26 mtm Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/520.pfdenied b/etc/periodic/security/520.pfdenied
index 5e5139363028..6c25cb0195ea 100644
--- a/etc/periodic/security/520.pfdenied
+++ b/etc/periodic/security/520.pfdenied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/520.pfdenied,v 1.1 2004/11/24 18:41:53 mlaier Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/550.ipfwlimit b/etc/periodic/security/550.ipfwlimit
index 6c2e1a04014a..214f2e037c3b 100755
--- a/etc/periodic/security/550.ipfwlimit
+++ b/etc/periodic/security/550.ipfwlimit
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.7.2.2 2005/09/13 14:31:34 maxim Exp $
 #
 
 # Show ipfw rules which have reached the log limit
diff --git a/etc/periodic/security/600.ip6fwdenied b/etc/periodic/security/600.ip6fwdenied
index 418ba1756338..12300cf4dec7 100755
--- a/etc/periodic/security/600.ip6fwdenied
+++ b/etc/periodic/security/600.ip6fwdenied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/610.ipf6denied b/etc/periodic/security/610.ipf6denied
index 6c64d92eee7e..be2b9dfd9382 100644
--- a/etc/periodic/security/610.ipf6denied
+++ b/etc/periodic/security/610.ipf6denied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/610.ipf6denied,v 1.1 2004/04/20 13:44:57 darrenr Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/650.ip6fwlimit b/etc/periodic/security/650.ip6fwlimit
index eaf4b10ec69f..f0770548c4e6 100755
--- a/etc/periodic/security/650.ip6fwlimit
+++ b/etc/periodic/security/650.ip6fwlimit
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $
 #
 
 # Show ip6fw rules which have reached the log limit
diff --git a/etc/periodic/security/700.kernelmsg b/etc/periodic/security/700.kernelmsg
index fb5ed633f461..94eff501966e 100755
--- a/etc/periodic/security/700.kernelmsg
+++ b/etc/periodic/security/700.kernelmsg
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.7 2002/11/16 14:57:12 thomas Exp $
 #
 
 # Show kernel log messages
diff --git a/etc/periodic/security/800.loginfail b/etc/periodic/security/800.loginfail
index dd02a4e4e791..945fcfd9ff16 100755
--- a/etc/periodic/security/800.loginfail
+++ b/etc/periodic/security/800.loginfail
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.5 2003/01/05 21:32:50 se Exp $
 #
 
 # Show login failures
diff --git a/etc/periodic/security/900.tcpwrap b/etc/periodic/security/900.tcpwrap
index 55f77099bb7c..705075267951 100755
--- a/etc/periodic/security/900.tcpwrap
+++ b/etc/periodic/security/900.tcpwrap
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/900.tcpwrap,v 1.3 2003/01/05 21:32:50 se Exp $
 #
 
 # Show tcp_wrapper warning messages
diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile
index f8f405fdffe6..75cfc7853237 100644
--- a/etc/periodic/security/Makefile
+++ b/etc/periodic/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/Makefile,v 1.4 2004/11/24 18:41:53 mlaier Exp $
 
 FILES=	100.chksetuid \
 	200.chkmounts \
diff --git a/etc/periodic/security/security.functions b/etc/periodic/security/security.functions
index f5b8dcd203d4..e8d63138a1bf 100644
--- a/etc/periodic/security/security.functions
+++ b/etc/periodic/security/security.functions
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/security.functions,v 1.4.2.1 2005/08/25 19:07:28 cperciva Exp $
 #
 
 #
diff --git a/etc/periodic/weekly/120.clean-kvmdb b/etc/periodic/weekly/120.clean-kvmdb
index 603e70b0d017..50b1fbd601d5 100755
--- a/etc/periodic/weekly/120.clean-kvmdb
+++ b/etc/periodic/weekly/120.clean-kvmdb
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/120.clean-kvmdb,v 1.6 2000/09/14 17:19:13 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/310.locate b/etc/periodic/weekly/310.locate
index e6921ab56e82..374880e15506 100755
--- a/etc/periodic/weekly/310.locate
+++ b/etc/periodic/weekly/310.locate
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.6 2000/09/14 17:19:13 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/320.whatis b/etc/periodic/weekly/320.whatis
index dfc218ae008c..5dacbe8de15d 100755
--- a/etc/periodic/weekly/320.whatis
+++ b/etc/periodic/weekly/320.whatis
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/320.whatis,v 1.8 2001/03/02 16:52:09 ru Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/330.catman b/etc/periodic/weekly/330.catman
index e810fcb9645b..9d7f92a6989c 100755
--- a/etc/periodic/weekly/330.catman
+++ b/etc/periodic/weekly/330.catman
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/330.catman,v 1.10 2005/03/30 18:02:49 ru Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/340.noid b/etc/periodic/weekly/340.noid
index 11a5f53ea25d..bc86bfc87a90 100644
--- a/etc/periodic/weekly/340.noid
+++ b/etc/periodic/weekly/340.noid
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/340.noid,v 1.5 2001/05/31 09:53:53 dougb Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/400.status-pkg b/etc/periodic/weekly/400.status-pkg
index 785c2fffd756..2141b77677ac 100755
--- a/etc/periodic/weekly/400.status-pkg
+++ b/etc/periodic/weekly/400.status-pkg
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/400.status-pkg,v 1.9 2004/05/19 09:18:08 joe Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/999.local b/etc/periodic/weekly/999.local
index 3951bb584d27..1a34e722889b 100755
--- a/etc/periodic/weekly/999.local
+++ b/etc/periodic/weekly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/999.local,v 1.6 2001/06/01 16:40:57 dougb Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index 090fa6bdcd8e..21b2e44cf297 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.8 2002/07/18 12:33:01 ru Exp $
 
 FILES=	120.clean-kvmdb \
 	310.locate \
diff --git a/etc/pf.conf b/etc/pf.conf
index d79f87e64e22..fb42ee24c7cf 100644
--- a/etc/pf.conf
+++ b/etc/pf.conf
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $
 #	$OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $
 #
 # See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
diff --git a/etc/pf.os b/etc/pf.os
index a0d1b79f352d..960a6790c741 100644
--- a/etc/pf.os
+++ b/etc/pf.os
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/pf.os,v 1.3 2004/09/14 00:30:14 mlaier Exp $
 # $OpenBSD: pf.os,v 1.17 2004/04/28 01:01:27 deraadt Exp $
 # passive OS fingerprinting
 # -------------------------
diff --git a/etc/phones b/etc/phones
index 536ac2019597..205488664d16 100644
--- a/etc/phones
+++ b/etc/phones
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/phones,v 1.8 1999/08/27 23:23:43 peter Exp $
 #	From: @(#)phones	5.2 (Berkeley) 6/30/90
 #
 # phones -- remote host phone number data base
diff --git a/etc/portsnap.conf b/etc/portsnap.conf
index 665061e776d3..cfe7834ed848 100644
--- a/etc/portsnap.conf
+++ b/etc/portsnap.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/portsnap.conf,v 1.1.2.1 2005/08/15 20:24:07 cperciva Exp $
 
 # Default directory where compressed snapshots are stored.
 # WORKDIR=/var/db/portsnap
diff --git a/etc/ppp/ppp.conf b/etc/ppp/ppp.conf
index 4ddbda504eee..4aec9b65ffd9 100644
--- a/etc/ppp/ppp.conf
+++ b/etc/ppp/ppp.conf
@@ -5,7 +5,7 @@
 #
 # See /usr/share/examples/ppp/ for some examples
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/ppp/ppp.conf,v 1.10 2004/11/19 17:12:56 obrien Exp $
 #################################################################
 
 default:
diff --git a/etc/printcap b/etc/printcap
index 5319a0ec2b93..1b768da96489 100644
--- a/etc/printcap
+++ b/etc/printcap
@@ -1,5 +1,5 @@
 #	@(#)printcap	5.3 (Berkeley) 6/30/90
-# $FreeBSD$
+# $FreeBSD: src/etc/printcap,v 1.14 2004/06/06 11:46:27 schweikh Exp $
 
 #
 # This enables a simple local "raw" printer, hooked up to the first
diff --git a/etc/profile b/etc/profile
index 665b61a36aed..631ebeef6bbe 100644
--- a/etc/profile
+++ b/etc/profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/profile,v 1.14 2004/06/06 11:46:27 schweikh Exp $
 #
 # System-wide .profile file for sh(1).
 #
diff --git a/etc/protocols b/etc/protocols
index 7c3654f17969..798a5c8eb900 100644
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet protocols
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/protocols,v 1.20 2005/02/22 13:04:02 glebius Exp $
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # See also http://www.iana.org/assignments/protocol-numbers
diff --git a/etc/rc b/etc/rc
index bc2e6f906cff..df9d4187cfd6 100644
--- a/etc/rc
+++ b/etc/rc
@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)rc	5.27 (Berkeley) 6/5/91
-# $FreeBSD$
+# $FreeBSD: src/etc/rc,v 1.336 2005/04/29 23:02:56 brooks Exp $
 #
 
 # System startup script run by init on autoboot
diff --git a/etc/rc.bsdextended b/etc/rc.bsdextended
index 69ecd545cf23..d374b4d6075a 100644
--- a/etc/rc.bsdextended
+++ b/etc/rc.bsdextended
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.bsdextended,v 1.1 2004/09/29 00:12:28 trhodes Exp $
 #
 
 ####
diff --git a/etc/rc.d/DAEMON b/etc/rc.d/DAEMON
index 95413803018b..327fe2baa24e 100755
--- a/etc/rc.d/DAEMON
+++ b/etc/rc.d/DAEMON
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: DAEMON
diff --git a/etc/rc.d/LOGIN b/etc/rc.d/LOGIN
index bf84a33fadcd..513f38f86ba1 100755
--- a/etc/rc.d/LOGIN
+++ b/etc/rc.d/LOGIN
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: LOGIN
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index e5835f761abb..ef3e878ff289 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.53.2.2 2005/10/08 03:32:53 yar Exp $
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
index d74c0b13f081..8a56fc49a64d 100644
--- a/etc/rc.d/NETWORKING
+++ b/etc/rc.d/NETWORKING
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.9 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: NETWORKING NETWORK
diff --git a/etc/rc.d/SERVERS b/etc/rc.d/SERVERS
index 48b19a51298d..253429e4daba 100755
--- a/etc/rc.d/SERVERS
+++ b/etc/rc.d/SERVERS
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/SERVERS,v 1.5 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: SERVERS
diff --git a/etc/rc.d/abi b/etc/rc.d/abi
index 53c54472b3d1..15ac2a19e644 100644
--- a/etc/rc.d/abi
+++ b/etc/rc.d/abi
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/abi,v 1.4 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: abi
diff --git a/etc/rc.d/accounting b/etc/rc.d/accounting
index 777555db474b..8142632dc225 100755
--- a/etc/rc.d/accounting
+++ b/etc/rc.d/accounting
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/accounting,v 1.9 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: accounting
diff --git a/etc/rc.d/addswap b/etc/rc.d/addswap
index 8213a9077cdd..5814129b423a 100644
--- a/etc/rc.d/addswap
+++ b/etc/rc.d/addswap
@@ -2,7 +2,7 @@
 #
 # Add additional swap files
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/addswap,v 1.4 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: addswap
diff --git a/etc/rc.d/adjkerntz b/etc/rc.d/adjkerntz
index b420653daed6..9803908105f6 100644
--- a/etc/rc.d/adjkerntz
+++ b/etc/rc.d/adjkerntz
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.5 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: adjkerntz
diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index 57218d5e81cc..628b8b623a4d 100755
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/amd,v 1.15 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: amd
diff --git a/etc/rc.d/apm b/etc/rc.d/apm
index 3d15701956ed..c5230f76a273 100644
--- a/etc/rc.d/apm
+++ b/etc/rc.d/apm
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/apm,v 1.6 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: apm
diff --git a/etc/rc.d/apmd b/etc/rc.d/apmd
index 22410e139727..919a17ab480c 100755
--- a/etc/rc.d/apmd
+++ b/etc/rc.d/apmd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: apmd
diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep
index da93e8ba860c..e6051a640908 100644
--- a/etc/rc.d/archdep
+++ b/etc/rc.d/archdep
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/archdep,v 1.7 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: archdep
diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1
index dc91700ed241..5c6b8171d2d8 100644
--- a/etc/rc.d/atm1
+++ b/etc/rc.d/atm1
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/atm1,v 1.15 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: atm1
diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2
index ffb63c35aef5..a13a5a4ae32a 100644
--- a/etc/rc.d/atm2
+++ b/etc/rc.d/atm2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/atm2,v 1.16 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: atm2
diff --git a/etc/rc.d/atm3 b/etc/rc.d/atm3
index 4dbd128b8e85..9effa00ee6d6 100644
--- a/etc/rc.d/atm3
+++ b/etc/rc.d/atm3
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/atm3,v 1.14 2004/10/07 13:55:25 mtm Exp $
 #
 
 # Start ATM daemons
diff --git a/etc/rc.d/bgfsck b/etc/rc.d/bgfsck
index 4b41bcd7face..761796807dbc 100644
--- a/etc/rc.d/bgfsck
+++ b/etc/rc.d/bgfsck
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bgfsck,v 1.6 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: bgfsck
diff --git a/etc/rc.d/bootconf.sh b/etc/rc.d/bootconf.sh
index 24803bcaeecf..bca48d3db193 100755
--- a/etc/rc.d/bootconf.sh
+++ b/etc/rc.d/bootconf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: bootconf.sh,v 1.5 2002/03/25 03:22:10 wiz Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.4 2002/10/12 10:31:31 schweikh Exp $
 #
 
 # PROVIDE: bootconf
diff --git a/etc/rc.d/bootparams b/etc/rc.d/bootparams
index bcef34651bdf..f0bae966ae5d 100755
--- a/etc/rc.d/bootparams
+++ b/etc/rc.d/bootparams
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: bootparams
diff --git a/etc/rc.d/bsnmpd b/etc/rc.d/bsnmpd
index e266c3ba448f..e2e10621c3f9 100644
--- a/etc/rc.d/bsnmpd
+++ b/etc/rc.d/bsnmpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bsnmpd,v 1.1 2005/04/17 10:47:58 glebius Exp $
 #
 
 # PROVIDE: bsnmpd
diff --git a/etc/rc.d/ccd b/etc/rc.d/ccd
index ce58ac72cebe..b406add4033c 100755
--- a/etc/rc.d/ccd
+++ b/etc/rc.d/ccd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar
index 8178feffad88..2163d599a09d 100644
--- a/etc/rc.d/cleanvar
+++ b/etc/rc.d/cleanvar
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/cleanvar,v 1.8.2.1 2005/08/16 08:41:30 pjd Exp $
 #
 
 # PROVIDE: cleanvar
diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp
index bacc235cc9d2..7b7979344722 100755
--- a/etc/rc.d/cleartmp
+++ b/etc/rc.d/cleartmp
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/cleartmp,v 1.12 2005/01/12 07:18:25 anholt Exp $
 #
 
 # PROVIDE: cleartmp
diff --git a/etc/rc.d/cron b/etc/rc.d/cron
index d053f324ba05..e6ea2c3828c1 100755
--- a/etc/rc.d/cron
+++ b/etc/rc.d/cron
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: cron
diff --git a/etc/rc.d/devd b/etc/rc.d/devd
index c282f3b1d0a2..c67d694fca10 100644
--- a/etc/rc.d/devd
+++ b/etc/rc.d/devd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/devd,v 1.7 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: devd
diff --git a/etc/rc.d/devfs b/etc/rc.d/devfs
index d74e988e4efd..415471af646a 100644
--- a/etc/rc.d/devfs
+++ b/etc/rc.d/devfs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/devfs,v 1.10 2004/10/23 06:50:50 mtm Exp $
 #
 
 # PROVIDE: devfs
diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient
index ca3aece92017..62536d7bf122 100755
--- a/etc/rc.d/dhclient
+++ b/etc/rc.d/dhclient
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.20.2.1 2005/07/29 23:36:28 brooks Exp $
 #
 
 # PROVIDE: dhclient
diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg
index b6fb05a27ac2..84b6123fd228 100755
--- a/etc/rc.d/dmesg
+++ b/etc/rc.d/dmesg
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dmesg,v 1.5 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: dmesg
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index 7697eab20400..eeb73eb59f98 100644
--- a/etc/rc.d/dumpon
+++ b/etc/rc.d/dumpon
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dumpon,v 1.9.2.1 2005/09/20 13:28:01 rwatson Exp $
 #
 
 # PROVIDE: dumpon
diff --git a/etc/rc.d/early.sh b/etc/rc.d/early.sh
index aaebe33e234a..a4dddd2101d1 100644
--- a/etc/rc.d/early.sh
+++ b/etc/rc.d/early.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/early.sh,v 1.2 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: early
diff --git a/etc/rc.d/encswap b/etc/rc.d/encswap
index 622199869d1c..8c3e8a3d723f 100644
--- a/etc/rc.d/encswap
+++ b/etc/rc.d/encswap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/encswap,v 1.8.2.1 2005/08/16 09:04:55 pjd Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/fsck b/etc/rc.d/fsck
index 7d329d28c258..5bdfaa993e93 100755
--- a/etc/rc.d/fsck
+++ b/etc/rc.d/fsck
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/fsck,v 1.10 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: fsck
diff --git a/etc/rc.d/gbde b/etc/rc.d/gbde
index 6117b86ea617..d17feb602605 100644
--- a/etc/rc.d/gbde
+++ b/etc/rc.d/gbde
@@ -3,7 +3,7 @@
 # This file, originally written by Garrett A. Wollman, is in the public
 # domain.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/gbde,v 1.12.2.1 2005/08/16 08:39:36 pjd Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/geli b/etc/rc.d/geli
index a5d959dddca9..356aec17796b 100644
--- a/etc/rc.d/geli
+++ b/etc/rc.d/geli
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/geli,v 1.2.2.1 2005/08/16 09:20:32 pjd Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/geli2 b/etc/rc.d/geli2
index a7802b3922c2..8bf6d56cf634 100644
--- a/etc/rc.d/geli2
+++ b/etc/rc.d/geli2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/geli2,v 1.1.2.1 2005/08/16 09:20:32 pjd Exp $
 #
 
 # PROVIDE: geli2
diff --git a/etc/rc.d/hostname b/etc/rc.d/hostname
index 3db4e770d0a7..22e6084134f1 100644
--- a/etc/rc.d/hostname
+++ b/etc/rc.d/hostname
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: hostname
diff --git a/etc/rc.d/ike b/etc/rc.d/ike
index 267113ea1cc5..6a4a1f4cc09e 100644
--- a/etc/rc.d/ike
+++ b/etc/rc.d/ike
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ike,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ike
diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd
index 4944d6aa5789..3af6d6e917ba 100755
--- a/etc/rc.d/inetd
+++ b/etc/rc.d/inetd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/inetd,v 1.5 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: inetd
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
index 2c8dc525f98d..e24af2de61f0 100644
--- a/etc/rc.d/initrandom
+++ b/etc/rc.d/initrandom
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.5 2005/03/02 19:03:08 brooks Exp $
 #
 
 # PROVIDE: initrandom
diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl
index 910580ed238c..bc716ea5f359 100644
--- a/etc/rc.d/ip6addrctl
+++ b/etc/rc.d/ip6addrctl
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ip6addrctl
diff --git a/etc/rc.d/ip6fw b/etc/rc.d/ip6fw
index 36aa29503262..ffa4bfd820e8 100644
--- a/etc/rc.d/ip6fw
+++ b/etc/rc.d/ip6fw
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ip6fw,v 1.6 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ip6fw
diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter
index 3d9164174411..54b14a15c31f 100755
--- a/etc/rc.d/ipfilter
+++ b/etc/rc.d/ipfilter
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.24 2005/07/07 05:59:44 jkim Exp $
 #
 
 # PROVIDE: ipfilter
diff --git a/etc/rc.d/ipfs b/etc/rc.d/ipfs
index 0adddacf4462..5ad57c1d7135 100755
--- a/etc/rc.d/ipfs
+++ b/etc/rc.d/ipfs
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipfs,v 1.6 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ipfs
diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw
index 90636c2c56fe..4dabbb4f0675 100644
--- a/etc/rc.d/ipfw
+++ b/etc/rc.d/ipfw
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.10 2005/03/16 08:47:48 ru Exp $
 #
 
 # PROVIDE: ipfw
diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon
index 271b99dbc733..46ecea8350ef 100755
--- a/etc/rc.d/ipmon
+++ b/etc/rc.d/ipmon
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipmon,v 1.13 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ipmon
diff --git a/etc/rc.d/ipnat b/etc/rc.d/ipnat
index 4298f8e5726e..8e1c2caf5fa5 100755
--- a/etc/rc.d/ipnat
+++ b/etc/rc.d/ipnat
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipnat,v 1.14 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ipnat
diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec
index 788ff3a01bf8..3cc1827c5464 100755
--- a/etc/rc.d/ipsec
+++ b/etc/rc.d/ipsec
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipsec,v 1.11 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ipsec
diff --git a/etc/rc.d/ipxrouted b/etc/rc.d/ipxrouted
index 04d3586daa39..8808b1f7be70 100644
--- a/etc/rc.d/ipxrouted
+++ b/etc/rc.d/ipxrouted
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipxrouted,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ipxrouted
diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd
index 7ed1628efe7a..c6df7b87fa16 100644
--- a/etc/rc.d/isdnd
+++ b/etc/rc.d/isdnd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/isdnd,v 1.20 2005/01/16 03:12:03 obrien Exp $
 #
 # Mostly based on original script (/etc/rc.isdn) written by  Hellmuth Michaelis
 #
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 1281bb52b09a..5eae0ce658d9 100644
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/jail,v 1.23.2.2 2005/08/16 08:43:06 pjd Exp $
 #
 
 # PROVIDE: jail
diff --git a/etc/rc.d/kadmind b/etc/rc.d/kadmind
index 1e07938ffcd6..2f2295b2fa83 100644
--- a/etc/rc.d/kadmind
+++ b/etc/rc.d/kadmind
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kadmind,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: kadmin
diff --git a/etc/rc.d/kerberos b/etc/rc.d/kerberos
index cdd6a0019add..d808bd3f1398 100644
--- a/etc/rc.d/kerberos
+++ b/etc/rc.d/kerberos
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kerberos,v 1.4.2.1 2005/09/25 18:45:56 rwatson Exp $
 #
 
 # PROVIDE: kerberos
diff --git a/etc/rc.d/keyserv b/etc/rc.d/keyserv
index 6be21278e537..34205ca8b4c6 100644
--- a/etc/rc.d/keyserv
+++ b/etc/rc.d/keyserv
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/keyserv,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # Start keyserv if we are running Secure RPC
diff --git a/etc/rc.d/kldxref b/etc/rc.d/kldxref
index 866321396379..ce12d958a6d1 100644
--- a/etc/rc.d/kldxref
+++ b/etc/rc.d/kldxref
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kldxref,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: kldxref
diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd
index d7f40ac4ad7d..a581734af59a 100644
--- a/etc/rc.d/kpasswdd
+++ b/etc/rc.d/kpasswdd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: kpasswdd
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 96de36348919..e2953fcccdb1 100755
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.14 2005/01/16 08:34:30 obrien Exp $
 #
 
 # PROVIDE: ldconfig
diff --git a/etc/rc.d/local b/etc/rc.d/local
index da163f6d9cbb..9e82422730d6 100755
--- a/etc/rc.d/local
+++ b/etc/rc.d/local
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/local,v 1.6 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: local
diff --git a/etc/rc.d/localpkg b/etc/rc.d/localpkg
index c4ade879024b..6eb34ed39b56 100644
--- a/etc/rc.d/localpkg
+++ b/etc/rc.d/localpkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/localpkg,v 1.5.2.1 2005/10/07 17:20:35 brooks Exp $
 #
 
 # PROVIDE: localpkg
diff --git a/etc/rc.d/lpd b/etc/rc.d/lpd
index dc2c3f35200d..11c12148ce36 100755
--- a/etc/rc.d/lpd
+++ b/etc/rc.d/lpd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/lpd,v 1.7 2005/03/02 02:46:47 brooks Exp $
 #
 
 # PROVIDE: lpd
diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer
index 948292a4857e..819b14f94a72 100644
--- a/etc/rc.d/mixer
+++ b/etc/rc.d/mixer
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mixer,v 1.5 2005/03/17 22:36:16 njl Exp $
 #
 
 # PROVIDE: mixer
diff --git a/etc/rc.d/motd b/etc/rc.d/motd
index 2b675b51409a..ad8ede342be4 100755
--- a/etc/rc.d/motd
+++ b/etc/rc.d/motd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/motd,v 1.9 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: motd
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 49f1ba9bdef8..2178a0586f89 100755
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.12 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: mountcritlocal
diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote
index 4b3d2f9a36b6..6b950db02a8e 100755
--- a/etc/rc.d/mountcritremote
+++ b/etc/rc.d/mountcritremote
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.11 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: mountcritremote
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd
index 438945126167..ce40be6c77ad 100755
--- a/etc/rc.d/mountd
+++ b/etc/rc.d/mountd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountd,v 1.15.2.1 2005/09/21 20:27:50 rodrigc Exp $
 #
 
 # PROVIDE: mountd
diff --git a/etc/rc.d/moused b/etc/rc.d/moused
index ed9070391358..52dce84f9c43 100644
--- a/etc/rc.d/moused
+++ b/etc/rc.d/moused
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/moused,v 1.9 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: moused
diff --git a/etc/rc.d/mroute6d b/etc/rc.d/mroute6d
index d733092df145..63ac345bc6f8 100644
--- a/etc/rc.d/mroute6d
+++ b/etc/rc.d/mroute6d
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mroute6d,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: mroute6d
diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted
index 79e369373b61..8a271b1a1f3c 100755
--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mrouted,v 1.9 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: mrouted
diff --git a/etc/rc.d/msgs b/etc/rc.d/msgs
index 6031acc7337d..3b578195a5f1 100644
--- a/etc/rc.d/msgs
+++ b/etc/rc.d/msgs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/msgs,v 1.2 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: msgs
diff --git a/etc/rc.d/named b/etc/rc.d/named
index 2b91396a896b..c087153d44c2 100755
--- a/etc/rc.d/named
+++ b/etc/rc.d/named
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/named,v 1.22 2005/05/23 12:25:33 pjd Exp $
 #
 
 # PROVIDE: named
diff --git a/etc/rc.d/natd b/etc/rc.d/natd
index 60e9e15f687b..d7b13d6b7153 100644
--- a/etc/rc.d/natd
+++ b/etc/rc.d/natd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/natd,v 1.3 2004/10/22 19:36:03 andre Exp $
 #
 
 # PROVIDE: natd
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index b692ee3e7fc5..5471117b95fe 100644
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -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/etc/rc.d/netif,v 1.14.2.1 2005/09/10 17:05:04 brooks Exp $
 #
 
 # PROVIDE: netif
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index f9329644decb..1dc1e192c8f0 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.141 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: netoptions
diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index d47416449778..3a278fcf5c3a 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm Exp $
 # 	From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43
 #
 
diff --git a/etc/rc.d/newsyslog b/etc/rc.d/newsyslog
index 9c4ed18aaf89..2d2205fe8740 100755
--- a/etc/rc.d/newsyslog
+++ b/etc/rc.d/newsyslog
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: newsyslog,v 1.5 2002/03/24 15:51:26 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/newsyslog,v 1.3 2005/03/02 00:40:55 brooks Exp $
 #
 
 # PROVIDE: newsyslog
diff --git a/etc/rc.d/nfsclient b/etc/rc.d/nfsclient
index b6d4bf1af04c..c5b463eb0982 100644
--- a/etc/rc.d/nfsclient
+++ b/etc/rc.d/nfsclient
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nfsclient,v 1.5 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: nfsclient
diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd
index 62b3e7cfc0cb..bedd517f9f9d 100755
--- a/etc/rc.d/nfsd
+++ b/etc/rc.d/nfsd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nfsd,v 1.13 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: nfsd
diff --git a/etc/rc.d/nfslocking b/etc/rc.d/nfslocking
index f8a77e8afa7a..0b92c756e063 100755
--- a/etc/rc.d/nfslocking
+++ b/etc/rc.d/nfslocking
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: nfslocking
diff --git a/etc/rc.d/nfsserver b/etc/rc.d/nfsserver
index 76531ffd7921..aa4f65a2bf62 100644
--- a/etc/rc.d/nfsserver
+++ b/etc/rc.d/nfsserver
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nfsserver,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: nfsserver
diff --git a/etc/rc.d/nisdomain b/etc/rc.d/nisdomain
index a24f107d1513..0f84c87af5a1 100644
--- a/etc/rc.d/nisdomain
+++ b/etc/rc.d/nisdomain
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nisdomain,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: nisdomain
diff --git a/etc/rc.d/nsswitch b/etc/rc.d/nsswitch
index 3ba233b00fb5..111523c044c3 100644
--- a/etc/rc.d/nsswitch
+++ b/etc/rc.d/nsswitch
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nsswitch,v 1.5 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: nsswitch
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index 407b307d7a1d..205bf7cbdb24 100755
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ntpd,v 1.11 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: ntpd
diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate
index 96adcbabb53a..4e571eb92ff6 100755
--- a/etc/rc.d/ntpdate
+++ b/etc/rc.d/ntpdate
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ntpdate,v 1.8 2002/03/22 04:16:39 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ntpdate,v 1.13 2005/01/17 18:28:09 ceri Exp $
 #
 
 # BEFORE: ntpd
diff --git a/etc/rc.d/othermta b/etc/rc.d/othermta
index 7ab3e63649ac..467953c149d9 100644
--- a/etc/rc.d/othermta
+++ b/etc/rc.d/othermta
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/othermta,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: mail
diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
index 67604bd066f8..583431486b33 100644
--- a/etc/rc.d/pccard
+++ b/etc/rc.d/pccard
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pccard,v 1.30 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: pccard
diff --git a/etc/rc.d/pcvt b/etc/rc.d/pcvt
index dd84b0fcebff..407154b1f517 100644
--- a/etc/rc.d/pcvt
+++ b/etc/rc.d/pcvt
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pcvt,v 1.5 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: pcvt
diff --git a/etc/rc.d/pf b/etc/rc.d/pf
index 8db398750471..ea31ea6c14e2 100644
--- a/etc/rc.d/pf
+++ b/etc/rc.d/pf
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pf,v 1.7.2.1 2005/10/08 03:32:53 yar Exp $
 #
 
 # PROVIDE: pf
diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog
index 4adbdfc818c4..030bfb5a01e9 100644
--- a/etc/rc.d/pflog
+++ b/etc/rc.d/pflog
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pflog,v 1.5 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: pflog
diff --git a/etc/rc.d/pfsync b/etc/rc.d/pfsync
index 8d490421c163..4bbf0bd809f5 100644
--- a/etc/rc.d/pfsync
+++ b/etc/rc.d/pfsync
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pfsync,v 1.1.2.1 2005/10/08 03:32:54 yar Exp $
 #
 
 # PROVIDE: pfsync
diff --git a/etc/rc.d/power_profile b/etc/rc.d/power_profile
index dbc7aa3e5c96..e386bb4e9b35 100644
--- a/etc/rc.d/power_profile
+++ b/etc/rc.d/power_profile
@@ -5,7 +5,7 @@
 #
 # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance)
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/power_profile,v 1.7 2005/02/26 20:17:07 njl Exp $
 #
 
 # PROVIDE: power_profile
diff --git a/etc/rc.d/powerd b/etc/rc.d/powerd
index 2c0e7966e8e7..c921841c11f7 100644
--- a/etc/rc.d/powerd
+++ b/etc/rc.d/powerd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/powerd,v 1.2 2005/02/27 07:11:47 njl Exp $
 #
 
 # PROVIDE: powerd
diff --git a/etc/rc.d/ppp-user b/etc/rc.d/ppp-user
index f13175cd1b1a..f0d83579722b 100644
--- a/etc/rc.d/ppp-user
+++ b/etc/rc.d/ppp-user
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ppp-user,v 1.7 2004/12/15 12:39:28 brian Exp $
 #
 
 # PROVIDE: ppp-user
diff --git a/etc/rc.d/pppoed b/etc/rc.d/pppoed
index b9cfb142a5cf..dc57143bda47 100644
--- a/etc/rc.d/pppoed
+++ b/etc/rc.d/pppoed
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pppoed,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: pppoed
diff --git a/etc/rc.d/pwcheck b/etc/rc.d/pwcheck
index b07c993a7dff..f2d9851af8d1 100755
--- a/etc/rc.d/pwcheck
+++ b/etc/rc.d/pwcheck
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: pwcheck,v 1.4 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: pwcheck
diff --git a/etc/rc.d/quota b/etc/rc.d/quota
index 8a81f83ab974..8d15a451e8f3 100755
--- a/etc/rc.d/quota
+++ b/etc/rc.d/quota
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/quota,v 1.5 2004/10/07 13:55:26 mtm Exp $
 #
 
 # Enable/Check the quotas (must be after ypbind if using NIS)
diff --git a/etc/rc.d/ramdisk b/etc/rc.d/ramdisk
index 3ac0c42a3b21..0bd2e4edbad1 100644
--- a/etc/rc.d/ramdisk
+++ b/etc/rc.d/ramdisk
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ramdisk,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ramdisk
diff --git a/etc/rc.d/ramdisk-own b/etc/rc.d/ramdisk-own
index 2e2017cc90a8..cfff94382210 100644
--- a/etc/rc.d/ramdisk-own
+++ b/etc/rc.d/ramdisk-own
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ramdisk-own,v 1.4 2004/11/16 04:14:28 wes Exp $
 #
 
 # PROVIDE: ramdisk-own
diff --git a/etc/rc.d/random b/etc/rc.d/random
index 7c72e5542b56..5543c07f2f6a 100644
--- a/etc/rc.d/random
+++ b/etc/rc.d/random
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/random,v 1.8 2005/04/11 02:45:05 dougb Exp $
 #
 
 # PROVIDE: random
diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd
index a79da9dce65f..cda96848061b 100755
--- a/etc/rc.d/rarpd
+++ b/etc/rc.d/rarpd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rarpd,v 1.6 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: rarpd
diff --git a/etc/rc.d/rcconf.sh b/etc/rc.d/rcconf.sh
index fdcd95b29958..cde4ac8ef5e6 100644
--- a/etc/rc.d/rcconf.sh
+++ b/etc/rc.d/rcconf.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rcconf.sh,v 1.4 2005/04/29 23:02:56 brooks Exp $
 #
 
 # PROVIDE: rcconf
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index d2d637119dd0..504f71d890e6 100644
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/resolv,v 1.35 2005/03/02 19:03:08 brooks Exp $
 #
 
 # PROVIDE: resolv
diff --git a/etc/rc.d/root b/etc/rc.d/root
index aeb9a980742c..5c136215a846 100755
--- a/etc/rc.d/root
+++ b/etc/rc.d/root
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/root,v 1.10 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: root
diff --git a/etc/rc.d/route6d b/etc/rc.d/route6d
index e9861b47a9f8..eb66356f9e20 100755
--- a/etc/rc.d/route6d
+++ b/etc/rc.d/route6d
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: route6d,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/route6d,v 1.9 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: route6d
diff --git a/etc/rc.d/routed b/etc/rc.d/routed
index 6ecab4fe360f..80dabe962397 100755
--- a/etc/rc.d/routed
+++ b/etc/rc.d/routed
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/routed,v 1.12 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: routed
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index dc6da0fea6c7..3beb7c8437ae 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -2,7 +2,7 @@
 #
 # Configure routing and miscellaneous network tunables
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/routing,v 1.141 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: routing
diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index 84595354cf8c..b207debb8cb2 100755
--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: rpcbind
diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd
index c21106af388b..627207b30a3a 100755
--- a/etc/rc.d/rtadvd
+++ b/etc/rc.d/rtadvd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: rtadvd,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: rtadvd
diff --git a/etc/rc.d/rwho b/etc/rc.d/rwho
index 9a319bbe1cb9..e3fabfa2b743 100755
--- a/etc/rc.d/rwho
+++ b/etc/rc.d/rwho
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: rwho,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rwho,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: rwho
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 6e3d698f74b1..d6665f05489b 100755
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/savecore,v 1.10 2004/10/24 13:04:09 des Exp $
 #
 
 # PROVIDE: savecore
diff --git a/etc/rc.d/securelevel b/etc/rc.d/securelevel
index 8bd5ee1a9cd5..198a2aa072b5 100755
--- a/etc/rc.d/securelevel
+++ b/etc/rc.d/securelevel
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/securelevel,v 1.10 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: securelevel
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index 33b11dd1fc1c..49cbcb58c019 100755
--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sendmail,v 1.14.2.1 2005/09/02 03:53:10 gshapiro Exp $
 #
 
 # PROVIDE: mail
diff --git a/etc/rc.d/serial b/etc/rc.d/serial
index e586e7352b27..8f3cb8354698 100644
--- a/etc/rc.d/serial
+++ b/etc/rc.d/serial
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/serial,v 1.24 2004/11/14 19:51:34 obrien Exp $
 #
 
 # PROVIDE: serial
diff --git a/etc/rc.d/sppp b/etc/rc.d/sppp
index d4a183bf3fb5..f5deb2b1f397 100644
--- a/etc/rc.d/sppp
+++ b/etc/rc.d/sppp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sppp,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: sppp
diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd
index 2f300d8405cd..0af866251849 100755
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sshd,v 1.8 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: sshd
diff --git a/etc/rc.d/swap1 b/etc/rc.d/swap1
index 2cac446937b7..bc77faeea7bc 100755
--- a/etc/rc.d/swap1
+++ b/etc/rc.d/swap1
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $
 #
 
 # PROVIDE: localswap
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons
index 9d7caf521f12..b95da2d7d6ee 100644
--- a/etc/rc.d/syscons
+++ b/etc/rc.d/syscons
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/syscons,v 1.13 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: syscons
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index 67d3e063a69e..31c698d99265 100644
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sysctl,v 1.16 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: sysctl
diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd
index ac3c4dbf938d..49d17cbf73d0 100755
--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/syslogd,v 1.10 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: syslogd
diff --git a/etc/rc.d/timed b/etc/rc.d/timed
index 016c831eead1..cfdcd27c1c52 100755
--- a/etc/rc.d/timed
+++ b/etc/rc.d/timed
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: timed,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/timed,v 1.5 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: timed
diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp
index 9b0d74b31f47..c3528761d0d9 100644
--- a/etc/rc.d/tmp
+++ b/etc/rc.d/tmp
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/tmp,v 1.35 2004/11/09 10:03:17 keramida Exp $
 #
 
 # PROVIDE: tmp
diff --git a/etc/rc.d/ugidfw b/etc/rc.d/ugidfw
index 1d5f885f52b2..c7044de62c3b 100644
--- a/etc/rc.d/ugidfw
+++ b/etc/rc.d/ugidfw
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ugidfw,v 1.3 2005/04/02 00:01:03 trhodes Exp $
 
 # PROVIDE: ugidfw
 # REQUIRE:
diff --git a/etc/rc.d/usbd b/etc/rc.d/usbd
index 979589cacc8d..21ec4aa2ac98 100644
--- a/etc/rc.d/usbd
+++ b/etc/rc.d/usbd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/usbd,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: usbd
diff --git a/etc/rc.d/var b/etc/rc.d/var
index be434fc42829..c8288cbdcaa8 100644
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/var,v 1.40 2005/03/02 16:41:35 brooks Exp $
 #
 
 # PROVIDE: var
diff --git a/etc/rc.d/virecover b/etc/rc.d/virecover
index 9af4151ad3aa..6ec130b5fa3e 100755
--- a/etc/rc.d/virecover
+++ b/etc/rc.d/virecover
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/virecover,v 1.9 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: virecover
diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd
index 3e12f54be96a..ee1d644abf26 100644
--- a/etc/rc.d/watchdogd
+++ b/etc/rc.d/watchdogd
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/watchdogd,v 1.5 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: watchdogd
diff --git a/etc/rc.d/wpa_supplicant b/etc/rc.d/wpa_supplicant
index 6e34924b07de..20eb73ad2656 100644
--- a/etc/rc.d/wpa_supplicant
+++ b/etc/rc.d/wpa_supplicant
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.1.4.1 2005/10/27 17:08:55 wpaul Exp $
 #
 
 # PROVIDE: wpa_supplicant
diff --git a/etc/rc.d/ypbind b/etc/rc.d/ypbind
index 0ed5cd5ec426..72ec71fb4ab0 100755
--- a/etc/rc.d/ypbind
+++ b/etc/rc.d/ypbind
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ypbind,v 1.5 2002/03/22 04:34:01 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypbind,v 1.9 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ypbind
diff --git a/etc/rc.d/yppasswdd b/etc/rc.d/yppasswdd
index 4e805f5f704d..3d9a85d20b6d 100755
--- a/etc/rc.d/yppasswdd
+++ b/etc/rc.d/yppasswdd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: yppasswdd,v 1.6 2002/03/22 04:34:01 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.10 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: yppasswdd
diff --git a/etc/rc.d/ypserv b/etc/rc.d/ypserv
index 54ddd5bff611..a603c2e711e6 100755
--- a/etc/rc.d/ypserv
+++ b/etc/rc.d/ypserv
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ypserv,v 1.5 2000/09/19 13:04:39 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypserv,v 1.11 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ypserv
diff --git a/etc/rc.d/ypset b/etc/rc.d/ypset
index bf091c168d7f..be4d4654aebe 100644
--- a/etc/rc.d/ypset
+++ b/etc/rc.d/ypset
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypset,v 1.6 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ypset
diff --git a/etc/rc.d/ypupdated b/etc/rc.d/ypupdated
index 106db0f4bf16..c354030b78fc 100644
--- a/etc/rc.d/ypupdated
+++ b/etc/rc.d/ypupdated
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypupdated,v 1.5 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ypupdated
diff --git a/etc/rc.d/ypxfrd b/etc/rc.d/ypxfrd
index 100092e0fee1..5038a09a4da0 100644
--- a/etc/rc.d/ypxfrd
+++ b/etc/rc.d/ypxfrd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.6 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ypxfrd
diff --git a/etc/rc.firewall b/etc/rc.firewall
index 05a1a6aaec95..40cdf124f935 100644
--- a/etc/rc.firewall
+++ b/etc/rc.firewall
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.firewall,v 1.47 2003/11/02 07:31:44 ru Exp $
 #
 
 #
diff --git a/etc/rc.firewall6 b/etc/rc.firewall6
index c14a09a74ed8..344bf61450e6 100644
--- a/etc/rc.firewall6
+++ b/etc/rc.firewall6
@@ -1,7 +1,7 @@
 #!/bin/sh -
 ############
 # Setup system for IPv6 firewall service.
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.firewall6,v 1.15.8.1 2005/10/09 04:35:10 ume Exp $
 
 # Suck in the configuration variables.
 if [ -z "${source_rc_confs_defined}" ]; then
diff --git a/etc/rc.initdiskless b/etc/rc.initdiskless
index 1b40f3b41c41..641ea89a6207 100644
--- a/etc/rc.initdiskless
+++ b/etc/rc.initdiskless
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.initdiskless,v 1.42.2.2 2005/09/22 16:58:56 rwatson Exp $
 
 # On entry to this script the entire system consists of a read-only root
 # mounted via NFS. The kernel has run BOOTP and configured an interface
diff --git a/etc/rc.resume b/etc/rc.resume
index 4e133e0926d4..fbb2eb88ced0 100755
--- a/etc/rc.resume
+++ b/etc/rc.resume
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.resume,v 1.7 2003/12/30 17:30:39 njl Exp $
 #
 
 # sample run command file for APM Resume Event
diff --git a/etc/rc.sendmail b/etc/rc.sendmail
index b025bc0bd62c..f9343a56e05d 100644
--- a/etc/rc.sendmail
+++ b/etc/rc.sendmail
@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.sendmail,v 1.6 2003/10/19 00:31:50 gshapiro Exp $
 #
 
 # This script is used by /etc/rc at boot time to start sendmail.  It
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index 075881f3d4f4..122ca9bde557 100644
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.shutdown,v 1.30 2004/12/14 14:36:35 rse Exp $
 #
 
 # Site-specific closing actions for daemons run by init on shutdown,
diff --git a/etc/rc.subr b/etc/rc.subr
index 94944ab70b94..bb2cb5c76731 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.subr,v 1.34.2.3 2005/08/28 09:08:05 yar Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
diff --git a/etc/rc.suspend b/etc/rc.suspend
index 26fe198ceda1..c673457e876a 100755
--- a/etc/rc.suspend
+++ b/etc/rc.suspend
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.suspend,v 1.6 2004/01/21 03:03:40 njl Exp $
 #
 
 # sample run command file for APM Suspend Event
diff --git a/etc/remote b/etc/remote
index f58463ca0350..996efabddba0 100644
--- a/etc/remote
+++ b/etc/remote
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/remote,v 1.16 2004/10/13 08:32:34 phk Exp $
 #
 #	@(#)remote	5.2 (Berkeley) 6/30/90
 #
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 313af8e2507d..35b0ba9a8fe3 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.cshrc,v 1.29 2004/04/01 19:28:00 krion Exp $
 #
 # .cshrc - csh resource script, read at beginning of execution by each shell
 #
diff --git a/etc/root/dot.k5login b/etc/root/dot.k5login
index e01b9417fdbe..6736182501e9 100644
--- a/etc/root/dot.k5login
+++ b/etc/root/dot.k5login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.k5login,v 1.1 2003/04/30 20:58:49 markm Exp $
 #
 # user1/root@YOUR.REALM.WHEREVER
 # user2/root@YOUR.REALM.WHEREVER
diff --git a/etc/root/dot.login b/etc/root/dot.login
index 3032ef97c762..813654cb44e1 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.login,v 1.22 2000/07/15 03:25:14 rwatson Exp $
 #
 # .login - csh login script, read by login shell, after `.cshrc' at login.
 #
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
index bcf606d1047e..0beab0e55e9b 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.profile,v 1.20 1999/08/27 23:24:09 peter Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 export PATH
diff --git a/etc/rpc b/etc/rpc
index 935ea2f1b592..3b42b0a39e3a 100644
--- a/etc/rpc
+++ b/etc/rpc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rpc,v 1.11 2004/06/06 11:46:27 schweikh Exp $
 # rpc 88/08/01 4.0 RPCSRC; from 1.12   99/07/25 SMI
 #
 rpcbind		100000  portmap sunrpc rpcbind
diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index b79e722a4bf4..42723081e964 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.19 (Berkeley) 1/14/97
-# $FreeBSD$
+# $FreeBSD: src/etc/sendmail/Makefile,v 1.31 2004/01/22 17:51:02 ru Exp $
 
 M4=		m4
 CHMOD=		chmod
diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc
index fe45fa534c0f..0f241ba13ed0 100644
--- a/etc/sendmail/freebsd.mc
+++ b/etc/sendmail/freebsd.mc
@@ -44,7 +44,7 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$FreeBSD$')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.30 2005/06/14 02:25:17 gshapiro Exp $')
 OSTYPE(freebsd6)
 DOMAIN(generic)
 
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
index bfc98a2bbfc7..d5cd98a3ef89 100644
--- a/etc/sendmail/freebsd.submit.mc
+++ b/etc/sendmail/freebsd.submit.mc
@@ -16,7 +16,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$FreeBSD$')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.1 2003/10/19 00:03:13 gshapiro Exp $')
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
diff --git a/etc/sendmail/freefall.mc b/etc/sendmail/freefall.mc
index 9f77dbd18025..6f65da8e16ee 100644
--- a/etc/sendmail/freefall.mc
+++ b/etc/sendmail/freefall.mc
@@ -40,7 +40,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$FreeBSD$')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freefall.mc,v 1.20 2005/06/14 02:25:17 gshapiro Exp $')
 
 OSTYPE(freebsd6)
 FEATURE(nullclient, hub.$m)
diff --git a/etc/services b/etc/services
index d50cf12614aa..257c060f2ce0 100644
--- a/etc/services
+++ b/etc/services
@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/services,v 1.102 2004/08/16 11:52:22 cperciva Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
diff --git a/etc/shells b/etc/shells
index fe1e0294a010..673332a82fd3 100644
--- a/etc/shells
+++ b/etc/shells
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/shells,v 1.5 2000/04/27 21:58:46 ache Exp $
 #
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
diff --git a/etc/snmpd.config b/etc/snmpd.config
index 22603737611c..0d0b73244358 100644
--- a/etc/snmpd.config
+++ b/etc/snmpd.config
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/snmpd.config,v 1.1 2005/04/17 10:47:57 glebius Exp $
 #
 # Example configuration file for bsnmpd(1).
 #
diff --git a/etc/sysctl.conf b/etc/sysctl.conf
index 0c9e796a7ac8..21fb8e77d3df 100644
--- a/etc/sysctl.conf
+++ b/etc/sysctl.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/sysctl.conf,v 1.8 2003/03/13 18:43:50 mux Exp $
 #
 #  This file is read when going to multi-user and its contents piped thru
 #  ``sysctl'' to adjust kernel values.  ``man 5 sysctl.conf'' for details.
diff --git a/etc/syslog.conf b/etc/syslog.conf
index cf8667a73d19..38869eb83d03 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/syslog.conf,v 1.28 2005/03/12 12:31:16 glebius Exp $
 #
 #	Spaces ARE valid field separators in this file. However,
 #	other *nix-like systems still insist on using tabs as field
diff --git a/etc/termcap.small b/etc/termcap.small
index f8a68a7d1748..2156843cc737 100644
--- a/etc/termcap.small
+++ b/etc/termcap.small
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)termcap.src	5.88 (Berkeley) 4/30/91
-# $FreeBSD$
+# $FreeBSD: src/etc/termcap.small,v 1.28 2004/06/06 11:46:27 schweikh Exp $
 #
 # for syscons
 # common entry without semigraphics
diff --git a/etc/usbd.conf b/etc/usbd.conf
index fca2aff58c69..685e7c4ecc89 100644
--- a/etc/usbd.conf
+++ b/etc/usbd.conf
@@ -2,7 +2,7 @@
 #
 # See usbd.conf(5) for the description of the format of the file.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/usbd.conf,v 1.15 2004/11/28 23:16:00 iedowse Exp $
 
 # Firmware download into the ActiveWire board. After the firmware download is
 # done the device detaches and reappears as something new and shiny automatically.
diff --git a/games/Makefile b/games/Makefile
index 214a394f4495..720cd71d5e9a 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/games/Makefile,v 1.20 2002/10/20 11:18:56 markm Exp $
 
 SUBDIR= \
 	bcd \
diff --git a/games/Makefile.inc b/games/Makefile.inc
index b81af5e0f246..5886b3851a96 100644
--- a/games/Makefile.inc
+++ b/games/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/Makefile.inc,v 1.16 2002/10/21 10:05:14 markm Exp $
 
 BINDIR?=	/usr/games
 FILESDIR?=	${SHAREDIR}/games
diff --git a/games/bcd/Makefile b/games/bcd/Makefile
index 5698c121d638..5ef7a419a2a9 100644
--- a/games/bcd/Makefile
+++ b/games/bcd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/bcd/Makefile,v 1.6 2004/07/11 17:26:18 stefanf Exp $
 
 PROG=	bcd
 WARNS?=	6
diff --git a/games/bcd/bcd.6 b/games/bcd/bcd.6
index dc6431790888..c4af8df31075 100644
--- a/games/bcd/bcd.6
+++ b/games/bcd/bcd.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bcd.6	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/bcd/bcd.6,v 1.12 2001/02/06 16:13:09 ru Exp $
 .\"
 .Dd December 7, 2000
 .Dt BCD 6
diff --git a/games/bcd/bcd.c b/games/bcd/bcd.c
index 27f483ec6313..9e7a84b8ab07 100644
--- a/games/bcd/bcd.c
+++ b/games/bcd/bcd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)bcd.c	8.2 (Berkeley) 3/20/94";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/bcd/bcd.c,v 1.9 2004/07/11 17:26:18 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index ebb770e861e4..4ebb3e43265f 100644
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/caesar/Makefile,v 1.10 2005/05/01 19:34:22 stefanf Exp $
 
 PROG=	caesar
 DPADD=	${LIBM}
diff --git a/games/caesar/caesar.6 b/games/caesar/caesar.6
index 4f6ac172a9ca..a95ecff512a1 100644
--- a/games/caesar/caesar.6
+++ b/games/caesar/caesar.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)caesar.6	8.2 (Berkeley) 11/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/caesar/caesar.6,v 1.9 2003/05/16 21:26:39 ru Exp $
 .\"
 .Dd November 16, 1993
 .Dt CAESAR 6
diff --git a/games/caesar/caesar.c b/games/caesar/caesar.c
index 25c0a123bd4f..b0e21f2a6977 100644
--- a/games/caesar/caesar.c
+++ b/games/caesar/caesar.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)caesar.c    8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.14 2005/05/01 19:34:22 stefanf Exp $");
 
 #include <errno.h>
 #include <math.h>
diff --git a/games/factor/Makefile b/games/factor/Makefile
index 62c6f60fb2f8..eb65ae4aedb0 100644
--- a/games/factor/Makefile
+++ b/games/factor/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/factor/Makefile,v 1.10 2005/04/22 18:57:32 trhodes Exp $
 
 PROG=	factor
 SRCS=	factor.c pr_tbl.c
diff --git a/games/factor/factor.6 b/games/factor/factor.6
index 07fc7b98a697..3163d29eb549 100644
--- a/games/factor/factor.6
+++ b/games/factor/factor.6
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)factor.6	8.1 (Berkeley) 5/31/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/factor/factor.6,v 1.8 2002/11/29 16:21:33 ru Exp $
 .\"
 .\" By: Landon Curt Noll   chongo@toad.com,   ...!{sun,tolsoft}!hoptoad!chongo
 .\"
diff --git a/games/factor/factor.c b/games/factor/factor.c
index e3aa90cb8bee..0d6370c48c14 100644
--- a/games/factor/factor.c
+++ b/games/factor/factor.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)factor.c	8.4 (Berkeley) 5/4/95";
 __RCSID("$NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $");
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/factor/factor.c,v 1.13 2002/10/09 19:55:04 fanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/fortune/Notes b/games/fortune/Notes
index 83b062defa30..3641de35ada7 100644
--- a/games/fortune/Notes
+++ b/games/fortune/Notes
@@ -1,5 +1,5 @@
 #	@(#)Notes	8.1 (Berkeley) 5/31/93
-#	$FreeBSD$
+#	$FreeBSD: src/games/fortune/Notes,v 1.3 2003/02/16 18:38:12 schweikh Exp $
 
 Warning:
 	The fortunes contained in the fortune database have been collected
diff --git a/games/fortune/README b/games/fortune/README
index 31b96a2535fb..50d18f180878 100644
--- a/games/fortune/README
+++ b/games/fortune/README
@@ -1,5 +1,5 @@
 #	@(#)README	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/README,v 1.2 2002/09/24 19:00:52 schweikh Exp $
 
 The potentially offensive fortunes are installed by default on FreeBSD
 systems.  If you're absolutely, *positively*, without-a-shadow-of-a-doubt
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index 15d7a0ce5866..8ffedc73b1ca 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/19/94
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.33 2005/02/03 00:20:36 ru Exp $
 
 FILES=	fortunes freebsd-tips murphy startrek zippy
 BLDS=	fortunes.dat murphy.dat startrek.dat zippy.dat \
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index a12fcb7979b7..3139db5efd8e 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.179 2005/06/10 08:58:44 phk Exp $
 
 %
 =======================================================================
diff --git a/games/fortune/datfiles/fortunes-o.real b/games/fortune/datfiles/fortunes-o.real
index 301ac0bd3dde..246cd73e1780 100644
--- a/games/fortune/datfiles/fortunes-o.real
+++ b/games/fortune/datfiles/fortunes-o.real
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.19 2004/04/29 04:36:36 smkelly Exp $
 		My Favorite Drugs [Sung to My Favorite Things]
 Reefers and roach clips and papers and rollers
 Cocaine and procaine for twenty year molars
diff --git a/games/fortune/datfiles/fortunes.sp.ok b/games/fortune/datfiles/fortunes.sp.ok
index e5eed4075fa7..ecc471f32f32 100644
--- a/games/fortune/datfiles/fortunes.sp.ok
+++ b/games/fortune/datfiles/fortunes.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.6 2004/07/26 21:18:58 des Exp $
 A.A.A.A.A
 A.D
 AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk
diff --git a/games/fortune/datfiles/fortunes2-o b/games/fortune/datfiles/fortunes2-o
index 646b6fcba3e3..653a2d6687a5 100644
--- a/games/fortune/datfiles/fortunes2-o
+++ b/games/fortune/datfiles/fortunes2-o
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.30 2005/02/03 22:48:29 schweikh Exp $
 %
 						PLAYGIRL, Inc.
 						Philadelphia, Pa.  19369
diff --git a/games/fortune/datfiles/freebsd-tips b/games/fortune/datfiles/freebsd-tips
index 304d8d64bcbf..22f9678a1e86 100644
--- a/games/fortune/datfiles/freebsd-tips
+++ b/games/fortune/datfiles/freebsd-tips
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.39 2005/03/19 02:44:41 murray Exp $
 %
 Having trouble using fetch through a firewall? Try setting the environment
 variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
diff --git a/games/fortune/datfiles/gerrold.limerick b/games/fortune/datfiles/gerrold.limerick
index cd0b87fb068c..8ff27cd91556 100755
--- a/games/fortune/datfiles/gerrold.limerick
+++ b/games/fortune/datfiles/gerrold.limerick
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.5 2002/11/10 23:37:25 dcs Exp $
 %% From The War Against The Chtorr,
 %% Copyright David Gerrold, 1984-2000, all rights reserved,
 %% used with permission of the author.
diff --git a/games/fortune/datfiles/limerick b/games/fortune/datfiles/limerick
index a10e5f6f47b8..2cc4fd28c7ff 100644
--- a/games/fortune/datfiles/limerick
+++ b/games/fortune/datfiles/limerick
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.8 2005/05/07 17:56:50 schweikh Exp $
 A bad little girl in Madrid,
 A most reprehensible kid,
 	Told her Tante Louise
diff --git a/games/fortune/datfiles/murphy b/games/fortune/datfiles/murphy
index 88f822883c05..1cc8d18f5388 100644
--- a/games/fortune/datfiles/murphy
+++ b/games/fortune/datfiles/murphy
@@ -1,4 +1,4 @@
-%%$FreeBSD$
+%%$FreeBSD: src/games/fortune/datfiles/murphy,v 1.11 2005/02/01 16:34:38 ru Exp $
 When things are going well, someone will inevitably
 experiment detrimentally.
 %
diff --git a/games/fortune/datfiles/murphy-o b/games/fortune/datfiles/murphy-o
index f0a6829d5c63..5fc17c7c0a9e 100644
--- a/games/fortune/datfiles/murphy-o
+++ b/games/fortune/datfiles/murphy-o
@@ -1,4 +1,4 @@
-%%$FreeBSD$
+%%$FreeBSD: src/games/fortune/datfiles/murphy-o,v 1.2 2003/03/19 17:50:59 eivind Exp $
 You can lead a horticulture, but you can't make her think.
 %
 When you're up to your nose in shit,
diff --git a/games/fortune/datfiles/startrek b/games/fortune/datfiles/startrek
index 67e8ebabcdc7..e28a1f09954f 100644
--- a/games/fortune/datfiles/startrek
+++ b/games/fortune/datfiles/startrek
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.7 2005/04/24 15:31:11 schweikh Exp $
 A father doesn't destroy his children.
 		-- Lt. Carolyn Palamas, "Who Mourns for Adonais?",
 		   stardate 3468.1.
diff --git a/games/fortune/datfiles/startrek.sp.ok b/games/fortune/datfiles/startrek.sp.ok
index 5d1180e0230b..34ee9328cbb9 100644
--- a/games/fortune/datfiles/startrek.sp.ok
+++ b/games/fortune/datfiles/startrek.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.2 2003/01/04 17:08:23 schweikh Exp $
 Adonais
 Amanda
 Apella
diff --git a/games/fortune/datfiles/zippy b/games/fortune/datfiles/zippy
index c2dd028b7676..3730d8526a46 100644
--- a/games/fortune/datfiles/zippy
+++ b/games/fortune/datfiles/zippy
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/zippy,v 1.4 2005/02/01 16:34:38 ru Exp $
 A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAQUIRI!!
 %
 A dwarf is passing out somewhere in Detroit!
diff --git a/games/fortune/fortune/Makefile b/games/fortune/fortune/Makefile
index e8bd74be5626..a5a0f248181d 100644
--- a/games/fortune/fortune/Makefile
+++ b/games/fortune/fortune/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/fortune/Makefile,v 1.8 2005/02/17 18:06:37 ru Exp $
 
 PROG=	fortune
 MAN=	fortune.6
diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index 96aee79f67e1..969079a0f839 100644
--- a/games/fortune/fortune/fortune.6
+++ b/games/fortune/fortune/fortune.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fortune.6	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.20 2005/02/13 23:45:45 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt FORTUNE 6
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index a7a8f452e612..65fe5ef38f5d 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)fortune.c   8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.27 2005/02/17 18:06:37 ru Exp $");
 
 # include	<sys/stat.h>
 # include	<sys/endian.h>
diff --git a/games/fortune/strfile/Makefile b/games/fortune/strfile/Makefile
index 251779eb2274..1208d2de23f8 100644
--- a/games/fortune/strfile/Makefile
+++ b/games/fortune/strfile/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.7 2005/02/23 20:42:47 ru Exp $
 
 PROG=	strfile
 MAN=	strfile.8
diff --git a/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index 5c2d64241be4..883acc152ae7 100644
--- a/games/fortune/strfile/strfile.8
+++ b/games/fortune/strfile/strfile.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strfile.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/fortune/strfile/strfile.8,v 1.14 2005/02/17 18:06:37 ru Exp $
 .\"
 .Dd February 17, 2005
 .Dt STRFILE 8
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index 69240d142cb1..d6a6621bc817 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)strfile.c   8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.28 2005/02/17 18:06:37 ru Exp $");
 
 # include	<sys/param.h>
 # include	<sys/endian.h>
diff --git a/games/fortune/strfile/strfile.h b/games/fortune/strfile/strfile.h
index 4726024cca13..1aa4bdef7e8e 100644
--- a/games/fortune/strfile/strfile.h
+++ b/games/fortune/strfile/strfile.h
@@ -35,7 +35,7 @@
  *
  *	@(#)strfile.h	8.1 (Berkeley) 5/31/93
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/games/fortune/strfile/strfile.h,v 1.4 2005/02/17 18:06:37 ru Exp $ */
 
 #include <sys/types.h>
 
diff --git a/games/fortune/tools/do_sort b/games/fortune/tools/do_sort
index 07e301b2cf71..b5f7a4bbe4c2 100644
--- a/games/fortune/tools/do_sort
+++ b/games/fortune/tools/do_sort
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 #	@(#)do_sort	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/tools/do_sort,v 1.2 2005/02/03 00:18:06 ru Exp $
 #
 # an aggressive little script for sorting the fortune files
 # depends on octal 02 and 03 not being anywhere in the files.
diff --git a/games/fortune/tools/do_uniq.py b/games/fortune/tools/do_uniq.py
index bea9644d9dca..eb05f5f6a312 100644
--- a/games/fortune/tools/do_uniq.py
+++ b/games/fortune/tools/do_uniq.py
@@ -1,6 +1,6 @@
 #!/usr/local/bin/python
 #
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/tools/do_uniq.py,v 1.1 2005/02/07 21:15:16 ru Exp $
 #
 # an aggressive little script for trimming duplicate cookies
 
diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile
index 0331e4bfa2a8..be95ad0618eb 100644
--- a/games/fortune/unstr/Makefile
+++ b/games/fortune/unstr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/unstr/Makefile,v 1.7 2005/02/23 20:59:03 ru Exp $
 
 PROG=	unstr
 NO_MAN=
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index 25996f4f6b95..2d888d66b911 100644
--- a/games/fortune/unstr/unstr.c
+++ b/games/fortune/unstr/unstr.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)unstr.c     8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/fortune/unstr/unstr.c,v 1.11 2005/02/23 20:59:03 ru Exp $");
 
 /*
  *	This program un-does what "strfile" makes, thereby obtaining the
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 0aeea1e2ab2e..1dfcf0b4252d 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/grdc/Makefile,v 1.8 2001/09/25 13:45:46 ru Exp $
 
 PROG=   grdc
 WARNS?=	2
diff --git a/games/grdc/grdc.6 b/games/grdc/grdc.6
index 5226a6b2a9c7..84b2ea0ccf92 100644
--- a/games/grdc/grdc.6
+++ b/games/grdc/grdc.6
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/grdc/grdc.6,v 1.6 2003/05/16 21:27:23 ru Exp $
 .Dd September 25, 2001
 .Dt GRDC 6
 .Os
diff --git a/games/grdc/grdc.c b/games/grdc/grdc.c
index d27b10ed7916..d9a9b628bcb5 100644
--- a/games/grdc/grdc.c
+++ b/games/grdc/grdc.c
@@ -11,7 +11,7 @@
  * modified 03-25-03 for 12 hour option
  *     - Samy Al Bahra <samy@kerneled.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/games/grdc/grdc.c,v 1.12 2003/06/23 16:02:40 will Exp $
  */
 
 #include <err.h>
diff --git a/games/morse/Makefile b/games/morse/Makefile
index 44b20bab668b..dd85b551e470 100644
--- a/games/morse/Makefile
+++ b/games/morse/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/morse/Makefile,v 1.7 2001/03/26 14:20:58 ru Exp $
 
 PROG=	morse
 MAN=	morse.6
diff --git a/games/morse/morse.6 b/games/morse/morse.6
index f9ac378dc2d9..dfca303228a4 100644
--- a/games/morse/morse.6
+++ b/games/morse/morse.6
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bcd.6	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/morse/morse.6,v 1.17 2005/06/07 21:43:16 ru Exp $
 .\"
 .Dd June 7, 2005
 .Dt MORSE 6
diff --git a/games/morse/morse.c b/games/morse/morse.c
index eb9e4d4b7d24..5dcaea703150 100644
--- a/games/morse/morse.c
+++ b/games/morse/morse.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)morse.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/morse/morse.c,v 1.20 2005/06/07 19:01:41 joerg Exp $";
 #endif /* not lint */
 
 #include <sys/time.h>
diff --git a/games/number/Makefile b/games/number/Makefile
index 8e75f71a7858..cebde90fa5f9 100644
--- a/games/number/Makefile
+++ b/games/number/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/number/Makefile,v 1.4 2001/03/26 14:20:58 ru Exp $
 
 PROG=	number
 MAN=	number.6
diff --git a/games/number/number.6 b/games/number/number.6
index eb7892d80d58..67ac04dd1218 100644
--- a/games/number/number.6
+++ b/games/number/number.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)number.6	8.2 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/number/number.6,v 1.6 2005/02/13 22:25:10 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt NUMBER 6
diff --git a/games/number/number.c b/games/number/number.c
index 243fc8ddc866..5901f917cb8e 100644
--- a/games/number/number.c
+++ b/games/number/number.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)number.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/number/number.c,v 1.15 2005/02/09 18:22:15 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/pom/Makefile b/games/pom/Makefile
index 332f3cf1aeaf..b574d0acbcf2 100644
--- a/games/pom/Makefile
+++ b/games/pom/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/pom/Makefile,v 1.7 2005/05/01 19:34:22 stefanf Exp $
 
 PROG=	pom
 MAN=	pom.6
diff --git a/games/pom/pom.6 b/games/pom/pom.6
index 1a5325b4b5a0..67f27c1e4306 100644
--- a/games/pom/pom.6
+++ b/games/pom/pom.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pom.6	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/pom/pom.6,v 1.4 2001/07/15 07:49:21 dd Exp $
 .\"
 .TH POM 6 "May 31, 1993"
 .UC 7
diff --git a/games/pom/pom.c b/games/pom/pom.c
index d245f34bd7f2..fe2b45c87444 100644
--- a/games/pom/pom.c
+++ b/games/pom/pom.c
@@ -45,7 +45,7 @@ static const char sccsid[] = "@(#)pom.c       8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/pom/pom.c,v 1.13 2005/05/01 19:34:22 stefanf Exp $");
 
 /*
  * Phase of the Moon.  Calculates the current phase of the moon.
diff --git a/games/ppt/Makefile b/games/ppt/Makefile
index d4433c45ccc3..c423d9d754e4 100644
--- a/games/ppt/Makefile
+++ b/games/ppt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/ppt/Makefile,v 1.5 2004/12/21 08:46:57 ru Exp $
 
 PROG=	ppt
 NO_MAN=
diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c
index e0ae5e137c54..9a902e91da27 100644
--- a/games/ppt/ppt.c
+++ b/games/ppt/ppt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ppt.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/ppt/ppt.c,v 1.8 2004/08/01 18:52:40 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/primes/Makefile b/games/primes/Makefile
index 5e111e7baf10..a4032a3156bc 100644
--- a/games/primes/Makefile
+++ b/games/primes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/primes/Makefile,v 1.3 2004/12/21 08:46:57 ru Exp $
 
 PROG=	primes
 SRCS=	pattern.c pr_tbl.c primes.c
diff --git a/games/primes/pattern.c b/games/primes/pattern.c
index 66b2dc807151..1e08b7503849 100644
--- a/games/primes/pattern.c
+++ b/games/primes/pattern.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)pattern.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/primes/pattern.c,v 1.6 2003/01/01 18:48:42 schweikh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/pr_tbl.c b/games/primes/pr_tbl.c
index 6447916daad3..e615439aa6d9 100644
--- a/games/primes/pr_tbl.c
+++ b/games/primes/pr_tbl.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)pr_tbl.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/primes/pr_tbl.c,v 1.5 2002/10/09 19:38:55 fanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/primes.c b/games/primes/primes.c
index c89817d7da68..52c32b35fcb8 100644
--- a/games/primes/primes.c
+++ b/games/primes/primes.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)primes.c	8.5 (Berkeley) 5/10/95";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/primes/primes.c,v 1.21 2002/10/09 20:42:40 fanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/primes.h b/games/primes/primes.h
index fde2b83f3fa9..3f12e4dfbffe 100644
--- a/games/primes/primes.h
+++ b/games/primes/primes.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)primes.h	8.2 (Berkeley) 3/1/94
- * $FreeBSD$
+ * $FreeBSD: src/games/primes/primes.h,v 1.3 2003/01/01 18:48:42 schweikh Exp $
  */
 
 /*
diff --git a/games/random/Makefile b/games/random/Makefile
index 7db5a8f8f85a..6b8fe1ee860c 100644
--- a/games/random/Makefile
+++ b/games/random/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/games/random/Makefile,v 1.5 2003/02/15 10:26:10 seanc Exp $
 
 PROG=	random
 MAN=	random.6
diff --git a/games/random/random.6 b/games/random/random.6
index 33a3511eaf8f..0125338213b7 100644
--- a/games/random/random.6
+++ b/games/random/random.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)random.6	8.2 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/random/random.6,v 1.8 2005/01/18 08:57:18 ru Exp $
 .\"
 .Dd February 8, 2003
 .Dt RANDOM 6
diff --git a/games/random/random.c b/games/random/random.c
index 62c83ba75294..3f49d13b2380 100644
--- a/games/random/random.c
+++ b/games/random/random.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)random.c	8.5 (Berkeley) 4/5/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/random/random.c,v 1.19 2005/06/22 15:24:00 jhb Exp $");
 
 #include <sys/types.h>
 
diff --git a/games/random/randomize_fd.c b/games/random/randomize_fd.c
index 33588b14c6cd..24ac1d9736d8 100644
--- a/games/random/randomize_fd.c
+++ b/games/random/randomize_fd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.2 2003/02/15 10:26:10 seanc Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/games/random/randomize_fd.h b/games/random/randomize_fd.h
index 5b50e6265504..6e4c19f611b1 100644
--- a/games/random/randomize_fd.h
+++ b/games/random/randomize_fd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/games/random/randomize_fd.h,v 1.2 2003/02/15 10:26:10 seanc Exp $
  */
 
 #ifndef __RANDOMIZE_FD__
diff --git a/gnu/Makefile b/gnu/Makefile
index 6656adfbdfad..5f2502f6d304 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.33.1.1 (Berkeley) 5/6/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/Makefile,v 1.36 2002/06/05 17:02:37 obrien Exp $
 
 SUBDIR= lib usr.bin
 
diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc
index 5de8a1ece6f8..70c0792c4b2e 100644
--- a/gnu/Makefile.inc
+++ b/gnu/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/Makefile.inc,v 1.6 2004/12/21 09:33:44 ru Exp $
 
 # Do not lint the GNU stuff. It is all externally maintained and
 # lint output is wasteful noise here.
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 0e5b51c2641c..92ce27a522bb 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/Makefile,v 1.40 2004/08/14 03:23:24 kan Exp $
 
 SUBDIR= csu libgcc libgcov libdialog libregex libreadline
 
diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc
index 265f86d1ed55..7fa85248ad1b 100644
--- a/gnu/lib/Makefile.inc
+++ b/gnu/lib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/Makefile.inc,v 1.8 2002/09/25 09:55:19 markm Exp $
 
 .include "../Makefile.inc"
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 312821987f7c..ec28f8b7294a 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.24 2004/09/10 06:48:04 ru Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 CCDIR=	${.CURDIR}/../../usr.bin/cc
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index e2e171024bb0..683983e68636 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libdialog
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.42.2.1 2005/07/22 17:29:01 kensmith Exp $
 
 LIB=    dialog
 INCS=	dialog.h
diff --git a/gnu/lib/libdialog/TESTS/Makefile b/gnu/lib/libdialog/TESTS/Makefile
index 65e3d71c1f6a..c2ba8592e8e2 100644
--- a/gnu/lib/libdialog/TESTS/Makefile
+++ b/gnu/lib/libdialog/TESTS/Makefile
@@ -2,7 +2,7 @@
 # bmake was friendlier to the concept of multiple progs/libs in the same
 # directory.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libdialog/TESTS/Makefile,v 1.11 2003/05/03 21:30:34 obrien Exp $
 
 PROGS=	msg yesno prgbox gauge dselect fselect text menu1 menu2 menu3 \
 	input1 input2 check1 check2 check3 radio1 radio2 radio3 \
diff --git a/gnu/lib/libdialog/TESTS/check1.c b/gnu/lib/libdialog/TESTS/check1.c
index a2bec62606ac..775aa1ce7648 100644
--- a/gnu/lib/libdialog/TESTS/check1.c
+++ b/gnu/lib/libdialog/TESTS/check1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/check1.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/check2.c b/gnu/lib/libdialog/TESTS/check2.c
index 3608261caf8f..60013a748174 100644
--- a/gnu/lib/libdialog/TESTS/check2.c
+++ b/gnu/lib/libdialog/TESTS/check2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/check2.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/check3.c b/gnu/lib/libdialog/TESTS/check3.c
index d97b8048415c..d44933881d86 100644
--- a/gnu/lib/libdialog/TESTS/check3.c
+++ b/gnu/lib/libdialog/TESTS/check3.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/check3.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <sys/wait.h>
 #include <dialog.h>
diff --git a/gnu/lib/libdialog/TESTS/dselect.c b/gnu/lib/libdialog/TESTS/dselect.c
index 11103791f680..78dc60d2727d 100644
--- a/gnu/lib/libdialog/TESTS/dselect.c
+++ b/gnu/lib/libdialog/TESTS/dselect.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/dselect.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/fselect.c b/gnu/lib/libdialog/TESTS/fselect.c
index 6cefaf3f4b8f..c14174bca7dd 100644
--- a/gnu/lib/libdialog/TESTS/fselect.c
+++ b/gnu/lib/libdialog/TESTS/fselect.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/fselect.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/ftree1.c b/gnu/lib/libdialog/TESTS/ftree1.c
index f21e0e50bf6d..638a91201675 100644
--- a/gnu/lib/libdialog/TESTS/ftree1.c
+++ b/gnu/lib/libdialog/TESTS/ftree1.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/ftree1.c,v 1.3 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/ftree2.c b/gnu/lib/libdialog/TESTS/ftree2.c
index aa4663adf2cd..97245c1adc7a 100644
--- a/gnu/lib/libdialog/TESTS/ftree2.c
+++ b/gnu/lib/libdialog/TESTS/ftree2.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/ftree2.c,v 1.3 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/gauge.c b/gnu/lib/libdialog/TESTS/gauge.c
index bf0cfc9894bc..c351010a5639 100644
--- a/gnu/lib/libdialog/TESTS/gauge.c
+++ b/gnu/lib/libdialog/TESTS/gauge.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/gauge.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/input1.c b/gnu/lib/libdialog/TESTS/input1.c
index 37510712d7ea..d14bf2244d85 100644
--- a/gnu/lib/libdialog/TESTS/input1.c
+++ b/gnu/lib/libdialog/TESTS/input1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/input1.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/input2.c b/gnu/lib/libdialog/TESTS/input2.c
index 827c0522b4df..26ab24665f73 100644
--- a/gnu/lib/libdialog/TESTS/input2.c
+++ b/gnu/lib/libdialog/TESTS/input2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/input2.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/menu1.c b/gnu/lib/libdialog/TESTS/menu1.c
index 640157a89692..34d30f9861fb 100644
--- a/gnu/lib/libdialog/TESTS/menu1.c
+++ b/gnu/lib/libdialog/TESTS/menu1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/menu1.c,v 1.9 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/menu2.c b/gnu/lib/libdialog/TESTS/menu2.c
index 1545cd828b12..cb348ae5b10f 100644
--- a/gnu/lib/libdialog/TESTS/menu2.c
+++ b/gnu/lib/libdialog/TESTS/menu2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/menu2.c,v 1.9 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/menu3.c b/gnu/lib/libdialog/TESTS/menu3.c
index 4a29074b36d8..8196d25640f7 100644
--- a/gnu/lib/libdialog/TESTS/menu3.c
+++ b/gnu/lib/libdialog/TESTS/menu3.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/menu3.c,v 1.10 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/msg.c b/gnu/lib/libdialog/TESTS/msg.c
index c6f590fc7a04..d6667d20d7b6 100644
--- a/gnu/lib/libdialog/TESTS/msg.c
+++ b/gnu/lib/libdialog/TESTS/msg.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/msg.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/prgbox.c b/gnu/lib/libdialog/TESTS/prgbox.c
index 2da4611ce015..0419d3ebab1e 100644
--- a/gnu/lib/libdialog/TESTS/prgbox.c
+++ b/gnu/lib/libdialog/TESTS/prgbox.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/prgbox.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/radio1.c b/gnu/lib/libdialog/TESTS/radio1.c
index afcac1e0bddb..2086a9b94299 100644
--- a/gnu/lib/libdialog/TESTS/radio1.c
+++ b/gnu/lib/libdialog/TESTS/radio1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/radio1.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/radio2.c b/gnu/lib/libdialog/TESTS/radio2.c
index 15e353cc8294..81386bbad3c0 100644
--- a/gnu/lib/libdialog/TESTS/radio2.c
+++ b/gnu/lib/libdialog/TESTS/radio2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/radio2.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/radio3.c b/gnu/lib/libdialog/TESTS/radio3.c
index e11011cffd9c..57b397641422 100644
--- a/gnu/lib/libdialog/TESTS/radio3.c
+++ b/gnu/lib/libdialog/TESTS/radio3.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/radio3.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/text.c b/gnu/lib/libdialog/TESTS/text.c
index e071937e30f5..79346cc47d43 100644
--- a/gnu/lib/libdialog/TESTS/text.c
+++ b/gnu/lib/libdialog/TESTS/text.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/text.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/tree.c b/gnu/lib/libdialog/TESTS/tree.c
index c69b52e7d04f..2a5072a424d6 100644
--- a/gnu/lib/libdialog/TESTS/tree.c
+++ b/gnu/lib/libdialog/TESTS/tree.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/tree.c,v 1.3 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/yesno.c b/gnu/lib/libdialog/TESTS/yesno.c
index 647b51c44fe8..d0c386169713 100644
--- a/gnu/lib/libdialog/TESTS/yesno.c
+++ b/gnu/lib/libdialog/TESTS/yesno.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/yesno.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/checklist.c b/gnu/lib/libdialog/checklist.c
index dc65d755b86e..663c1e4f9b7f 100644
--- a/gnu/lib/libdialog/checklist.c
+++ b/gnu/lib/libdialog/checklist.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/checklist.c,v 1.40 2005/01/04 11:30:24 phantom Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3
index 2e4b8fbaabba..0328dd3456cf 100644
--- a/gnu/lib/libdialog/dialog.3
+++ b/gnu/lib/libdialog/dialog.3
@@ -11,7 +11,7 @@
 .\" nor does the author assume any responsibility for damages incurred with
 .\" its use.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/lib/libdialog/dialog.3,v 1.27.2.1 2005/09/24 01:59:35 keramida Exp $
 .\"
 .Dd January 1, 2000
 .Dt DIALOG 3
diff --git a/gnu/lib/libdialog/dialog.h b/gnu/lib/libdialog/dialog.h
index 94675a4592c3..21534312b3d3 100644
--- a/gnu/lib/libdialog/dialog.h
+++ b/gnu/lib/libdialog/dialog.h
@@ -22,7 +22,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.22 2000/12/14 02:35:22 jkh Exp $
  *
  */
 
diff --git a/gnu/lib/libdialog/gauge.c b/gnu/lib/libdialog/gauge.c
index d8138f632740..68ae1684fb65 100644
--- a/gnu/lib/libdialog/gauge.c
+++ b/gnu/lib/libdialog/gauge.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/gauge.c,v 1.5 2002/09/09 17:44:08 wollman Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/gnu/lib/libdialog/kernel.c b/gnu/lib/libdialog/kernel.c
index 9ed5eac6fccc..4e41d137eb63 100644
--- a/gnu/lib/libdialog/kernel.c
+++ b/gnu/lib/libdialog/kernel.c
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/kernel.c,v 1.28 2003/05/03 21:31:08 obrien Exp $");
 
 #define __DIALOG_MAIN__
 
diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c
index a01acd576088..e4abb95b0bc8 100644
--- a/gnu/lib/libdialog/menubox.c
+++ b/gnu/lib/libdialog/menubox.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/menubox.c,v 1.38 2004/02/26 01:52:39 eric Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/msgbox.c b/gnu/lib/libdialog/msgbox.c
index 41d78c828414..295ece87aacd 100644
--- a/gnu/lib/libdialog/msgbox.c
+++ b/gnu/lib/libdialog/msgbox.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/msgbox.c,v 1.19 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/notify.c b/gnu/lib/libdialog/notify.c
index 7fc22eb355a3..cf1d834fe6b2 100644
--- a/gnu/lib/libdialog/notify.c
+++ b/gnu/lib/libdialog/notify.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/notify.c,v 1.9 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/prgbox.c b/gnu/lib/libdialog/prgbox.c
index bcafacfc059f..b885592a479f 100644
--- a/gnu/lib/libdialog/prgbox.c
+++ b/gnu/lib/libdialog/prgbox.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/prgbox.c,v 1.14 2003/05/03 21:31:08 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c
index 4b865a63be32..dfe5da11b2f1 100644
--- a/gnu/lib/libdialog/radiolist.c
+++ b/gnu/lib/libdialog/radiolist.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/radiolist.c,v 1.40 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/raw_popen.c b/gnu/lib/libdialog/raw_popen.c
index 163c09a6a148..af2f4cab7b08 100644
--- a/gnu/lib/libdialog/raw_popen.c
+++ b/gnu/lib/libdialog/raw_popen.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/raw_popen.c,v 1.5 2003/05/03 21:31:08 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/gnu/lib/libdialog/textbox.c b/gnu/lib/libdialog/textbox.c
index 19a13bbc650e..147011cd436b 100644
--- a/gnu/lib/libdialog/textbox.c
+++ b/gnu/lib/libdialog/textbox.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/textbox.c,v 1.22 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/tree.c b/gnu/lib/libdialog/tree.c
index ceacf05f0e59..2a94c470e476 100644
--- a/gnu/lib/libdialog/tree.c
+++ b/gnu/lib/libdialog/tree.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/tree.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdlib.h>
 #include <strings.h>
diff --git a/gnu/lib/libdialog/yesno.c b/gnu/lib/libdialog/yesno.c
index 24eb41a27a01..ab6f5c404135 100644
--- a/gnu/lib/libdialog/yesno.c
+++ b/gnu/lib/libdialog/yesno.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/yesno.c,v 1.15 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libg2c/MAIN.c b/gnu/lib/libg2c/MAIN.c
index 9c6f895b3ae2..09bbd6d71882 100644
--- a/gnu/lib/libg2c/MAIN.c
+++ b/gnu/lib/libg2c/MAIN.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libg2c/MAIN.c,v 1.2 2000/10/31 11:36:33 obrien Exp $ */
 
 int
 MAIN__(){ return 0; }
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 0a2ed81d67d9..638eab87f093 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.15.2.1 2005/07/22 17:29:01 kensmith Exp $
 
 SRCDIR=	${.CURDIR}/../../../contrib/libf2c
 
diff --git a/gnu/lib/libg2c/config.h b/gnu/lib/libg2c/config.h
index c4d0c2860cc3..90f00ca6f0ef 100644
--- a/gnu/lib/libg2c/config.h
+++ b/gnu/lib/libg2c/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libg2c/config.h,v 1.3 2004/04/20 15:33:00 obrien Exp $ */
 
 /* *****[ libU77 ]***** */
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 6eb28b8ec1c0..0e0883da52e1 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.54 2004/12/21 09:33:45 ru Exp $
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
diff --git a/gnu/lib/libgcc_r/Makefile b/gnu/lib/libgcc_r/Makefile
index 501549c46430..a5c479401460 100644
--- a/gnu/lib/libgcc_r/Makefile
+++ b/gnu/lib/libgcc_r/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgcc_r/Makefile,v 1.5 2000/11/01 01:18:27 jdp Exp $
 
 LIB=	gcc_r
 CFLAGS+=-D_PTHREADS
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index bcf4d2d3e6e7..9ade88373756 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.3 2004/12/21 09:33:45 ru Exp $
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
diff --git a/gnu/lib/libiberty/Makefile b/gnu/lib/libiberty/Makefile
index 17228f85b94f..dde139d0a210 100644
--- a/gnu/lib/libiberty/Makefile
+++ b/gnu/lib/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libiberty/Makefile,v 1.4 2002/05/13 10:53:23 ru Exp $
 
 SRCDIR=	${.CURDIR}/../../../contrib/binutils/libiberty
 
diff --git a/gnu/lib/libiberty/config.h b/gnu/lib/libiberty/config.h
index 3db0e3ee7dba..8ff81744de1c 100644
--- a/gnu/lib/libiberty/config.h
+++ b/gnu/lib/libiberty/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libiberty/config.h,v 1.1 2001/03/31 07:02:02 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 6d7b50b7003a..035517576816 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.26.2.2 2005/08/19 02:49:54 cperciva Exp $
 
 OBJCDIR=${.CURDIR}/../../../contrib/libobjc
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 637dcc8a5733..273f41d5cd16 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/Makefile,v 1.34 2000/01/29 12:01:51 obrien Exp $
 
 SUBDIR = history readline
 
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index 2f2245268dad..93408868b124 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.11.2.1 2005/07/22 17:29:02 kensmith Exp $
 
 SHLIB_MAJOR=6
 RL_LIBRARY_VERSION=5.0
diff --git a/gnu/lib/libreadline/config.h b/gnu/lib/libreadline/config.h
index 7edf1d6f3960..eded84190dcf 100644
--- a/gnu/lib/libreadline/config.h
+++ b/gnu/lib/libreadline/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libreadline/config.h,v 1.7 2004/10/18 07:49:59 ache Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Maintained by hand. */
 
diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
index 7c8349653c80..4227026ab82d 100644
--- a/gnu/lib/libreadline/history/Makefile
+++ b/gnu/lib/libreadline/history/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/history/Makefile,v 1.6 2001/04/21 22:05:30 ache Exp $
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/history/doc/Makefile b/gnu/lib/libreadline/history/doc/Makefile
index 4b050e75ad92..d9a24220f3a9 100644
--- a/gnu/lib/libreadline/history/doc/Makefile
+++ b/gnu/lib/libreadline/history/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/history/doc/Makefile,v 1.3 2004/10/18 08:08:03 ache Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index fab4aa230513..bec78c24dded 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.13 2004/10/18 08:36:40 ache Exp $
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
index 42254de7fdaa..4664b4a3d374 100644
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ b/gnu/lib/libreadline/readline/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/readline/doc/Makefile,v 1.5 2004/10/18 08:03:38 ache Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libregex/FREEBSD-upgrade b/gnu/lib/libregex/FREEBSD-upgrade
index d072aafec5fc..03b6feea308a 100644
--- a/gnu/lib/libregex/FREEBSD-upgrade
+++ b/gnu/lib/libregex/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/lib/libregex/FREEBSD-upgrade,v 1.3 2005/05/10 12:04:01 tjr Exp $
 
 GNU regex (from glibc):
 
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 777a09911cc9..5cca6b231968 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.31.2.1 2005/07/22 17:29:02 kensmith Exp $
 
 SUBDIR=		doc
 
diff --git a/gnu/lib/libregex/config.h b/gnu/lib/libregex/config.h
index bf7f0a03b867..3f59c7c2d0d4 100644
--- a/gnu/lib/libregex/config.h
+++ b/gnu/lib/libregex/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libregex/config.h,v 1.1 2005/05/10 11:37:37 tjr Exp $ */
 
 #define	_REGEX_RE_COMP	1
 #define	HAVE_LANGINFO_H	1
diff --git a/gnu/lib/libregex/doc/Makefile b/gnu/lib/libregex/doc/Makefile
index b812f4445df7..e4c4959330ea 100644
--- a/gnu/lib/libregex/doc/Makefile
+++ b/gnu/lib/libregex/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/doc/Makefile,v 1.5 2001/11/01 07:11:10 obrien Exp $
 
 INFO = regex
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/lib/libregex/gnuregex.h b/gnu/lib/libregex/gnuregex.h
index 7356f9ffbe42..6767df4fa934 100644
--- a/gnu/lib/libregex/gnuregex.h
+++ b/gnu/lib/libregex/gnuregex.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libregex/gnuregex.h,v 1.3 2004/02/25 10:56:54 ache Exp $
  */
 
 #ifdef __GNUC__
diff --git a/gnu/lib/libregex/regex.c b/gnu/lib/libregex/regex.c
index df7abe2a42a2..862020b51de1 100644
--- a/gnu/lib/libregex/regex.c
+++ b/gnu/lib/libregex/regex.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.15 2005/05/10 10:52:30 tjr Exp $ */
 /* Extended regular expression matching and search library.
    Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
diff --git a/gnu/lib/libregex/regex.h b/gnu/lib/libregex/regex.h
index 364966d3606b..240d752464d5 100644
--- a/gnu/lib/libregex/regex.h
+++ b/gnu/lib/libregex/regex.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libregex/regex.h,v 1.5 2004/02/25 02:39:10 ache Exp $ */
 #ifndef _REGEX_H
 #include <posix/regex.h>
 
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index dba2f1203650..7d64fe1b87af 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.55.2.1 2005/07/22 17:29:02 kensmith Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
diff --git a/gnu/lib/libstdc++/config.h b/gnu/lib/libstdc++/config.h
index 08183d32cf45..f5bbdfc2eef5 100644
--- a/gnu/lib/libstdc++/config.h
+++ b/gnu/lib/libstdc++/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.11 2005/03/26 08:27:53 das Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
diff --git a/gnu/lib/libstdc++/doc/Makefile b/gnu/lib/libstdc++/doc/Makefile
index b0285199e051..9c7d0004fc36 100644
--- a/gnu/lib/libstdc++/doc/Makefile
+++ b/gnu/lib/libstdc++/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libstdc++/doc/Makefile,v 1.7 2002/05/29 21:14:48 obrien Exp $
 
 SRCDIR= ${.CURDIR}/../../../../contrib/libstdc++
 
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index 50c6097ebc40..d3e4259d1c16 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.6.8.1 2005/08/19 02:49:55 cperciva Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++/libsupc++
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 536acfb02150..170b5d71d1cf 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.84 2005/03/21 05:30:58 kientzle Exp $
 
 SUBDIR= bc \
 	${_binutils} \
diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc
index 4cec6fe01a45..398952b0f1b9 100644
--- a/gnu/usr.bin/Makefile.inc
+++ b/gnu/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/Makefile.inc,v 1.5 2002/09/25 09:55:20 markm Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile
index 4786ebfeb584..d92192232d7f 100644
--- a/gnu/usr.bin/bc/Makefile
+++ b/gnu/usr.bin/bc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/bc/Makefile,v 1.24 2004/02/17 00:56:16 ache Exp $
 
 BCDIR=	${.CURDIR}/../../../contrib/bc
 .PATH: ${BCDIR}/bc ${BCDIR}/lib ${BCDIR}/doc ${BCDIR}/Examples
diff --git a/gnu/usr.bin/bc/config.h b/gnu/usr.bin/bc/config.h
index b9e3520ac551..599feef96c2f 100644
--- a/gnu/usr.bin/bc/config.h
+++ b/gnu/usr.bin/bc/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/bc/config.h,v 1.7 2001/11/09 17:09:42 ache Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index 80c9d2911422..b1e888c6777a 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.29 2004/06/25 07:34:56 obrien Exp $
 
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as ld nm objcopy objdump ranlib readelf \
diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index 393b2b925952..9d02b22ac54c 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.8 2004/02/24 19:23:28 johan Exp $
 #
 
 .if (${TARGET_ARCH} == "alpha")
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index bda5ebf03a0d..1d8f27383a51 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.37 2004/07/08 17:05:30 obrien Exp $
 #
 # This is included explicitly at the top of each sub-Makefile.  We can't
 # use the normal "Makefile.inc" mechanism, because we need some of these
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 958afa65d7b0..e12aca544060 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/addr2line/Makefile,v 1.11 2004/06/16 07:09:33 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index 59031869a25a..cb6d1683d5ca 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index 9bf4880faf2d..d7fd10dd2b47 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.16 2004/12/21 09:59:40 ru Exp $
 
 
 # BINDIR
diff --git a/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h b/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h
index a0fe73b3c8df..ef18309db6a8 100644
--- a/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h
+++ b/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h,v 1.1 2003/04/26 03:28:20 obrien Exp $ */
 
 #include "itbl-i386.h"
diff --git a/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h
index 34219a5293f8..66a236cbe62c 100644
--- a/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$*/
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h,v 1.1 2003/04/26 03:28:20 obrien Exp $*/
 
 #include "tc-i386.h"
diff --git a/gnu/usr.bin/binutils/as/config.h b/gnu/usr.bin/binutils/as/config.h
index 35986130f194..a8639296e2c5 100644
--- a/gnu/usr.bin/binutils/as/config.h
+++ b/gnu/usr.bin/binutils/as/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/config.h,v 1.1 2004/07/08 17:05:30 obrien Exp $ */
 
 #define HAVE_DECL_GETOPT 1
 
diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
index a0a6360d68e0..35172e843242 100644
--- a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h,v 1.1 2001/10/15 02:12:09 obrien Exp $ */
 
 #include "tc-ia64.h"
diff --git a/gnu/usr.bin/binutils/as/obj-format.h b/gnu/usr.bin/binutils/as/obj-format.h
index 02a3030e1ad3..773a26a71628 100644
--- a/gnu/usr.bin/binutils/as/obj-format.h
+++ b/gnu/usr.bin/binutils/as/obj-format.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/obj-format.h,v 1.1 2001/10/15 01:43:21 obrien Exp $ */
 
 #include "obj-elf.h"
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h
index b55da9afd1aa..2719c1d0580e 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h,v 1.2 2002/05/18 04:50:32 obrien Exp $ */
 
 /* Values for processors will be from 0 to NUMBER_OF_PROCESSORS-1 */
 #define NUMBER_OF_PROCESSORS 1
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h
index 891bd6cabaf1..ee364d8370ed 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h,v 1.2 2002/05/18 04:50:32 obrien Exp $ */
 
 #include "tc-ppc.h"
diff --git a/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h
index 46e43130fc11..199ca9a0d565 100644
--- a/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h,v 1.3 2002/03/15 07:45:42 obrien Exp $ */
 
 #include "tc-sparc.h"
diff --git a/gnu/usr.bin/binutils/as/targ-env.h b/gnu/usr.bin/binutils/as/targ-env.h
index 8e14d63ff12d..00894448e63b 100644
--- a/gnu/usr.bin/binutils/as/targ-env.h
+++ b/gnu/usr.bin/binutils/as/targ-env.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/targ-env.h,v 1.1 2001/10/15 01:43:21 obrien Exp $ */
 
 #include "te-freebsd.h"
diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index b271f19b0a62..5b9638702eb7 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.21 2004/06/25 06:55:49 marcel Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile
index 51ea9d9ec479..36d3fb370742 100644
--- a/gnu/usr.bin/binutils/gasp/Makefile
+++ b/gnu/usr.bin/binutils/gasp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gasp/Makefile,v 1.20 2004/03/17 18:38:07 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gasp/gasp.1 b/gnu/usr.bin/binutils/gasp/gasp.1
index 5aaff9a165bb..2263a2068a4b 100644
--- a/gnu/usr.bin/binutils/gasp/gasp.1
+++ b/gnu/usr.bin/binutils/gasp/gasp.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/binutils/gasp/gasp.1,v 1.4 2005/01/09 19:54:23 ru Exp $
 .\"
 .Dd December 29, 1999
 .Dt GASP 1
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index ecf8cce33ed9..c7b7b30ce559 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,5 +1,5 @@
 # ex:ts=8
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.82 2004/12/21 09:59:40 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.alpha b/gnu/usr.bin/binutils/gdb/Makefile.alpha
index e05dd278a82a..038d3bd6f37d 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.alpha
+++ b/gnu/usr.bin/binutils/gdb/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.8 2002/10/11 19:39:18 obrien Exp $
 
 XSRCS+=	alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.arm b/gnu/usr.bin/binutils/gdb/Makefile.arm
index 3a8bcff9b135..c70b9e03d8a2 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.arm
+++ b/gnu/usr.bin/binutils/gdb/Makefile.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.arm,v 1.1 2002/06/29 03:18:28 obrien Exp $
 
 XSRCS+=	armnbsd-nat.c armnbsd-tdep.c arm-tdep.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.i386 b/gnu/usr.bin/binutils/gdb/Makefile.i386
index 14e7a3fe7856..1358dd774d38 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.i386
+++ b/gnu/usr.bin/binutils/gdb/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.7 2002/10/11 19:39:18 obrien Exp $
 
 XSRCS+=	i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \
 	i387-nat.c i387-tdep.c \
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.ia64 b/gnu/usr.bin/binutils/gdb/Makefile.ia64
index 08283c7344b0..a591d6e6bdbc 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.ia64
+++ b/gnu/usr.bin/binutils/gdb/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.ia64,v 1.1 2002/06/29 03:18:28 obrien Exp $
 
 XSRCS+=	ia64-tdep.c ia64-fbsd-nat.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.powerpc b/gnu/usr.bin/binutils/gdb/Makefile.powerpc
index b5f9778667a3..9d076ee9e61e 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/gdb/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.powerpc,v 1.1 2002/06/29 03:18:28 obrien Exp $
 
 XSRCS+=	ppcnbsd-nat.c ppc-tdep.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.sparc64 b/gnu/usr.bin/binutils/gdb/Makefile.sparc64
index 5eb0f2ec7dfe..08802720202a 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/gdb/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.sparc64,v 1.1 2002/06/29 03:16:40 obrien Exp $
 
 XSRCS+=	sparc-nat.c sparc-tdep.c
 CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_sparc_vec
diff --git a/gnu/usr.bin/binutils/gdb/config.h b/gnu/usr.bin/binutils/gdb/config.h
index a5731261b088..4b6c77e1972e 100644
--- a/gnu/usr.bin/binutils/gdb/config.h
+++ b/gnu/usr.bin/binutils/gdb/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/config.h,v 1.8 2002/10/20 07:50:19 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
index 6b5cf20a8527..dae50b1619aa 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_ALPHA_H
 #define FBSD_KGDB_ALPHA_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h
index ee62200abb77..6f69176b955a 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h,v 1.1 2004/01/26 09:17:26 obrien Exp $ */
 
 #ifndef FBSD_KGDB_AMD64_H
 #define FBSD_KGDB_AMD64_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
index 5896125f03c8..99dad1bb37b0 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_ARM_H
 #define FBSD_KGDB_ARM_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
index 3196316d83b9..ba91221d7fe8 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.5 2004/01/26 19:40:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_I386_H
 #define FBSD_KGDB_I386_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
index 8f198fdfa1b3..78ab8801a3f8 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_IA64_H
 #define FBSD_KGDB_IA64_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
index c6821e109e55..7279bace3741 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_POWERPC_H
 #define FBSD_KGDB_POWERPC_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
index 56fd480deffa..c2b243d0d2b7 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_SPARC64_H
 #define FBSD_KGDB_SPARC64_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h
index e7744363106f..818cb86b4b7d 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h
@@ -1,5 +1,5 @@
 /* Native-kernel debugging definitions for FreeBSD.
- * $FreeBSD$ 
+ * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.4 2003/03/21 00:30:53 iedowse Exp $ 
  */
 
 #ifndef FBSD_KGDB_H
diff --git a/gnu/usr.bin/binutils/gdb/freebsd-uthread.c b/gnu/usr.bin/binutils/gdb/freebsd-uthread.c
index 0974c3ee04fc..6cb9579cca82 100644
--- a/gnu/usr.bin/binutils/gdb/freebsd-uthread.c
+++ b/gnu/usr.bin/binutils/gdb/freebsd-uthread.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.11 2003/11/12 08:33:18 obrien Exp $ */
 
 /* This module implements a sort of half target that sits between the
    machine-independent parts of GDB and the ptrace interface (infptrace.c) to
diff --git a/gnu/usr.bin/binutils/gdb/gdb.1 b/gnu/usr.bin/binutils/gdb/gdb.1
index b6cd3cc47d76..31f7c7f1d3e8 100644
--- a/gnu/usr.bin/binutils/gdb/gdb.1
+++ b/gnu/usr.bin/binutils/gdb/gdb.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/binutils/gdb/gdb.1,v 1.7 1999/08/27 23:34:49 peter Exp $
 .TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
 .SH NAME
 gdb \- The GNU Debugger
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h b/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h
index 11260acec53a..e89736562677 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h,v 1.1 2004/06/11 16:09:38 obrien Exp $");
 
 #include "alpha/tm-alpha.h"
 
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h b/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h
index b7e4a204108d..d4de0223eb7d 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h,v 1.1 2004/06/11 16:09:38 obrien Exp $");
 
 #include <machine/frame.h>
 
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h b/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h
index 52ed91cf0938..31f1f9c5aeee 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h,v 1.1 2004/06/11 16:09:38 obrien Exp $");
 
 #define	SPARC_INTREG_SIZE	8
 
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
index 93395a7f9040..6401c20f3a3c 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.49 2004/06/11 16:09:38 obrien Exp $");
 
 /*
  * This works like "remote" but, you use it like this:
diff --git a/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c b/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c
index 190e6e668716..b986b547bee8 100644
--- a/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c
+++ b/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c
@@ -20,7 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c,v 1.2 2003/10/29 14:40:59 simokawa Exp $ */
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/gnu/usr.bin/binutils/gdbreplay/Makefile b/gnu/usr.bin/binutils/gdbreplay/Makefile
index 107051a11873..145210346ecb 100644
--- a/gnu/usr.bin/binutils/gdbreplay/Makefile
+++ b/gnu/usr.bin/binutils/gdbreplay/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdbreplay/Makefile,v 1.15 2004/12/21 08:46:58 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdbserver/Makefile b/gnu/usr.bin/binutils/gdbserver/Makefile
index bb620a9d8901..78ca140c4803 100644
--- a/gnu/usr.bin/binutils/gdbserver/Makefile
+++ b/gnu/usr.bin/binutils/gdbserver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdbserver/Makefile,v 1.10 2002/06/21 19:21:41 peter Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdbserver/low-fbsd.c b/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
index 2f1af940838f..71a18547054b 100644
--- a/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
+++ b/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdbserver/low-fbsd.c,v 1.5 2001/10/10 17:48:42 bde Exp $ */
 
 #include "defs.h"
 #include <sys/wait.h>
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 66e8e2ab9035..cc374142c0d4 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.31 2004/12/21 09:59:40 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 59afdb6d3d7d..8add4345ebed 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.alpha,v 1.22 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION= elf64alpha_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.amd64 b/gnu/usr.bin/binutils/ld/Makefile.amd64
index bac730d57b20..702e956d9ed0 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.amd64
+++ b/gnu/usr.bin/binutils/ld/Makefile.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.amd64,v 1.7 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION= elf_x86_64_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 24a06d7be7aa..01433ffe6649 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.i386,v 1.22 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION= elf_i386_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64
index 44e3cb32f650..27aae45a7d3e 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.ia64
+++ b/gnu/usr.bin/binutils/ld/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.ia64,v 1.9 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION= elf64_ia64_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index 4eaac084d9e4..7ff98c2f63b0 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.powerpc,v 1.16 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION=	elf32ppc
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc64 b/gnu/usr.bin/binutils/ld/Makefile.sparc64
index 14126e38387d..6722c62cd049 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.sparc64,v 1.16 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION= elf64_sparc_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/config.h b/gnu/usr.bin/binutils/ld/config.h
index c645f91ea2ec..08cc1f42a952 100644
--- a/gnu/usr.bin/binutils/ld/config.h
+++ b/gnu/usr.bin/binutils/ld/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/ld/config.h,v 1.8 2004/06/16 07:09:37 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/ld/genscripts.sh b/gnu/usr.bin/binutils/ld/genscripts.sh
index 181a96c37515..fb5e44c6edf9 100755
--- a/gnu/usr.bin/binutils/ld/genscripts.sh
+++ b/gnu/usr.bin/binutils/ld/genscripts.sh
@@ -9,7 +9,7 @@
 # sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3
 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.6 2004/06/16 07:09:37 obrien Exp $
 #
 # This is a cut-down version of the GNU script. Instead of jumping through
 # hoops for all possible combinations of paths, just use the libdir
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index c90281ad0c59..17985b938521 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.33 2004/10/24 15:32:25 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 5d413fa78f62..83b9370e2b82 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.13 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf64_alpha_freebsd_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.amd64 b/gnu/usr.bin/binutils/libbfd/Makefile.amd64
index abe8d6be36b0..ed96e16b1123 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.4 2004/07/08 17:05:32 obrien Exp $
 
 .include "${.CURDIR}/Makefile.i386"
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index 7ab33ddb0404..be5916d54ee1 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf32_i386_freebsd_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
index d45f7913f80c..d49f3f3e7ed5 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.9 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf64_ia64_little_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
index 75f06aecda1c..deb9375a12bb 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.8 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf32_powerpc_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64 b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
index 9a3fc03d4f2b..246cd5a98272 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.11 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf64_sparc_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/bfd.h b/gnu/usr.bin/binutils/libbfd/bfd.h
index 1e65701f17b6..ea3c37b3433a 100644
--- a/gnu/usr.bin/binutils/libbfd/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/bfd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.3 2004/07/08 17:05:32 obrien Exp $ */
 
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
    generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", 
diff --git a/gnu/usr.bin/binutils/libbfd/config.h.fbsd b/gnu/usr.bin/binutils/libbfd/config.h.fbsd
index 1864ef5f3dfe..0dd687841af4 100644
--- a/gnu/usr.bin/binutils/libbfd/config.h.fbsd
+++ b/gnu/usr.bin/binutils/libbfd/config.h.fbsd
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/config.h.fbsd,v 1.6 2004/06/19 19:25:33 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c b/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c
index 526ba8cfb2c1..fd885b9061e6 100644
--- a/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c
+++ b/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c,v 1.1 2003/04/26 03:28:21 obrien Exp $
  */
 
 #include "bfd.h"
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index d8dc0469f5f0..38421d4e97e0 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.22 2004/10/24 15:32:26 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libbinutils/config.h b/gnu/usr.bin/binutils/libbinutils/config.h
index 1b35139f1c66..1d76a4f21b95 100644
--- a/gnu/usr.bin/binutils/libbinutils/config.h
+++ b/gnu/usr.bin/binutils/libbinutils/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/config.h,v 1.12 2004/06/16 07:09:40 obrien Exp $ */
 
 /* FreeBSD isn't any form of AIX. */
 #define bin_dummy_emulation bin_vanilla_emulation
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index 292d1fcbe733..e231c582043b 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.24 2005/02/14 12:10:13 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libiberty/config.h b/gnu/usr.bin/binutils/libiberty/config.h
index 13bc9aa6aeb6..e7ab503a5886 100644
--- a/gnu/usr.bin/binutils/libiberty/config.h
+++ b/gnu/usr.bin/binutils/libiberty/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.6 2004/06/16 07:09:41 obrien Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index a2b271201d05..4fbe5d21809c 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile,v 1.10 2004/10/24 15:32:26 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
index 03d911dbd73b..5dee51c5c177 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.alpha,v 1.4 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	alpha-dis.c alpha-opc.c
 CFLAGS+= -DARCH_alpha
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
index 5b1ce3a96896..21e5fd601561 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.amd64,v 1.3 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	i386-dis.c
 CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.i386 b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
index 5b1ce3a96896..889c076e9236 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.i386
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.i386,v 1.3 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	i386-dis.c
 CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64 b/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
index 98198cdea109..ca4238b74e92 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.ia64,v 1.1 2001/10/15 02:12:08 obrien Exp $
 
 SRCS+=	ia64-dis.c ia64-opc.c
 CFLAGS+= -DARCH_ia64
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.m68k b/gnu/usr.bin/binutils/libopcodes/Makefile.m68k
index 927e2a1ea5cb..e0e1f6aa4542 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.m68k
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.m68k
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.m68k,v 1.1 1999/11/06 21:02:48 jb Exp $
 #
 
 SRCS+=		m68k-dis.c m68k-opc.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
index cc010ec4a306..72345b269b80 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc,v 1.2 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	ppc-dis.c ppc-opc.c
 CFLAGS+= -DARCH_powerpc -DARCH_rs6000
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc
index 190b76621cc0..ac2e8b4b6ba7 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.sparc,v 1.1 1999/11/06 21:02:48 jb Exp $
 #
 
 SRCS+=		sparc-dis.c sparc-opc.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64 b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
index e795ad494bba..28d1abce3620 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64,v 1.3 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	sparc-dis.c sparc-opc.c
 CFLAGS+= -DARCH_sparc
diff --git a/gnu/usr.bin/binutils/libopcodes/config.h b/gnu/usr.bin/binutils/libopcodes/config.h
index 9ad1fc8c3bb3..4b70bbc6598e 100644
--- a/gnu/usr.bin/binutils/libopcodes/config.h
+++ b/gnu/usr.bin/binutils/libopcodes/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/config.h,v 1.8 2004/06/16 07:09:41 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index 4da4bb2d0423..b7b0def22326 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/nm/Makefile,v 1.13 2004/06/16 07:09:41 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index 977e1d86aece..2d90148ab233 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/objcopy/Makefile,v 1.12 2004/06/16 07:09:42 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index e86d9cac5ec9..39d139bf7131 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/objdump/Makefile,v 1.14 2004/06/16 07:09:42 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index 8edfa01bb13b..cc3487242db2 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index 8a50e06304e0..bc32402c9547 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/readelf/Makefile,v 1.10 2004/06/16 07:09:43 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index dc1f896fb7e6..1c6d4ea35db8 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/size/Makefile,v 1.12 2004/06/16 07:09:43 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 0f80db4a4a8b..04128cf91d04 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/strings/Makefile,v 1.12 2004/06/16 07:09:44 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index a3ed45aeafe0..40f0619481cd 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.17 2004/06/16 07:09:44 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/update.sh b/gnu/usr.bin/binutils/update.sh
index 976cf3ec61c6..1042226bb8cc 100755
--- a/gnu/usr.bin/binutils/update.sh
+++ b/gnu/usr.bin/binutils/update.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/update.sh,v 1.4 2000/12/15 20:11:28 obrien Exp $
 #
 # This script installs the main files generated by the binutils
 # "configure" scripts and makefiles.  It can be used for upgrading to
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index d8ea8c26ae28..7764fb401f7c 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.38 2004/11/07 22:49:20 kan Exp $
 
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
diff --git a/gnu/usr.bin/cc/Makefile.fe b/gnu/usr.bin/cc/Makefile.fe
index a7057b162bac..c5961375cd2b 100644
--- a/gnu/usr.bin/cc/Makefile.fe
+++ b/gnu/usr.bin/cc/Makefile.fe
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.fe,v 1.3 2004/07/28 05:27:19 kan Exp $
 
 #	Front-end-only bits
 
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index b130243456ca..052d5c182127 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.63 2002/06/04 19:45:08 obrien Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 6182b69a4d5e..3e6ea6234d23 100644
--- a/gnu/usr.bin/cc/Makefile.tgt
+++ b/gnu/usr.bin/cc/Makefile.tgt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index bf7aad0d53d0..2991f2393984 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.23 2004/12/21 08:46:58 ru Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index f912c78e484e..c753dbe1dd26 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.20 2004/12/21 08:46:58 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index ae8745bbc550..ac63669def78 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.31 2004/12/21 09:59:41 ru Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index b05ad1ef9337..e768f85ba059 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.34 2004/12/21 09:59:41 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 075e7576cd0e..81593b6b674d 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.27 2004/12/21 09:59:41 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 4ba5d668c51d..6aee0935f065 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.38 2004/12/21 09:59:41 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index c45565185d33..80467d728475 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.45 2004/10/24 15:32:27 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_int/amd64.patch b/gnu/usr.bin/cc/cc_int/amd64.patch
index 2c5078099b56..25cfd9b47d3e 100644
--- a/gnu/usr.bin/cc/cc_int/amd64.patch
+++ b/gnu/usr.bin/cc/cc_int/amd64.patch
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/amd64.patch,v 1.1 2003/05/24 20:58:47 peter Exp $
 # The first chunk is to stop gcc generating stupid assembler output
 # for jump tables.  This change is already in gcc-3.3.
 # The second chunk is to stop gcc doing an ICE on libc/stdio/vfprintf.c.
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 78bdb690a0f8..5a73cf741e9f 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.81 2005/06/03 04:21:04 kan Exp $
 
 #
 # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index 5470788543ab..f8a5bb2fd617 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.18 2004/07/28 05:27:20 kan Exp $ */
 
 #ifndef __FreeBSD_version
 #include <sys/param.h>
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index cc39a2a15325..1fa4b7101f58 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.24.10.1 2005/11/01 23:10:08 scottl Exp $ */
 
 /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
    source tree so it can be configured appropriately without using
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
index 23f14d1e088d..bbdca350d29c 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
@@ -3,7 +3,7 @@
  * function name.  In order to avoid touching vendor source while gcc3.4
  * is in progress, try a minimal workaround.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h,v 1.1 2004/06/10 22:18:33 peter Exp $
  */
 #undef MCOUNT_NAME
 #define MCOUNT_NAME ".mcount"
diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile
index 5aa9e35f4e0b..0cf7032baa8c 100644
--- a/gnu/usr.bin/cc/collect2/Makefile
+++ b/gnu/usr.bin/cc/collect2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.9 2004/12/21 08:46:59 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index f8e52f370250..2d1801ea3ddf 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.24 2004/02/05 22:44:21 ru Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index af2054117102..f0836a08eb6f 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/doc/Makefile,v 1.13 2004/07/28 05:27:20 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index 3b76bc591a71..1d51713454b7 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.21 2004/01/05 20:23:16 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile
index 8d0909270e39..12d446c40d4b 100644
--- a/gnu/usr.bin/cc/f771/Makefile
+++ b/gnu/usr.bin/cc/f771/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/f771/Makefile,v 1.13 2004/12/21 08:46:59 ru Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/f77doc/Makefile b/gnu/usr.bin/cc/f77doc/Makefile
index 5e0808d355f5..618aa7420244 100644
--- a/gnu/usr.bin/cc/f77doc/Makefile
+++ b/gnu/usr.bin/cc/f77doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/f77doc/Makefile,v 1.5 2003/07/01 14:46:26 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/gcov/Makefile b/gnu/usr.bin/cc/gcov/Makefile
index adb2ac1cfbc2..25c198b40dc7 100644
--- a/gnu/usr.bin/cc/gcov/Makefile
+++ b/gnu/usr.bin/cc/gcov/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/gcov/Makefile,v 1.4 2004/07/28 05:27:20 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index 631861786cde..37d60cee0496 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.8 2004/12/21 08:46:50 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/protoize/Makefile b/gnu/usr.bin/cc/protoize/Makefile
index acd970058d63..0a992a3c3721 100644
--- a/gnu/usr.bin/cc/protoize/Makefile
+++ b/gnu/usr.bin/cc/protoize/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/protoize/Makefile,v 1.3 2004/12/21 08:46:59 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index cc8a8f3088e4..dee3e460cb3a 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -1,7 +1,7 @@
 # Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
 # even though it may live in src/gnu/...
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.9 2004/02/17 01:40:25 ache Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/cpio
 
diff --git a/gnu/usr.bin/cpio/doc/Makefile b/gnu/usr.bin/cpio/doc/Makefile
index 5ccf5da50a85..ea77c415c64e 100644
--- a/gnu/usr.bin/cpio/doc/Makefile
+++ b/gnu/usr.bin/cpio/doc/Makefile
@@ -1,7 +1,7 @@
 # Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
 # even though it may live in src/gnu/...
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cpio/doc/Makefile,v 1.3 1999/08/27 23:35:24 peter Exp $
 
 .PATH:	${.CURDIR}/../../../../contrib/cpio
 
diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
index dc41a73ad96a..08726b7a7b56 100644
--- a/gnu/usr.bin/cvs/Makefile
+++ b/gnu/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.16 2005/06/03 15:08:29 imp Exp $
 
 SUBDIR = lib libdiff cvs contrib cvsbug doc
 
diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index 4acfa0b9cd7a..dd09976099b1 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/Makefile.inc,v 1.6 2005/06/10 06:12:50 des Exp $
 
 .if !defined(CVSDIR)
 
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 56e026d6b33a..71b6004c1b6d 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.18 2005/06/03 15:08:29 imp Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl
index d2669578fdb9..cece2c0c50ff 100644
--- a/gnu/usr.bin/cvs/contrib/easy-import.pl
+++ b/gnu/usr.bin/cvs/contrib/easy-import.pl
@@ -8,7 +8,7 @@
 #
 # Written by Jörg Wunsch, 95/03/07, and placed in the public domain.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/easy-import.pl,v 1.16 1999/09/05 17:35:31 peter Exp $
 
 require "complete.pl";
 require "getopts.pl";
@@ -22,7 +22,7 @@ sub scan_opts
 
     $dont_do_it = "-n" if $opt_n;
     if($opt_v) {
-	print STDERR '$FreeBSD$' . "\n"; # 'emacs kludge
+	print STDERR '$FreeBSD: src/gnu/usr.bin/cvs/contrib/easy-import.pl,v 1.16 1999/09/05 17:35:31 peter Exp $' . "\n"; # 'emacs kludge
 	exit 0;
     }
     die "usage: $0 [-v] [-n] [moduledir]\n" .
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 62ad55453b5a..f167d99a401d 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.50 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.c b/gnu/usr.bin/cvs/cvs/prepend_args.c
index 12322ce48bdf..fa1c47d8ef4e 100644
--- a/gnu/usr.bin/cvs/cvs/prepend_args.c
+++ b/gnu/usr.bin/cvs/cvs/prepend_args.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/cvs/prepend_args.c,v 1.3 2002/09/02 06:09:03 peter Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.h b/gnu/usr.bin/cvs/cvs/prepend_args.h
index 6708442ec124..b4cfb042f003 100644
--- a/gnu/usr.bin/cvs/cvs/prepend_args.h
+++ b/gnu/usr.bin/cvs/cvs/prepend_args.h
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/cvs/prepend_args.h,v 1.2 2002/09/02 06:09:03 peter Exp $ */
 
 /* This code, taken from GNU Grep, originally used the "PARAM" macro, as the
    current GNU coding standards requires.  Older GNU code used the "PROTO"
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index ad07f39f5b6c..112c5995d6e5 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.23 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index ade0e8b3e2ba..3e3534f24e65 100644
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/doc/Makefile,v 1.15 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 3a04eef1fd79..35991e08c713 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.28 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
index adea88889770..4623c9579f46 100644
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ b/gnu/usr.bin/cvs/lib/config.h.proto
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.17 2003/07/07 19:13:39 obrien Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
index 7fd67a43fec5..4c61a2c13cb8 100644
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ b/gnu/usr.bin/cvs/libdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/libdiff/Makefile,v 1.10 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/dc/Makefile b/gnu/usr.bin/dc/Makefile
index 12de718b8f8f..1ec66d504e03 100644
--- a/gnu/usr.bin/dc/Makefile
+++ b/gnu/usr.bin/dc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dc/Makefile,v 1.12 2004/02/17 01:34:53 ache Exp $
 
 BCDIR=	${.CURDIR}/../../../contrib/bc
 
diff --git a/gnu/usr.bin/dc/doc/Makefile b/gnu/usr.bin/dc/doc/Makefile
index 2b3d553efb8a..3cc009d42e70 100644
--- a/gnu/usr.bin/dc/doc/Makefile
+++ b/gnu/usr.bin/dc/doc/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright Andreas Klemm <andreas@FreeBSD.ORG> 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dc/doc/Makefile,v 1.4 1999/08/27 23:35:31 peter Exp $
 
 .PATH:	${.CURDIR}/../../../../contrib/bc/doc
 
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index c30dff7631f6..05773ace8834 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for dialog
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dialog/Makefile,v 1.11 2004/02/05 22:44:22 ru Exp $
 
 SUBDIR=	TESTS
 
diff --git a/gnu/usr.bin/dialog/TESTS/Makefile b/gnu/usr.bin/dialog/TESTS/Makefile
index 39eb15e23a2c..215266dba4c6 100644
--- a/gnu/usr.bin/dialog/TESTS/Makefile
+++ b/gnu/usr.bin/dialog/TESTS/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dialog/TESTS/Makefile,v 1.5 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 FILES=		README checklist ftreebox infobox inputbox menubox msgbox \
diff --git a/gnu/usr.bin/dialog/TESTS/README b/gnu/usr.bin/dialog/TESTS/README
index 951fe3b597d6..79cea96b02b7 100644
--- a/gnu/usr.bin/dialog/TESTS/README
+++ b/gnu/usr.bin/dialog/TESTS/README
@@ -12,4 +12,4 @@ textbox		- simple text box
 treebox		- tree box
 yesno		- yes/no dialog
 
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/dialog/TESTS/README,v 1.1 2000/01/07 13:35:10 phantom Exp $
diff --git a/gnu/usr.bin/dialog/dialog.c b/gnu/usr.bin/dialog/dialog.c
index ecb4f1d414a9..783b3079f536 100644
--- a/gnu/usr.bin/dialog/dialog.c
+++ b/gnu/usr.bin/dialog/dialog.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/dialog/dialog.c,v 1.14 2000/10/16 07:11:30 brian Exp $
  *
  *
  *  HISTORY:
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index f9f329b28a87..5c1353f542d9 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.16 2004/02/17 05:38:45 ache Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/diff/diff.1 b/gnu/usr.bin/diff/diff.1
index f04d90f93498..81cdf02983c4 100644
--- a/gnu/usr.bin/diff/diff.1
+++ b/gnu/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/diff/diff.1,v 1.9 2004/02/01 13:52:19 ceri Exp $
 .TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools"
 .SH NAME
 diff \- find differences between two files
diff --git a/gnu/usr.bin/diff/doc/Makefile b/gnu/usr.bin/diff/doc/Makefile
index 973dbcc87675..7f67bb20853a 100644
--- a/gnu/usr.bin/diff/doc/Makefile
+++ b/gnu/usr.bin/diff/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff/doc/Makefile,v 1.6 1999/08/27 23:35:33 peter Exp $
 
 INFO = diff
 
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index f5f9c89a839b..8c983a89e100 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff3/Makefile,v 1.7 2004/02/17 01:28:48 ache Exp $
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile
index 74a35982d92a..3e9c6beac90e 100644
--- a/gnu/usr.bin/gdb/Makefile
+++ b/gnu/usr.bin/gdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.9 2004/07/25 05:32:50 marcel Exp $
 
 SUBDIR=	doc libgdb gdb gdbtui kgdb
 
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index abb5296dd056..91bf991a4304 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.13 2004/12/21 08:47:00 ru Exp $
 
 VERSION= "6.1.1 [FreeBSD]"
 VENDOR= marcel
diff --git a/gnu/usr.bin/gdb/arch/alpha/Makefile b/gnu/usr.bin/gdb/arch/alpha/Makefile
index 6ed43689b830..e6e63af2e332 100644
--- a/gnu/usr.bin/gdb/arch/alpha/Makefile
+++ b/gnu/usr.bin/gdb/arch/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.3 2004/12/05 06:58:59 marcel Exp $
 
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= core-regset.c solib.c solib-legacy.c solib-svr4.c
diff --git a/gnu/usr.bin/gdb/arch/alpha/config.h b/gnu/usr.bin/gdb/arch/alpha/config.h
index 8f132c0dd7b3..e83b2fda94c4 100644
--- a/gnu/usr.bin/gdb/arch/alpha/config.h
+++ b/gnu/usr.bin/gdb/arch/alpha/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.3 2004/12/05 06:58:59 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/alpha/init.c b/gnu/usr.bin/gdb/arch/alpha/init.c
index d2dc208e90c9..559af057fb2a 100644
--- a/gnu/usr.bin/gdb/arch/alpha/init.c
+++ b/gnu/usr.bin/gdb/arch/alpha/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/init.c,v 1.2 2004/12/05 06:58:59 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/amd64/Makefile b/gnu/usr.bin/gdb/arch/amd64/Makefile
index a7d37f12a402..e78a6d6b4925 100644
--- a/gnu/usr.bin/gdb/arch/amd64/Makefile
+++ b/gnu/usr.bin/gdb/arch/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.3 2004/12/05 06:58:59 marcel Exp $
 
 GENSRCS+= xm.h
 .if !defined(GDB_CROSS_DEBUGGER)
diff --git a/gnu/usr.bin/gdb/arch/amd64/config.h b/gnu/usr.bin/gdb/arch/amd64/config.h
index ac81c5491cff..0cf9b7202622 100644
--- a/gnu/usr.bin/gdb/arch/amd64/config.h
+++ b/gnu/usr.bin/gdb/arch/amd64/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.3 2004/12/05 06:58:59 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/amd64/init.c b/gnu/usr.bin/gdb/arch/amd64/init.c
index 1b296f4a9406..acdf795de796 100644
--- a/gnu/usr.bin/gdb/arch/amd64/init.c
+++ b/gnu/usr.bin/gdb/arch/amd64/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/init.c,v 1.3 2004/12/05 06:58:59 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/i386/Makefile b/gnu/usr.bin/gdb/arch/i386/Makefile
index fd4a880e8a17..93cf1e81dec0 100644
--- a/gnu/usr.bin/gdb/arch/i386/Makefile
+++ b/gnu/usr.bin/gdb/arch/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.4 2004/12/05 06:59:00 marcel Exp $
 
 GENSRCS+= xm.h
 .if !defined(GDB_CROSS_DEBUGGER)
diff --git a/gnu/usr.bin/gdb/arch/i386/config.h b/gnu/usr.bin/gdb/arch/i386/config.h
index f21da4c579e2..cb11f871e011 100644
--- a/gnu/usr.bin/gdb/arch/i386/config.h
+++ b/gnu/usr.bin/gdb/arch/i386/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.4 2005/05/31 09:43:03 dfr Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/i386/init.c b/gnu/usr.bin/gdb/arch/i386/init.c
index 7675d8e688ce..b5de9d1c9dd1 100644
--- a/gnu/usr.bin/gdb/arch/i386/init.c
+++ b/gnu/usr.bin/gdb/arch/i386/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/init.c,v 1.3 2004/12/05 06:59:00 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/ia64/Makefile b/gnu/usr.bin/gdb/arch/ia64/Makefile
index 5462cc2b94c3..f39bbab7e25e 100644
--- a/gnu/usr.bin/gdb/arch/ia64/Makefile
+++ b/gnu/usr.bin/gdb/arch/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.3 2004/12/05 06:59:01 marcel Exp $
 
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= fbsd-proc.c gcore.c
diff --git a/gnu/usr.bin/gdb/arch/ia64/config.h b/gnu/usr.bin/gdb/arch/ia64/config.h
index 5faa96bb5113..d0e389b9bf36 100644
--- a/gnu/usr.bin/gdb/arch/ia64/config.h
+++ b/gnu/usr.bin/gdb/arch/ia64/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.3 2004/12/05 06:59:01 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/ia64/init.c b/gnu/usr.bin/gdb/arch/ia64/init.c
index c2cd71f42bb2..ab8a2a9add34 100644
--- a/gnu/usr.bin/gdb/arch/ia64/init.c
+++ b/gnu/usr.bin/gdb/arch/ia64/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/init.c,v 1.2 2004/12/05 06:59:01 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/sparc64/Makefile b/gnu/usr.bin/gdb/arch/sparc64/Makefile
index b985711f009c..1acadecf7bd0 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/Makefile
+++ b/gnu/usr.bin/gdb/arch/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.3 2004/12/05 06:59:01 marcel Exp $
 
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= solib.c solib-legacy.c solib-svr4.c
diff --git a/gnu/usr.bin/gdb/arch/sparc64/config.h b/gnu/usr.bin/gdb/arch/sparc64/config.h
index 5527a79d2bf5..d332d16b473d 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/config.h
+++ b/gnu/usr.bin/gdb/arch/sparc64/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.3 2004/12/05 06:59:01 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/sparc64/init.c b/gnu/usr.bin/gdb/arch/sparc64/init.c
index 25f46580a1e1..9f9260b3c45a 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/init.c
+++ b/gnu/usr.bin/gdb/arch/sparc64/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/init.c,v 1.2 2004/12/05 06:59:01 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/doc/Makefile b/gnu/usr.bin/gdb/doc/Makefile
index a09f66a9b123..a70599ec2d74 100644
--- a/gnu/usr.bin/gdb/doc/Makefile
+++ b/gnu/usr.bin/gdb/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/doc/Makefile,v 1.13 2004/10/18 10:13:24 ache Exp $
 
 INFO=	gdb gdbint stabs
 INFOSECTION= "Software development"
diff --git a/gnu/usr.bin/gdb/doc/inc-hist.diff b/gnu/usr.bin/gdb/doc/inc-hist.diff
index 923f97322641..a176df364f98 100644
--- a/gnu/usr.bin/gdb/doc/inc-hist.diff
+++ b/gnu/usr.bin/gdb/doc/inc-hist.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/gdb/doc/inc-hist.diff,v 1.5 2004/06/27 03:31:49 marcel Exp $
 
 --- inc-hist.texinfo.orig	Wed Apr 11 08:20:01 2001
 +++ inc-hist.texinfo	Wed Apr 11 08:21:57 2001
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index ef9e13574661..a3cc0d47f839 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.44 2005/02/14 12:10:13 obrien Exp $
 
 PROG=	gdb${GDB_SUFFIX}
 SRCS=	gdb.c
diff --git a/gnu/usr.bin/gdb/gdb/gdb.1 b/gnu/usr.bin/gdb/gdb/gdb.1
index ea4d6494ef30..dbd85e8d6f2a 100644
--- a/gnu/usr.bin/gdb/gdb/gdb.1
+++ b/gnu/usr.bin/gdb/gdb/gdb.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gdb/gdb/gdb.1,v 1.9 2005/02/15 07:13:51 marcel Exp $
 .TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
 .SH NAME
 gdb \- The GNU Debugger
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile
index 4a01eae71ce5..25eda0e77ec7 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.6 2005/02/14 12:10:14 obrien Exp $
 
 PROG=	gdbtui${GDB_SUFFIX}
 SRCS=	tui-main.c
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 8093f9ce2b57..d65953e59177 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.6 2005/02/20 23:06:03 kan Exp $
 
 PROG=	kgdb${GDB_SUFFIX}
 SRCS=	main.c kthr.c trgt.c trgt_${TARGET_ARCH}.c
diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.1 b/gnu/usr.bin/gdb/kgdb/kgdb.1
index ba47fce3330c..4da72481ae4e 100644
--- a/gnu/usr.bin/gdb/kgdb/kgdb.1
+++ b/gnu/usr.bin/gdb/kgdb/kgdb.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.7.2.1 2005/09/15 05:32:10 marcel Exp $
 .Dd March 2, 2005
 .Os
 .Dt KGDB 1
diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.h b/gnu/usr.bin/gdb/kgdb/kgdb.h
index 2103acdb082d..8559102d1821 100644
--- a/gnu/usr.bin/gdb/kgdb/kgdb.h
+++ b/gnu/usr.bin/gdb/kgdb/kgdb.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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.2.2.1 2005/09/15 05:32:10 marcel Exp $
  */
 
 #ifndef _KGDB_H_
diff --git a/gnu/usr.bin/gdb/kgdb/kthr.c b/gnu/usr.bin/gdb/kgdb/kthr.c
index 9156f1a9cf66..c6feb3828979 100644
--- a/gnu/usr.bin/gdb/kgdb/kthr.c
+++ b/gnu/usr.bin/gdb/kgdb/kthr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.2.2.1 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/gnu/usr.bin/gdb/kgdb/main.c b/gnu/usr.bin/gdb/kgdb/main.c
index b07328cf8e91..483f673e3231 100644
--- a/gnu/usr.bin/gdb/kgdb/main.c
+++ b/gnu/usr.bin/gdb/kgdb/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.7.2.2 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt.c b/gnu/usr.bin/gdb/kgdb/trgt.c
index d365f6b17328..2eb82e1fdd61 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.2.2.2 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_alpha.c b/gnu/usr.bin/gdb/kgdb/trgt_alpha.c
index 99e8df64d677..6cef2920ffe8 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_alpha.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_alpha.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c,v 1.2.2.1 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/pcb.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_amd64.c b/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
index c3596fb14bd1..b6d675cf89f4 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c,v 1.2.2.1 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/pcb.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_i386.c b/gnu/usr.bin/gdb/kgdb/trgt_i386.c
index 73d02d4a3e28..d2735d7b44b8 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_i386.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_i386.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.2.2.1 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/pcb.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c b/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
index 86d83fc2fceb..e6afa5221629 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c,v 1.2.2.1 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/frame.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c b/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c
index 3e4a41abb4d5..15e222b9d33c 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c,v 1.2.2.2 2005/09/15 05:32:10 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/asm.h>
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index 29598d3c2305..0cc4d9579983 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.9.2.1 2005/09/15 05:32:11 marcel Exp $
 
 TARGET_ARCH?= ${MACHINE_ARCH}
 
diff --git a/gnu/usr.bin/gdb/libgdb/fbsd-threads.c b/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
index 6e9184d54f4f..4fc43ee49ff5 100644
--- a/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
+++ b/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.13 2005/05/31 09:43:03 dfr Exp $ */
 /* FreeBSD libthread_db assisted debugging support.
    Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 
diff --git a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff b/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
index 8143c55aeefe..512b1a7d90f6 100644
--- a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
+++ b/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/gdb/libgdb/frame-unwind.diff,v 1.1.2.1 2005/09/15 05:32:11 marcel Exp $
 
 Index: frame-unwind.c
 ===================================================================
diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 57fd0612bf77..364d20802311 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gperf/Makefile,v 1.11 2004/02/17 01:49:20 ache Exp $
 
 GPROFDIR=	${.CURDIR}/../../../contrib/gperf
 
diff --git a/gnu/usr.bin/gperf/config.h b/gnu/usr.bin/gperf/config.h
index 464005e3fa58..508fd570e117 100644
--- a/gnu/usr.bin/gperf/config.h
+++ b/gnu/usr.bin/gperf/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gperf/config.h,v 1.1 2000/03/25 07:49:58 kris Exp $ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
diff --git a/gnu/usr.bin/gperf/doc/Makefile b/gnu/usr.bin/gperf/doc/Makefile
index 1c0ec790e597..69321baa49fa 100644
--- a/gnu/usr.bin/gperf/doc/Makefile
+++ b/gnu/usr.bin/gperf/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gperf/doc/Makefile,v 1.7 2000/03/25 07:50:02 kris Exp $
 
 INFO = gperf
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/usr.bin/grep/FREEBSD-upgrade b/gnu/usr.bin/grep/FREEBSD-upgrade
index 06b14fe13139..8bac83f1a31e 100644
--- a/gnu/usr.bin/grep/FREEBSD-upgrade
+++ b/gnu/usr.bin/grep/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/grep/FREEBSD-upgrade,v 1.1 2005/05/14 06:33:23 tjr Exp $
 
 GNU grep
 
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index b0c3988552b4..c91038df276a 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.30 2004/07/04 10:05:37 tjr Exp $
 
 GREP_LIBZ=YES
 
diff --git a/gnu/usr.bin/grep/config.h b/gnu/usr.bin/grep/config.h
index 6f7794e485f1..216d597e13a4 100644
--- a/gnu/usr.bin/grep/config.h
+++ b/gnu/usr.bin/grep/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/config.h,v 1.9 2004/08/12 06:45:31 tjr Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.in by autoheader.  */
 
diff --git a/gnu/usr.bin/grep/dfa.c b/gnu/usr.bin/grep/dfa.c
index 920d13986fdf..1e4a978d44c1 100644
--- a/gnu/usr.bin/grep/dfa.c
+++ b/gnu/usr.bin/grep/dfa.c
@@ -18,7 +18,7 @@
 /* Written June, 1988 by Mike Haertel
    Modified July, 1988 by Arthur David Olson to assist BMG speedups  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/dfa.c,v 1.21 2005/05/14 03:18:20 tjr Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/gnu/usr.bin/grep/dfa.h b/gnu/usr.bin/grep/dfa.h
index 4cdbe7a4f7f9..bca07f8c3c6d 100644
--- a/gnu/usr.bin/grep/dfa.h
+++ b/gnu/usr.bin/grep/dfa.h
@@ -17,7 +17,7 @@
 
 /* Written June, 1988 by Mike Haertel */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/dfa.h,v 1.9 2005/05/14 03:02:22 tjr Exp $ */
 
 /* FIXME:
    2.  We should not export so much of the DFA internals.
diff --git a/gnu/usr.bin/grep/doc/Makefile b/gnu/usr.bin/grep/doc/Makefile
index 82620f984eb7..fcb1f2e372fe 100644
--- a/gnu/usr.bin/grep/doc/Makefile
+++ b/gnu/usr.bin/grep/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/grep/doc/Makefile,v 1.3 1999/11/22 08:56:30 obrien Exp $
 
 INFO=		grep
 INFOSECTION=	"System Utilities"
diff --git a/gnu/usr.bin/grep/getpagesize.h b/gnu/usr.bin/grep/getpagesize.h
index 7b3e3763c45f..410512069161 100644
--- a/gnu/usr.bin/grep/getpagesize.h
+++ b/gnu/usr.bin/grep/getpagesize.h
@@ -1,6 +1,6 @@
 /* Emulate getpagesize on systems that lack it.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/getpagesize.h,v 1.7 2004/07/04 10:02:03 tjr Exp $ */
 
 #ifndef HAVE_GETPAGESIZE
 
diff --git a/gnu/usr.bin/grep/grep.1 b/gnu/usr.bin/grep/grep.1
index fdef4a40da50..e3a2582f2809 100644
--- a/gnu/usr.bin/grep/grep.1
+++ b/gnu/usr.bin/grep/grep.1
@@ -1,5 +1,5 @@
 .\" grep man page
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.26 2004/11/09 17:00:06 keramida Exp $
 .if !\n(.g \{\
 .	if !\w|\*(lq| \{\
 .		ds lq ``
diff --git a/gnu/usr.bin/grep/grep.c b/gnu/usr.bin/grep/grep.c
index 1684a820b670..990d9dbc09bb 100644
--- a/gnu/usr.bin/grep/grep.c
+++ b/gnu/usr.bin/grep/grep.c
@@ -19,7 +19,7 @@
 /* Written July 1992 by Mike Haertel.  */
 /* Builtin decompression 1997 by Wolfram Schneider <wosch@FreeBSD.org>.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/grep.c,v 1.31.4.1 2005/10/26 21:15:51 jkim Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/gnu/usr.bin/grep/grep.h b/gnu/usr.bin/grep/grep.h
index f4937e763833..04f4380d5d72 100644
--- a/gnu/usr.bin/grep/grep.h
+++ b/gnu/usr.bin/grep/grep.h
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/grep.h,v 1.8 2005/05/14 03:02:22 tjr Exp $ */
 
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) || __STRICT_ANSI__
 # define __attribute__(x)
diff --git a/gnu/usr.bin/grep/hard-locale.c b/gnu/usr.bin/grep/hard-locale.c
index 9c5da2b3ea8b..a6d027338d7b 100644
--- a/gnu/usr.bin/grep/hard-locale.c
+++ b/gnu/usr.bin/grep/hard-locale.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/hard-locale.c,v 1.2 2004/07/04 10:22:50 tjr Exp $ */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/gnu/usr.bin/grep/kwset.c b/gnu/usr.bin/grep/kwset.c
index 79025396d1b9..c1ccfbcf13ff 100644
--- a/gnu/usr.bin/grep/kwset.c
+++ b/gnu/usr.bin/grep/kwset.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/kwset.c,v 1.9 2004/07/04 10:02:03 tjr Exp $ */
 
 /* Written August 1989 by Mike Haertel.
    The author may be reached (Email) at the address mike@ai.mit.edu,
diff --git a/gnu/usr.bin/grep/kwset.h b/gnu/usr.bin/grep/kwset.h
index 1724f68de11b..5e107c8bde41 100644
--- a/gnu/usr.bin/grep/kwset.h
+++ b/gnu/usr.bin/grep/kwset.h
@@ -20,7 +20,7 @@
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/kwset.h,v 1.5 2004/07/04 10:02:03 tjr Exp $ */
 
 struct kwsmatch
 {
diff --git a/gnu/usr.bin/grep/search.c b/gnu/usr.bin/grep/search.c
index a1951567e0d9..49fad0353ba7 100644
--- a/gnu/usr.bin/grep/search.c
+++ b/gnu/usr.bin/grep/search.c
@@ -18,7 +18,7 @@
 
 /* Written August 1992 by Mike Haertel. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/search.c,v 1.23.4.1 2005/10/27 16:29:02 jkim Exp $ */
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 7c61f71be945..3bfe9b627527 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.11 2003/05/02 00:55:52 ru Exp $
 
 SUBDIR=		contrib doc font man src tmac
 
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index b00f1e373268..d33a97f1738c 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.11 2005/06/10 07:06:07 ru Exp $
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
diff --git a/gnu/usr.bin/groff/contrib/Makefile b/gnu/usr.bin/groff/contrib/Makefile
index 6718107cafdd..ec60e6b04972 100644
--- a/gnu/usr.bin/groff/contrib/Makefile
+++ b/gnu/usr.bin/groff/contrib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile,v 1.1 2001/04/17 12:36:32 ru Exp $
 
 SUBDIR=		mm
 
diff --git a/gnu/usr.bin/groff/contrib/Makefile.inc b/gnu/usr.bin/groff/contrib/Makefile.inc
index d5552c54c4f8..3c30d5c661ad 100644
--- a/gnu/usr.bin/groff/contrib/Makefile.inc
+++ b/gnu/usr.bin/groff/contrib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.1 2001/04/17 12:36:32 ru Exp $
 
 DIST_SUBDIR=	contrib/${.CURDIR:T}
 TOPREL=		../..
diff --git a/gnu/usr.bin/groff/contrib/groffer/Makefile b/gnu/usr.bin/groff/contrib/groffer/Makefile
index 2b07a88cb8b6..f50ac0289ca2 100644
--- a/gnu/usr.bin/groff/contrib/groffer/Makefile
+++ b/gnu/usr.bin/groff/contrib/groffer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/groffer/Makefile,v 1.1 2002/10/11 08:58:13 ru Exp $
 
 SCRIPTS=	groffer
 MAN=		groffer.1
diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile
index 763386ba780e..428e18d2f0d7 100644
--- a/gnu/usr.bin/groff/contrib/mm/Makefile
+++ b/gnu/usr.bin/groff/contrib/mm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.6 2002/10/11 08:58:13 ru Exp $
 
 SCRIPTS=	mmroff.pl
 MAN=		mmroff.1
diff --git a/gnu/usr.bin/groff/doc/Makefile b/gnu/usr.bin/groff/doc/Makefile
index 6381812cab45..c4ccea7208f2 100644
--- a/gnu/usr.bin/groff/doc/Makefile
+++ b/gnu/usr.bin/groff/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/doc/Makefile,v 1.4 2000/12/06 12:17:01 ru Exp $
 
 INFO=	groff
 SRCDIR=	${DIST_DIR}
diff --git a/gnu/usr.bin/groff/font/Makefile b/gnu/usr.bin/groff/font/Makefile
index d78fc81e4b9e..9be9ef22cb77 100644
--- a/gnu/usr.bin/groff/font/Makefile
+++ b/gnu/usr.bin/groff/font/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile,v 2.1 2001/04/17 12:36:42 ru Exp $
 
 SUBDIR=		devX100 devX100-12 devX75 devX75-12 \
 		devascii devcp1047 devdvi devhtml devkoi8-r \
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index c4a74c62fc75..a62a4091ff7f 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.12 2003/05/01 13:22:18 ru Exp $
 
 FILES=		${DEVFILES}
 FILESDIR?=	${fontdir}/dev${DEV}
diff --git a/gnu/usr.bin/groff/font/Makefile.inc b/gnu/usr.bin/groff/font/Makefile.inc
index 22a1a42e40c7..c917736c9379 100644
--- a/gnu/usr.bin/groff/font/Makefile.inc
+++ b/gnu/usr.bin/groff/font/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.inc,v 2.1 2001/04/17 12:36:42 ru Exp $
 
 DIST_SUBDIR=	font/${.CURDIR:T}
 TOPREL=		../..
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index d515835614b0..b73da83dc865 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7 2001/04/17 12:36:42 ru Exp $
 
 FONTS?=R I B BI S L CW
 DEVFILES=$(FONTS) DESC
diff --git a/gnu/usr.bin/groff/font/devX100-12/Makefile b/gnu/usr.bin/groff/font/devX100-12/Makefile
index 1d77faa431c6..dac74237568f 100644
--- a/gnu/usr.bin/groff/font/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX100-12/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX100-12/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX100/Makefile b/gnu/usr.bin/groff/font/devX100/Makefile
index 1d77faa431c6..1a8ad19c5d4a 100644
--- a/gnu/usr.bin/groff/font/devX100/Makefile
+++ b/gnu/usr.bin/groff/font/devX100/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX100/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile b/gnu/usr.bin/groff/font/devX75-12/Makefile
index 1d77faa431c6..3cc429cf64ba 100644
--- a/gnu/usr.bin/groff/font/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX75-12/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX75-12/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75/Makefile b/gnu/usr.bin/groff/font/devX75/Makefile
index 1d77faa431c6..f9cf792dc2a0 100644
--- a/gnu/usr.bin/groff/font/devX75/Makefile
+++ b/gnu/usr.bin/groff/font/devX75/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX75/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devascii/Makefile b/gnu/usr.bin/groff/font/devascii/Makefile
index 544ec16e475d..462f2d03aed1 100644
--- a/gnu/usr.bin/groff/font/devascii/Makefile
+++ b/gnu/usr.bin/groff/font/devascii/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devascii/Makefile,v 1.1 2001/04/17 12:36:46 ru Exp $
 
 DEV=		ascii
 
diff --git a/gnu/usr.bin/groff/font/devcp1047/Makefile b/gnu/usr.bin/groff/font/devcp1047/Makefile
index d0a887a685c4..a3eaa06396d2 100644
--- a/gnu/usr.bin/groff/font/devcp1047/Makefile
+++ b/gnu/usr.bin/groff/font/devcp1047/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devcp1047/Makefile,v 1.1 2001/04/17 12:36:46 ru Exp $
 
 DEV=		cp1047
 
diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile
index 9497e2d45b4a..8d276e55e74e 100644
--- a/gnu/usr.bin/groff/font/devdvi/Makefile
+++ b/gnu/usr.bin/groff/font/devdvi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devdvi/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
 
 DEV=		dvi
 DEVFILES=	DESC \
diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile
index e210eed1fab9..8659c9982ad9 100644
--- a/gnu/usr.bin/groff/font/devhtml/Makefile
+++ b/gnu/usr.bin/groff/font/devhtml/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.2 2002/10/11 08:58:13 ru Exp $
 
 DEV=		html
 FONTS=		R I B BI CR CI CB CBI S
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/Makefile b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
index 399d2b6d0879..24605ddc537f 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/Makefile
+++ b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/Makefile,v 1.1 2001/04/17 12:36:47 ru Exp $
 
 DEV=		koi8-r
 
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/R.proto b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
index 8c16013d4669..73511e47b1d9 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/R.proto
+++ b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.6 2003/09/08 17:46:33 ru Exp $
 name R
 internalname 0
 spacewidth 24
diff --git a/gnu/usr.bin/groff/font/devlatin1/Makefile b/gnu/usr.bin/groff/font/devlatin1/Makefile
index 238320216c1e..f33a41b19195 100644
--- a/gnu/usr.bin/groff/font/devlatin1/Makefile
+++ b/gnu/usr.bin/groff/font/devlatin1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlatin1/Makefile,v 1.1 2001/04/17 12:36:47 ru Exp $
 
 DEV=		latin1
 
diff --git a/gnu/usr.bin/groff/font/devlbp/Makefile b/gnu/usr.bin/groff/font/devlbp/Makefile
index 1372c8fd8768..07d6a1e05221 100644
--- a/gnu/usr.bin/groff/font/devlbp/Makefile
+++ b/gnu/usr.bin/groff/font/devlbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlbp/Makefile,v 1.2 2002/10/11 08:58:13 ru Exp $
 
 DEV=		lbp
 LBPPRINT=	${PSPRINT}
diff --git a/gnu/usr.bin/groff/font/devlj4/Makefile b/gnu/usr.bin/groff/font/devlj4/Makefile
index 504677cec4c3..3691034f5c6f 100644
--- a/gnu/usr.bin/groff/font/devlj4/Makefile
+++ b/gnu/usr.bin/groff/font/devlj4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.1 2001/04/17 12:36:48 ru Exp $
 
 DEV=		lj4
 LJ4RES=		600
diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile
index d45d4426a06e..f69a1629e7bb 100644
--- a/gnu/usr.bin/groff/font/devps/Makefile
+++ b/gnu/usr.bin/groff/font/devps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
 
 DEV=		ps
 DISTFILES=	text.enc download \
diff --git a/gnu/usr.bin/groff/font/devutf8/Makefile b/gnu/usr.bin/groff/font/devutf8/Makefile
index bf5965e19d3e..a6699b8cf5f1 100644
--- a/gnu/usr.bin/groff/font/devutf8/Makefile
+++ b/gnu/usr.bin/groff/font/devutf8/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devutf8/Makefile,v 1.1 2001/04/17 12:36:49 ru Exp $
 
 DEV=		utf8
 
diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile
index b22c4c4b1904..4e4c1e42db66 100644
--- a/gnu/usr.bin/groff/man/Makefile
+++ b/gnu/usr.bin/groff/man/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/man/Makefile,v 1.9 2002/10/11 08:58:14 ru Exp $
 
 MAN=		groff_font.5 groff_out.5 groff_tmac.5
 MLINKS=		groff_tmac.5 tmac.5
diff --git a/gnu/usr.bin/groff/src/Makefile b/gnu/usr.bin/groff/src/Makefile
index 7d2ca90a2252..e18d64543f82 100644
--- a/gnu/usr.bin/groff/src/Makefile
+++ b/gnu/usr.bin/groff/src/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/Makefile,v 1.1 2001/04/17 12:37:02 ru Exp $
 
 SUBDIR=		libs devices preproc roff utils
 
diff --git a/gnu/usr.bin/groff/src/devices/Makefile b/gnu/usr.bin/groff/src/devices/Makefile
index 8af4ff85b996..6e83166bebb4 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile
+++ b/gnu/usr.bin/groff/src/devices/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile,v 1.1 2001/04/17 12:37:02 ru Exp $
 
 SUBDIR=		grodvi grohtml grolbp grolj4 grops grotty
 
diff --git a/gnu/usr.bin/groff/src/devices/Makefile.inc b/gnu/usr.bin/groff/src/devices/Makefile.inc
index 4619cbe9ad15..b0e19d9db159 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile.inc
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1 2001/04/17 12:37:02 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/devices/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 37454406520a..01beb68df078 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
 
 PROG_CXX=	grodvi
 SRCS=		dvi.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 0a1a08636f2f..cd5a7de21c02 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.7 2004/12/21 08:47:00 ru Exp $
 
 PROG_CXX=	post-grohtml
 SRCS=		post-html.cpp html-table.cpp html-text.cpp output.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index 85a41c169b95..1eed35e97634 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
 
 PROG_CXX=	grolbp
 SRCS=		lbp.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index 270910a5316d..5ead05928b74 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
 
 PROG_CXX=	grolj4
 SRCS=		lj4.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 4511f69b152e..0626ed4a2f73 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	grops
 SRCS=		ps.cpp psrm.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index d15ee8bf6231..539538415a0e 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	grotty
 SRCS=		tty.cpp
diff --git a/gnu/usr.bin/groff/src/include/config.h b/gnu/usr.bin/groff/src/include/config.h
index e95f574715e8..2de2cb74a994 100644
--- a/gnu/usr.bin/groff/src/include/config.h
+++ b/gnu/usr.bin/groff/src/include/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/groff/src/include/config.h,v 1.4 2003/05/02 11:56:43 ru Exp $ */
 
 #include <osreldate.h>
 
diff --git a/gnu/usr.bin/groff/src/include/defs.h b/gnu/usr.bin/groff/src/include/defs.h
index 76bd1178d45f..4fe5a37a440b 100644
--- a/gnu/usr.bin/groff/src/include/defs.h
+++ b/gnu/usr.bin/groff/src/include/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/groff/src/include/defs.h,v 1.4 2001/04/17 12:37:07 ru Exp $ */
 
 #define PROG_PREFIX ""
 #define DEVICE "ps"
diff --git a/gnu/usr.bin/groff/src/libs/Makefile b/gnu/usr.bin/groff/src/libs/Makefile
index 1461cda28bac..9b1e706be76a 100644
--- a/gnu/usr.bin/groff/src/libs/Makefile
+++ b/gnu/usr.bin/groff/src/libs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile,v 1.1 2001/04/17 12:37:08 ru Exp $
 
 SUBDIR=		libgroff libdriver libbib
 
diff --git a/gnu/usr.bin/groff/src/libs/Makefile.inc b/gnu/usr.bin/groff/src/libs/Makefile.inc
index 627553fa6e85..3f786b71de5e 100644
--- a/gnu/usr.bin/groff/src/libs/Makefile.inc
+++ b/gnu/usr.bin/groff/src/libs/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile.inc,v 1.1 2001/04/17 12:37:08 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/libs/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile
index ed1fd2fc7a6d..5b4a1450af2e 100644
--- a/gnu/usr.bin/groff/src/libs/libbib/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $
 
 LIB=		bib
 INTERNALLIB=
diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
index 0c107b4918f8..45b2ffdbdfc4 100644
--- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $
 
 LIB=		driver
 INTERNALLIB=
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index ea66a9d23628..ccd21c145232 100644
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.8 2004/10/24 15:32:29 ru Exp $
 
 LIB=		groff
 INTERNALLIB=
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile b/gnu/usr.bin/groff/src/preproc/Makefile
index 70af839313d6..411115b49cb9 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile,v 1.2 2002/10/29 14:56:06 ru Exp $
 
 SUBDIR=		eqn grn html pic refer soelim tbl
 
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile.inc b/gnu/usr.bin/groff/src/preproc/Makefile.inc
index 16c104a1aae6..20129800b27d 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile.inc
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.1 2001/04/17 12:37:09 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/preproc/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index 80871fee3c89..b7049443fb4b 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	eqn
 SRCS=		eqn.cpp eqn_tab.h main.cpp lex.cpp \
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 58309d2a5eb8..3bec3ddbb0c0 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	grn
 SRCS=		hdb.cpp hpoint.cpp hgraph.cpp main.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index 2a3fb4952e4f..532326a9f636 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.7 2004/12/21 08:47:00 ru Exp $
 
 PROG_CXX=	pre-grohtml
 SRCS=		pre-html.cpp pushback.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 3b5939c3bff1..d100f7490bf0 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	pic
 SRCS=		lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 8a18f6f7987c..5e76656ebfc1 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	refer
 SRCS=		command.cpp label.cpp ref.cpp refer.cpp token.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
index 2c68b8005f0a..04999bc75a2a 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.3 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	soelim
 SRCS=		soelim.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index 29e7ac238f89..bf25418acb18 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	tbl
 SRCS=		main.cpp table.cpp
diff --git a/gnu/usr.bin/groff/src/roff/Makefile b/gnu/usr.bin/groff/src/roff/Makefile
index 543a990c680f..e0ab68576ebb 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
 
 SUBDIR=		groff grog nroff psroff troff
 
diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc
index f893659c1b99..a910a7134dc6 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1 2001/04/17 12:37:12 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/roff/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 2ae541bbb502..f963934a934f 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	groff
 SRCS=		groff.cpp pipeline.c
diff --git a/gnu/usr.bin/groff/src/roff/grog/Makefile b/gnu/usr.bin/groff/src/roff/grog/Makefile
index 718f0cf78acd..09b3b90dcb39 100644
--- a/gnu/usr.bin/groff/src/roff/grog/Makefile
+++ b/gnu/usr.bin/groff/src/roff/grog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
 
 SCRIPTS=	grog
 MAN=		grog.1
diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile b/gnu/usr.bin/groff/src/roff/nroff/Makefile
index 6971890c67e6..be4631f42da8 100644
--- a/gnu/usr.bin/groff/src/roff/nroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
 
 SCRIPTS=	nroff
 MAN=		nroff.1
diff --git a/gnu/usr.bin/groff/src/roff/psroff/Makefile b/gnu/usr.bin/groff/src/roff/psroff/Makefile
index 74bb4ad54980..508f69c27ed7 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/psroff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
 
 SCRIPTS=	psroff.sh
 MAN=		psroff.1
diff --git a/gnu/usr.bin/groff/src/roff/psroff/psroff.1 b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
index e2291bab49d3..57bd86e5ffde 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/psroff.1
+++ b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.1,v 1.1 2001/04/10 17:04:31 ru Exp $
 .Dd September 15, 1997
 .Dt PSROFF 1
 .Os
diff --git a/gnu/usr.bin/groff/src/roff/psroff/psroff.sh b/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
index 612fbcce3923..a8e8e7fe3fcf 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
+++ b/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
@@ -1,5 +1,5 @@
 #! /bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.sh,v 1.2 2001/07/10 17:23:07 ru Exp $
 
 exec groff -Tps -l -C ${1+"$@"}
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 4f62293fce6f..74a38c7522d9 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	troff
 SRCS=		dictionary.cpp div.cpp env.cpp glyphuni.cpp input.cpp \
diff --git a/gnu/usr.bin/groff/src/utils/Makefile b/gnu/usr.bin/groff/src/utils/Makefile
index 14953b925312..816a8025a52f 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile
+++ b/gnu/usr.bin/groff/src/utils/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $
 
 SUBDIR=		addftinfo afmtodit hpftodit indxbib lkbib lookbib pfbtops tfmtodit
 
diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc
index 68945ab39f93..e11ee4704235 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile.inc
+++ b/gnu/usr.bin/groff/src/utils/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.1 2001/04/17 12:37:15 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/utils/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index 26fbb57b9d1c..20476a396158 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	addftinfo
 SRCS=		addftinfo.cpp guess.cpp
diff --git a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
index 00f88ad2b982..ecc4c7b665d6 100644
--- a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $
 
 SCRIPTS=	afmtodit
 MAN=		afmtodit.1
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 50e51c96b0bc..28835bf75a2e 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	hpftodit
 SRCS=		hpftodit.cpp
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index b2c59a2cee81..9cd0fb5a7328 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.7 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	indxbib
 SRCS=		indxbib.cpp signal.c
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index f30dc56cbb8f..3168aca0fc5b 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	lkbib
 SRCS=		lkbib.cpp
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index 18834a7432d3..c7d50112fc42 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	lookbib
 SRCS=		lookbib.cpp
diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
index 4fa71b525af6..c03a11eaff77 100644
--- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.1 2001/04/17 12:37:17 ru Exp $
 
 PROG=		pfbtops
 DPADD=		${LIBGROFF}
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index ba3bbc54646f..d9cfdf26746a 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	tfmtodit
 SRCS=		tfmtodit.cpp
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 43ef6fe77918..36393dfbee01 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.42 2003/09/08 17:46:33 ru Exp $
 
 TMACOWN?=	${BINOWN}
 TMACGRP?=	${BINGRP}
diff --git a/gnu/usr.bin/groff/tmac/fr.ISO8859-1 b/gnu/usr.bin/groff/tmac/fr.ISO8859-1
index 88dda0d296c6..7b882c7fc6eb 100644
--- a/gnu/usr.bin/groff/tmac/fr.ISO8859-1
+++ b/gnu/usr.bin/groff/tmac/fr.ISO8859-1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/fr.ISO8859-1,v 1.4 2003/09/20 21:23:53 ru Exp $
 .\"
 .\"     %beginstrip%
 .
diff --git a/gnu/usr.bin/groff/tmac/koi8-r.tmac b/gnu/usr.bin/groff/tmac/koi8-r.tmac
index 068f7162af6e..77b342552cbd 100644
--- a/gnu/usr.bin/groff/tmac/koi8-r.tmac
+++ b/gnu/usr.bin/groff/tmac/koi8-r.tmac
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/koi8-r.tmac,v 1.1 2003/09/08 17:46:33 ru Exp $
 .\"
 .nr _C \n(.C
 .cp 0
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index f6655250bed8..d1a625c9bd8d 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.48.2.2 2005/08/20 13:24:28 rwatson Exp $
 .\"
 .\"     %beginstrip%
 .
diff --git a/gnu/usr.bin/groff/tmac/ru.KOI8-R b/gnu/usr.bin/groff/tmac/ru.KOI8-R
index 0d3eb0f7eb7a..8032126c2827 100644
--- a/gnu/usr.bin/groff/tmac/ru.KOI8-R
+++ b/gnu/usr.bin/groff/tmac/ru.KOI8-R
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.14 2003/09/20 21:30:33 ru Exp $
 .\"
 .\"     %beginstrip%
 .
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index 9d30300ab4d0..58281c40880d 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile    5.3 (Berkeley) 5/12/90
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/Makefile,v 1.26 2004/02/17 01:59:37 ache Exp $
 
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
diff --git a/gnu/usr.bin/gzip/bits.c b/gnu/usr.bin/gzip/bits.c
index efce3910632e..35d0f39cd670 100644
--- a/gnu/usr.bin/gzip/bits.c
+++ b/gnu/usr.bin/gzip/bits.c
@@ -60,7 +60,7 @@
 #endif
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/bits.c,v 1.7 1999/08/27 23:35:49 peter Exp $";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/crypt.c b/gnu/usr.bin/gzip/crypt.c
index cdbd812368cc..b1a77b99dd93 100644
--- a/gnu/usr.bin/gzip/crypt.c
+++ b/gnu/usr.bin/gzip/crypt.c
@@ -2,5 +2,5 @@
  * Hardly worth copyrighting :-)
  */
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/crypt.c,v 1.6 1999/08/27 23:35:49 peter Exp $";
 #endif
diff --git a/gnu/usr.bin/gzip/deflate.c b/gnu/usr.bin/gzip/deflate.c
index cbc48843ce1d..0643c4ae368b 100644
--- a/gnu/usr.bin/gzip/deflate.c
+++ b/gnu/usr.bin/gzip/deflate.c
@@ -68,7 +68,7 @@
 #include "lzw.h" /* just for consistency checking */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/deflate.c,v 1.7 1999/08/27 23:35:50 peter Exp $";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/gzexe b/gnu/usr.bin/gzip/gzexe
index 8cce647a8afc..b13e0adcba13 100644
--- a/gnu/usr.bin/gzip/gzexe
+++ b/gnu/usr.bin/gzip/gzexe
@@ -12,7 +12,7 @@
 # The : is required for some old versions of csh.
 # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/gzexe,v 1.8 2000/11/19 13:10:11 kris Exp $
 
 x=`basename $0`
 if test $# = 0; then
diff --git a/gnu/usr.bin/gzip/gzip.1 b/gnu/usr.bin/gzip/gzip.1
index 795e47fe059d..3b851f2ac468 100644
--- a/gnu/usr.bin/gzip/gzip.1
+++ b/gnu/usr.bin/gzip/gzip.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gzip/gzip.1,v 1.7 1999/09/20 09:15:15 phantom Exp $
 .\"
 .PU
 .TH GZIP 1
diff --git a/gnu/usr.bin/gzip/gzip.c b/gnu/usr.bin/gzip/gzip.c
index a9af12c1b0fc..34c95ba00c15 100644
--- a/gnu/usr.bin/gzip/gzip.c
+++ b/gnu/usr.bin/gzip/gzip.c
@@ -45,7 +45,7 @@ static char  *license_msg[] = {
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.12 2005/06/08 21:25:19 simon Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/gzip.h b/gnu/usr.bin/gzip/gzip.h
index 79b0efd95980..bda3f2b91d22 100644
--- a/gnu/usr.bin/gzip/gzip.h
+++ b/gnu/usr.bin/gzip/gzip.h
@@ -3,7 +3,7 @@
  * This is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License, see the file COPYING.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/gzip/gzip.h,v 1.4 2004/05/02 23:07:49 obrien Exp $
  */
 
 #if defined(__STDC__) || defined(PROTO)
diff --git a/gnu/usr.bin/gzip/inflate.c b/gnu/usr.bin/gzip/inflate.c
index 82b15704254a..bc660a551d21 100644
--- a/gnu/usr.bin/gzip/inflate.c
+++ b/gnu/usr.bin/gzip/inflate.c
@@ -97,7 +97,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/inflate.c,v 1.9 2004/08/13 05:38:44 tjr Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/gnu/usr.bin/gzip/lzw.c b/gnu/usr.bin/gzip/lzw.c
index 934a8d994d41..d4d06747c165 100644
--- a/gnu/usr.bin/gzip/lzw.c
+++ b/gnu/usr.bin/gzip/lzw.c
@@ -3,7 +3,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/lzw.c,v 1.6 1999/08/27 23:35:51 peter Exp $";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/match.S b/gnu/usr.bin/gzip/match.S
index f283f862e214..99a411609ed9 100644
--- a/gnu/usr.bin/gzip/match.S
+++ b/gnu/usr.bin/gzip/match.S
@@ -9,7 +9,7 @@
  * Kristoffer Eriksson <ske@pkmab.se>
  */
  
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gzip/match.S,v 1.9 2002/09/17 01:48:49 peter Exp $ */
 
 /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
  * external symbols with an underline character '_'.
diff --git a/gnu/usr.bin/gzip/revision.h b/gnu/usr.bin/gzip/revision.h
index 43b0885e4154..155e34d0ec7b 100644
--- a/gnu/usr.bin/gzip/revision.h
+++ b/gnu/usr.bin/gzip/revision.h
@@ -13,4 +13,4 @@
 #  undef LZW
 #endif
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gzip/revision.h,v 1.6 1999/08/27 23:35:52 peter Exp $ */
diff --git a/gnu/usr.bin/gzip/tailor.h b/gnu/usr.bin/gzip/tailor.h
index abdde17d18fd..05f73e4c2812 100644
--- a/gnu/usr.bin/gzip/tailor.h
+++ b/gnu/usr.bin/gzip/tailor.h
@@ -8,7 +8,7 @@
  * The target dependent functions should be defined in tailor.c.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gzip/tailor.h,v 1.7 1999/08/27 23:35:53 peter Exp $ */
 
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
diff --git a/gnu/usr.bin/gzip/trees.c b/gnu/usr.bin/gzip/trees.c
index fe2405e47f52..a1fd7985667c 100644
--- a/gnu/usr.bin/gzip/trees.c
+++ b/gnu/usr.bin/gzip/trees.c
@@ -59,7 +59,7 @@
 #include "gzip.h"
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/trees.c,v 1.9 1999/08/27 23:35:53 peter Exp $";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/unlzh.c b/gnu/usr.bin/gzip/unlzh.c
index 971ecc0389a4..200b9e94b417 100644
--- a/gnu/usr.bin/gzip/unlzh.c
+++ b/gnu/usr.bin/gzip/unlzh.c
@@ -4,7 +4,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unlzh.c,v 1.5 1999/08/27 23:35:53 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/gzip/unlzw.c b/gnu/usr.bin/gzip/unlzw.c
index 7e89ca487822..570f43b051fc 100644
--- a/gnu/usr.bin/gzip/unlzw.c
+++ b/gnu/usr.bin/gzip/unlzw.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unlzw.c,v 1.7 1999/08/27 23:35:53 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/gnu/usr.bin/gzip/unpack.c b/gnu/usr.bin/gzip/unpack.c
index a0ef28699e4c..97f151458e22 100644
--- a/gnu/usr.bin/gzip/unpack.c
+++ b/gnu/usr.bin/gzip/unpack.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unpack.c,v 1.6 1999/08/27 23:35:54 peter Exp $";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/unzip.c b/gnu/usr.bin/gzip/unzip.c
index b103a7f49657..8b50bc5bbba5 100644
--- a/gnu/usr.bin/gzip/unzip.c
+++ b/gnu/usr.bin/gzip/unzip.c
@@ -17,7 +17,7 @@
 static char rcsid[] = "$Id: unzip.c,v 0.13 1993/06/10 13:29:00 jloup Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.8 2004/05/03 10:33:27 obrien Exp $");
 
 #include "tailor.h"
 #include "gzip.h"
diff --git a/gnu/usr.bin/gzip/util.c b/gnu/usr.bin/gzip/util.c
index 684cc5dd4a54..52fa56f6dca0 100644
--- a/gnu/usr.bin/gzip/util.c
+++ b/gnu/usr.bin/gzip/util.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/util.c,v 1.8 1999/08/27 23:35:54 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/zdiff b/gnu/usr.bin/gzip/zdiff
index 310a201e1a34..34aa3aaed266 100644
--- a/gnu/usr.bin/gzip/zdiff
+++ b/gnu/usr.bin/gzip/zdiff
@@ -9,7 +9,7 @@
 # necessary) and fed to cmp or diff.  The exit status from cmp
 # or diff is preserved.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zdiff,v 1.6 2002/01/25 15:02:01 nectar Exp $
 
 prog=`echo $0 | sed 's|.*/||'`
 case "$prog" in
diff --git a/gnu/usr.bin/gzip/zforce b/gnu/usr.bin/gzip/zforce
index 146db92c86d1..251003d3f946 100644
--- a/gnu/usr.bin/gzip/zforce
+++ b/gnu/usr.bin/gzip/zforce
@@ -5,7 +5,7 @@
 # This can be useful for files with names truncated after a file transfer.
 # foo is renamed to foo.gz
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zforce,v 1.5 1999/08/27 23:35:55 peter Exp $
 
 x=`basename $0`
 if test $# = 0; then
diff --git a/gnu/usr.bin/gzip/zgrep b/gnu/usr.bin/gzip/zgrep
index fe5efb9917fd..cc3ca95f190f 100644
--- a/gnu/usr.bin/gzip/zgrep
+++ b/gnu/usr.bin/gzip/zgrep
@@ -3,7 +3,7 @@
 # zgrep -- a wrapper around a grep program that decompresses files as needed
 # Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zgrep,v 1.3 1999/08/27 23:35:55 peter Exp $
 
 prog=`echo $0 | sed 's|.*/||'`
 case "$prog" in
diff --git a/gnu/usr.bin/gzip/zgrep.getopt b/gnu/usr.bin/gzip/zgrep.getopt
index e6811b7e969e..e5a6fe9b8303 100644
--- a/gnu/usr.bin/gzip/zgrep.getopt
+++ b/gnu/usr.bin/gzip/zgrep.getopt
@@ -26,7 +26,7 @@
 #
 # zgrep - search possibly compressed files for a regular expression
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zgrep.getopt,v 1.7 1999/08/27 23:35:55 peter Exp $
 
 
 PATH=/bin:/usr/bin:$PATH; export PATH
diff --git a/gnu/usr.bin/gzip/zgrep.libz b/gnu/usr.bin/gzip/zgrep.libz
index 3001efae61e0..cd6baaef58a8 100644
--- a/gnu/usr.bin/gzip/zgrep.libz
+++ b/gnu/usr.bin/gzip/zgrep.libz
@@ -5,7 +5,7 @@
 # zgrep - Search possibly compressed files for a regular expression. This
 #         version of zgrep(1) depend on a grep(1) linked with libz.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zgrep.libz,v 1.2 1999/08/27 23:35:55 peter Exp $
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/gnu/usr.bin/gzip/zip.c b/gnu/usr.bin/gzip/zip.c
index c5b985e71dc0..9f77c5f9ec00 100644
--- a/gnu/usr.bin/gzip/zip.c
+++ b/gnu/usr.bin/gzip/zip.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/zip.c,v 1.6 1999/08/27 23:35:56 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/zmore b/gnu/usr.bin/gzip/zmore
index f5c2d5fe6014..3bc01e5b2c55 100644
--- a/gnu/usr.bin/gzip/zmore
+++ b/gnu/usr.bin/gzip/zmore
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zmore,v 1.5 1999/08/27 23:35:56 peter Exp $
 
 if test "`echo -n a`" = "-n a"; then
   # looks like a SysV system:
diff --git a/gnu/usr.bin/gzip/zmore.1 b/gnu/usr.bin/gzip/zmore.1
index b8157e519f5e..5a76c1d4bf7b 100644
--- a/gnu/usr.bin/gzip/zmore.1
+++ b/gnu/usr.bin/gzip/zmore.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gzip/zmore.1,v 1.4 1999/08/27 23:35:56 peter Exp $
 .\"
 .TH ZMORE 1
 .SH NAME
diff --git a/gnu/usr.bin/gzip/znew b/gnu/usr.bin/gzip/znew
index 52b0ae963c2f..1eb988b09305 100644
--- a/gnu/usr.bin/gzip/znew
+++ b/gnu/usr.bin/gzip/znew
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/znew,v 1.6 2002/01/25 15:02:01 nectar Exp $
 
 check=0
 pipe=0
diff --git a/gnu/usr.bin/man/Makefile b/gnu/usr.bin/man/Makefile
index 8a730e198ad7..8d34315d52e8 100644
--- a/gnu/usr.bin/man/Makefile
+++ b/gnu/usr.bin/man/Makefile
@@ -4,7 +4,7 @@
 # License as specified in the README file that comes with the man 1.0
 # distribution.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.6 2002/11/18 10:25:27 ru Exp $
 #
 
 SUBDIR = lib man manpath apropos
diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index e1caf901ef6a..c2ba800fcf5c 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/Makefile.inc,v 1.22 2005/06/10 06:12:50 des Exp $
 #
 # Set a bunch of things to hardcoded paths so that we don't accidently
 # pick up a user's own version of some utility and hose ourselves.
diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index 2f5244b6d6a8..6a98354ccc03 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/apropos/Makefile,v 1.16 2001/04/07 11:21:18 ru Exp $
 MAINTAINER= wosch
 
 SCRIPTS=apropos
diff --git a/gnu/usr.bin/man/apropos/apropos.man b/gnu/usr.bin/man/apropos/apropos.man
index 0b3bd616ecaa..339f6d33b126 100644
--- a/gnu/usr.bin/man/apropos/apropos.man
+++ b/gnu/usr.bin/man/apropos/apropos.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.13.2.1 2005/09/07 16:20:13 garys Exp $
 .Dd January 15, 1991
 .Dt APROPOS 1
 .Os
diff --git a/gnu/usr.bin/man/apropos/apropos.sh b/gnu/usr.bin/man/apropos/apropos.sh
index 093d633c72b7..4e8437ba06c3 100644
--- a/gnu/usr.bin/man/apropos/apropos.sh
+++ b/gnu/usr.bin/man/apropos/apropos.sh
@@ -15,7 +15,7 @@
 # The University of Texas at Austin
 # Austin, Texas  78712
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.16 2002/10/21 07:44:42 ru Exp $
 
 
 PATH=/bin:/usr/bin:$PATH
diff --git a/gnu/usr.bin/man/lib/Makefile b/gnu/usr.bin/man/lib/Makefile
index d707316a2684..f65efa8cf9bb 100644
--- a/gnu/usr.bin/man/lib/Makefile
+++ b/gnu/usr.bin/man/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/lib/Makefile,v 1.13 2004/10/24 15:32:29 ru Exp $
 
 LIB=	man
 INTERNALLIB=
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 905d4dbedf52..521bc90f8d8e 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.33 2002/01/15 14:11:05 ru Exp $
 #
 
 MAN_LIBZ=YES
diff --git a/gnu/usr.bin/man/man/glob.c b/gnu/usr.bin/man/man/glob.c
index 1dff84ae75d3..53396fe36081 100644
--- a/gnu/usr.bin/man/man/glob.c
+++ b/gnu/usr.bin/man/man/glob.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/man/man/glob.c,v 1.5 2003/08/03 04:47:34 ache Exp $ */
 
 /* To whomever it may concern: I have never seen the code which most
    Unix programs use to perform this function.  I wrote this from scratch
diff --git a/gnu/usr.bin/man/man/man.c b/gnu/usr.bin/man/man/man.c
index 18005dfc036d..9324958d3df8 100644
--- a/gnu/usr.bin/man/man/man.c
+++ b/gnu/usr.bin/man/man/man.c
@@ -16,7 +16,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.62 2003/10/26 06:40:37 bde Exp $";
 #endif /* not lint */
 
 #define MAN_MAIN
diff --git a/gnu/usr.bin/man/man/man.man b/gnu/usr.bin/man/man/man.man
index 9f808bf4148f..10842b0bbcd8 100644
--- a/gnu/usr.bin/man/man/man.man
+++ b/gnu/usr.bin/man/man/man.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.24.2.1 2005/09/24 01:59:36 keramida Exp $
 .\"
 .Dd January 5, 1991
 .Dt MAN 1
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index b4d04faf0aaf..345f1174ba3f 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/manpath/Makefile,v 1.26 2002/01/11 15:12:00 ru Exp $
 
 PROG=	manpath
 
diff --git a/gnu/usr.bin/man/manpath/manpath.c b/gnu/usr.bin/man/manpath/manpath.c
index c1a25dea2f53..92b0473ae0be 100644
--- a/gnu/usr.bin/man/manpath/manpath.c
+++ b/gnu/usr.bin/man/manpath/manpath.c
@@ -13,7 +13,7 @@
  * The University of Texas at Austin
  * Austin, Texas  78712
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.13 2002/10/27 02:12:52 kris Exp $
  */
 
 #define MANPATH_MAIN
diff --git a/gnu/usr.bin/man/manpath/manpath.config b/gnu/usr.bin/man/manpath/manpath.config
index 5134e46ff017..66fc7548c619 100644
--- a/gnu/usr.bin/man/manpath/manpath.config
+++ b/gnu/usr.bin/man/manpath/manpath.config
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.25 2004/02/04 22:37:14 des Exp $
 #
 # This file is read by manpath(1) to configure the mandatory manpath,
 # optional manpath and to map each path element to a manpath element.
diff --git a/gnu/usr.bin/man/manpath/manpath.man b/gnu/usr.bin/man/manpath/manpath.man
index 9bddd194fa8f..162b77d6cac9 100644
--- a/gnu/usr.bin/man/manpath/manpath.man
+++ b/gnu/usr.bin/man/manpath/manpath.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.man,v 1.10 2005/02/13 22:25:11 ru Exp $
 .Dd August 16, 1999
 .Dt MANPATH 1
 .Os
diff --git a/gnu/usr.bin/patch/EXTERN.h b/gnu/usr.bin/patch/EXTERN.h
index 374c94faa178..2a55648dc871 100644
--- a/gnu/usr.bin/patch/EXTERN.h
+++ b/gnu/usr.bin/patch/EXTERN.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/EXTERN.h,v 1.6 1999/09/05 17:31:54 peter Exp $
  *
  * $Log: EXTERN.h,v $
  * Revision 2.0  86/09/17  15:35:37  lwall
diff --git a/gnu/usr.bin/patch/INTERN.h b/gnu/usr.bin/patch/INTERN.h
index c04e722248a5..c59f8e90cd7b 100644
--- a/gnu/usr.bin/patch/INTERN.h
+++ b/gnu/usr.bin/patch/INTERN.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/INTERN.h,v 1.6 1999/09/05 17:31:54 peter Exp $
  *
  * $Log: INTERN.h,v $
  * Revision 2.0  86/09/17  15:35:58  lwall
diff --git a/gnu/usr.bin/patch/Makefile b/gnu/usr.bin/patch/Makefile
index 373efbb83f77..1be477faff76 100644
--- a/gnu/usr.bin/patch/Makefile
+++ b/gnu/usr.bin/patch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/patch/Makefile,v 1.8 2004/02/17 01:24:45 ache Exp $
 
 PROG= 	patch
 SRCS=   backupfile.c inp.c patch.c pch.c util.c version.c
diff --git a/gnu/usr.bin/patch/backupfile.c b/gnu/usr.bin/patch/backupfile.c
index 94a615de5f7c..6d8b786e35e0 100644
--- a/gnu/usr.bin/patch/backupfile.c
+++ b/gnu/usr.bin/patch/backupfile.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/patch/backupfile.c,v 1.8 2003/10/26 04:20:19 peter Exp $");
 
 #include "config.h"
 #include <stdio.h>
diff --git a/gnu/usr.bin/patch/backupfile.h b/gnu/usr.bin/patch/backupfile.h
index 7600714ae364..78a7cb73ad8c 100644
--- a/gnu/usr.bin/patch/backupfile.h
+++ b/gnu/usr.bin/patch/backupfile.h
@@ -16,7 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/patch/backupfile.h,v 1.5 2002/04/28 01:33:45 gad Exp $
  */
 
 /* When to make backup files. */
diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h
index ed97132183f6..44f473d23ccd 100644
--- a/gnu/usr.bin/patch/common.h
+++ b/gnu/usr.bin/patch/common.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.9 2002/10/13 01:18:33 kris Exp $
  *
  * $Log: common.h,v $
  * Revision 2.0.1.2  88/06/22  20:44:53  lwall
diff --git a/gnu/usr.bin/patch/inp.c b/gnu/usr.bin/patch/inp.c
index d77ef65ff841..9b35e4debbc9 100644
--- a/gnu/usr.bin/patch/inp.c
+++ b/gnu/usr.bin/patch/inp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/inp.c,v 1.12 2002/05/21 00:44:18 gad Exp $
  *
  * $Log: inp.c,v $
  * Revision 2.0.1.1  88/06/03  15:06:13  lwall
diff --git a/gnu/usr.bin/patch/inp.h b/gnu/usr.bin/patch/inp.h
index f1f0386e02b3..b585d7947cf5 100644
--- a/gnu/usr.bin/patch/inp.h
+++ b/gnu/usr.bin/patch/inp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/inp.h,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: inp.h,v $
  * Revision 2.0  86/09/17  15:37:25  lwall
diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1
index 3cc7957b6304..e17bab84b481 100644
--- a/gnu/usr.bin/patch/patch.1
+++ b/gnu/usr.bin/patch/patch.1
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .rn '' }`
 '\" $Header: patch.man,v 2.0.1.2 88/06/22 20:47:18 lwall Locked $
-'\" $FreeBSD$
+'\" $FreeBSD: src/gnu/usr.bin/patch/patch.1,v 1.14 2004/03/18 20:36:14 dannyboy Exp $
 '\" 
 '\" $Log:	patch.man,v $
 '\" Revision 2.0.1.2  88/06/22  20:47:18  lwall
diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c
index 8e06c33beaf5..e3a069bff466 100644
--- a/gnu/usr.bin/patch/patch.c
+++ b/gnu/usr.bin/patch/patch.c
@@ -1,5 +1,5 @@
 char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/gnu/usr.bin/patch/patch.c,v 1.21 2002/10/13 01:18:33 kris Exp $";
 
 /* patch - a program to apply diffs to original files
  *
diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c
index 7dee1a64ed0e..89c9d327d92c 100644
--- a/gnu/usr.bin/patch/pch.c
+++ b/gnu/usr.bin/patch/pch.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.20 2002/05/21 00:44:18 gad Exp $
  *
  * $Log: pch.c,v $
  * Revision 2.0.2.0  90/05/01  22:17:51  davison
diff --git a/gnu/usr.bin/patch/pch.h b/gnu/usr.bin/patch/pch.h
index d815fe8d14e8..8aebf32db967 100644
--- a/gnu/usr.bin/patch/pch.h
+++ b/gnu/usr.bin/patch/pch.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/pch.h,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: pch.h,v $
  * Revision 2.0.1.1  87/01/30  22:47:16  lwall
diff --git a/gnu/usr.bin/patch/util.c b/gnu/usr.bin/patch/util.c
index b6e6652646b4..436e30f28bc3 100644
--- a/gnu/usr.bin/patch/util.c
+++ b/gnu/usr.bin/patch/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/patch/util.c,v 1.10 2002/05/21 00:44:18 gad Exp $ */
 
 #include <paths.h>
 
diff --git a/gnu/usr.bin/patch/util.h b/gnu/usr.bin/patch/util.h
index f31f2e2d5444..42469ece14bb 100644
--- a/gnu/usr.bin/patch/util.h
+++ b/gnu/usr.bin/patch/util.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/util.h,v 1.8 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: util.h,v $
  * Revision 2.0  86/09/17  15:40:06  lwall
diff --git a/gnu/usr.bin/patch/version.c b/gnu/usr.bin/patch/version.c
index 753dbfbcd629..b32a14e60c10 100644
--- a/gnu/usr.bin/patch/version.c
+++ b/gnu/usr.bin/patch/version.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/version.c,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: version.c,v $
  * Revision 2.0  86/09/17  15:40:11  lwall
diff --git a/gnu/usr.bin/patch/version.h b/gnu/usr.bin/patch/version.h
index faddf7c65ecd..d08fd580c26c 100644
--- a/gnu/usr.bin/patch/version.h
+++ b/gnu/usr.bin/patch/version.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/version.h,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: version.h,v $
  * Revision 2.0  86/09/17  15:40:14  lwall
diff --git a/gnu/usr.bin/rcs/CREDITS b/gnu/usr.bin/rcs/CREDITS
index 589e8b685091..9b3e93cdbabd 100644
--- a/gnu/usr.bin/rcs/CREDITS
+++ b/gnu/usr.bin/rcs/CREDITS
@@ -21,4 +21,4 @@ Brendan Kehoe of Cygnus Support suggested rlog's -N option.
 Paul D. Smith of Data General suggested improvements in option
 and error processing.  Adam Hammer of Purdue QAed.
 
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/rcs/CREDITS,v 1.5 1999/08/27 23:36:36 peter Exp $
diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc
index a46437ad8c82..67c9fd6c43e2 100644
--- a/gnu/usr.bin/rcs/Makefile.inc
+++ b/gnu/usr.bin/rcs/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/Makefile.inc,v 1.4 2005/06/10 06:12:50 des Exp $
 
 LIBRCS=	${.OBJDIR}/../lib/librcs.a
diff --git a/gnu/usr.bin/rcs/NEWS b/gnu/usr.bin/rcs/NEWS
index 99208064bd32..b23236a3b8ac 100644
--- a/gnu/usr.bin/rcs/NEWS
+++ b/gnu/usr.bin/rcs/NEWS
@@ -1,6 +1,6 @@
 Recent changes to RCS (and possible future changes)
 
- $FreeBSD$
+ $FreeBSD: src/gnu/usr.bin/rcs/NEWS,v 1.5 1999/08/27 23:36:36 peter Exp $
 
 	Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert
 	Distributed under license by the Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/rcs/REFS b/gnu/usr.bin/rcs/REFS
index 89fc823525ee..0e008885d3e3 100644
--- a/gnu/usr.bin/rcs/REFS
+++ b/gnu/usr.bin/rcs/REFS
@@ -2,7 +2,7 @@ Here are references to RCS and related free software and documentation.
 Some of this information changes often; see the Frequently Asked Questions
 for more up-to-date references.
 
- $FreeBSD$
+ $FreeBSD: src/gnu/usr.bin/rcs/REFS,v 1.5 1999/08/27 23:36:36 peter Exp $
 
 
 Frequently Asked Questions (FAQs)
diff --git a/gnu/usr.bin/rcs/ci/ci.1 b/gnu/usr.bin/rcs/ci/ci.1
index 1378af222cb8..d55b45d75cdf 100644
--- a/gnu/usr.bin/rcs/ci/ci.1
+++ b/gnu/usr.bin/rcs/ci/ci.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/ci/ci.1,v 1.6 1999/08/27 23:36:38 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c
index 749a4cf6dbe9..dec62f8d7f2c 100644
--- a/gnu/usr.bin/rcs/ci/ci.c
+++ b/gnu/usr.bin/rcs/ci/ci.c
@@ -274,7 +274,7 @@ static struct hshentry newdelta;	/* new delta to be inserted	*/
 static struct stat workstat;
 static struct Symrev *assoclst, **nextassoc;
 
-mainProg(ciId, "ci", "$FreeBSD$")
+mainProg(ciId, "ci", "$FreeBSD: src/gnu/usr.bin/rcs/ci/ci.c,v 1.7 1999/08/27 23:36:38 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/co/co.1 b/gnu/usr.bin/rcs/co/co.1
index 2aea3ad1b40d..9aa12ff8b8c9 100644
--- a/gnu/usr.bin/rcs/co/co.1
+++ b/gnu/usr.bin/rcs/co/co.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/co/co.1,v 1.6 1999/08/27 23:36:39 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/co/co.c b/gnu/usr.bin/rcs/co/co.c
index 51cb2b277927..82564325c10e 100644
--- a/gnu/usr.bin/rcs/co/co.c
+++ b/gnu/usr.bin/rcs/co/co.c
@@ -191,7 +191,7 @@ static struct hshentries *gendeltas;	/* deltas to be generated	*/
 static struct hshentry *targetdelta;	/* final delta to be generated	*/
 static struct stat workstat;
 
-mainProg(coId, "co", "$FreeBSD$")
+mainProg(coId, "co", "$FreeBSD: src/gnu/usr.bin/rcs/co/co.c,v 1.10 1999/08/27 23:36:40 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/doc/rcs.ms b/gnu/usr.bin/rcs/doc/rcs.ms
index f6b0db300330..4abeed7e9805 100644
--- a/gnu/usr.bin/rcs/doc/rcs.ms
+++ b/gnu/usr.bin/rcs/doc/rcs.ms
@@ -18,7 +18,7 @@
 .de Id
 .ND \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/doc/rcs.ms,v 1.5 1999/08/27 23:36:41 peter Exp $
 .RP
 .TL
 RCS\*-A System for Version Control
diff --git a/gnu/usr.bin/rcs/ident/ident.1 b/gnu/usr.bin/rcs/ident/ident.1
index 253a2ce72724..5b1240dd65fc 100644
--- a/gnu/usr.bin/rcs/ident/ident.1
+++ b/gnu/usr.bin/rcs/ident/ident.1
@@ -3,7 +3,7 @@
 .ds Dt \\$4
 .ds iD \\$3 \\$4 \\$5 \\$6 \\$7
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/ident/ident.1,v 1.5 1999/08/27 23:36:42 peter Exp $
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
 .if n .ds - \%--
diff --git a/gnu/usr.bin/rcs/ident/ident.c b/gnu/usr.bin/rcs/ident/ident.c
index 9b8bf57365ec..1057abbb5527 100644
--- a/gnu/usr.bin/rcs/ident/ident.c
+++ b/gnu/usr.bin/rcs/ident/ident.c
@@ -102,7 +102,7 @@ static int match P((FILE*));
 static int scanfile P((FILE*,char const*,int));
 static void reportError P((char const*));
 
-mainProg(identId, "ident", "$FreeBSD$")
+mainProg(identId, "ident", "$FreeBSD: src/gnu/usr.bin/rcs/ident/ident.c,v 1.8 2001/12/10 20:44:31 peter Exp $")
 /*  Ident searches the named files for all occurrences
  *  of the pattern $@: text $ where @ is a keyword.
  */
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
index f21fda1e8100..6883d8145f54 100644
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/lib/Makefile,v 1.9 2004/10/24 15:32:29 ru Exp $
 
 # Define FSYNC_ALL to get slower but safer writes in case of crashes in
 # the middle of CVS/RCS changes
diff --git a/gnu/usr.bin/rcs/lib/conf.h b/gnu/usr.bin/rcs/lib/conf.h
index 96ec07d6c875..805870d35ca5 100644
--- a/gnu/usr.bin/rcs/lib/conf.h
+++ b/gnu/usr.bin/rcs/lib/conf.h
@@ -1,6 +1,6 @@
 /* RCS compile-time configuration */
 
-	/* $FreeBSD$ */
+	/* $FreeBSD: src/gnu/usr.bin/rcs/lib/conf.h,v 1.11 2003/10/26 04:26:52 peter Exp $ */
 
 /*
  * This file is generated automatically.
diff --git a/gnu/usr.bin/rcs/lib/maketime.c b/gnu/usr.bin/rcs/lib/maketime.c
index 0f83bf5690d6..878aa28e9cd7 100644
--- a/gnu/usr.bin/rcs/lib/maketime.c
+++ b/gnu/usr.bin/rcs/lib/maketime.c
@@ -43,7 +43,7 @@ Report problems and direct all questions to:
 #include "maketime.h"
 
 char const maketId[]
-  = "$FreeBSD$";
+  = "$FreeBSD: src/gnu/usr.bin/rcs/lib/maketime.c,v 1.7 1999/08/27 23:36:43 peter Exp $";
 
 static int isleap P((int));
 static int month_days P((struct tm const*));
diff --git a/gnu/usr.bin/rcs/lib/merger.c b/gnu/usr.bin/rcs/lib/merger.c
index 8f1d610d5f56..9f261b65e827 100644
--- a/gnu/usr.bin/rcs/lib/merger.c
+++ b/gnu/usr.bin/rcs/lib/merger.c
@@ -28,7 +28,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mergerId, "$FreeBSD$")
+libId(mergerId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/merger.c,v 1.5 1999/08/27 23:36:44 peter Exp $")
 
 	static char const *normalize_arg P((char const*,char**));
 	static char const *
diff --git a/gnu/usr.bin/rcs/lib/partime.c b/gnu/usr.bin/rcs/lib/partime.c
index 05b010854950..ca796444aa82 100644
--- a/gnu/usr.bin/rcs/lib/partime.c
+++ b/gnu/usr.bin/rcs/lib/partime.c
@@ -46,7 +46,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 
 char const partimeId[]
-  = "$FreeBSD$";
+  = "$FreeBSD: src/gnu/usr.bin/rcs/lib/partime.c,v 1.6 1999/08/27 23:36:44 peter Exp $";
 
 
 /* Lookup tables for names of months, weekdays, time zones.  */
diff --git a/gnu/usr.bin/rcs/lib/rcsbase.h b/gnu/usr.bin/rcs/lib/rcsbase.h
index 9f2f68cc8b6b..c44af38156e4 100644
--- a/gnu/usr.bin/rcs/lib/rcsbase.h
+++ b/gnu/usr.bin/rcs/lib/rcsbase.h
@@ -1,6 +1,6 @@
 /* RCS common definitions and data structures */
 
-#define RCSBASE "$FreeBSD$"
+#define RCSBASE "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsbase.h,v 1.10 1999/08/27 23:36:44 peter Exp $"
 
 /* Copyright 1982, 1988, 1989 Walter Tichy
    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/lib/rcsedit.c b/gnu/usr.bin/rcs/lib/rcsedit.c
index dc9dd307de6a..5c8212d46766 100644
--- a/gnu/usr.bin/rcs/lib/rcsedit.c
+++ b/gnu/usr.bin/rcs/lib/rcsedit.c
@@ -201,7 +201,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(editId, "$FreeBSD$")
+libId(editId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsedit.c,v 1.12 2001/05/06 03:07:12 kris Exp $")
 
 static void editEndsPrematurely P((void)) exiting;
 static void editLineNumberOverflow P((void)) exiting;
diff --git a/gnu/usr.bin/rcs/lib/rcsfcmp.c b/gnu/usr.bin/rcs/lib/rcsfcmp.c
index ef0529001b87..7a9a68f01b7c 100644
--- a/gnu/usr.bin/rcs/lib/rcsfcmp.c
+++ b/gnu/usr.bin/rcs/lib/rcsfcmp.c
@@ -118,7 +118,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(fcmpId, "$FreeBSD$")
+libId(fcmpId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsfcmp.c,v 1.7 1999/08/27 23:36:45 peter Exp $")
 
 	static int discardkeyval P((int,RILE*));
 	static int
diff --git a/gnu/usr.bin/rcs/lib/rcsfnms.c b/gnu/usr.bin/rcs/lib/rcsfnms.c
index 00caec5adf6f..4ba009d9d989 100644
--- a/gnu/usr.bin/rcs/lib/rcsfnms.c
+++ b/gnu/usr.bin/rcs/lib/rcsfnms.c
@@ -177,7 +177,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(fnmsId, "$FreeBSD$")
+libId(fnmsId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsfnms.c,v 1.11 2001/05/06 03:07:12 kris Exp $")
 
 static char const *bindex P((char const*,int));
 static int fin2open P((char const*, size_t, char const*, size_t, char const*, size_t, RILE*(*)P((struct buf*,struct stat*,int)), int));
diff --git a/gnu/usr.bin/rcs/lib/rcsgen.c b/gnu/usr.bin/rcs/lib/rcsgen.c
index 35d8702a34f8..03469ec010df 100644
--- a/gnu/usr.bin/rcs/lib/rcsgen.c
+++ b/gnu/usr.bin/rcs/lib/rcsgen.c
@@ -140,7 +140,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(genId, "$FreeBSD$")
+libId(genId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsgen.c,v 1.7 1999/08/27 23:36:46 peter Exp $")
 
 int interactiveflag;  /* Should we act as if stdin is a tty?  */
 struct buf curlogbuf;  /* buffer for current log message */
diff --git a/gnu/usr.bin/rcs/lib/rcskeep.c b/gnu/usr.bin/rcs/lib/rcskeep.c
index 4a90f851e615..059e815abf64 100644
--- a/gnu/usr.bin/rcs/lib/rcskeep.c
+++ b/gnu/usr.bin/rcs/lib/rcskeep.c
@@ -98,7 +98,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(keepId, "$FreeBSD$")
+libId(keepId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcskeep.c,v 1.8 1999/08/27 23:36:46 peter Exp $")
 
 static int badly_terminated P((void));
 static int checknum P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcskeys.c b/gnu/usr.bin/rcs/lib/rcskeys.c
index 378f57dd0f77..34e2c39af1f2 100644
--- a/gnu/usr.bin/rcs/lib/rcskeys.c
+++ b/gnu/usr.bin/rcs/lib/rcskeys.c
@@ -63,7 +63,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(keysId, "$FreeBSD$")
+libId(keysId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcskeys.c,v 1.13 2002/02/08 11:57:43 ru Exp $")
 
 
 char const *Keyword[] = {
diff --git a/gnu/usr.bin/rcs/lib/rcslex.c b/gnu/usr.bin/rcs/lib/rcslex.c
index 7a11f79b46c8..e8c00e3486c0 100644
--- a/gnu/usr.bin/rcs/lib/rcslex.c
+++ b/gnu/usr.bin/rcs/lib/rcslex.c
@@ -168,7 +168,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(lexId, "$FreeBSD$")
+libId(lexId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcslex.c,v 1.8 1999/08/27 23:36:47 peter Exp $")
 
 static char *checkidentifier P((char*,int,int));
 static void errsay P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcsmap.c b/gnu/usr.bin/rcs/lib/rcsmap.c
index 89fb08daf364..fa4bd8ab5b76 100644
--- a/gnu/usr.bin/rcs/lib/rcsmap.c
+++ b/gnu/usr.bin/rcs/lib/rcsmap.c
@@ -29,7 +29,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mapId, "$FreeBSD$")
+libId(mapId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsmap.c,v 1.5 1999/08/27 23:36:47 peter Exp $")
 
 /* map of character types */
 /* ISO 8859/1 (Latin-1) */
diff --git a/gnu/usr.bin/rcs/lib/rcsrev.c b/gnu/usr.bin/rcs/lib/rcsrev.c
index 12c6c43006ac..3d623d5b40a7 100644
--- a/gnu/usr.bin/rcs/lib/rcsrev.c
+++ b/gnu/usr.bin/rcs/lib/rcsrev.c
@@ -105,7 +105,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(revId, "$FreeBSD$")
+libId(revId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsrev.c,v 1.8 1999/08/27 23:36:48 peter Exp $")
 
 static char const *branchtip P((char const*));
 static char const *lookupsym P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcssyn.c b/gnu/usr.bin/rcs/lib/rcssyn.c
index 07f155bfb8ea..72e84ec1efa5 100644
--- a/gnu/usr.bin/rcs/lib/rcssyn.c
+++ b/gnu/usr.bin/rcs/lib/rcssyn.c
@@ -153,7 +153,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(synId, "$FreeBSD$")
+libId(synId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcssyn.c,v 1.7 1999/08/27 23:36:48 peter Exp $")
 
 static char const *getkeyval P((char const*,enum tokens,int));
 static int getdelta P((void));
diff --git a/gnu/usr.bin/rcs/lib/rcstime.c b/gnu/usr.bin/rcs/lib/rcstime.c
index cfd466096ff7..6083c1e4bd0d 100644
--- a/gnu/usr.bin/rcs/lib/rcstime.c
+++ b/gnu/usr.bin/rcs/lib/rcstime.c
@@ -30,7 +30,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 #include "maketime.h"
 
-libId(rcstimeId, "$FreeBSD$")
+libId(rcstimeId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcstime.c,v 1.5 1999/08/27 23:36:48 peter Exp $")
 
 static long zone_offset; /* seconds east of UTC, or TM_LOCAL_ZONE */
 static int use_zone_offset; /* if zero, use UTC without zone indication */
diff --git a/gnu/usr.bin/rcs/lib/rcsutil.c b/gnu/usr.bin/rcs/lib/rcsutil.c
index e10afff6c20d..dfa516a6d491 100644
--- a/gnu/usr.bin/rcs/lib/rcsutil.c
+++ b/gnu/usr.bin/rcs/lib/rcsutil.c
@@ -186,7 +186,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(utilId, "$FreeBSD$")
+libId(utilId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsutil.c,v 1.8 1999/08/27 23:36:49 peter Exp $")
 
 #if !has_memcmp
 	int
diff --git a/gnu/usr.bin/rcs/merge/merge.1 b/gnu/usr.bin/rcs/merge/merge.1
index a4fd35b7986a..d59d9c2539a3 100644
--- a/gnu/usr.bin/rcs/merge/merge.1
+++ b/gnu/usr.bin/rcs/merge/merge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/merge/merge.1,v 1.6 1999/08/27 23:36:50 peter Exp $
 .ds r \&\s-1RCS\s0
 .TH MERGE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index aa127bf1c8ec..57e540e70b2b 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -41,7 +41,7 @@ badoption(a)
 }
 
 
-mainProg(mergeId, "merge", "$FreeBSD$")
+mainProg(mergeId, "merge", "$FreeBSD: src/gnu/usr.bin/rcs/merge/merge.c,v 1.5 1999/08/27 23:36:51 peter Exp $")
 {
 	register char const *a;
 	char const *arg[3], *label[3], *edarg = 0;
diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile
index aa7cc5fb315d..7e97a2ec7f4d 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile
+++ b/gnu/usr.bin/rcs/rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcs/Makefile,v 1.8 2001/03/27 14:59:05 ru Exp $
 
 PROG=	rcs
 MAN=	rcs.1 rcsintro.1 rcsfile.5
diff --git a/gnu/usr.bin/rcs/rcs/rcs.1 b/gnu/usr.bin/rcs/rcs/rcs.1
index 37fb59fea068..0b0dba116b65 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.1
+++ b/gnu/usr.bin/rcs/rcs/rcs.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcs.1,v 1.5 1999/08/27 23:36:52 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcs.c b/gnu/usr.bin/rcs/rcs/rcs.c
index dfb622a6f808..d97ad3717cd1 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.c
+++ b/gnu/usr.bin/rcs/rcs/rcs.c
@@ -275,7 +275,7 @@ static struct delrevpair delrev;
 static struct hshentry *cuthead, *cuttail, *delstrt;
 static struct hshentries *gendeltas;
 
-mainProg(rcsId, "rcs", "$FreeBSD$")
+mainProg(rcsId, "rcs", "$FreeBSD: src/gnu/usr.bin/rcs/rcs/rcs.c,v 1.7 1999/08/27 23:36:52 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcs usage: rcs -{ae}logins -Afile -{blu}[rev] -cstring -{iILqTU} -ksubst -mrev:msg -{nN}name[:[rev]] -orange -sstate[:rev] -t[text] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcs/rcsfile.5 b/gnu/usr.bin/rcs/rcs/rcsfile.5
index 0d8aac874d45..6d2f7404e1a4 100644
--- a/gnu/usr.bin/rcs/rcs/rcsfile.5
+++ b/gnu/usr.bin/rcs/rcs/rcsfile.5
@@ -5,7 +5,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcsfile.5,v 1.6 2001/07/09 09:53:19 dd Exp $
 .ds r \s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcsintro.1 b/gnu/usr.bin/rcs/rcs/rcsintro.1
index edcd9ee9389d..f02c0e7ea927 100644
--- a/gnu/usr.bin/rcs/rcs/rcsintro.1
+++ b/gnu/usr.bin/rcs/rcs/rcsintro.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcsintro.1,v 1.5 1999/08/27 23:36:53 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.1 b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
index 3111915455a6..5f8245060ec6 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.1
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsclean/rcsclean.1,v 1.5 1999/08/27 23:36:54 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.c b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
index 32c8e7dfbc63..6759d8263f25 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.c
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
@@ -38,7 +38,7 @@ static void cleanup P((void));
 static RILE *workptr;
 static int exitstatus;
 
-mainProg(rcscleanId, "rcsclean", "$FreeBSD$")
+mainProg(rcscleanId, "rcsclean", "$FreeBSD: src/gnu/usr.bin/rcs/rcsclean/rcsclean.c,v 1.5 1999/08/27 23:36:54 peter Exp $")
 {
 	static char const usage[] =
 		"\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1 b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
index 74117c270e6c..deeedd9ec94f 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1,v 1.5 1999/08/27 23:36:55 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
index 7d3c0a37f66a..8c8a119055aa 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
@@ -151,7 +151,7 @@ static int exitstatus;
 static RILE *workptr;
 static struct stat workstat;
 
-mainProg(rcsdiffId, "rcsdiff", "$FreeBSD$")
+mainProg(rcsdiffId, "rcsdiff", "$FreeBSD: src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c,v 1.8 1999/08/27 23:36:55 peter Exp $")
 {
     static char const cmdusage[] =
 	    "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone [diff options] file ...";
diff --git a/gnu/usr.bin/rcs/rcsfreeze/Makefile b/gnu/usr.bin/rcs/rcsfreeze/Makefile
index 1b249c737f17..3e6247d15492 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/Makefile
+++ b/gnu/usr.bin/rcs/rcsfreeze/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.9 2004/10/18 21:44:17 ru Exp $
 
 SCRIPTS= rcsfreeze.sh
 MAN=	rcsfreeze.1
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1 b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
index 3f513c4d65ad..084830aeb51d 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1,v 1.5 1999/08/27 23:36:57 peter Exp $
 .ds r \s-1RCS\s0
 .TH RCSFREEZE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
index be79406fe0c1..9ef61e118409 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
@@ -2,7 +2,7 @@
 
 # rcsfreeze - assign a symbolic revision number to a configuration of RCS files
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh,v 1.9 2001/03/02 16:52:11 ru Exp $
 
 #       The idea is to run rcsfreeze each time a new version is checked
 #       in. A unique symbolic revision number (C_[number], where number
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
index aff6f666dabb..e9c4187f7313 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1,v 1.5 1999/08/27 23:36:58 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
index e09dc2469867..72ef0cf09ad7 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -117,7 +117,7 @@ Report problems and direct all questions to:
 
 static char const co[] = CO;
 
-mainProg(rcsmergeId, "rcsmerge", "$FreeBSD$")
+mainProg(rcsmergeId, "rcsmerge", "$FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c,v 1.7 1999/08/27 23:36:58 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
diff --git a/gnu/usr.bin/rcs/rcstest b/gnu/usr.bin/rcs/rcstest
index 75165f1bbd59..777ff906678c 100755
--- a/gnu/usr.bin/rcs/rcstest
+++ b/gnu/usr.bin/rcs/rcstest
@@ -15,7 +15,7 @@
 
 # The current directory and ./RCS must be readable, writable, and searchable.
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcstest,v 1.5 1999/08/27 23:36:37 peter Exp $
 
 
 #    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/rlog/rlog.1 b/gnu/usr.bin/rcs/rlog/rlog.1
index 26bf08a2bcb0..891b4a23dfe9 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.1
+++ b/gnu/usr.bin/rcs/rlog/rlog.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rlog/rlog.1,v 1.8 1999/08/27 23:36:59 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/rlog/rlog.c b/gnu/usr.bin/rcs/rlog/rlog.c
index f8872febb971..755828cca3de 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.c
+++ b/gnu/usr.bin/rcs/rlog/rlog.c
@@ -218,7 +218,7 @@ static struct rcslockers *lockerlist;
 static struct stateattri *statelist;
 
 
-mainProg(rlogId, "rlog", "$FreeBSD$")
+mainProg(rlogId, "rlog", "$FreeBSD: src/gnu/usr.bin/rcs/rlog/rlog.c,v 1.13 1999/08/27 23:36:59 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrlog usage: rlog -{bhLNRt} -v[string] -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index f4f4c2812886..b5c338b833d8 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/sdiff/Makefile,v 1.6 2004/02/17 01:30:56 ache Exp $
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/sdiff/sdiff.1 b/gnu/usr.bin/sdiff/sdiff.1
index b5faa3e0b69b..d4040dcb607e 100644
--- a/gnu/usr.bin/sdiff/sdiff.1
+++ b/gnu/usr.bin/sdiff/sdiff.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/sdiff/sdiff.1,v 1.2 2002/12/14 23:58:49 keramida Exp $
 .\"
 .TH SDIFF 1 "22sep1993" "GNU Tools" "GNU Tools"
 .SH NAME
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index f17db49acca5..60b9d0b03318 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.18 2003/09/07 13:38:07 ru Exp $
 #
 # Makefile for building a standalone send-pr.
 #
diff --git a/gnu/usr.bin/send-pr/categories b/gnu/usr.bin/send-pr/categories
index b1a1f3392fab..7162cad3e863 100644
--- a/gnu/usr.bin/send-pr/categories
+++ b/gnu/usr.bin/send-pr/categories
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.17 2005/01/05 12:13:10 ceri Exp $
 advocacy
 alpha
 amd64
diff --git a/gnu/usr.bin/send-pr/doc/categ.texi b/gnu/usr.bin/send-pr/doc/categ.texi
index fe84918c917f..e7d9a48c5d72 100644
--- a/gnu/usr.bin/send-pr/doc/categ.texi
+++ b/gnu/usr.bin/send-pr/doc/categ.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/categ.texi,v 1.2 2000/10/29 22:05:52 steve Exp $
 
 @node Valid Categories
 @unnumberedsec Valid Categories
diff --git a/gnu/usr.bin/send-pr/doc/fields.texi b/gnu/usr.bin/send-pr/doc/fields.texi
index 0cce6424dc4b..bc6eb8ba24e4 100644
--- a/gnu/usr.bin/send-pr/doc/fields.texi
+++ b/gnu/usr.bin/send-pr/doc/fields.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/fields.texi,v 1.3 2002/08/29 22:59:22 keramida Exp $
 
 @node Fields
 @section Problem Report format
diff --git a/gnu/usr.bin/send-pr/doc/s-usage.texi b/gnu/usr.bin/send-pr/doc/s-usage.texi
index 5c9006b200af..6e4a19d10c22 100644
--- a/gnu/usr.bin/send-pr/doc/s-usage.texi
+++ b/gnu/usr.bin/send-pr/doc/s-usage.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/s-usage.texi,v 1.3 2000/10/29 22:05:52 steve Exp $
 
 @c This is the usage section for send-pr.  It is called as 
 @c chapter (Invoking send-pr) by send-pr.texi, and also as
diff --git a/gnu/usr.bin/send-pr/doc/send-pr.texi b/gnu/usr.bin/send-pr/doc/send-pr.texi
index 1abb296d8645..d08be352936f 100644
--- a/gnu/usr.bin/send-pr/doc/send-pr.texi
+++ b/gnu/usr.bin/send-pr/doc/send-pr.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/send-pr.texi,v 1.3 2000/10/29 22:05:52 steve Exp $
 
 \input texinfo   @c -*-texinfo-*-
 @setfilename send-pr.info
diff --git a/gnu/usr.bin/send-pr/doc/states.texi b/gnu/usr.bin/send-pr/doc/states.texi
index f38405c8f292..c264169a65f8 100644
--- a/gnu/usr.bin/send-pr/doc/states.texi
+++ b/gnu/usr.bin/send-pr/doc/states.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/states.texi,v 1.2 2000/10/29 22:05:52 steve Exp $
 
 @node States
 @section States of Problem Reports
diff --git a/gnu/usr.bin/send-pr/doc/version.texi b/gnu/usr.bin/send-pr/doc/version.texi
index bffedc2a60d9..405d774a4416 100644
--- a/gnu/usr.bin/send-pr/doc/version.texi
+++ b/gnu/usr.bin/send-pr/doc/version.texi
@@ -1,3 +1,3 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/version.texi,v 1.2 2000/10/29 22:05:52 steve Exp $
 
 @set VERSION 3.113
diff --git a/gnu/usr.bin/send-pr/send-pr-el.in b/gnu/usr.bin/send-pr/send-pr-el.in
index 8195ecbd0dd4..c8e3ff720fed 100644
--- a/gnu/usr.bin/send-pr/send-pr-el.in
+++ b/gnu/usr.bin/send-pr/send-pr-el.in
@@ -40,7 +40,7 @@
 ;;;;
 ;;;;---------------------------------------------------------------------------
 ;;;;
-;;;; $FreeBSD$
+;;;; $FreeBSD: src/gnu/usr.bin/send-pr/send-pr-el.in,v 1.7 2000/10/29 22:11:38 steve Exp $
 
 (provide 'send-pr)
 
diff --git a/gnu/usr.bin/send-pr/send-pr.1 b/gnu/usr.bin/send-pr/send-pr.1
index 5df0ed37e956..2ea8fcc3ff16 100644
--- a/gnu/usr.bin/send-pr/send-pr.1
+++ b/gnu/usr.bin/send-pr/send-pr.1
@@ -22,7 +22,7 @@
 .\"
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.18 2005/06/16 19:27:12 ceri Exp $
 .nh
 .TH SEND-PR 1 3.113 "February 1993"
 .SH NAME
diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index 594c40a9c65d..a8950b032a80 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -20,7 +20,7 @@
 # along with GNU GNATS; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.36 2004/09/14 20:30:35 ceri Exp $
 
 # The version of this send-pr.
 VERSION=3.113
diff --git a/gnu/usr.bin/sort/Makefile b/gnu/usr.bin/sort/Makefile
index 2b116183792f..5f76bd7921f1 100644
--- a/gnu/usr.bin/sort/Makefile
+++ b/gnu/usr.bin/sort/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/sort/Makefile,v 1.12 2004/08/12 06:02:28 tjr Exp $
 
 SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort
 .PATH: ${SORTDIR}/lib ${SORTDIR}/src ${SORTDIR}/man
diff --git a/gnu/usr.bin/sort/alloca.h b/gnu/usr.bin/sort/alloca.h
index 59a1309f3cdc..839bdd15e2f9 100644
--- a/gnu/usr.bin/sort/alloca.h
+++ b/gnu/usr.bin/sort/alloca.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/alloca.h,v 1.1 2004/07/02 09:34:37 tjr Exp $ */
 extern void *alloca(size_t size);
diff --git a/gnu/usr.bin/sort/config.h b/gnu/usr.bin/sort/config.h
index 44f944c04b0c..127dee1234a2 100644
--- a/gnu/usr.bin/sort/config.h
+++ b/gnu/usr.bin/sort/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.8 2004/08/12 06:40:31 tjr Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
diff --git a/gnu/usr.bin/sort/localedir.h b/gnu/usr.bin/sort/localedir.h
index f119a5fbad3a..7da16bcbc4f0 100644
--- a/gnu/usr.bin/sort/localedir.h
+++ b/gnu/usr.bin/sort/localedir.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/localedir.h,v 1.1 2004/07/02 09:34:37 tjr Exp $ */
 #define	LOCALEDIR	""
diff --git a/gnu/usr.bin/sort/unlocked-io.h b/gnu/usr.bin/sort/unlocked-io.h
index 3c7a4765eeda..8270f1ad8890 100644
--- a/gnu/usr.bin/sort/unlocked-io.h
+++ b/gnu/usr.bin/sort/unlocked-io.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/unlocked-io.h,v 1.1 2002/06/08 10:34:12 ache Exp $ */
 /* Dummy file for trimmed down sort */
diff --git a/gnu/usr.bin/tar/Makefile b/gnu/usr.bin/tar/Makefile
index 24a0a0d5504b..01600476a826 100644
--- a/gnu/usr.bin/tar/Makefile
+++ b/gnu/usr.bin/tar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.26 2005/03/21 04:02:42 kientzle Exp $
 
 TARDIR=	${.CURDIR}/../../../contrib/tar
 .PATH: ${TARDIR}/lib ${TARDIR}/src
diff --git a/gnu/usr.bin/tar/config.h b/gnu/usr.bin/tar/config.h
index a0aecf4f26d6..68a0f70e01a5 100644
--- a/gnu/usr.bin/tar/config.h
+++ b/gnu/usr.bin/tar/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/tar/config.h,v 1.3 2003/09/04 01:29:11 peter Exp $ */
 
 #include <paths.h>
 
diff --git a/gnu/usr.bin/tar/doc/Makefile b/gnu/usr.bin/tar/doc/Makefile
index 2d2657de8671..17d540879a29 100644
--- a/gnu/usr.bin/tar/doc/Makefile
+++ b/gnu/usr.bin/tar/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/tar/doc/Makefile,v 1.3 2002/06/05 06:59:10 ru Exp $
 
 INFO=	tar
 SRCDIR=	${.CURDIR}/../../../../contrib/tar/doc
diff --git a/gnu/usr.bin/tar/localedir.h b/gnu/usr.bin/tar/localedir.h
index da23dbe43a4f..16630323e6f4 100644
--- a/gnu/usr.bin/tar/localedir.h
+++ b/gnu/usr.bin/tar/localedir.h
@@ -1 +1 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/tar/localedir.h,v 1.1 2002/06/04 11:14:48 sobomax Exp $ */
diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1
index 582167f843a9..556ba45c68e6 100644
--- a/gnu/usr.bin/tar/tar.1
+++ b/gnu/usr.bin/tar/tar.1
@@ -4,7 +4,7 @@
 .\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
 .\"	Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.48 2005/02/13 22:25:11 ru Exp $
 .\"
 .Dd December 23, 2000
 .Os
diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index dc0d9e420a2c..4c5a6d0a389c 100644
--- a/gnu/usr.bin/texinfo/Makefile
+++ b/gnu/usr.bin/texinfo/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile,v 1.11 2002/03/25 13:20:03 ru Exp $
 #
 
 SUBDIR= libtxi makeinfo info infokey install-info texindex doc
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index d5c8e8154e46..4d0ec7228627 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/gnu/usr.bin/texinfo/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.12 2005/06/10 06:12:51 des Exp $
 
 TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
 LIBTXI=		${.OBJDIR}/../libtxi/libtxi.a
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile
index 2a0b1a3616a7..0dd18306c7e1 100644
--- a/gnu/usr.bin/texinfo/doc/Makefile
+++ b/gnu/usr.bin/texinfo/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/doc/Makefile,v 1.12 2000/01/17 10:59:24 ru Exp $
 
 INFO=	info info-stnd texinfo
 SRCDIR=	${TXIDIR}/doc
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index 07dedeaec5a4..d5af7f19a159 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.13 2002/06/05 06:58:32 ru Exp $
 
 PROG=	info
 MAN=	info.1 info.5 texinfo.5
diff --git a/gnu/usr.bin/texinfo/infokey/Makefile b/gnu/usr.bin/texinfo/infokey/Makefile
index 50be00d91405..6c4e03a5b370 100644
--- a/gnu/usr.bin/texinfo/infokey/Makefile
+++ b/gnu/usr.bin/texinfo/infokey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/infokey/Makefile,v 1.4 2005/05/23 10:52:07 ru Exp $
 
 PROG=	infokey
 SRCS=	infokey.c key.c
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile
index 325c9095b35f..81496c3edfb8 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile
+++ b/gnu/usr.bin/texinfo/install-info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/install-info/Makefile,v 1.12 2002/06/05 06:58:32 ru Exp $
 
 PROG=	install-info
 
diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile
index 8decad1daed4..7dabf988f4e6 100644
--- a/gnu/usr.bin/texinfo/libtxi/Makefile
+++ b/gnu/usr.bin/texinfo/libtxi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/libtxi/Makefile,v 1.10 2004/10/24 15:32:29 ru Exp $
 
 LIB=	txi
 INTERNALLIB=
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index 373c326467b4..01f079cfc4f3 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/makeinfo/Makefile,v 1.17 2005/05/23 10:52:07 ru Exp $
 
 PROG=	makeinfo
 SRCS=	cmds.c defun.c files.c float.c footnote.c html.c \
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile
index 91c2dfc14e30..00a36664f2cd 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile
+++ b/gnu/usr.bin/texinfo/texindex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/texindex/Makefile,v 1.8 2002/06/05 06:58:33 ru Exp $
 
 PROG=	texindex
 
diff --git a/include/Makefile b/include/Makefile
index d336eaad0ed3..e497b403c1fd 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD$
+# $FreeBSD: src/include/Makefile,v 1.244.2.1 2005/08/05 20:02:45 pjd Exp $
 #
 # Doing a "make install" builds /usr/include.
 
diff --git a/include/_ctype.h b/include/_ctype.h
index 1a42952a09dc..888f287571ba 100644
--- a/include/_ctype.h
+++ b/include/_ctype.h
@@ -40,7 +40,7 @@
  *
  * From @(#)ctype.h	8.4 (Berkeley) 1/21/94
  * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp
- * $FreeBSD$
+ * $FreeBSD: src/include/_ctype.h,v 1.30 2004/08/21 07:00:40 tjr Exp $
  */
 
 #ifndef __CTYPE_H_
diff --git a/include/a.out.h b/include/a.out.h
index b0bbe4954819..4053ce08d8c9 100644
--- a/include/a.out.h
+++ b/include/a.out.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)a.out.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/a.out.h,v 1.4 2004/06/22 17:05:36 obrien Exp $
  */
 
 #ifndef	_AOUT_H_
diff --git a/include/arpa/Makefile b/include/arpa/Makefile
index a480b31341e5..1944e03c7d47 100644
--- a/include/arpa/Makefile
+++ b/include/arpa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/include/arpa/Makefile,v 1.3 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 41cbc11f2cf1..d50e4668b053 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -50,7 +50,7 @@
  *
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  *	From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/inet.h,v 1.25 2002/08/21 16:19:56 mike Exp $
  */
 
 #ifndef _ARPA_INET_H_
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 99b51c2e7254..8735b8bd36f2 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -50,7 +50,7 @@
 
 /*
  *	From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/nameser.h,v 1.16 2002/03/23 17:24:55 imp Exp $
  */
 
 #ifndef _ARPA_NAMESER_H_
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index e4f8ab844de6..5f3e8338a7dc 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -33,7 +33,7 @@
 /*
  *      from nameser.h	8.1 (Berkeley) 6/2/93
  *	From: Id: nameser_compat.h,v 8.9 1998/03/20 23:25:10 halley Exp
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.4 2002/05/28 04:32:25 mike Exp $
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h
index c937f03eacde..dd941c7e700a 100644
--- a/include/arpa/telnet.h
+++ b/include/arpa/telnet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/telnet.h,v 1.9 2003/01/18 06:13:57 billf Exp $
  */
 
 #ifndef _ARPA_TELNET_H_
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h
index 84d7dc167c8f..1de4dd48a960 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/tftp.h,v 1.5 2001/09/27 20:50:14 obrien Exp $
  */
 
 #ifndef _ARPA_TFTP_H_
diff --git a/include/assert.h b/include/assert.h
index f267a4a2a2ab..5ad013563851 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)assert.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/assert.h,v 1.4 2002/03/23 17:24:53 imp Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/include/bitstring.h b/include/bitstring.h
index cef9d0248d84..3dfb955cb4a6 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/bitstring.h,v 1.3 2003/06/13 19:40:13 phk Exp $
  */
 
 #ifndef _BITSTRING_H_
diff --git a/include/complex.h b/include/complex.h
index 502a178dff33..51d9a7f72251 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/complex.h,v 1.6 2004/08/14 18:03:21 stefanf Exp $
  */
 
 #ifndef _COMPLEX_H
diff --git a/include/cpio.h b/include/cpio.h
index e1d27ce5d2d9..d287af631ca1 100644
--- a/include/cpio.h
+++ b/include/cpio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/cpio.h,v 1.1 2002/08/01 07:18:38 mike Exp $
  */
 
 #ifndef _CPIO_H_
diff --git a/include/ctype.h b/include/ctype.h
index 0825ff652c28..4368a9bfb064 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ctype.h	8.4 (Berkeley) 1/21/94
- *      $FreeBSD$
+ *      $FreeBSD: src/include/ctype.h,v 1.28 2004/08/12 09:33:47 tjr Exp $
  */
 
 #ifndef _CTYPE_H_
diff --git a/include/db.h b/include/db.h
index c192a88733da..a3975f0eda53 100644
--- a/include/db.h
+++ b/include/db.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)db.h	8.7 (Berkeley) 6/16/94
- * $FreeBSD$
+ * $FreeBSD: src/include/db.h,v 1.5 2002/03/26 01:35:05 bde Exp $
  */
 
 #ifndef _DB_H_
diff --git a/include/dirent.h b/include/dirent.h
index d686dafc8e9f..1d0e1e0be566 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.2 (Berkeley) 7/28/94
- * $FreeBSD$
+ * $FreeBSD: src/include/dirent.h,v 1.14 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _DIRENT_H_
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 2575861ed8c4..581ffcf1b2de 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/dlfcn.h,v 1.19 2003/02/13 17:47:43 kan Exp $
  */
 
 #ifndef _DLFCN_H_
diff --git a/include/elf-hints.h b/include/elf-hints.h
index e009074a98e7..d572a4f14a43 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/elf-hints.h,v 1.4 2001/05/02 23:56:17 obrien Exp $
  */
 
 #ifndef	_ELF_HINTS_H_
diff --git a/include/elf.h b/include/elf.h
index c094a1c78837..b67318709d8a 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $
  */
 
 /*
diff --git a/include/err.h b/include/err.h
index 675c708f98cb..a3c04cf19f46 100644
--- a/include/err.h
+++ b/include/err.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)err.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/err.h,v 1.11 2002/08/21 16:19:55 mike Exp $
  */
 
 #ifndef _ERR_H_
diff --git a/include/fmtmsg.h b/include/fmtmsg.h
index 32f0970fb94e..256cf335e696 100644
--- a/include/fmtmsg.h
+++ b/include/fmtmsg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/fmtmsg.h,v 1.2 2002/08/05 16:37:05 mike Exp $
  */
 
 #ifndef _FMTMSG_H_
diff --git a/include/fnmatch.h b/include/fnmatch.h
index f905ff6e3c26..d1cc03ac650d 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/fnmatch.h,v 1.15 2003/12/18 10:41:39 jkh Exp $
  *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
  */
 
diff --git a/include/fstab.h b/include/fstab.h
index cae9172aed8c..22d807cb6bd1 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fstab.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/fstab.h,v 1.4 2003/04/07 12:54:59 mdodd Exp $
  */
 
 #ifndef _FSTAB_H_
diff --git a/include/fts.h b/include/fts.h
index 7eb03a649943..2178559a0598 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
+ * $FreeBSD: src/include/fts.h,v 1.11 2005/01/07 00:06:20 pjd Exp $
  */
 
 #ifndef	_FTS_H_
diff --git a/include/ftw.h b/include/ftw.h
index f01fda20d925..9fc3edea17b8 100644
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -19,7 +19,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/ftw.h,v 1.2 2004/08/24 13:00:54 tjr Exp $
  */
 
 #ifndef	_FTW_H
diff --git a/include/getopt.h b/include/getopt.h
index dca3c3d66194..ddacd89406e9 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/getopt.h,v 1.6 2004/02/24 08:09:20 ache Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/include/glob.h b/include/glob.h
index 694ac40589af..8a8d2aad645a 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/glob.h,v 1.7 2002/07/17 04:58:09 mikeh Exp $
  */
 
 #ifndef _GLOB_H_
diff --git a/include/grp.h b/include/grp.h
index 70b4a8a24513..55a57a715223 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)grp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/grp.h,v 1.18 2003/04/17 14:15:25 nectar Exp $
  */
 
 #ifndef _GRP_H_
diff --git a/include/hesiod.h b/include/hesiod.h
index 4b5d42f7d302..c7dbeee332e7 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hesiod.h,v 1.3 1999/01/24 23:53:18 lukem Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/hesiod.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */
 
 
 /*-
diff --git a/include/histedit.h b/include/histedit.h
index a4db871fc964..c7415a0b24e3 100644
--- a/include/histedit.h
+++ b/include/histedit.h
@@ -31,7 +31,7 @@
  *
  *	@(#)histedit.h	8.2 (Berkeley) 1/3/94
  *	$NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/histedit.h,v 1.9.10.1 2005/10/09 03:44:00 delphij Exp $
  */
 
 /*
diff --git a/include/ieeefp.h b/include/ieeefp.h
index e4f943d38916..981deea0a2cd 100644
--- a/include/ieeefp.h
+++ b/include/ieeefp.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/ieeefp.h,v 1.7 2003/01/19 06:01:32 marcel Exp $ */
 
 /* 
  * Written by J.T. Conklin, Apr 6, 1995
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index f0911a48f3ef..4de13c5a6138 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/include/ifaddrs.h,v 1.3 2003/11/14 18:53:22 bms Exp $	*/
 
 /*
  * Copyright (c) 1995, 1999
diff --git a/include/inttypes.h b/include/inttypes.h
index 05171a6c9d42..ae537a577198 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/inttypes.h,v 1.8 2002/09/22 08:06:45 tjr Exp $
  */
 
 #ifndef _INTTYPES_H_
diff --git a/include/iso646.h b/include/iso646.h
index d38bf4be6a2e..392b19f0b53f 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/iso646.h,v 1.4 2002/09/18 22:23:59 mike Exp $
  */
 
 #ifndef _ISO646_H_
diff --git a/include/kenv.h b/include/kenv.h
index 87f36f33c94a..e41bb5980630 100644
--- a/include/kenv.h
+++ b/include/kenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/kenv.h,v 1.1 2002/04/17 13:06:32 mux Exp $
  */
 
 #ifndef _KENV_H_
diff --git a/include/langinfo.h b/include/langinfo.h
index 59b50f9ce34c..4a1375ce7725 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/langinfo.h,v 1.6 2002/09/18 05:54:25 mike Exp $
  */
 
 #ifndef _LANGINFO_H_
diff --git a/include/libgen.h b/include/libgen.h
index 3639c712b9fa..df21c663bf7f 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/include/libgen.h,v 1.2 2002/03/23 17:24:53 imp Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/include/limits.h b/include/limits.h
index 3f770cc3408e..587f01f767bc 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/include/limits.h,v 1.16 2003/04/29 13:35:58 kan Exp $
  */
 
 #ifndef _LIMITS_H_
diff --git a/include/link.h b/include/link.h
index f95bbe8872a4..bb1c737dd552 100644
--- a/include/link.h
+++ b/include/link.h
@@ -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/include/link.h,v 1.25 2002/09/17 01:48:50 peter Exp $
  */
 
 #include <sys/link_elf.h>
diff --git a/include/locale.h b/include/locale.h
index ba702140a4ec..b5a48eaaee27 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locale.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/locale.h,v 1.8 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _LOCALE_H_
diff --git a/include/malloc.h b/include/malloc.h
index 5d7d7e8396d3..0688aaae7aaf 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/malloc.h,v 1.5 2001/11/07 23:14:31 obrien Exp $ */
 #if __STDC__
 #error "<malloc.h> has been replaced by <stdlib.h>"
 #else
diff --git a/include/monetary.h b/include/monetary.h
index ade6a88b511f..4d4c69d5a5d6 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/monetary.h,v 1.7 2002/09/20 08:22:48 mike Exp $
  */
 
 #ifndef _MONETARY_H_
diff --git a/include/mpool.h b/include/mpool.h
index b5be330a0cc5..8342ca1cb698 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mpool.h	8.2 (Berkeley) 7/14/94
- * $FreeBSD$
+ * $FreeBSD: src/include/mpool.h,v 1.9 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef _MPOOL_H_
diff --git a/include/ndbm.h b/include/ndbm.h
index e144ba816a46..1637cd903d52 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ndbm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/ndbm.h,v 1.4 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef _NDBM_H_
diff --git a/include/netconfig.h b/include/netconfig.h
index 80dc0da2738f..cead3210902c 100644
--- a/include/netconfig.h
+++ b/include/netconfig.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/netconfig.h,v 1.3 2002/03/23 17:24:53 imp Exp $ */
 
 
 #ifndef _NETCONFIG_H_
diff --git a/include/netdb.h b/include/netdb.h
index 2e7caae369af..4c243302f1dd 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -55,7 +55,7 @@
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/netdb.h,v 1.38.2.1 2005/07/22 20:17:30 ume Exp $
  */
 
 #ifndef _NETDB_H_
diff --git a/include/nl_types.h b/include/nl_types.h
index 349fd77fc710..100d570a0a0c 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $
  */
 
 #ifndef _NL_TYPES_H_
diff --git a/include/nlist.h b/include/nlist.h
index 3dccf9e7b8eb..ec5507423103 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -37,7 +37,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nlist.h,v 1.9 2002/08/22 20:37:57 peter Exp $
  */
 
 #ifndef _NLIST_H_
diff --git a/include/nss.h b/include/nss.h
index 1f4d078b1c3b..792b16bb5a4f 100644
--- a/include/nss.h
+++ b/include/nss.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nss.h,v 1.2 2004/01/09 13:43:49 nectar Exp $
  *
  * Compatibility header for the GNU C Library-style nsswitch interface.
  */
diff --git a/include/nsswitch.h b/include/nsswitch.h
index 22e482c3a853..9936ad1decc4 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/nsswitch.h,v 1.3 2003/04/17 14:14:21 nectar Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/include/objformat.h b/include/objformat.h
index ec3443a5b1b9..e89432333af9 100644
--- a/include/objformat.h
+++ b/include/objformat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/objformat.h,v 1.2 1999/08/27 23:44:51 peter Exp $
  */
 
 #ifndef _OBJFORMAT_H_
diff --git a/include/paths.h b/include/paths.h
index 55fc21e26392..952a3ae224b1 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/paths.h,v 1.25 2004/01/04 17:17:46 iedowse Exp $
  */
 
 #ifndef _PATHS_H_
diff --git a/include/proc_service.h b/include/proc_service.h
index 0299b959df88..05184a7c7fc9 100644
--- a/include/proc_service.h
+++ b/include/proc_service.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/proc_service.h,v 1.3 2005/05/31 09:43:03 dfr Exp $
  */
 
 #ifndef _PROC_SERVICE_H_
diff --git a/include/protocols/Makefile b/include/protocols/Makefile
index ddd8f21dc912..2dc4e9e68427 100644
--- a/include/protocols/Makefile
+++ b/include/protocols/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/include/protocols/Makefile,v 1.3 2004/12/21 08:46:52 ru Exp $
 
 NO_OBJ=
 INCS=	dumprestore.h routed.h rwhod.h talkd.h timed.h
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 6abf922eb192..8062ee6b833b 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -37,7 +37,7 @@
  *
  *	@(#)dumprestore.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/protocols/dumprestore.h,v 1.10 2002/07/17 02:03:19 mckusick Exp $
  */
 
 #ifndef _PROTOCOLS_DUMPRESTORE_H_
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index b55b62250788..5ed6aafb1cef 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -32,7 +32,7 @@
  *
  *	@(#)routed.h	8.1 (Berkeley) 6/2/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/protocols/routed.h,v 1.16 2004/02/25 23:45:57 bms Exp $
  *	$Revision: 2.26 $
  */
 
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index faa44e4e49fd..cc23ac845c6d 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -32,7 +32,7 @@
  *
  *	@(#)timed.h	8.1 (Berkeley) 6/2/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/protocols/timed.h,v 1.7 2002/02/03 12:00:05 markm Exp $
  */
 
 #ifndef	_PROTOCOLS_TIMED_H_
diff --git a/include/pthread.h b/include/pthread.h
index b0485c0d7d12..1ca11da7e0b2 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/pthread.h,v 1.36 2005/05/31 15:18:17 rodrigc Exp $
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
diff --git a/include/pthread_np.h b/include/pthread_np.h
index a11511cb5bee..3c2a82c84c1f 100644
--- a/include/pthread_np.h
+++ b/include/pthread_np.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/pthread_np.h,v 1.15 2003/01/07 21:43:30 fjoe Exp $
  */
 #ifndef _PTHREAD_NP_H_
 #define _PTHREAD_NP_H_
diff --git a/include/pwd.h b/include/pwd.h
index 4503ddb243a0..69a1a8950cf7 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pwd.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/pwd.h,v 1.16 2005/01/26 17:26:54 nectar Exp $
  */
 
 #ifndef _PWD_H_
diff --git a/include/readpassphrase.h b/include/readpassphrase.h
index 031f51796c91..ce28f2a5df88 100644
--- a/include/readpassphrase.h
+++ b/include/readpassphrase.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: /usr/local/www/cvsroot/OpenBSD/src/include/readpassphrase.h,v 1.2 2002/02/16 21:27:17 millert Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/include/readpassphrase.h,v 1.2 2002/03/08 20:52:52 green Exp $	*/
 
 /*
  * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/include/regex.h b/include/regex.h
index 3c3c87fde57b..5c072f46bf9a 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $
  */
 
 #ifndef _REGEX_H_
diff --git a/include/regexp.h b/include/regexp.h
index 96c2c94db951..53330155665d 100644
--- a/include/regexp.h
+++ b/include/regexp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regexp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/regexp.h,v 1.2 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef	_REGEXP_H_
diff --git a/include/resolv.h b/include/resolv.h
index f9f8de1ad926..25fd22b33f77 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -51,7 +51,7 @@
 /*
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/resolv.h,v 1.26 2004/09/09 17:39:47 yar Exp $
  */
 
 #ifndef _RESOLV_H_
diff --git a/include/rpc/Makefile b/include/rpc/Makefile
index a7a40a2251c0..b6f1d6795500 100644
--- a/include/rpc/Makefile
+++ b/include/rpc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-#	$FreeBSD$
+#	$FreeBSD: src/include/rpc/Makefile,v 1.2 2002/05/12 16:00:48 ru Exp $
 
 .SUFFIXES: .x
 
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 5cb9abd0368b..b1d5757aa014 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -31,7 +31,7 @@
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
  *	from: @(#)auth.h	1.43 	98/02/02 SMI
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/auth.h,v 1.20 2003/01/01 18:48:42 schweikh Exp $
  */
 
 /*
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index fff4ebfe300c..24ef5d3442ef 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -1,5 +1,5 @@
 /*	@(#)auth_des.h	2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/auth_des.h,v 1.3 2002/03/23 17:24:55 imp Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/auth_kerb.h b/include/rpc/auth_kerb.h
index 98ad595350e8..bf5f09ea0a1f 100644
--- a/include/rpc/auth_kerb.h
+++ b/include/rpc/auth_kerb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 48373b2c24c7..721a5c942ad8 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/auth_unix.h,v 1.11 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 1c85a4a73688..ef0cb764f3f9 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -47,7 +47,7 @@
  *
  *	from: @(#)clnt.h 1.31 94/04/29 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/clnt.h,v 1.21 2003/01/24 01:47:55 fjoe Exp $
  */
 
 /*
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index 1e7a0dea59e4..338d28fbd51c 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: clnt_soc.h,v 1.1 2000/06/02 22:57:55 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/clnt_soc.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/clnt_stat.h b/include/rpc/clnt_stat.h
index 6148b4eb94a5..397bdbc596ed 100644
--- a/include/rpc/clnt_stat.h
+++ b/include/rpc/clnt_stat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/clnt_stat.h,v 1.2 2001/03/20 08:20:50 alfred Exp $ */
 /*
  * Copyright (c) 1986 - 1991, 1994, 1996, 1997 by Sun Microsystems, Inc.
  * All rights reserved.
diff --git a/include/rpc/des.h b/include/rpc/des.h
index f920e22d24a3..385afde075d3 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -1,5 +1,5 @@
 /*  @(#)des.h	2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/rpc/des.h,v 1.4 2002/03/23 17:24:55 imp Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index a5df606e9e0b..eb166eded1f5 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -1,6 +1,6 @@
 /*
  * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC;	from 1.4 88/02/08 (C) 1986 SMI
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/des_crypt.h,v 1.4 2002/03/23 17:24:55 imp Exp $
  *
  * des_crypt.h, des library routine interface
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index 5e26268a68da..b18dc49fe634 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/nettype.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 89f1614ab9c9..e6333c7c7e7b 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI 
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_clnt.h,v 1.14 2002/04/28 15:18:45 des Exp $
  */
 
 /*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 366832a7d3f8..d83049943c25 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI 
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_prot.h,v 1.12 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 5c0806681e9e..3e069e785c3b 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_rmt.h,v 1.12 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/raw.h b/include/rpc/raw.h
index 0fea4ad087a2..d418bf41ebba 100644
--- a/include/rpc/raw.h
+++ b/include/rpc/raw.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: raw.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/raw.h,v 1.1 2001/03/19 12:49:47 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 725b542a8dde..72a717c05395 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/rpc.h,v 1.17 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index 122fe7e4baca..56bc68aea829 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/rpc_com.h,v 1.6 2003/01/16 07:13:51 mbr Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 354b34147677..ab2cde81a535 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/rpc_msg.h,v 1.15 2003/01/01 18:48:42 schweikh Exp $
  */
 
 /*
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index fa64a853f90d..3b9966b3b08b 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/rpcb_clnt.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x
index c5748413cdfd..39f162776593 100644
--- a/include/rpc/rpcb_prot.x
+++ b/include/rpc/rpcb_prot.x
@@ -1,5 +1,5 @@
 %/*
-% * $FreeBSD$
+% * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $
 % *
 % * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 % * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 4388d8b9ff88..dbc8b0e5f932 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcent.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/rpcent.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 7ecae0c68e8f..393d104ce44c 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)svc.h 1.35 88/12/17 SMI
  *	from: @(#)svc.h      1.27    94/04/25 SMI
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/svc.h,v 1.24 2003/06/15 10:32:01 mbr Exp $
  */
 
 /*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 67df9765e62b..366f752d9093 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	@(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/svc_dg.h b/include/rpc/svc_dg.h
index 3514745d2efd..67d25643b2ce 100644
--- a/include/rpc/svc_dg.h
+++ b/include/rpc/svc_dg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: svc_dg.h,v 1.1 2000/06/02 23:11:16 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/svc_dg.h,v 1.1 2001/03/19 12:49:47 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index 6c528dbc95c6..ceb4392c74da 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: svc_soc.h,v 1.1 2000/06/02 22:57:57 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/svc_soc.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/types.h b/include/rpc/types.h
index 58d22a8a5416..4323f6dece5a 100644
--- a/include/rpc/types.h
+++ b/include/rpc/types.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/types.h,v 1.11 2003/12/07 21:10:06 marcel Exp $
  */
 
 /*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index db29cc3cf5fa..3138a21b1154 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/xdr.h,v 1.23 2003/03/07 13:19:40 nectar Exp $
  */
 
 /*
diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
index d7d093fe5eb7..31613697fe1a 100644
--- a/include/rpcsvc/Makefile
+++ b/include/rpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-# $FreeBSD$
+# $FreeBSD: src/include/rpcsvc/Makefile,v 1.25 2002/05/12 16:00:49 ru Exp $
 
 .SUFFIXES: .x
 
diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x
index 78b0a1575487..af4f3cd964df 100644
--- a/include/rpcsvc/bootparam_prot.x
+++ b/include/rpcsvc/bootparam_prot.x
@@ -49,7 +49,7 @@
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/bootparam_prot.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const MAX_MACHINE_NAME  = 255;
diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x
index 3b296c0ddf1d..23772ab066fb 100644
--- a/include/rpcsvc/crypt.x
+++ b/include/rpcsvc/crypt.x
@@ -32,7 +32,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/crypt.x,v 1.5 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /*
diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x
index 7800a0781ec6..555d1d203fce 100644
--- a/include/rpcsvc/key_prot.x
+++ b/include/rpcsvc/key_prot.x
@@ -46,7 +46,7 @@
 %/* From: #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
 %/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/key_prot.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 %
 %/* 
 % * Compiled from key_prot.x using rpcgen.
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index f820bdc1fc80..6a3f8614d22d 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -42,7 +42,7 @@
 %/*static char sccsid[] = "from: @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/klm_prot.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const	LM_MAXSTRLEN = 1024;
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index 95966610cf14..d9dc426ec41f 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -37,7 +37,7 @@
 %/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/mount.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const MNTPATHLEN = 1024;	/* maximum bytes in a pathname argument */
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index 8a09ac3a4d1f..722ea3874254 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -33,7 +33,7 @@
 %/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nfs_prot.x,v 1.8 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const NFS_PORT          = 2049;
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index 7ebb19dff81b..8cf9b1cea5d2 100644
--- a/include/rpcsvc/nis.x
+++ b/include/rpcsvc/nis.x
@@ -30,7 +30,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nis.x,v 1.6 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /* 
diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x
index 6edaea92c38b..01a0af926a5f 100644
--- a/include/rpcsvc/nis_cache.x
+++ b/include/rpcsvc/nis_cache.x
@@ -39,7 +39,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nis_cache.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 #ifdef RPC_HDR
diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x
index 3146ec30673d..7fd6b53236a7 100644
--- a/include/rpcsvc/nis_callback.x
+++ b/include/rpcsvc/nis_callback.x
@@ -39,7 +39,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nis_callback.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /*
diff --git a/include/rpcsvc/nis_db.h b/include/rpcsvc/nis_db.h
index 9dcc78376b1a..b0b59fbbd2ce 100644
--- a/include/rpcsvc/nis_db.h
+++ b/include/rpcsvc/nis_db.h
@@ -26,7 +26,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/nis_db.h,v 1.6 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpcsvc/nislib.h b/include/rpcsvc/nislib.h
index 754affe9a430..9b2e7f2508f5 100644
--- a/include/rpcsvc/nislib.h
+++ b/include/rpcsvc/nislib.h
@@ -26,7 +26,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/nislib.h,v 1.4 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x
index 87bf6c844359..d9f44dba2774 100644
--- a/include/rpcsvc/nlm_prot.x
+++ b/include/rpcsvc/nlm_prot.x
@@ -15,7 +15,7 @@
 %/*static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $");
 %#endif /* not lint */
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nlm_prot.x,v 1.11 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /*
diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x
index 19a4d8c5a2fd..ceb0b6aea38b 100644
--- a/include/rpcsvc/pmap_prot.x
+++ b/include/rpcsvc/pmap_prot.x
@@ -36,7 +36,7 @@
 %
 %#pragma ident	"@(#)pmap_prot.x	1.6	94/04/29 SMI"
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/pmap_prot.x,v 1.3 2003/05/04 02:51:42 obrien Exp $");
 %
 %#ifndef _KERNEL
 %
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index eabc4d5928ee..507f79afbf67 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -37,7 +37,7 @@
 %/*static char sccsid[] = "from: @(#)rex.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rex.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const STRINGSIZE = 1024;
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index c554827a079e..5ddb22dcf3ee 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -37,7 +37,7 @@
 %/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rnusers.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const MAXUSERS = 100;
diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x
index 0f3ecfc54d2e..fb73b2796b6b 100644
--- a/include/rpcsvc/rquota.x
+++ b/include/rpcsvc/rquota.x
@@ -9,7 +9,7 @@
 %/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rquota.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const RQ_PATHLEN = 1024;
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index 3f524ee4c81b..b3d19a67ca5a 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -49,7 +49,7 @@
 %/*static char sccsid[] = "from: @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rstat.x,v 1.8 2003/05/04 02:51:42 obrien Exp $");
 
 #endif /* def RPC_HDR */
 
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x
index c66287d73231..dd50d4127b21 100644
--- a/include/rpcsvc/sm_inter.x
+++ b/include/rpcsvc/sm_inter.x
@@ -38,7 +38,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/sm_inter.x,v 1.11 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 program SM_PROG { 
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index 0e7c44e92e7b..2e14fea55a61 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -38,7 +38,7 @@
 %/*static char sccsid[] = "from: @(#)spray.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/spray.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const SPRAYMAX = 8845;	/* max amount can spray */
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x
index 212050fd7eb6..ae4454f6584b 100644
--- a/include/rpcsvc/yp.x
+++ b/include/rpcsvc/yp.x
@@ -35,7 +35,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/yp.x,v 1.13 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const YPMAXRECORD = 1024;
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index 42431a1ca45b..3a1d14bca717 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/yp_prot.h,v 1.12 2004/05/27 11:34:21 tmm Exp $
  */
 
 #ifndef _RPCSVC_YP_PROT_H_
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index abde97c3efeb..e51a65225d5c 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/ypclnt.h,v 1.16 2003/10/26 16:35:11 peter Exp $
  */
 
 #ifndef _RPCSVC_YPCLNT_H_
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index da0399d82db2..c42b3855f1bb 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -38,7 +38,7 @@
 %/*static char sccsid[] = "from: @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/yppasswd.x,v 1.8 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 program YPPASSWDPROG {
diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x
index 90648a023e6e..04bef54ae10c 100644
--- a/include/rpcsvc/ypupdate_prot.x
+++ b/include/rpcsvc/ypupdate_prot.x
@@ -35,7 +35,7 @@
 %/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/ypupdate_prot.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 #endif
 %
 %/*
diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x
index 6a767682360a..96b980b0e2bf 100644
--- a/include/rpcsvc/ypxfrd.x
+++ b/include/rpcsvc/ypxfrd.x
@@ -66,7 +66,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/ypxfrd.x,v 1.9 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /* XXX cribbed from yp.x */
diff --git a/include/runetype.h b/include/runetype.h
index 1625ef8f4e83..f3054fa51bb9 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/runetype.h,v 1.9 2004/06/23 07:01:43 tjr Exp $
  */
 
 #ifndef	_RUNETYPE_H_
diff --git a/include/search.h b/include/search.h
index 4e4606f12720..e401e01528c9 100644
--- a/include/search.h
+++ b/include/search.h
@@ -3,7 +3,7 @@
  * Public domain.
  *
  *	$NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/search.h,v 1.10 2002/10/16 14:29:23 robert Exp $
  */
 
 #ifndef _SEARCH_H_
diff --git a/include/setjmp.h b/include/setjmp.h
index 95644113e710..eb8e63081bc5 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)setjmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/setjmp.h,v 1.8 2002/10/05 05:48:50 mike Exp $
  */
 
 #ifndef _SETJMP_H_
diff --git a/include/signal.h b/include/signal.h
index e869e1dd0521..9c8dc7598af1 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.3 (Berkeley) 3/30/94
- * $FreeBSD$
+ * $FreeBSD: src/include/signal.h,v 1.24 2003/03/31 23:30:41 jeff Exp $
  */
 
 #ifndef _SIGNAL_H_
diff --git a/include/stdbool.h b/include/stdbool.h
index c0d6459cc029..dc8af5b1de87 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/stdbool.h,v 1.7 2005/02/19 13:47:33 marius Exp $
  */
 
 #ifndef _STDBOOL_H_
diff --git a/include/stddef.h b/include/stddef.h
index dd7362129323..a331305f57bb 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -32,7 +32,7 @@
  *
  *	@(#)stddef.h	8.1 (Berkeley) 6/2/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/stddef.h,v 1.10 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _STDDEF_H_
diff --git a/include/stdio.h b/include/stdio.h
index 8ff084dbd4a8..1c35d112ad41 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD$
+ * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $
  */
 
 #ifndef	_STDIO_H_
diff --git a/include/stdlib.h b/include/stdlib.h
index 0ae6b181351e..515744e8ac79 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/include/stdlib.h,v 1.57 2005/01/09 03:55:12 tjr Exp $
  */
 
 #ifndef _STDLIB_H_
diff --git a/include/string.h b/include/string.h
index f0dc21814897..27f522f28321 100644
--- a/include/string.h
+++ b/include/string.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/string.h,v 1.21.2.1 2005/08/29 18:46:39 andre Exp $
  */
 
 #ifndef _STRING_H_
diff --git a/include/stringlist.h b/include/stringlist.h
index bae2a2ca3871..52a121c24bdb 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/stringlist.h,v 1.3 2003/01/19 01:16:00 obrien Exp $
  */
 
 #ifndef _STRINGLIST_H
diff --git a/include/strings.h b/include/strings.h
index 4b19d0ecc665..a7f289ff8eca 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $
  */
 
 #ifndef _STRINGS_H_
diff --git a/include/tgmath.h b/include/tgmath.h
index 246a7ba595eb..b3cb64dd8a64 100644
--- a/include/tgmath.h
+++ b/include/tgmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/tgmath.h,v 1.4 2004/09/03 23:44:09 stefanf Exp $
  */
 
 #ifndef _TGMATH_H_
diff --git a/include/time.h b/include/time.h
index 99b997b0874e..59f1fb0364fe 100644
--- a/include/time.h
+++ b/include/time.h
@@ -39,7 +39,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/include/time.h,v 1.32 2005/04/02 12:33:27 das Exp $
  */
 
 #ifndef _TIME_H_
diff --git a/include/timeconv.h b/include/timeconv.h
index cce937cf7e54..a9345c6986e2 100644
--- a/include/timeconv.h
+++ b/include/timeconv.h
@@ -39,7 +39,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/include/timeconv.h,v 1.2 2002/08/21 16:19:55 mike Exp $
  */
 
 #ifndef _TIMECONV_H_
diff --git a/include/timers.h b/include/timers.h
index 73180f9c75e1..9a6eacda8ad3 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/timers.h,v 1.4 1999/08/27 23:44:52 peter Exp $
  *
  * Description : Basic timers header.
  *
diff --git a/include/ttyent.h b/include/ttyent.h
index 12902d097fcf..e870d705da54 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttyent.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/ttyent.h,v 1.7 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef	_TTYENT_H_
diff --git a/include/ulimit.h b/include/ulimit.h
index ffc40671ea0f..c6a451c75f9c 100644
--- a/include/ulimit.h
+++ b/include/ulimit.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/ulimit.h,v 1.4 2003/01/08 01:18:13 tjr Exp $
  */
 
 #ifndef _ULIMIT_H_
diff --git a/include/unistd.h b/include/unistd.h
index 9bc7af71e27f..b52f57117c5d 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD$
+ * $FreeBSD: src/include/unistd.h,v 1.78 2005/05/13 16:27:30 delphij Exp $
  */
 
 #ifndef _UNISTD_H_
diff --git a/include/utime.h b/include/utime.h
index 8f803657bc48..ded805af27c6 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utime.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/utime.h,v 1.5 2002/08/24 00:11:52 mike Exp $
  */
 
 #ifndef	_UTIME_H_
diff --git a/include/utmp.h b/include/utmp.h
index bdf137be93e8..fdd9accc6a60 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/utmp.h,v 1.10 2001/10/27 20:40:54 peter Exp $
  */
 
 #ifndef	_UTMP_H_
diff --git a/include/uuid.h b/include/uuid.h
index 13e65ea4a09f..634f5b2f6bed 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/uuid.h,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #ifndef _UUID_H_
diff --git a/include/varargs.h b/include/varargs.h
index 51a9b595c54b..cd5444f907bf 100644
--- a/include/varargs.h
+++ b/include/varargs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/varargs.h,v 1.1 2003/09/01 03:28:25 kan Exp $
  */
 
 #ifndef _VARARGS_H_
diff --git a/include/vis.h b/include/vis.h
index 28f9765e78bd..f06cfbac9810 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/vis.h,v 1.11 2003/10/30 10:40:49 phk Exp $
  */
 
 #ifndef _VIS_H_
diff --git a/include/wchar.h b/include/wchar.h
index 931a4088ef78..87bc16edb69e 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/wchar.h,v 1.45 2004/08/12 12:19:10 tjr Exp $
  */
 
 /*-
diff --git a/include/wctype.h b/include/wctype.h
index 098045fa11a5..2372176de4da 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -25,7 +25,7 @@
  *
  *	citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp
  *	$NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/wctype.h,v 1.13 2004/08/12 10:29:14 tjr Exp $
  */
 
 #ifndef _WCTYPE_H_
diff --git a/include/wordexp.h b/include/wordexp.h
index b86e6f9e34b7..1a41e3512620 100644
--- a/include/wordexp.h
+++ b/include/wordexp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/wordexp.h,v 1.5 2004/06/30 13:55:08 tjr Exp $
  */
 
 #ifndef _WORDEXP_H_
diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index b434526d202f..ba2f03e84e52 100644
--- a/kerberos5/Makefile
+++ b/kerberos5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/Makefile,v 1.16 2004/01/31 08:15:52 ru Exp $
 
 SUBDIR=	doc tools lib libexec usr.bin usr.sbin
 
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 6e799ff7155b..0b933dc22c38 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/Makefile.inc,v 1.26 2005/06/10 06:12:51 des Exp $
 
 NO_LINT=
 
diff --git a/kerberos5/doc/Makefile b/kerberos5/doc/Makefile
index 1f71ed85cf5e..83b11f946047 100644
--- a/kerberos5/doc/Makefile
+++ b/kerberos5/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/doc/Makefile,v 1.1 2002/07/05 05:47:13 ru Exp $
 
 INFO=	heimdal
 SRCDIR=	${.CURDIR}/../../crypto/heimdal/doc
diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index fd7ad2601209..ea5cecbe9885 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -1,7 +1,7 @@
 /* include/config.h.  Generated automatically by configure.  */
 /* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/config.h,v 1.15 2005/02/24 22:24:23 nectar Exp $ */
 
 #include <osreldate.h>
 
diff --git a/kerberos5/include/crypto-headers.h b/kerberos5/include/crypto-headers.h
index b224364140f0..904e0c81e5d1 100644
--- a/kerberos5/include/crypto-headers.h
+++ b/kerberos5/include/crypto-headers.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/crypto-headers.h,v 1.2 2003/01/21 14:08:24 nectar Exp $ */
 #ifndef __crypto_headers_h__
 #define __crypto_headers_h__
 #define OPENSSL_DES_LIBDES_COMPATIBILITY
diff --git a/kerberos5/include/krb5-types.h b/kerberos5/include/krb5-types.h
index d43bb74db679..b88f94b97e8e 100644
--- a/kerberos5/include/krb5-types.h
+++ b/kerberos5/include/krb5-types.h
@@ -1,7 +1,7 @@
 /* krb5-types.h -- this file was generated for i386-unknown-freebsd5.0 by
                    $Id: bits.c,v 1.22 2002/08/28 16:08:44 joda Exp $ */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/krb5-types.h,v 1.3 2002/08/30 21:33:16 nectar Exp $ */
 
 #ifndef __krb5_types_h__
 #define __krb5_types_h__
diff --git a/kerberos5/include/version.h b/kerberos5/include/version.h
index 14807354c390..95a75efd4db4 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/version.h,v 1.14 2005/02/24 22:24:23 nectar Exp $ */
 const char *heimdal_long_version = "@(#)$Version: Heimdal 0.6.3 (FreeBSD) $";
 const char *heimdal_version = "Heimdal 0.6.3";
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index 1d07e0b47cfd..333ed56ed242 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/Makefile,v 1.10 2004/01/31 08:15:52 ru Exp $
 
 SUBDIR=	libasn1 libgssapi libhdb libkadm5clnt libkadm5srv \
 	libkafs5 libkrb5 libroken libsl libvers
diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc
index 2f21f36100aa..0dd51c836559 100644
--- a/kerberos5/lib/Makefile.inc
+++ b/kerberos5/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.6.10.1 2005/07/22 17:29:02 kensmith Exp $
 
 SHLIB_MAJOR?=	8
 
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index b42f8025cc88..5ce6ced41a91 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.23 2005/02/24 22:24:24 nectar Exp $
 
 LIB=	asn1
 INCS=	asn1_err.h krb5_asn1.h
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index 68424a66dfc5..c4cd3eb57184 100644
--- a/kerberos5/lib/libgssapi/Makefile
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.10 2004/04/04 03:31:05 nectar Exp $
 
 LIB=	gssapi
 INCS=	gssapi.h
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index eef619f4a9e0..f8a153acd984 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.18 2004/02/05 18:51:49 ru Exp $
 
 LIB=	hdb
 
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index 32cc80b3b004..23d0e7047676 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.8 2004/02/05 18:51:49 ru Exp $
 
 LIB=	kadm5clnt
 
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index 086cb8f63178..c142bc0bad0a 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.7 2004/02/05 18:51:49 ru Exp $
 
 LIB=	kadm5srv
 
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index 337c642be9dd..5ce85714c6bc 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkafs5/Makefile,v 1.9 2004/02/05 18:51:49 ru Exp $
 
 LIB=	kafs5
 INCS=	kafs.h
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 40cddc361d79..64bca5663c55 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.17 2004/02/05 18:51:49 ru Exp $
 
 LIB=	krb5
 
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index a0b60f1f63a8..6948c97d385b 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libroken/Makefile,v 1.16 2004/02/05 18:51:49 ru Exp $
 
 LIB=	roken
 INCS=	roken.h roken-common.h
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 71a38a5729d1..46fb0bca8da6 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libsl/Makefile,v 1.8 2004/02/05 18:51:49 ru Exp $
 
 LIB=	sl
 INTERNALLIB=
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
index 1b91ac172e26..2cc95e2adff8 100644
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libvers/Makefile,v 1.8 2004/02/05 18:51:50 ru Exp $
 
 LIB=	vers
 INTERNALLIB=
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile
index 89baf6daad57..559f609faa5f 100644
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/Makefile,v 1.6 2004/01/30 11:06:48 mr Exp $
 
 SUBDIR=	ipropd-master ipropd-slave hprop hpropd kadmind kdc kpasswdd
 
diff --git a/kerberos5/libexec/Makefile.inc b/kerberos5/libexec/Makefile.inc
index 535597e7d2a5..9bc86b279405 100644
--- a/kerberos5/libexec/Makefile.inc
+++ b/kerberos5/libexec/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/Makefile.inc,v 1.2 2004/02/05 18:51:50 ru Exp $
 
 BINDIR=	/usr/libexec
 
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 84523cfac15d..769441485869 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.15 2004/02/05 18:51:50 ru Exp $
 
 PROG=	hprop
 MAN=	hprop.8
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 4db38fb4bb1b..c98df00ff971 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.15 2004/02/05 18:51:50 ru Exp $
 
 PROG=	hpropd
 MAN=	hpropd.8
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 6cfa99d9e789..58b89c45413e 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.17 2004/12/21 08:47:01 ru Exp $
 
 PROG=	ipropd-master
 NO_MAN=
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 11e2bc3761b0..b898595e289a 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.17 2004/12/21 08:47:01 ru Exp $
 
 PROG=	ipropd-slave
 NO_MAN=
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index d0514a01342c..87a4e0922536 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.18 2004/02/05 18:51:50 ru Exp $
 
 PROG=	kadmind
 MAN=	kadmind.8
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 73a1efcbf853..3d1d27e2d2b1 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.17 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kdc
 MAN=	kdc.8
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index c0e6a1ea1aa1..c7b3f7075eff 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/kpasswdd/Makefile,v 1.18 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kpasswdd
 MAN=	kpasswdd.8
diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile
index ed8d30a03019..0bd508de1de8 100644
--- a/kerberos5/tools/Makefile
+++ b/kerberos5/tools/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/Makefile,v 1.2 2004/02/01 09:30:02 ru Exp $
 
 SUBDIR=	make-print-version make-roken asn1_compile
 
diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc
index c0703a968ec6..7ceb8c8c3f23 100644
--- a/kerberos5/tools/Makefile.inc
+++ b/kerberos5/tools/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/Makefile.inc,v 1.1 2004/01/31 08:15:55 ru Exp $
 
 realinstall:
 
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index d59adbc984fd..0642cab0e2df 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.5 2004/12/21 08:47:01 ru Exp $
 
 PROG=	asn1_compile
 NO_MAN=
diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile
index 08899dc97c27..b82c4090c449 100644
--- a/kerberos5/tools/make-print-version/Makefile
+++ b/kerberos5/tools/make-print-version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/make-print-version/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $
 
 PROG=	make-print-version
 NO_MAN=
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
index 6f75cc64cdd5..a9d0d752c4d7 100644
--- a/kerberos5/tools/make-roken/Makefile
+++ b/kerberos5/tools/make-roken/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/make-roken/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $
 
 PROG=	make-roken
 NO_MAN=
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 737f13e871ef..e61b52e0e24f 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/Makefile,v 1.11 2004/01/31 08:15:56 ru Exp $
 
 SUBDIR=	kadmin kdestroy kinit klist kpasswd krb5-config ksu \
 	verify_krb5_conf
diff --git a/kerberos5/usr.bin/Makefile.inc b/kerberos5/usr.bin/Makefile.inc
index abd146b6720e..390acb095d61 100644
--- a/kerberos5/usr.bin/Makefile.inc
+++ b/kerberos5/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/Makefile.inc,v 1.1.1.1 2000/01/15 21:38:04 markm Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index b646c986eb94..7af1fee53231 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.18 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kadmin
 MAN=	kadmin.8
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 60bc792780d1..72fe0c59da10 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kdestroy
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 172ad985a84a..22d0d72f98ff 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kinit/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kinit
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index c97d65fc2ef6..5c078fcfa19a 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/klist/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
 
 PROG=	klist
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 686c299ccdca..708c929c9b50 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.14 2004/02/05 18:51:52 ru Exp $
 
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
index d9b48b9f5e58..ac1a411180c2 100644
--- a/kerberos5/usr.bin/krb5-config/Makefile
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.15 2005/02/24 22:24:24 nectar Exp $
 
 SCRIPTS=krb5-config
 MAN=	krb5-config.1
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 1e095ec29020..7a3abd807f24 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.16 2005/07/07 14:16:37 kensmith Exp $
 
 PROG=	ksu
 .if defined(ENABLE_SUID_K5SU) || defined(_FREEFALL_CONFIG)
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
index 7acce0eb7cad..d93e3a8ca346 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/verify_krb5_conf/Makefile,v 1.3 2004/02/05 18:51:52 ru Exp $
 
 PROG=	verify_krb5_conf
 MAN=	verify_krb5_conf.8
diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile
index 2e722ee64ddf..859d51ca0222 100644
--- a/kerberos5/usr.sbin/Makefile
+++ b/kerberos5/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/Makefile,v 1.3 2003/03/09 21:56:55 markm Exp $
 
 SUBDIR=	kstash ktutil
 
diff --git a/kerberos5/usr.sbin/Makefile.inc b/kerberos5/usr.sbin/Makefile.inc
index dab729d159e4..ae5a70c4a3db 100644
--- a/kerberos5/usr.sbin/Makefile.inc
+++ b/kerberos5/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/Makefile.inc,v 1.1.1.1 2000/01/24 19:56:25 markm Exp $
 
 BINDIR=	/usr/sbin
 
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index d9c6d8d9461d..44369dbebf5e 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/kstash/Makefile,v 1.16 2004/02/05 18:51:52 ru Exp $
 
 PROG=	kstash
 MAN=	kstash.8
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index e134cce942eb..a77d29bd0d6e 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.17 2004/02/05 18:51:52 ru Exp $
 
 PROG=	ktutil
 MAN=	ktutil.8
diff --git a/lib/Makefile b/lib/Makefile
index 000d97721363..1f185f923ad3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/Makefile,v 1.205.2.1 2005/07/28 13:47:18 rwatson Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index ae850bab75eb..faa81b5e9845 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/Makefile.inc,v 1.2.14.1 2005/07/22 17:29:02 kensmith Exp $
 # Default version for system libs (override in <lib>/Makefile if necessary)
 SHLIB_MAJOR?= 3
diff --git a/lib/bind/Makefile b/lib/bind/Makefile
index 5eccf49cf248..0f10e65320a0 100644
--- a/lib/bind/Makefile
+++ b/lib/bind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/Makefile,v 1.1 2004/09/21 19:01:42 des Exp $
 
 SUBDIR=		bind bind9 dns isc isccc isccfg lwres
 
diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index 72b00835bcbe..67bc581e06d6 100644
--- a/lib/bind/bind/Makefile
+++ b/lib/bind/bind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/bind/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/bind/config.h b/lib/bind/bind/config.h
index ac563d3459a8..c8162e377ab5 100644
--- a/lib/bind/bind/config.h
+++ b/lib/bind/bind/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/bind/config.h,v 1.1.4.1 2005/07/30 07:56:26 des Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* #undef _SOCKADDR_LEN */
diff --git a/lib/bind/bind/port_after.h b/lib/bind/bind/port_after.h
index 755779b13ac7..e1886b37a23e 100644
--- a/lib/bind/bind/port_after.h
+++ b/lib/bind/bind/port_after.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.1 2004/09/21 19:01:42 des Exp $ */
 
 #ifndef port_after_h
 #define port_after_h
diff --git a/lib/bind/bind/port_before.h b/lib/bind/bind/port_before.h
index 02a45bda9c8a..ee843caa84d0 100644
--- a/lib/bind/bind/port_before.h
+++ b/lib/bind/bind/port_before.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/bind/port_before.h,v 1.1 2004/09/21 19:01:42 des Exp $ */
 
 #ifndef port_before_h
 #define port_before_h
diff --git a/lib/bind/bind9/Makefile b/lib/bind/bind9/Makefile
index d470ed66efa4..b89a0fe6e081 100644
--- a/lib/bind/bind9/Makefile
+++ b/lib/bind/bind9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/config.h b/lib/bind/config.h
index 42d2c14c4353..25db1e7f6a45 100644
--- a/lib/bind/config.h
+++ b/lib/bind/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/config.h,v 1.2.2.1 2005/07/30 07:56:25 des Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 15d81229d43d..4ea9549d5b72 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/config.mk,v 1.14.2.1 2005/07/30 07:56:25 des Exp $
 
 # BIND version number
 .if defined(BIND_DIR) && exists(${BIND_DIR}/version)
diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile
index a3ab5656c7c6..789c36720a2c 100644
--- a/lib/bind/dns/Makefile
+++ b/lib/bind/dns/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/dns/Makefile,v 1.5 2005/03/17 08:35:21 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/dns/code.h b/lib/bind/dns/code.h
index 7cf495eadba7..5e19a014e1a4 100644
--- a/lib/bind/dns/code.h
+++ b/lib/bind/dns/code.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/code.h,v 1.2 2005/03/17 08:39:12 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/enumclass.h b/lib/bind/dns/dns/enumclass.h
index f3490a471184..924d5b8f539b 100644
--- a/lib/bind/dns/dns/enumclass.h
+++ b/lib/bind/dns/dns/enumclass.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/dns/enumclass.h,v 1.2 2005/03/17 08:39:12 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/enumtype.h b/lib/bind/dns/dns/enumtype.h
index 8692368d5e61..9eb92ff7c3f1 100644
--- a/lib/bind/dns/dns/enumtype.h
+++ b/lib/bind/dns/dns/enumtype.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/dns/enumtype.h,v 1.2 2005/03/17 08:39:12 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/rdatastruct.h b/lib/bind/dns/dns/rdatastruct.h
index ce30e49f59d7..39ea114adf34 100644
--- a/lib/bind/dns/dns/rdatastruct.h
+++ b/lib/bind/dns/dns/rdatastruct.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/dns/rdatastruct.h,v 1.2 2005/03/17 08:39:12 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index c296235ff18f..a2a7219fdbc5 100644
--- a/lib/bind/isc/Makefile
+++ b/lib/bind/isc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/isc/Makefile,v 1.4.4.1 2005/07/30 07:56:26 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/isc/isc/platform.h b/lib/bind/isc/isc/platform.h
index c40be125b4b3..9554efe40660 100644
--- a/lib/bind/isc/isc/platform.h
+++ b/lib/bind/isc/isc/platform.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.1.4.1 2005/07/30 07:56:26 des Exp $ */
 
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/isccc/Makefile b/lib/bind/isccc/Makefile
index 18e9c1465552..90746e8c14af 100644
--- a/lib/bind/isccc/Makefile
+++ b/lib/bind/isccc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/isccfg/Makefile b/lib/bind/isccfg/Makefile
index 609da2c98c16..2f7fb5034612 100644
--- a/lib/bind/isccfg/Makefile
+++ b/lib/bind/isccfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index 55b59ebd3610..7cb12f1b4ac9 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.7 2004/10/24 15:32:30 ru Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
diff --git a/lib/bind/lwres/lwres/netdb.h b/lib/bind/lwres/lwres/netdb.h
index 0746e1465a2f..e2229a81207a 100644
--- a/lib/bind/lwres/lwres/netdb.h
+++ b/lib/bind/lwres/lwres/netdb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/lwres/lwres/netdb.h,v 1.1 2004/09/21 19:01:44 des Exp $ */
 
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/lwres/lwres/platform.h b/lib/bind/lwres/lwres/platform.h
index 99b78004d3a0..7a9bf7c40b39 100644
--- a/lib/bind/lwres/lwres/platform.h
+++ b/lib/bind/lwres/lwres/platform.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/lwres/lwres/platform.h,v 1.1 2004/09/21 19:01:44 des Exp $ */
 
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index 8b81815146c3..8f3e04ff1976 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/alpha/Makefile,v 1.24 2002/07/29 09:40:10 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 SRCS=	crt1.c crti.S crtn.S
diff --git a/lib/csu/alpha/crt1.c b/lib/csu/alpha/crt1.c
index b8ad3ea10063..4130c4728eaf 100644
--- a/lib/csu/alpha/crt1.c
+++ b/lib/csu/alpha/crt1.c
@@ -111,4 +111,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/alpha/crt1.c,v 1.17 2004/08/21 08:22:00 dfr Exp $\"");
diff --git a/lib/csu/alpha/crti.S b/lib/csu/alpha/crti.S
index 5ecd99c30028..cc47041e4695 100644
--- a/lib/csu/alpha/crti.S
+++ b/lib/csu/alpha/crti.S
@@ -50,4 +50,4 @@ $_fini..ng:
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/alpha/crti.S,v 1.3 2002/02/27 21:53:27 obrien Exp $\0"
diff --git a/lib/csu/alpha/crtn.S b/lib/csu/alpha/crtn.S
index 6928d37c1a29..e3031e771e57 100644
--- a/lib/csu/alpha/crtn.S
+++ b/lib/csu/alpha/crtn.S
@@ -42,4 +42,4 @@
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/alpha/crtn.S,v 1.3 2002/02/27 21:53:27 obrien Exp $\0"
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index 4b51e6b68a70..283dddc086bf 100644
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.18 2003/06/30 12:53:39 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/amd64/crt1.c b/lib/csu/amd64/crt1.c
index f1f0f7b0b0c2..5e0eb0876247 100644
--- a/lib/csu/amd64/crt1.c
+++ b/lib/csu/amd64/crt1.c
@@ -97,4 +97,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.14 2004/08/15 16:18:51 dfr Exp $\"");
diff --git a/lib/csu/amd64/crti.S b/lib/csu/amd64/crti.S
index c46f00101916..a1a209e91926 100644
--- a/lib/csu/amd64/crti.S
+++ b/lib/csu/amd64/crti.S
@@ -38,4 +38,4 @@ _fini:
 	subq	$8,%rsp
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.7 2004/03/21 01:39:01 peter Exp $\0"
diff --git a/lib/csu/amd64/crtn.S b/lib/csu/amd64/crtn.S
index d6d09dabeb21..4f9325cc50b5 100644
--- a/lib/csu/amd64/crtn.S
+++ b/lib/csu/amd64/crtn.S
@@ -32,4 +32,4 @@
 	ret
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.6 2004/03/21 01:39:01 peter Exp $\0"
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile
index 23954e840f36..c14a75dd607e 100644
--- a/lib/csu/arm/Makefile
+++ b/lib/csu/arm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/arm/Makefile,v 1.1 2004/05/14 12:19:04 cognet Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/arm/crt1.c b/lib/csu/arm/crt1.c
index 02af3c290470..b11fb9897739 100644
--- a/lib/csu/arm/crt1.c
+++ b/lib/csu/arm/crt1.c
@@ -134,4 +134,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/arm/crt1.c,v 1.3 2004/09/23 23:00:51 cognet Exp $\"");
diff --git a/lib/csu/arm/crti.S b/lib/csu/arm/crti.S
index 40e83bbf2f11..9459e1d3aa64 100644
--- a/lib/csu/arm/crti.S
+++ b/lib/csu/arm/crti.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/csu/arm/crti.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
 
 	.section .init,"ax",%progbits
 	.align 4
diff --git a/lib/csu/arm/crtn.S b/lib/csu/arm/crtn.S
index d148b1eb0965..6c116fc53238 100644
--- a/lib/csu/arm/crtn.S
+++ b/lib/csu/arm/crtn.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/csu/arm/crtn.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
 	.section .init,"ax",%progbits
 	ldmea	fp, {fp, sp, pc}
 	mov	pc, lr
diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c
index ec50ecdee121..d03b53079b04 100644
--- a/lib/csu/common/crtbegin.c
+++ b/lib/csu/common/crtbegin.c
@@ -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/lib/csu/common/crtbegin.c,v 1.8 2002/01/28 19:02:34 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index dde60b38bb48..7e9014477b76 100644
--- a/lib/csu/common/crtbrand.c
+++ b/lib/csu/common/crtbrand.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.4 2003/10/17 15:43:13 peter Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c
index 4b33f0c7bb4f..5d83c01e380c 100644
--- a/lib/csu/common/crtend.c
+++ b/lib/csu/common/crtend.c
@@ -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/lib/csu/common/crtend.c,v 1.3 1999/08/27 23:57:57 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile
index 8598ce8552f5..7f5c3bef679b 100644
--- a/lib/csu/i386-elf/Makefile
+++ b/lib/csu/i386-elf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.20 2004/01/20 13:31:35 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/i386-elf/crt1.c b/lib/csu/i386-elf/crt1.c
index c6774b0f394f..1c4423cd0277 100644
--- a/lib/csu/i386-elf/crt1.c
+++ b/lib/csu/i386-elf/crt1.c
@@ -115,4 +115,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.14 2005/05/19 07:36:07 dfr Exp $\"");
diff --git a/lib/csu/i386-elf/crti.S b/lib/csu/i386-elf/crti.S
index bb11f3ac718d..ff895cbdadd2 100644
--- a/lib/csu/i386-elf/crti.S
+++ b/lib/csu/i386-elf/crti.S
@@ -38,4 +38,4 @@ _fini:
 	sub	$12,%esp	/* re-align stack pointer */
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/i386-elf/crti.S,v 1.7 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/csu/i386-elf/crtn.S b/lib/csu/i386-elf/crtn.S
index bc90d31d7c13..8e820e3c0d96 100644
--- a/lib/csu/i386-elf/crtn.S
+++ b/lib/csu/i386-elf/crtn.S
@@ -32,4 +32,4 @@
 	ret
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/i386-elf/crtn.S,v 1.6 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile
index c906c094267b..c17035908d81 100644
--- a/lib/csu/ia64/Makefile
+++ b/lib/csu/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/ia64/Makefile,v 1.12 2003/07/13 23:11:37 marcel Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/ia64/crt1.S b/lib/csu/ia64/crt1.S
index 10e1a63d17b4..0a1be8ae5ad0 100644
--- a/lib/csu/ia64/crt1.S
+++ b/lib/csu/ia64/crt1.S
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-		.ident		"$FreeBSD$"
+		.ident		"$FreeBSD: src/lib/csu/ia64/crt1.S,v 1.4 2004/08/18 23:06:47 marcel Exp $"
 
 		.text
 
diff --git a/lib/csu/ia64/crti.S b/lib/csu/ia64/crti.S
index 1314cb3a5b2c..5bb540ecf817 100644
--- a/lib/csu/ia64/crti.S
+++ b/lib/csu/ia64/crti.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/ia64/crti.S,v 1.3 2001/11/03 06:31:27 peter Exp $
  */
 
 /*
diff --git a/lib/csu/ia64/crtn.S b/lib/csu/ia64/crtn.S
index 42ec1feffabe..68b496fc9fb4 100644
--- a/lib/csu/ia64/crtn.S
+++ b/lib/csu/ia64/crtn.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/ia64/crtn.S,v 1.2 2001/10/29 10:18:58 peter Exp $
  */
 
 	.file	"crtn.S"
diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
index 23954e840f36..e8b4de9ac6b2 100644
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/powerpc/Makefile,v 1.9 2002/07/29 09:40:11 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/powerpc/crt1.c b/lib/csu/powerpc/crt1.c
index 080691c57ccf..e6c00bd35719 100644
--- a/lib/csu/powerpc/crt1.c
+++ b/lib/csu/powerpc/crt1.c
@@ -120,4 +120,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/powerpc/crt1.c,v 1.11 2004/08/15 16:18:52 dfr Exp $\"");
diff --git a/lib/csu/powerpc/crti.S b/lib/csu/powerpc/crti.S
index 75d4345cad2d..45679438fe21 100644
--- a/lib/csu/powerpc/crti.S
+++ b/lib/csu/powerpc/crti.S
@@ -47,4 +47,4 @@ _fini:
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/powerpc/crti.S,v 1.2 2002/05/15 04:19:49 obrien Exp $\0"
diff --git a/lib/csu/powerpc/crtn.S b/lib/csu/powerpc/crtn.S
index 80735cc3a8ab..c860eafd94db 100644
--- a/lib/csu/powerpc/crtn.S
+++ b/lib/csu/powerpc/crtn.S
@@ -42,4 +42,4 @@
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/powerpc/crtn.S,v 1.2 2002/05/15 04:19:49 obrien Exp $\0"
diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile
index 2e1d03f9cb6d..1eb2230e517d 100644
--- a/lib/csu/sparc64/Makefile
+++ b/lib/csu/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.12 2002/07/29 09:40:11 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/sparc64/crt1.c b/lib/csu/sparc64/crt1.c
index 19c0fadb738d..9abdc10adf76 100644
--- a/lib/csu/sparc64/crt1.c
+++ b/lib/csu/sparc64/crt1.c
@@ -122,4 +122,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/sparc64/crt1.c,v 1.16 2004/08/15 16:18:52 dfr Exp $\"");
diff --git a/lib/csu/sparc64/crti.S b/lib/csu/sparc64/crti.S
index e3e81af18cc9..466645c4af41 100644
--- a/lib/csu/sparc64/crti.S
+++ b/lib/csu/sparc64/crti.S
@@ -55,4 +55,4 @@ _fini:
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/sparc64/crti.S,v 1.1 2001/10/28 00:20:34 obrien Exp $\0"
diff --git a/lib/csu/sparc64/crtn.S b/lib/csu/sparc64/crtn.S
index 7c0d1605393d..c35fecad30c1 100644
--- a/lib/csu/sparc64/crtn.S
+++ b/lib/csu/sparc64/crtn.S
@@ -39,4 +39,4 @@
 	 restore
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/sparc64/crtn.S,v 1.1 2001/10/28 00:20:34 obrien Exp $\0"
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index 465216a9c1c3..8908cd909a19 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/Makefile,v 1.30.2.1 2005/07/22 17:29:02 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../sys/netinet/libalias
 
diff --git a/lib/libarchive/COPYING b/lib/libarchive/COPYING
index 0d9c216bef70..645e5fceee90 100644
--- a/lib/libarchive/COPYING
+++ b/lib/libarchive/COPYING
@@ -33,5 +33,5 @@ contain Makefiles and/or shell scripts that are generated
 automatically by GNU autoconf and GNU automake.  Those generated files
 are controlled by the relevant licenses.
 
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/COPYING,v 1.1 2004/08/07 03:09:28 kientzle Exp $
 
diff --git a/lib/libarchive/INSTALL b/lib/libarchive/INSTALL
index 7da94c1d42bf..8275ed2e16e2 100644
--- a/lib/libarchive/INSTALL
+++ b/lib/libarchive/INSTALL
@@ -35,5 +35,5 @@ You should be able to use the following command to build a distribution:
 The result will be a file named libarchive-<version>.tar.gz in
 the object directory.
 
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/INSTALL,v 1.1 2004/08/07 03:09:28 kientzle Exp $
 
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 1428c82d5bb0..d56777c7bc9c 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.36.2.1 2005/07/22 17:29:03 kensmith Exp $
 
 #
 # Use "make distfile" to build a conventional tar.gz archive
diff --git a/lib/libarchive/Makefile.am b/lib/libarchive/Makefile.am
index 5ad73618a39e..d7bff909fa33 100644
--- a/lib/libarchive/Makefile.am
+++ b/lib/libarchive/Makefile.am
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/Makefile.am,v 1.3 2005/01/25 06:07:28 kientzle Exp $
 
 lib_LIBRARIES=	libarchive.a
 
diff --git a/lib/libarchive/README b/lib/libarchive/README
index 1380b4ad3f39..a1b80ec545db 100644
--- a/lib/libarchive/README
+++ b/lib/libarchive/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/README,v 1.4 2005/02/12 23:09:44 kientzle Exp $
 
 libarchive: a library for reading and writing streaming archives
 
diff --git a/lib/libarchive/archive.h.in b/lib/libarchive/archive.h.in
index 149e82dbe43f..6810ec4d6552 100644
--- a/lib/libarchive/archive.h.in
+++ b/lib/libarchive/archive.h.in
@@ -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/lib/libarchive/archive.h.in,v 1.23 2005/06/04 22:24:04 kientzle Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
diff --git a/lib/libarchive/archive_check_magic.c b/lib/libarchive/archive_check_magic.c
index 528da5e486ff..63932a0bd3d5 100644
--- a/lib/libarchive/archive_check_magic.c
+++ b/lib/libarchive/archive_check_magic.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.5 2004/10/18 04:34:30 kientzle Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libarchive/archive_entry.3 b/lib/libarchive/archive_entry.3
index e02e1c073d71..41de9e90ecf6 100644
--- a/lib/libarchive/archive_entry.3
+++ b/lib/libarchive/archive_entry.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.9.8.1 2005/08/18 15:01:22 keramida Exp $
 .\"
 .Dd December 15, 2003
 .Dt archive_entry 3
diff --git a/lib/libarchive/archive_entry.c b/lib/libarchive/archive_entry.c
index a3919e5bbfd4..67cd87959238 100644
--- a/lib/libarchive/archive_entry.c
+++ b/lib/libarchive/archive_entry.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.29 2005/06/04 22:26:23 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_entry.h b/lib/libarchive/archive_entry.h
index dec8b960d8b4..b4856c37c9ac 100644
--- a/lib/libarchive/archive_entry.h
+++ b/lib/libarchive/archive_entry.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/lib/libarchive/archive_entry.h,v 1.16 2005/06/04 22:24:04 kientzle Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_H_INCLUDED
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h
index 92dded3d1eef..709638a37580 100644
--- a/lib/libarchive/archive_platform.h
+++ b/lib/libarchive/archive_platform.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/lib/libarchive/archive_platform.h,v 1.16 2005/06/04 22:30:36 kientzle Exp $
  */
 
 /*
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index 0b96180352f8..f673c2592482 100644
--- a/lib/libarchive/archive_private.h
+++ b/lib/libarchive/archive_private.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/lib/libarchive/archive_private.h,v 1.18 2005/06/01 15:52:39 kientzle Exp $
  */
 
 #ifndef ARCHIVE_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_read.3 b/lib/libarchive/archive_read.3
index d0b07ce23c54..4496d2f998fb 100644
--- a/lib/libarchive/archive_read.3
+++ b/lib/libarchive/archive_read.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.20.2.1 2005/08/18 15:01:22 keramida Exp $
 .\"
 .Dd January 8, 2005
 .Dt archive_read 3
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index 61a9661b350a..7342ebac20e6 100644
--- a/lib/libarchive/archive_read.c
+++ b/lib/libarchive/archive_read.c
@@ -33,7 +33,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.15 2005/06/01 15:52:39 kientzle Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libarchive/archive_read_data_into_buffer.c b/lib/libarchive/archive_read_data_into_buffer.c
index 0b526174209d..48d12ff101d4 100644
--- a/lib/libarchive/archive_read_data_into_buffer.c
+++ b/lib/libarchive/archive_read_data_into_buffer.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_buffer.c,v 1.4 2004/06/27 01:15:31 kientzle Exp $");
 
 #include <string.h>
 
diff --git a/lib/libarchive/archive_read_data_into_fd.c b/lib/libarchive/archive_read_data_into_fd.c
index b01220dd73d7..7ee04384c878 100644
--- a/lib/libarchive/archive_read_data_into_fd.c
+++ b/lib/libarchive/archive_read_data_into_fd.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.8 2005/06/01 15:52:39 kientzle Exp $");
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/lib/libarchive/archive_read_extract.c b/lib/libarchive/archive_read_extract.c
index cde42b86db2b..5bed79d643b3 100644
--- a/lib/libarchive/archive_read_extract.c
+++ b/lib/libarchive/archive_read_extract.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.41.2.1 2005/09/21 03:12:45 kientzle Exp $");
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_ACL_H
diff --git a/lib/libarchive/archive_read_open_fd.c b/lib/libarchive/archive_read_open_fd.c
index e3b2527a5978..6f8caded0e24 100644
--- a/lib/libarchive/archive_read_open_fd.c
+++ b/lib/libarchive/archive_read_open_fd.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.3 2004/06/27 23:36:39 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_open_file.c b/lib/libarchive/archive_read_open_file.c
index ea8ebbd8a687..4b519656a0e1 100644
--- a/lib/libarchive/archive_read_open_file.c
+++ b/lib/libarchive/archive_read_open_file.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.8 2005/03/13 01:51:16 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_compression_all.c b/lib/libarchive/archive_read_support_compression_all.c
index bd3a9b9f37af..b9c458483aff 100644
--- a/lib/libarchive/archive_read_support_compression_all.c
+++ b/lib/libarchive/archive_read_support_compression_all.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_all.c,v 1.5 2004/07/30 04:14:47 kientzle Exp $");
 
 #include "archive.h"
 
diff --git a/lib/libarchive/archive_read_support_compression_bzip2.c b/lib/libarchive/archive_read_support_compression_bzip2.c
index a51d2d45bbce..3cb2869c192f 100644
--- a/lib/libarchive/archive_read_support_compression_bzip2.c
+++ b/lib/libarchive/archive_read_support_compression_bzip2.c
@@ -26,7 +26,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.7 2004/12/22 06:30:14 kientzle Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libarchive/archive_read_support_compression_compress.c b/lib/libarchive/archive_read_support_compression_compress.c
index f6ec9f0f4a31..a84a43fb093d 100644
--- a/lib/libarchive/archive_read_support_compression_compress.c
+++ b/lib/libarchive/archive_read_support_compression_compress.c
@@ -65,7 +65,7 @@
 
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.3 2004/10/17 23:40:10 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_read_support_compression_gzip.c b/lib/libarchive/archive_read_support_compression_gzip.c
index b0cda3afb894..dec7b1fd7b24 100644
--- a/lib/libarchive/archive_read_support_compression_gzip.c
+++ b/lib/libarchive/archive_read_support_compression_gzip.c
@@ -26,7 +26,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.9 2005/03/13 01:48:33 kientzle Exp $");
 
 
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_compression_none.c b/lib/libarchive/archive_read_support_compression_none.c
index 8e7ca3c6e985..fbec19e8d180 100644
--- a/lib/libarchive/archive_read_support_compression_none.c
+++ b/lib/libarchive/archive_read_support_compression_none.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.6 2005/02/13 23:29:54 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_read_support_format_all.c b/lib/libarchive/archive_read_support_format_all.c
index 3b7eaafbeb0b..3f09482449f4 100644
--- a/lib/libarchive/archive_read_support_format_all.c
+++ b/lib/libarchive/archive_read_support_format_all.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_all.c,v 1.6 2005/01/25 06:07:28 kientzle Exp $");
 
 #include "archive.h"
 
diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c
index 5a0ac704ae11..60471503b1f5 100644
--- a/lib/libarchive/archive_read_support_format_cpio.c
+++ b/lib/libarchive/archive_read_support_format_cpio.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.13 2005/04/06 04:19:30 kientzle Exp $");
 
 #include <sys/stat.h>
 
diff --git a/lib/libarchive/archive_read_support_format_iso9660.c b/lib/libarchive/archive_read_support_format_iso9660.c
index a66ec18590e6..4cae32bf4fc8 100644
--- a/lib/libarchive/archive_read_support_format_iso9660.c
+++ b/lib/libarchive/archive_read_support_format_iso9660.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.8 2005/04/06 04:19:30 kientzle Exp $");
 
 #include <sys/stat.h>
 
diff --git a/lib/libarchive/archive_read_support_format_tar.c b/lib/libarchive/archive_read_support_format_tar.c
index 81f08b1c766e..8a83c45db890 100644
--- a/lib/libarchive/archive_read_support_format_tar.c
+++ b/lib/libarchive/archive_read_support_format_tar.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.32 2005/04/06 04:19:30 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_zip.c b/lib/libarchive/archive_read_support_format_zip.c
index 931ea9f7509e..3a5ef0d3d4ad 100644
--- a/lib/libarchive/archive_read_support_format_zip.c
+++ b/lib/libarchive/archive_read_support_format_zip.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.5 2005/04/06 04:19:30 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_string.c b/lib/libarchive/archive_string.c
index b18f31dbb66c..2227afc148c3 100644
--- a/lib/libarchive/archive_string.c
+++ b/lib/libarchive/archive_string.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_string.c,v 1.6 2004/12/22 06:12:40 kientzle Exp $");
 
 /*
  * Basic resizable string support, to simplify manipulating arbitrary-sized
diff --git a/lib/libarchive/archive_string.h b/lib/libarchive/archive_string.h
index c9d1c004b025..b8b3b598f296 100644
--- a/lib/libarchive/archive_string.h
+++ b/lib/libarchive/archive_string.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/lib/libarchive/archive_string.h,v 1.6 2005/01/16 22:13:51 kientzle Exp $
  *
  */
 
diff --git a/lib/libarchive/archive_string_sprintf.c b/lib/libarchive/archive_string_sprintf.c
index 64ca7d095b8d..63a06d724869 100644
--- a/lib/libarchive/archive_string_sprintf.c
+++ b/lib/libarchive/archive_string_sprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.7 2005/01/16 22:13:51 kientzle Exp $");
 
 /*
  * The use of printf()-family functions can be troublesome
diff --git a/lib/libarchive/archive_util.3 b/lib/libarchive/archive_util.3
index 84589b8832a5..838ae214d03f 100644
--- a/lib/libarchive/archive_util.3
+++ b/lib/libarchive/archive_util.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.3 2005/01/08 19:51:04 kientzle Exp $
 .\"
 .Dd January 8, 2005
 .Dt archive_util 3
diff --git a/lib/libarchive/archive_util.c b/lib/libarchive/archive_util.c
index de9656d4b810..2050bb02b592 100644
--- a/lib/libarchive/archive_util.c
+++ b/lib/libarchive/archive_util.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.9 2005/02/23 06:57:04 kientzle Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_write.3 b/lib/libarchive/archive_write.3
index 20864242b688..85c6f5bd6b89 100644
--- a/lib/libarchive/archive_write.3
+++ b/lib/libarchive/archive_write.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.12 2005/06/04 22:19:25 kientzle Exp $
 .\"
 .Dd January 8, 2005
 .Dt archive_write 3
diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c
index 3e87eead2ac7..1ca47244f1d5 100644
--- a/lib/libarchive/archive_write.c
+++ b/lib/libarchive/archive_write.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.15 2005/06/01 15:52:39 kientzle Exp $");
 
 /*
  * This file contains the "essential" portions of the write API, that
diff --git a/lib/libarchive/archive_write_open_fd.c b/lib/libarchive/archive_write_open_fd.c
index 58bfbd3fbd7d..30495bc5803b 100644
--- a/lib/libarchive/archive_write_open_fd.c
+++ b/lib/libarchive/archive_write_open_fd.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_fd.c,v 1.4 2004/10/17 23:47:30 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_open_file.c b/lib/libarchive/archive_write_open_file.c
index 65cdbb604b05..c12dd800bfde 100644
--- a/lib/libarchive/archive_write_open_file.c
+++ b/lib/libarchive/archive_write_open_file.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.11 2005/03/13 01:47:31 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_bzip2.c b/lib/libarchive/archive_write_set_compression_bzip2.c
index 429cc155f456..7dd43c423316 100644
--- a/lib/libarchive/archive_write_set_compression_bzip2.c
+++ b/lib/libarchive/archive_write_set_compression_bzip2.c
@@ -29,7 +29,7 @@
 /* Don't compile this if we don't have bzlib. */
 #if HAVE_BZLIB_H
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.8 2005/06/01 15:52:39 kientzle Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libarchive/archive_write_set_compression_gzip.c b/lib/libarchive/archive_write_set_compression_gzip.c
index 3229507a1996..908561d51dd8 100644
--- a/lib/libarchive/archive_write_set_compression_gzip.c
+++ b/lib/libarchive/archive_write_set_compression_gzip.c
@@ -29,7 +29,7 @@
 /* Don't compile this if we don't have zlib. */
 #if HAVE_ZLIB_H
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.10 2005/06/01 15:52:39 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_write_set_compression_none.c b/lib/libarchive/archive_write_set_compression_none.c
index 2a6362994237..7c3b51f6fa92 100644
--- a/lib/libarchive/archive_write_set_compression_none.c
+++ b/lib/libarchive/archive_write_set_compression_none.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.8 2005/06/01 15:52:39 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_write_set_format.c b/lib/libarchive/archive_write_set_format.c
index 5f6df0ef8451..559b74b9f5cf 100644
--- a/lib/libarchive/archive_write_set_format.c
+++ b/lib/libarchive/archive_write_set_format.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libarchive/archive_write_set_format_by_name.c b/lib/libarchive/archive_write_set_format_by_name.c
index 2402e1c38b25..239e89f70c50 100644
--- a/lib/libarchive/archive_write_set_format_by_name.c
+++ b/lib/libarchive/archive_write_set_format_by_name.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.3 2004/07/25 23:10:38 kientzle Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libarchive/archive_write_set_format_cpio.c b/lib/libarchive/archive_write_set_format_cpio.c
index c4e669816307..1da9509dfd93 100644
--- a/lib/libarchive/archive_write_set_format_cpio.c
+++ b/lib/libarchive/archive_write_set_format_cpio.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.5 2004/11/05 05:26:30 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_pax.c b/lib/libarchive/archive_write_set_format_pax.c
index 479cca6206d5..c81028a6ae7f 100644
--- a/lib/libarchive/archive_write_set_format_pax.c
+++ b/lib/libarchive/archive_write_set_format_pax.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.27 2005/06/01 15:44:23 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_shar.c b/lib/libarchive/archive_write_set_format_shar.c
index b636cfbd431f..3075463133e3 100644
--- a/lib/libarchive/archive_write_set_format_shar.c
+++ b/lib/libarchive/archive_write_set_format_shar.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.11 2004/11/05 05:26:30 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_ustar.c b/lib/libarchive/archive_write_set_format_ustar.c
index 51ca5759d236..1d314147796d 100644
--- a/lib/libarchive/archive_write_set_format_ustar.c
+++ b/lib/libarchive/archive_write_set_format_ustar.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.12 2004/11/05 05:26:30 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libarchive/configure.ac.in b/lib/libarchive/configure.ac.in
index 05a0b4c07961..9514fb187702 100644
--- a/lib/libarchive/configure.ac.in
+++ b/lib/libarchive/configure.ac.in
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.6 2005/06/04 22:30:36 kientzle Exp $
 
 #Process this file with autoconf to produce a configure script.
 AC_INIT(libarchive, @VERSION@, kientzle@freebsd.org)
diff --git a/lib/libarchive/libarchive-formats.5 b/lib/libarchive/libarchive-formats.5
index 0b32c7bf61b8..4dfd4cc5d832 100644
--- a/lib/libarchive/libarchive-formats.5
+++ b/lib/libarchive/libarchive-formats.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive-formats.5,v 1.7 2005/06/15 19:04:03 ru Exp $
 .\"
 .Dd April 27, 2004
 .Dt libarchive-formats 3
diff --git a/lib/libarchive/libarchive.3 b/lib/libarchive/libarchive.3
index 5c8976d06873..0bba953cadf0 100644
--- a/lib/libarchive/libarchive.3
+++ b/lib/libarchive/libarchive.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive.3,v 1.7 2005/01/21 20:50:38 ru Exp $
 .\"
 .Dd January 8, 2005
 .Dt LIBARCHIVE 3
diff --git a/lib/libarchive/tar.5 b/lib/libarchive/tar.5
index c8879311ca0b..fe800080191b 100644
--- a/lib/libarchive/tar.5
+++ b/lib/libarchive/tar.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.12 2005/06/15 19:04:03 ru Exp $
 .\"
 .Dd May 20, 2004
 .Dt TAR 5
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index bc5fb9dee4bf..00efb279dd42 100644
--- a/lib/libatm/Makefile
+++ b/lib/libatm/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/lib/libatm/Makefile,v 1.12 2005/04/22 18:57:31 trhodes Exp $
 
 LIB=	atm
 SHLIBDIR?= /lib
diff --git a/lib/libatm/atm_addr.c b/lib/libatm/atm_addr.c
index f4c65f2b25f4..771e0dec4d0c 100644
--- a/lib/libatm/atm_addr.c
+++ b/lib/libatm/atm_addr.c
@@ -30,7 +30,7 @@ static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.12 2003/07/29 13:51:27 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/cache_key.c b/lib/libatm/cache_key.c
index 8e212e6e6362..2fd3850a6e4b 100644
--- a/lib/libatm/cache_key.c
+++ b/lib/libatm/cache_key.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.9 2003/07/29 13:35:03 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/ioctl_subr.c b/lib/libatm/ioctl_subr.c
index f7b15f1178bc..5610c3c9eba0 100644
--- a/lib/libatm/ioctl_subr.c
+++ b/lib/libatm/ioctl_subr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.11 2004/02/21 16:29:10 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/ip_addr.c b/lib/libatm/ip_addr.c
index d3a52765011b..2b76476237a9 100644
--- a/lib/libatm/ip_addr.c
+++ b/lib/libatm/ip_addr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.12 2004/02/21 16:29:10 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/ip_checksum.c b/lib/libatm/ip_checksum.c
index 2881c24a16b0..8171c445c815 100644
--- a/lib/libatm/ip_checksum.c
+++ b/lib/libatm/ip_checksum.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.9 2003/07/29 13:35:03 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/libatm.h b/lib/libatm/libatm.h
index 1c2088fa0784..bbd7b5db84a1 100644
--- a/lib/libatm/libatm.h
+++ b/lib/libatm/libatm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.7 2003/07/29 13:35:03 harti Exp $
  *
  */
 
diff --git a/lib/libatm/timer.c b/lib/libatm/timer.c
index 1870e55c017b..3b69bd928967 100644
--- a/lib/libatm/timer.c
+++ b/lib/libatm/timer.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libautofs/Makefile b/lib/libautofs/Makefile
index 744bc6301a04..28a8acf804e8 100644
--- a/lib/libautofs/Makefile
+++ b/lib/libautofs/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2004/09/08 08:12:21 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libautofs/Makefile,v 1.4 2004/09/08 08:44:14 alfred Exp $
 
 LIB=	autofs
 SHLIB_MAJOR= 1
diff --git a/lib/libautofs/libautofs.3 b/lib/libautofs/libautofs.3
index f4e07a90a9f6..cce0a3e6ae72 100644
--- a/lib/libautofs/libautofs.3
+++ b/lib/libautofs/libautofs.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: libautofs.3,v 1.4 2004/09/08 08:12:21 bright Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.7.2.1 2005/08/18 15:01:22 keramida Exp $
 .Dd September 9, 2004
 .Dt LIBAUTOFS 3
 .Os
diff --git a/lib/libautofs/libautofs.c b/lib/libautofs/libautofs.c
index 459b32d2048b..0bbc5dc4b6f0 100644
--- a/lib/libautofs/libautofs.c
+++ b/lib/libautofs/libautofs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libautofs/libautofs.c,v 1.5 2004/09/09 01:23:27 alfred Exp $
  * $Id: libautofs.c,v 1.5 2004/09/08 08:44:12 bright Exp $
  */
 #include <err.h>
diff --git a/lib/libautofs/libautofs.h b/lib/libautofs/libautofs.h
index f391bad3096f..0526b9657bcb 100644
--- a/lib/libautofs/libautofs.h
+++ b/lib/libautofs/libautofs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libautofs/libautofs.h,v 1.3 2004/09/09 01:23:27 alfred Exp $
  * $Id: libautofs.h,v 1.4 2004/09/08 08:12:21 bright Exp $
  */
 #ifndef _LIBAUTOFS_H
diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile
index 1b728aa64588..45345c1268a9 100644
--- a/lib/libbegemot/Makefile
+++ b/lib/libbegemot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbegemot/Makefile,v 1.2.2.1 2005/07/22 17:29:03 kensmith Exp $
 
 LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
 
diff --git a/lib/libbluetooth/Makefile b/lib/libbluetooth/Makefile
index 200f7e1840c5..46ba187661ff 100644
--- a/lib/libbluetooth/Makefile
+++ b/lib/libbluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.1.10.1 2005/07/22 17:29:03 kensmith Exp $
 
 LIB=		bluetooth
 MAN=		bluetooth.3
diff --git a/lib/libbluetooth/bluetooth.3 b/lib/libbluetooth/bluetooth.3
index d6adb260392f..910c1269b9c6 100644
--- a/lib/libbluetooth/bluetooth.3
+++ b/lib/libbluetooth/bluetooth.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.7 2005/01/21 10:26:11 ru Exp $
 .\"
 .Dd May 7, 2003
 .Dt BLUETOOTH 3
diff --git a/lib/libbluetooth/bluetooth.c b/lib/libbluetooth/bluetooth.c
index f206aeeee4d8..04b4c6f5c17a 100644
--- a/lib/libbluetooth/bluetooth.c
+++ b/lib/libbluetooth/bluetooth.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bluetooth.c,v 1.3 2003/05/20 23:04:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libbluetooth/bluetooth.c,v 1.2 2004/03/05 08:10:17 markm Exp $
  */
 
 #include <bluetooth.h>
diff --git a/lib/libbluetooth/bluetooth.h b/lib/libbluetooth/bluetooth.h
index d9797876e790..a46fa858df63 100644
--- a/lib/libbluetooth/bluetooth.h
+++ b/lib/libbluetooth/bluetooth.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.2 2005/03/17 21:39:44 emax Exp $
  */
 
 #ifndef _BLUETOOTH_H_
diff --git a/lib/libbsnmp/Makefile b/lib/libbsnmp/Makefile
index 22821c7bcb5a..05bd682f58ba 100644
--- a/lib/libbsnmp/Makefile
+++ b/lib/libbsnmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/Makefile,v 1.3 2005/03/14 17:32:15 harti Exp $
 
 SUBDIR=	libbsnmp
 
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index c5dec8d6bddf..f92d80a249ae 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.5.2.1 2005/07/22 17:29:03 kensmith Exp $
 
 SHLIB_MAJOR=	3
 WARNS?=		6
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index a261847361e6..bd262c193bb8 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/libbsnmp/Makefile,v 1.5 2004/08/06 13:43:29 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index 1bd848e1bc87..48827606d555 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbz2/Makefile,v 1.5.10.1 2005/07/22 17:29:03 kensmith Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index d86c16fe4801..c09be05843dc 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/Makefile,v 1.56 2005/01/15 05:23:56 das Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libc/alpha/Makefile.inc b/lib/libc/alpha/Makefile.inc
index c01413623223..6cd7e07b2b04 100644
--- a/lib/libc/alpha/Makefile.inc
+++ b/lib/libc/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/Makefile.inc,v 1.7 2005/01/15 05:23:56 das Exp $
 #
 # Machine dependent definitions for the alpha architecture.
 #
diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 5365e670bf8a..51a8d25f7bc2 100644
--- a/lib/libc/alpha/SYS.h
+++ b/lib/libc/alpha/SYS.h
@@ -26,7 +26,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/alpha/SYS.h,v 1.16 2003/10/29 10:45:00 tjr Exp $
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/alpha/_fpmath.h b/lib/libc/alpha/_fpmath.h
index 8b6d09ec97b1..cfa235c346c2 100644
--- a/lib/libc/alpha/_fpmath.h
+++ b/lib/libc/alpha/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/alpha/_fpmath.h,v 1.6 2005/03/07 04:55:21 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/alpha/arith.h b/lib/libc/alpha/arith.h
index c8af6de23075..e5a1df2d8fe2 100644
--- a/lib/libc/alpha/arith.h
+++ b/lib/libc/alpha/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/netlib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
  */
 
 /*
diff --git a/lib/libc/alpha/gen/Makefile.inc b/lib/libc/alpha/gen/Makefile.inc
index 8f8caf818487..41377c539c02 100644
--- a/lib/libc/alpha/gen/Makefile.inc
+++ b/lib/libc/alpha/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.16 2005/03/15 15:53:38 das Exp $
 
 SRCS+=	_setjmp.S _set_tp.c fabs.S infinity.c ldexp.c modf.c setjmp.S
 SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
diff --git a/lib/libc/alpha/gen/_ctx_start.S b/lib/libc/alpha/gen/_ctx_start.S
index 229a6c19bd16..fcf1832f1a79 100644
--- a/lib/libc/alpha/gen/_ctx_start.S
+++ b/lib/libc/alpha/gen/_ctx_start.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/_ctx_start.S,v 1.2 2003/01/19 00:17:02 obrien Exp $");
 
 /*
  * A0-A5 are the first 6 arguments to the start routine with the
diff --git a/lib/libc/alpha/gen/_set_tp.c b/lib/libc/alpha/gen/_set_tp.c
index 7aff9f76b09c..a5f98fedefff 100644
--- a/lib/libc/alpha/gen/_set_tp.c
+++ b/lib/libc/alpha/gen/_set_tp.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.2 2004/08/16 08:12:29 dfr Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.2 2004/08/16 08:12:29 dfr Exp $");
 
 #include <sys/types.h>
 #include <machine/alpha_cpu.h>
diff --git a/lib/libc/alpha/gen/_setjmp.S b/lib/libc/alpha/gen/_setjmp.S
index 85ed8c7e0831..b8236c35bc79 100644
--- a/lib/libc/alpha/gen/_setjmp.S
+++ b/lib/libc/alpha/gen/_setjmp.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/_setjmp.S,v 1.9 2003/01/19 00:17:02 obrien Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/alpha/gen/divrem.m4 b/lib/libc/alpha/gen/divrem.m4
index 6afa2e107199..9d28aa5a6654 100644
--- a/lib/libc/alpha/gen/divrem.m4
+++ b/lib/libc/alpha/gen/divrem.m4
@@ -1,5 +1,5 @@
 /*	$NetBSD: divrem.m4,v 1.7 1996/10/17 03:08:04 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
diff --git a/lib/libc/alpha/gen/fabs.S b/lib/libc/alpha/gen/fabs.S
index 5a742fec5e7b..dfb1157db03b 100644
--- a/lib/libc/alpha/gen/fabs.S
+++ b/lib/libc/alpha/gen/fabs.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fabs.S,v 1.3 2003/01/19 00:17:02 obrien Exp $");
 
 LEAF(fabs, 1)
 	cpys	fzero, fa0, fv0
diff --git a/lib/libc/alpha/gen/flt_rounds.c b/lib/libc/alpha/gen/flt_rounds.c
index c3219d91bd33..7ce455ec548d 100644
--- a/lib/libc/alpha/gen/flt_rounds.c
+++ b/lib/libc/alpha/gen/flt_rounds.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/flt_rounds.c,v 1.4 2004/03/16 20:41:12 des Exp $");
 
 #include <sys/types.h>
 #include <machine/float.h>
diff --git a/lib/libc/alpha/gen/fpgetmask.c b/lib/libc/alpha/gen/fpgetmask.c
index 036a150f7553..bfcda2bb633c 100644
--- a/lib/libc/alpha/gen/fpgetmask.c
+++ b/lib/libc/alpha/gen/fpgetmask.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fpgetmask.c,v 1.6 2004/01/09 16:52:08 nectar Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/alpha/gen/fpgetround.c b/lib/libc/alpha/gen/fpgetround.c
index 1fd96b2ec53e..af9e514a992f 100644
--- a/lib/libc/alpha/gen/fpgetround.c
+++ b/lib/libc/alpha/gen/fpgetround.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fpgetround.c,v 1.6 2004/03/16 20:41:12 des Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/alpha/gen/fpgetsticky.c b/lib/libc/alpha/gen/fpgetsticky.c
index 7586eb40722f..942d984c5171 100644
--- a/lib/libc/alpha/gen/fpgetsticky.c
+++ b/lib/libc/alpha/gen/fpgetsticky.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fpgetsticky.c,v 1.5 2004/03/16 20:41:12 des Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/alpha/gen/fpsetmask.c b/lib/libc/alpha/gen/fpsetmask.c
index 65da3c511421..1b1b55de934c 100644
--- a/lib/libc/alpha/gen/fpsetmask.c
+++ b/lib/libc/alpha/gen/fpsetmask.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fpsetmask.c,v 1.5 2004/01/09 16:52:08 nectar Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/alpha/gen/fpsetround.c b/lib/libc/alpha/gen/fpsetround.c
index 8e994c74d72a..a6bf2c4ae57c 100644
--- a/lib/libc/alpha/gen/fpsetround.c
+++ b/lib/libc/alpha/gen/fpsetround.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fpsetround.c,v 1.6 2004/03/16 20:41:12 des Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/alpha/gen/infinity.c b/lib/libc/alpha/gen/infinity.c
index b10f6d38a6e5..00a3be22f1ef 100644
--- a/lib/libc/alpha/gen/infinity.c
+++ b/lib/libc/alpha/gen/infinity.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/infinity.c,v 1.7 2003/02/08 20:37:48 mike Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/alpha/gen/makecontext.c b/lib/libc/alpha/gen/makecontext.c
index bc8ea037731a..8a0c6b3e33eb 100644
--- a/lib/libc/alpha/gen/makecontext.c
+++ b/lib/libc/alpha/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.4 2004/01/06 19:28:07 nectar Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/alpha/gen/modf.c b/lib/libc/alpha/gen/modf.c
index 37786dc1e19b..7d9d1919bb3d 100644
--- a/lib/libc/alpha/gen/modf.c
+++ b/lib/libc/alpha/gen/modf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/modf.c,v 1.3 2001/11/07 22:12:52 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/alpha/gen/rfork_thread.S b/lib/libc/alpha/gen/rfork_thread.S
index 68b0233549ba..5db7be7a42c4 100644
--- a/lib/libc/alpha/gen/rfork_thread.S
+++ b/lib/libc/alpha/gen/rfork_thread.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/rfork_thread.S,v 1.2 2003/01/19 00:17:02 obrien Exp $");
 
 #include "SYS.h"
 #include <sys/syscall.h>
diff --git a/lib/libc/alpha/gen/setjmp.S b/lib/libc/alpha/gen/setjmp.S
index 779684d328f3..a158e3eb654c 100644
--- a/lib/libc/alpha/gen/setjmp.S
+++ b/lib/libc/alpha/gen/setjmp.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/setjmp.S,v 1.17 2003/11/14 03:21:22 jeff Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/gen/signalcontext.c b/lib/libc/alpha/gen/signalcontext.c
index a3f639719594..1ab61ff04eb2 100644
--- a/lib/libc/alpha/gen/signalcontext.c
+++ b/lib/libc/alpha/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/signalcontext.c,v 1.1 2003/08/09 05:37:54 deischen Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/alpha/gen/sigsetjmp.S b/lib/libc/alpha/gen/sigsetjmp.S
index 0f7e4008f9a9..a36a987bbc1c 100644
--- a/lib/libc/alpha/gen/sigsetjmp.S
+++ b/lib/libc/alpha/gen/sigsetjmp.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/sigsetjmp.S,v 1.8 2003/01/19 00:17:02 obrien Exp $");
 
 /*
  * C library -- sigsetjmp, siglongjmp
diff --git a/lib/libc/alpha/net/Makefile.inc b/lib/libc/alpha/net/Makefile.inc
index b7178133b972..6fa6644654b4 100644
--- a/lib/libc/alpha/net/Makefile.inc
+++ b/lib/libc/alpha/net/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/net/Makefile.inc,v 1.2 1999/08/27 23:58:09 peter Exp $
 
 SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/alpha/net/byte_swap_2.S b/lib/libc/alpha/net/byte_swap_2.S
index d7933c4aebb2..c41cffbe89f5 100644
--- a/lib/libc/alpha/net/byte_swap_2.S
+++ b/lib/libc/alpha/net/byte_swap_2.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/net/byte_swap_2.S,v 1.3 2003/01/19 00:17:02 obrien Exp $");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/alpha/net/byte_swap_4.S b/lib/libc/alpha/net/byte_swap_4.S
index 04acc85d3aed..101eee35b82d 100644
--- a/lib/libc/alpha/net/byte_swap_4.S
+++ b/lib/libc/alpha/net/byte_swap_4.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/net/byte_swap_4.S,v 1.3 2003/01/19 00:17:02 obrien Exp $");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/alpha/net/htonl.S b/lib/libc/alpha/net/htonl.S
index 05c906c1bbbf..0944988a1a34 100644
--- a/lib/libc/alpha/net/htonl.S
+++ b/lib/libc/alpha/net/htonl.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/net/htonl.S,v 1.3 2003/01/19 00:17:02 obrien Exp $");
 
 #define	ALIAS	htonl
 #define	NAME	__htonl
diff --git a/lib/libc/alpha/net/htons.S b/lib/libc/alpha/net/htons.S
index 4bd3a8b61b60..69d171fcb494 100644
--- a/lib/libc/alpha/net/htons.S
+++ b/lib/libc/alpha/net/htons.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/net/htons.S,v 1.3 2003/01/19 00:17:02 obrien Exp $");
 
 #define	ALIAS	htons
 #define	NAME	__htons
diff --git a/lib/libc/alpha/net/ntohl.S b/lib/libc/alpha/net/ntohl.S
index a08a1627e28e..83c1f18644d8 100644
--- a/lib/libc/alpha/net/ntohl.S
+++ b/lib/libc/alpha/net/ntohl.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/net/ntohl.S,v 1.3 2003/01/19 00:17:02 obrien Exp $");
 
 #define	ALIAS	ntohl
 #define	NAME	__ntohl
diff --git a/lib/libc/alpha/net/ntohs.S b/lib/libc/alpha/net/ntohs.S
index 79e6e0c73d09..e4031b15ffc3 100644
--- a/lib/libc/alpha/net/ntohs.S
+++ b/lib/libc/alpha/net/ntohs.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/net/ntohs.S,v 1.3 2003/01/19 00:17:02 obrien Exp $");
 
 #define	ALIAS	ntohs
 #define	NAME	__ntohs
diff --git a/lib/libc/alpha/stdlib/Makefile.inc b/lib/libc/alpha/stdlib/Makefile.inc
index dda8c76018d8..789699de9aec 100644
--- a/lib/libc/alpha/stdlib/Makefile.inc
+++ b/lib/libc/alpha/stdlib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/stdlib/Makefile.inc,v 1.3 1999/08/27 23:58:09 peter Exp $
 
 MDSRCS+=	abs.c div.c labs.c ldiv.c
diff --git a/lib/libc/alpha/string/Makefile.inc b/lib/libc/alpha/string/Makefile.inc
index 7bbcc8de10e9..97bf568e03b7 100644
--- a/lib/libc/alpha/string/Makefile.inc
+++ b/lib/libc/alpha/string/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/string/Makefile.inc,v 1.2 1999/08/27 23:58:10 peter Exp $
 
 MDSRCS+=	bcopy.S bzero.S ffs.S memcpy.S memmove.S
diff --git a/lib/libc/alpha/string/bcopy.S b/lib/libc/alpha/string/bcopy.S
index dc230637fd16..8ccdd055e4b4 100644
--- a/lib/libc/alpha/string/bcopy.S
+++ b/lib/libc/alpha/string/bcopy.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/string/bcopy.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 #if defined(MEMCOPY) || defined(MEMMOVE)
 #ifdef MEMCOPY
diff --git a/lib/libc/alpha/string/bzero.S b/lib/libc/alpha/string/bzero.S
index dd94200f5c02..9558040f3884 100644
--- a/lib/libc/alpha/string/bzero.S
+++ b/lib/libc/alpha/string/bzero.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/string/bzero.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 LEAF(bzero,2)
 	ble	a1,bzero_done
diff --git a/lib/libc/alpha/string/ffs.S b/lib/libc/alpha/string/ffs.S
index 11147d607135..7d943e681a62 100644
--- a/lib/libc/alpha/string/ffs.S
+++ b/lib/libc/alpha/string/ffs.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/string/ffs.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 LEAF(ffs, 1)
 	addl	a0, 0, t0
diff --git a/lib/libc/alpha/string/memcpy.S b/lib/libc/alpha/string/memcpy.S
index ef50ab162905..28903b15bc34 100644
--- a/lib/libc/alpha/string/memcpy.S
+++ b/lib/libc/alpha/string/memcpy.S
@@ -2,7 +2,7 @@
 
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/string/memcpy.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/alpha/string/memmove.S b/lib/libc/alpha/string/memmove.S
index ad80b1cda1d3..8cbbeada58e6 100644
--- a/lib/libc/alpha/string/memmove.S
+++ b/lib/libc/alpha/string/memmove.S
@@ -1,7 +1,7 @@
 /*	$NetBSD: memmove.S,v 1.1 1995/08/13 00:40:48 cgd Exp $	*/
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/string/memmove.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/alpha/sys/Makefile.inc b/lib/libc/alpha/sys/Makefile.inc
index d0b21ed8d2d9..1a46ef5f4dde 100644
--- a/lib/libc/alpha/sys/Makefile.inc
+++ b/lib/libc/alpha/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/sys/Makefile.inc,v 1.12 2003/08/11 07:14:06 bms Exp $
 
 MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S \
 	sbrk.S setlogin.S sigreturn.S
diff --git a/lib/libc/alpha/sys/Ovfork.S b/lib/libc/alpha/sys/Ovfork.S
index 99663f1e5cb4..55558e059116 100644
--- a/lib/libc/alpha/sys/Ovfork.S
+++ b/lib/libc/alpha/sys/Ovfork.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/Ovfork.S,v 1.5 2003/08/16 18:59:08 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/brk.S b/lib/libc/alpha/sys/brk.S
index 9f3385b7bc27..049d5c9623a3 100644
--- a/lib/libc/alpha/sys/brk.S
+++ b/lib/libc/alpha/sys/brk.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/brk.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/cerror.S b/lib/libc/alpha/sys/cerror.S
index 5744129807bf..bbae3f94c584 100644
--- a/lib/libc/alpha/sys/cerror.S
+++ b/lib/libc/alpha/sys/cerror.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/cerror.S,v 1.6 2003/01/19 00:17:03 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/exect.S b/lib/libc/alpha/sys/exect.S
index 8ad065f69514..27d33b41b06f 100644
--- a/lib/libc/alpha/sys/exect.S
+++ b/lib/libc/alpha/sys/exect.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/exect.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/fork.S b/lib/libc/alpha/sys/fork.S
index 5f408966f2ee..f1ee930f33b6 100644
--- a/lib/libc/alpha/sys/fork.S
+++ b/lib/libc/alpha/sys/fork.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/fork.S,v 1.5 2003/08/16 18:59:08 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/pipe.S b/lib/libc/alpha/sys/pipe.S
index e94398e9656c..01d9e80d9132 100644
--- a/lib/libc/alpha/sys/pipe.S
+++ b/lib/libc/alpha/sys/pipe.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/pipe.S,v 1.5 2003/08/16 18:59:08 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/ptrace.S b/lib/libc/alpha/sys/ptrace.S
index 8e4c371f7f0c..3ae711e317d0 100644
--- a/lib/libc/alpha/sys/ptrace.S
+++ b/lib/libc/alpha/sys/ptrace.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/ptrace.S,v 1.2 2003/01/19 00:17:03 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/sbrk.S b/lib/libc/alpha/sys/sbrk.S
index 4d7990650229..1f84fca053ec 100644
--- a/lib/libc/alpha/sys/sbrk.S
+++ b/lib/libc/alpha/sys/sbrk.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/sbrk.S,v 1.3 2003/01/19 00:17:03 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/setlogin.S b/lib/libc/alpha/sys/setlogin.S
index 00b1d3c8e152..78d12362ae5f 100644
--- a/lib/libc/alpha/sys/setlogin.S
+++ b/lib/libc/alpha/sys/setlogin.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/setlogin.S,v 1.4 2003/08/16 18:59:08 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/alpha/sys/sigreturn.S b/lib/libc/alpha/sys/sigreturn.S
index 9b13d5f1a136..1538803eac3e 100644
--- a/lib/libc/alpha/sys/sigreturn.S
+++ b/lib/libc/alpha/sys/sigreturn.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/sys/sigreturn.S,v 1.4 2003/01/19 00:17:03 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/Makefile.inc b/lib/libc/amd64/Makefile.inc
index 954a02552342..1f78450c2ec2 100644
--- a/lib/libc/amd64/Makefile.inc
+++ b/lib/libc/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.3 2005/01/15 05:23:57 das Exp $
 #
 # Machine dependent definitions for the amd64 architecture.
 #
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index 844fe6a6ae36..6fd0a9c3b1da 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/SYS.h,v 1.27 2004/02/22 02:11:39 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/amd64/_fpmath.h b/lib/libc/amd64/_fpmath.h
index 8f8cf6fb8075..801ec809ccad 100644
--- a/lib/libc/amd64/_fpmath.h
+++ b/lib/libc/amd64/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.6 2005/03/07 04:55:21 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/amd64/arith.h b/lib/libc/amd64/arith.h
index ecb1a33fccb0..8d3b5f626892 100644
--- a/lib/libc/amd64/arith.h
+++ b/lib/libc/amd64/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $
  */
 
 /*
diff --git a/lib/libc/amd64/gen/Makefile.inc b/lib/libc/amd64/gen/Makefile.inc
index 38fe7e1a8ce3..53ab073a1549 100644
--- a/lib/libc/amd64/gen/Makefile.inc
+++ b/lib/libc/amd64/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.29 2005/03/15 15:53:38 das Exp $
 
 SRCS+=	_setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \
 	fabs.S modf.S \
diff --git a/lib/libc/amd64/gen/_set_tp.c b/lib/libc/amd64/gen/_set_tp.c
index 02e5e1460302..3cfffab2c4f9 100644
--- a/lib/libc/amd64/gen/_set_tp.c
+++ b/lib/libc/amd64/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/amd64/gen/_set_tp.c,v 1.1 2004/08/15 16:18:02 dfr Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index eed057bea584..c2584a04c946 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.18 2003/06/02 22:37:53 peter Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/amd64/gen/fabs.S b/lib/libc/amd64/gen/fabs.S
index 59cd910414ba..0fb3c43bb53d 100644
--- a/lib/libc/amd64/gen/fabs.S
+++ b/lib/libc/amd64/gen/fabs.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.3 2004/02/08 21:21:45 peter Exp $");
 
 /*
  * Return floating point absolute value of a double.
diff --git a/lib/libc/amd64/gen/flt_rounds.c b/lib/libc/amd64/gen/flt_rounds.c
index c0ce81f6dfa9..c4eb84729806 100644
--- a/lib/libc/amd64/gen/flt_rounds.c
+++ b/lib/libc/amd64/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $");
 
 #include <float.h>
 
diff --git a/lib/libc/amd64/gen/fpgetmask.c b/lib/libc/amd64/gen/fpgetmask.c
index 03bb2741ef6a..979c4b1171fa 100644
--- a/lib/libc/amd64/gen/fpgetmask.c
+++ b/lib/libc/amd64/gen/fpgetmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetmask.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpgetprec.c b/lib/libc/amd64/gen/fpgetprec.c
index 22d21480566a..051c32f93f2f 100644
--- a/lib/libc/amd64/gen/fpgetprec.c
+++ b/lib/libc/amd64/gen/fpgetprec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetprec.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpgetround.c b/lib/libc/amd64/gen/fpgetround.c
index 9c066b149ca2..31271a2d9996 100644
--- a/lib/libc/amd64/gen/fpgetround.c
+++ b/lib/libc/amd64/gen/fpgetround.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetround.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpgetsticky.c b/lib/libc/amd64/gen/fpgetsticky.c
index c3acb91d63e5..09cb5554a372 100644
--- a/lib/libc/amd64/gen/fpgetsticky.c
+++ b/lib/libc/amd64/gen/fpgetsticky.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetsticky.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpsetmask.c b/lib/libc/amd64/gen/fpsetmask.c
index 996e167ac1d9..3e9ebbe5eef4 100644
--- a/lib/libc/amd64/gen/fpsetmask.c
+++ b/lib/libc/amd64/gen/fpsetmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpsetmask.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpsetprec.c b/lib/libc/amd64/gen/fpsetprec.c
index 5898de7e0e82..0e256911ff39 100644
--- a/lib/libc/amd64/gen/fpsetprec.c
+++ b/lib/libc/amd64/gen/fpsetprec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpsetprec.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpsetround.c b/lib/libc/amd64/gen/fpsetround.c
index 6f13367510d6..f17f2e9d3b29 100644
--- a/lib/libc/amd64/gen/fpsetround.c
+++ b/lib/libc/amd64/gen/fpsetround.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpsetround.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/infinity.c b/lib/libc/amd64/gen/infinity.c
index 464b4029b35a..7b42ae8777a1 100644
--- a/lib/libc/amd64/gen/infinity.c
+++ b/lib/libc/amd64/gen/infinity.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/infinity.c,v 1.10 2003/02/08 20:37:52 mike Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/amd64/gen/ldexp.c b/lib/libc/amd64/gen/ldexp.c
index b01b9378c758..7efb58e17be5 100644
--- a/lib/libc/amd64/gen/ldexp.c
+++ b/lib/libc/amd64/gen/ldexp.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ldexp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/ldexp.c,v 1.12 2004/02/16 10:02:51 das Exp $");
 
 /*
  * ldexp(value, exp): return value * (2 ** exp).
diff --git a/lib/libc/amd64/gen/makecontext.c b/lib/libc/amd64/gen/makecontext.c
index 15f10b50ded4..0999a18059c4 100644
--- a/lib/libc/amd64/gen/makecontext.c
+++ b/lib/libc/amd64/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.4 2004/07/31 01:41:41 davidxu Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/amd64/gen/modf.S b/lib/libc/amd64/gen/modf.S
index d448de168012..e7ff17109533 100644
--- a/lib/libc/amd64/gen/modf.S
+++ b/lib/libc/amd64/gen/modf.S
@@ -40,7 +40,7 @@
 #if defined(LIBC_SCCS)
 	RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $")
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $");
 
 /*
  * modf(value, iptr): return fractional part of value, and stores the
diff --git a/lib/libc/amd64/gen/rfork_thread.S b/lib/libc/amd64/gen/rfork_thread.S
index aa7001c5d587..cb3cf644d32e 100644
--- a/lib/libc/amd64/gen/rfork_thread.S
+++ b/lib/libc/amd64/gen/rfork_thread.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/rfork_thread.S,v 1.1 2003/10/13 20:32:33 alc Exp $");
 
 /*
  * With thanks to John Dyson for the original version of this.
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index 14696f677697..2819d3fad6ff 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.26 2003/06/02 22:37:53 peter Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/amd64/gen/signalcontext.c b/lib/libc/amd64/gen/signalcontext.c
index 1a2621aa7229..b7efc1870896 100644
--- a/lib/libc/amd64/gen/signalcontext.c
+++ b/lib/libc/amd64/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.5 2004/07/28 13:08:24 davidxu Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index 3b138017205d..74a5fabeb0d0 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -41,7 +41,7 @@
 	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.28 2003/06/02 22:37:53 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/net/Makefile.inc b/lib/libc/amd64/net/Makefile.inc
index 96e559bf8027..643f74813b1c 100644
--- a/lib/libc/amd64/net/Makefile.inc
+++ b/lib/libc/amd64/net/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/net/Makefile.inc,v 1.6 1999/08/27 23:59:24 peter Exp $
 
 SRCS+=	htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/amd64/net/htonl.S b/lib/libc/amd64/net/htonl.S
index 8d802d62df2a..3d10614c2d12 100644
--- a/lib/libc/amd64/net/htonl.S
+++ b/lib/libc/amd64/net/htonl.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)htonl.s	5.3 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/net/htonl.S,v 1.10 2003/04/30 18:07:23 peter Exp $");
 
 /* netorder = htonl(hostorder) */
 
diff --git a/lib/libc/amd64/net/htons.S b/lib/libc/amd64/net/htons.S
index 6940ef06b0e1..aee48545f3a4 100644
--- a/lib/libc/amd64/net/htons.S
+++ b/lib/libc/amd64/net/htons.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)htons.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/net/htons.S,v 1.10 2003/04/30 18:07:23 peter Exp $");
 
 /* netorder = htons(hostorder) */
 
diff --git a/lib/libc/amd64/net/ntohl.S b/lib/libc/amd64/net/ntohl.S
index e5e2150c4525..c4aa9c2061d6 100644
--- a/lib/libc/amd64/net/ntohl.S
+++ b/lib/libc/amd64/net/ntohl.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)ntohl.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/net/ntohl.S,v 1.10 2003/04/30 18:07:23 peter Exp $");
 
 /* hostorder = ntohl(netorder) */
 
diff --git a/lib/libc/amd64/net/ntohs.S b/lib/libc/amd64/net/ntohs.S
index 02e44418e4eb..9be127d1dd20 100644
--- a/lib/libc/amd64/net/ntohs.S
+++ b/lib/libc/amd64/net/ntohs.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)ntohs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/net/ntohs.S,v 1.10 2003/04/30 18:07:23 peter Exp $");
 
 /* hostorder = ntohs(netorder) */
 
diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc
index f5d69d60fbc5..ac585a470e01 100644
--- a/lib/libc/amd64/string/Makefile.inc
+++ b/lib/libc/amd64/string/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.5 2005/04/10 18:58:49 alc Exp $
 
 MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \
 	strcat.S strcmp.S strcpy.S
diff --git a/lib/libc/amd64/string/bcmp.S b/lib/libc/amd64/string/bcmp.S
index 36a0c7e8419c..0ac411f4ef96 100644
--- a/lib/libc/amd64/string/bcmp.S
+++ b/lib/libc/amd64/string/bcmp.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcmp.S,v 1.2 2005/04/10 18:12:06 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcmp.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $")
diff --git a/lib/libc/amd64/string/bcopy.S b/lib/libc/amd64/string/bcopy.S
index d58f5918ee59..f95ac07651c7 100644
--- a/lib/libc/amd64/string/bcopy.S
+++ b/lib/libc/amd64/string/bcopy.S
@@ -30,7 +30,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.2 2005/04/08 05:10:18 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcopy.S,v 1.2 2003/08/07 16:42:36 agc Exp $")
diff --git a/lib/libc/amd64/string/bzero.S b/lib/libc/amd64/string/bzero.S
index d9d2a451a0d7..9b3dae75370d 100644
--- a/lib/libc/amd64/string/bzero.S
+++ b/lib/libc/amd64/string/bzero.S
@@ -5,7 +5,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bzero.S,v 1.2 2005/04/07 05:46:46 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: bzero.S,v 1.2 2003/07/26 19:24:38 salo Exp $")
diff --git a/lib/libc/amd64/string/memcmp.S b/lib/libc/amd64/string/memcmp.S
index 28194f82e7a0..8406f0ab5138 100644
--- a/lib/libc/amd64/string/memcmp.S
+++ b/lib/libc/amd64/string/memcmp.S
@@ -5,7 +5,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/memcmp.S,v 1.1 2005/04/08 05:15:55 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: memcmp.S,v 1.2 2003/07/26 19:24:39 salo Exp $")
diff --git a/lib/libc/amd64/string/memcpy.S b/lib/libc/amd64/string/memcpy.S
index bd1e8422ad84..5b0762f5f9d8 100644
--- a/lib/libc/amd64/string/memcpy.S
+++ b/lib/libc/amd64/string/memcpy.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: memcpy.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/lib/libc/amd64/string/memcpy.S,v 1.1 2005/04/07 03:56:03 alc Exp $ */
 
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/amd64/string/memmove.S b/lib/libc/amd64/string/memmove.S
index 85beb262f8d9..93d869358586 100644
--- a/lib/libc/amd64/string/memmove.S
+++ b/lib/libc/amd64/string/memmove.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: memmove.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/lib/libc/amd64/string/memmove.S,v 1.1 2005/04/07 03:56:03 alc Exp $ */
 
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/amd64/string/memset.S b/lib/libc/amd64/string/memset.S
index 142387aebd86..51d90a744599 100644
--- a/lib/libc/amd64/string/memset.S
+++ b/lib/libc/amd64/string/memset.S
@@ -5,7 +5,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/memset.S,v 1.1 2005/04/07 03:56:03 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: memset.S,v 1.3 2004/02/26 20:50:06 drochner Exp $")
diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/amd64/string/strcat.S
index 78a1b5645eef..9f1002b20f82 100644
--- a/lib/libc/amd64/string/strcat.S
+++ b/lib/libc/amd64/string/strcat.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/strcat.S,v 1.1 2005/04/10 18:58:49 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: strcat.S,v 1.4 2004/07/26 18:51:21 drochner Exp $")
diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/amd64/string/strcmp.S
index a7d252376978..9a5f25b92324 100644
--- a/lib/libc/amd64/string/strcmp.S
+++ b/lib/libc/amd64/string/strcmp.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/strcmp.S,v 1.1 2005/04/09 20:47:08 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
diff --git a/lib/libc/amd64/string/strcpy.S b/lib/libc/amd64/string/strcpy.S
index 04676fa1170a..db4438cda29c 100644
--- a/lib/libc/amd64/string/strcpy.S
+++ b/lib/libc/amd64/string/strcpy.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/strcpy.S,v 1.2 2005/04/23 18:45:36 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: strcpy.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index 4f8bef70f24c..ef7c1d9f252a 100644
--- a/lib/libc/amd64/sys/Makefile.inc
+++ b/lib/libc/amd64/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.29 2003/10/23 06:07:09 peter Exp $
 
 SRCS+=	amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c amd64_set_gsbase.c
 
diff --git a/lib/libc/amd64/sys/amd64_get_fsbase.c b/lib/libc/amd64/sys/amd64_get_fsbase.c
index ff5eb8f305ae..d9201eae2b07 100644
--- a/lib/libc/amd64/sys/amd64_get_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/amd64_get_gsbase.c b/lib/libc/amd64/sys/amd64_get_gsbase.c
index ddbf977f5dd1..566644bf27a2 100644
--- a/lib/libc/amd64/sys/amd64_get_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/amd64_set_fsbase.c b/lib/libc/amd64/sys/amd64_set_fsbase.c
index e0914859a1ae..c3c9af6b76bc 100644
--- a/lib/libc/amd64/sys/amd64_set_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_set_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/amd64_set_gsbase.c b/lib/libc/amd64/sys/amd64_set_gsbase.c
index f8963288ac07..b8829bfcc5b7 100644
--- a/lib/libc/amd64/sys/amd64_set_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_set_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/brk.S b/lib/libc/amd64/sys/brk.S
index ee04cac89406..460c3dfebd41 100644
--- a/lib/libc/amd64/sys/brk.S
+++ b/lib/libc/amd64/sys/brk.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)brk.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/brk.S,v 1.13 2004/10/27 17:11:43 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libc/amd64/sys/cerror.S
index fa28eca15b1b..79c306940ec9 100644
--- a/lib/libc/amd64/sys/cerror.S
+++ b/lib/libc/amd64/sys/cerror.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.14 2005/04/21 12:47:08 kan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/exect.S b/lib/libc/amd64/sys/exect.S
index d71a94b374df..708ec7a02ff6 100644
--- a/lib/libc/amd64/sys/exect.S
+++ b/lib/libc/amd64/sys/exect.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)exect.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/exect.S,v 1.11 2003/05/24 17:35:23 peter Exp $");
 
 #include "SYS.h"
 #include <machine/psl.h>
diff --git a/lib/libc/amd64/sys/getcontext.S b/lib/libc/amd64/sys/getcontext.S
index 9fa95fa09b18..06b78c68294c 100644
--- a/lib/libc/amd64/sys/getcontext.S
+++ b/lib/libc/amd64/sys/getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/getcontext.S,v 1.2 2003/09/04 00:31:45 peter Exp $");
 
 #include <SYS.h>
 
diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/amd64/sys/pipe.S
index 4baf20c9d0de..7b1f976676b0 100644
--- a/lib/libc/amd64/sys/pipe.S
+++ b/lib/libc/amd64/sys/pipe.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)pipe.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/pipe.S,v 1.13 2004/02/22 02:11:39 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/ptrace.S b/lib/libc/amd64/sys/ptrace.S
index f0b86f4aea64..d85614fdb478 100644
--- a/lib/libc/amd64/sys/ptrace.S
+++ b/lib/libc/amd64/sys/ptrace.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)ptrace.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/ptrace.S,v 1.11 2003/05/24 17:35:23 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/reboot.S b/lib/libc/amd64/sys/reboot.S
index 0ed4329ebca2..af2a52759fa2 100644
--- a/lib/libc/amd64/sys/reboot.S
+++ b/lib/libc/amd64/sys/reboot.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/reboot.S,v 1.9 2004/02/22 02:11:39 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/sbrk.S b/lib/libc/amd64/sys/sbrk.S
index dde1bcdabbc3..0d89dc7b4a1b 100644
--- a/lib/libc/amd64/sys/sbrk.S
+++ b/lib/libc/amd64/sys/sbrk.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)sbrk.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/sbrk.S,v 1.13 2003/05/24 17:35:23 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/setlogin.S b/lib/libc/amd64/sys/setlogin.S
index 439e41744363..28de338e6f0e 100644
--- a/lib/libc/amd64/sys/setlogin.S
+++ b/lib/libc/amd64/sys/setlogin.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)setlogin.s	5.2 (Berkeley) 4/12/91"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/setlogin.S,v 1.12 2004/02/22 02:11:39 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/sigreturn.S b/lib/libc/amd64/sys/sigreturn.S
index 2556ab94e505..c1040c100e3f 100644
--- a/lib/libc/amd64/sys/sigreturn.S
+++ b/lib/libc/amd64/sys/sigreturn.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/sigreturn.S,v 1.12 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index e49bca9b1ba8..716a592cd4c2 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)Ovfork.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/vfork.S,v 1.22 2003/09/04 00:26:40 peter Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/arm/Makefile.inc b/lib/libc/arm/Makefile.inc
index 90dde632d053..17e5163e0717 100644
--- a/lib/libc/arm/Makefile.inc
+++ b/lib/libc/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/Makefile.inc,v 1.3 2005/03/20 00:53:52 cognet Exp $
 #
 # Machine dependent definitions for the arm architecture.
 #
diff --git a/lib/libc/arm/SYS.h b/lib/libc/arm/SYS.h
index b9bc7424faff..6b70a0d01b9a 100644
--- a/lib/libc/arm/SYS.h
+++ b/lib/libc/arm/SYS.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/SYS.h,v 1.2 2004/11/09 16:49:13 cognet Exp $
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/arm/_fpmath.h b/lib/libc/arm/_fpmath.h
index 98d78327dec6..79e4346e2031 100644
--- a/lib/libc/arm/_fpmath.h
+++ b/lib/libc/arm/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/_fpmath.h,v 1.4 2005/03/20 00:53:52 cognet Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/arm/arith.h b/lib/libc/arm/arith.h
index 86121bf9a80c..d689d0b8512a 100644
--- a/lib/libc/arm/arith.h
+++ b/lib/libc/arm/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/arith.h,v 1.1 2004/05/14 12:04:29 cognet Exp $
  */
 
 /*
diff --git a/lib/libc/arm/gen/Makefile.inc b/lib/libc/arm/gen/Makefile.inc
index bbe225727889..f8dbaa69fbb0 100644
--- a/lib/libc/arm/gen/Makefile.inc
+++ b/lib/libc/arm/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.4 2004/09/23 23:12:57 cognet Exp $
 
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
 	infinity.c ldexp.c makecontext.c modf.c \
diff --git a/lib/libc/arm/gen/_ctx_start.S b/lib/libc/arm/gen/_ctx_start.S
index fbde35709e63..7958ab4b1287 100644
--- a/lib/libc/arm/gen/_ctx_start.S
+++ b/lib/libc/arm/gen/_ctx_start.S
@@ -1,6 +1,6 @@
 #include <machine/asm.h>
 
-.ident	"$FreeBSD$"
+.ident	"$FreeBSD: src/lib/libc/arm/gen/_ctx_start.S,v 1.2 2004/11/05 23:53:02 cognet Exp $"
 ENTRY(_ctx_start)
 	mov	lr, pc
 	mov	pc, r4
diff --git a/lib/libc/arm/gen/_set_tp.c b/lib/libc/arm/gen/_set_tp.c
index 4c26dffa0114..faaaee60e915 100644
--- a/lib/libc/arm/gen/_set_tp.c
+++ b/lib/libc/arm/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/arm/gen/_set_tp.c,v 1.1 2004/09/23 23:12:57 cognet Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S
index b9384051d9ec..d64eef9de0e0 100644
--- a/lib/libc/arm/gen/_setjmp.S
+++ b/lib/libc/arm/gen/_setjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/arm/gen/alloca.S b/lib/libc/arm/gen/alloca.S
index 9569d86d0ba7..e79869d773ff 100644
--- a/lib/libc/arm/gen/alloca.S
+++ b/lib/libc/arm/gen/alloca.S
@@ -35,7 +35,7 @@
 /* like alloc, but automatic automatic free in return */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/alloca.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(alloca)
 	add	r0, r0, #0x00000007	/* round up to next 8 byte alignment */
diff --git a/lib/libc/arm/gen/divsi3.S b/lib/libc/arm/gen/divsi3.S
index 104a958900be..5e6b8c576a90 100644
--- a/lib/libc/arm/gen/divsi3.S
+++ b/lib/libc/arm/gen/divsi3.S
@@ -15,7 +15,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/divsi3.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 /* 
  * stack is aligned as there's a possibility of branching to L_overflow
diff --git a/lib/libc/arm/gen/fabs.c b/lib/libc/arm/gen/fabs.c
index 8bb15025aead..c37cc283c77c 100644
--- a/lib/libc/arm/gen/fabs.c
+++ b/lib/libc/arm/gen/fabs.c
@@ -35,7 +35,7 @@
  * fabs(x) returns the absolute value of x.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/fabs.c,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 double
 fabs(double x)
diff --git a/lib/libc/arm/gen/infinity.c b/lib/libc/arm/gen/infinity.c
index 60faf42a7ea3..0c374dd3d925 100644
--- a/lib/libc/arm/gen/infinity.c
+++ b/lib/libc/arm/gen/infinity.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/infinity.c,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c
index 4fd3953ac51a..595a4f35efa2 100644
--- a/lib/libc/arm/gen/makecontext.c
+++ b/lib/libc/arm/gen/makecontext.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/makecontext.c,v 1.2 2004/11/05 23:53:02 cognet Exp $");
 
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/lib/libc/arm/gen/modf.c b/lib/libc/arm/gen/modf.c
index 347090cf1fe7..42d2a31dc5b9 100644
--- a/lib/libc/arm/gen/modf.c
+++ b/lib/libc/arm/gen/modf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/modf.c,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S
index f0e9cfa7a4dc..3e753b11b9db 100644
--- a/lib/libc/arm/gen/setjmp.S
+++ b/lib/libc/arm/gen/setjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.4 2004/11/09 16:49:14 cognet Exp $");
 /*
  * C library -- setjmp, longjmp
  *
diff --git a/lib/libc/arm/gen/signalcontext.c b/lib/libc/arm/gen/signalcontext.c
index bb9a54dbe115..c71e71dbbb51 100644
--- a/lib/libc/arm/gen/signalcontext.c
+++ b/lib/libc/arm/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/signalcontext.c,v 1.2 2004/11/05 23:53:02 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/arm/gen/sigsetjmp.S b/lib/libc/arm/gen/sigsetjmp.S
index 09ec2561029b..d4ba16d739d0 100644
--- a/lib/libc/arm/gen/sigsetjmp.S
+++ b/lib/libc/arm/gen/sigsetjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/sigsetjmp.S,v 1.2 2004/11/09 16:44:57 cognet Exp $");
 
 /*
  * C library -- sigsetjmp, siglongjmp
diff --git a/lib/libc/arm/net/Makefile.inc b/lib/libc/arm/net/Makefile.inc
index 69c34cb0d85a..a81352adbe99 100644
--- a/lib/libc/arm/net/Makefile.inc
+++ b/lib/libc/arm/net/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/net/Makefile.inc,v 1.1 2004/05/14 12:04:30 cognet Exp $
 
 SRCS+=	ntohl.S ntohs.S htonl.S htons.S
diff --git a/lib/libc/arm/net/htonl.S b/lib/libc/arm/net/htonl.S
index 152511e9006e..a11621210185 100644
--- a/lib/libc/arm/net/htonl.S
+++ b/lib/libc/arm/net/htonl.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/net/htonl.S,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 _ENTRY(_C_LABEL(htonl))
 _PROF_PROLOGUE
diff --git a/lib/libc/arm/net/htons.S b/lib/libc/arm/net/htons.S
index c031c1d22038..9bf4f73ef782 100644
--- a/lib/libc/arm/net/htons.S
+++ b/lib/libc/arm/net/htons.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/net/htons.S,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 _ENTRY(_C_LABEL(htons))
 _PROF_PROLOGUE
diff --git a/lib/libc/arm/net/ntohl.S b/lib/libc/arm/net/ntohl.S
index 5b5e0a98a97e..1ab394c64f40 100644
--- a/lib/libc/arm/net/ntohl.S
+++ b/lib/libc/arm/net/ntohl.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/net/ntohl.S,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 _ENTRY(_C_LABEL(ntohl))
 _PROF_PROLOGUE
diff --git a/lib/libc/arm/net/ntohs.S b/lib/libc/arm/net/ntohs.S
index 8c44db6059b6..a353ead456d1 100644
--- a/lib/libc/arm/net/ntohs.S
+++ b/lib/libc/arm/net/ntohs.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/net/ntohs.S,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 _ENTRY(_C_LABEL(ntohs))
 _PROF_PROLOGUE
diff --git a/lib/libc/arm/softfloat/arm-gcc.h b/lib/libc/arm/softfloat/arm-gcc.h
index 1204108250f7..d2c26141ff98 100644
--- a/lib/libc/arm/softfloat/arm-gcc.h
+++ b/lib/libc/arm/softfloat/arm-gcc.h
@@ -1,5 +1,5 @@
 /* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/arm/softfloat/arm-gcc.h,v 1.1 2004/05/14 12:04:30 cognet Exp $ */
 
 /*
 -------------------------------------------------------------------------------
diff --git a/lib/libc/arm/softfloat/milieu.h b/lib/libc/arm/softfloat/milieu.h
index 54775c768b91..87f9d3219b19 100644
--- a/lib/libc/arm/softfloat/milieu.h
+++ b/lib/libc/arm/softfloat/milieu.h
@@ -1,5 +1,5 @@
 /* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/arm/softfloat/milieu.h,v 1.1 2004/05/14 12:04:30 cognet Exp $ */
 
 /*
 ===============================================================================
diff --git a/lib/libc/arm/softfloat/softfloat.h b/lib/libc/arm/softfloat/softfloat.h
index 3019d90398e9..4fcdaa9d7b66 100644
--- a/lib/libc/arm/softfloat/softfloat.h
+++ b/lib/libc/arm/softfloat/softfloat.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/arm/softfloat/softfloat.h,v 1.1 2004/05/14 12:04:30 cognet Exp $ */
 
 /* This is a derivative work. */
 
diff --git a/lib/libc/arm/stdlib/Makefile.inc b/lib/libc/arm/stdlib/Makefile.inc
index 1814a0a9c9dc..582ef24f9383 100644
--- a/lib/libc/arm/stdlib/Makefile.inc
+++ b/lib/libc/arm/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/stdlib/Makefile.inc,v 1.1 2004/05/14 12:04:31 cognet Exp $
 
 MDSRCS+=abs.c div.c labs.c ldiv.c
diff --git a/lib/libc/arm/string/Makefile.inc b/lib/libc/arm/string/Makefile.inc
index 7b73e58f4db2..37c47fcb6395 100644
--- a/lib/libc/arm/string/Makefile.inc
+++ b/lib/libc/arm/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/string/Makefile.inc,v 1.1 2004/05/14 12:04:31 cognet Exp $
 
 MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S index.c memchr.c memcmp.S memcpy.S \
 	memmove.S memset.S rindex.c strcat.c strchr.c strcmp.S strcpy.c \
diff --git a/lib/libc/arm/string/bcopy.S b/lib/libc/arm/string/bcopy.S
index f2583fc7ffc8..3b83b7afc2ca 100644
--- a/lib/libc/arm/string/bcopy.S
+++ b/lib/libc/arm/string/bcopy.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: bcopy.S,v 1.3 2003/10/14 07:51:45 scw Exp $	*/
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/bcopy.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #define _BCOPY
 #include "memmove.S"
diff --git a/lib/libc/arm/string/bzero.S b/lib/libc/arm/string/bzero.S
index 008c48504dfc..20c456323d93 100644
--- a/lib/libc/arm/string/bzero.S
+++ b/lib/libc/arm/string/bzero.S
@@ -38,7 +38,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/bzero.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 
 #define _BZERO
 #include "memset.S"
diff --git a/lib/libc/arm/string/ffs.S b/lib/libc/arm/string/ffs.S
index 223d55d69236..1640104278e2 100644
--- a/lib/libc/arm/string/ffs.S
+++ b/lib/libc/arm/string/ffs.S
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
 
 /*
  * ffs - find first set bit, this algorithm isolates the first set
diff --git a/lib/libc/arm/string/memcmp.S b/lib/libc/arm/string/memcmp.S
index a81c9603edf4..2279fa2d2539 100644
--- a/lib/libc/arm/string/memcmp.S
+++ b/lib/libc/arm/string/memcmp.S
@@ -64,7 +64,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(memcmp)
 	mov	ip, r0
diff --git a/lib/libc/arm/string/memcpy.S b/lib/libc/arm/string/memcpy.S
index 1d17b93e5623..b814e5a7e9b3 100644
--- a/lib/libc/arm/string/memcpy.S
+++ b/lib/libc/arm/string/memcpy.S
@@ -1,7 +1,7 @@
 /*	$NetBSD: memcpy.S,v 1.4 2003/10/14 07:51:45 scw Exp $	*/
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #if !defined(__XSCALE__) || defined(_STANDALONE)
 #include "memcpy_arm.S"
 #else
diff --git a/lib/libc/arm/string/memcpy_arm.S b/lib/libc/arm/string/memcpy_arm.S
index 005c8c29c3c4..1455263776a9 100644
--- a/lib/libc/arm/string/memcpy_arm.S
+++ b/lib/libc/arm/string/memcpy_arm.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_arm.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 /*
  * This is one fun bit of code ...
  * Some easy listening music is suggested while trying to understand this
diff --git a/lib/libc/arm/string/memcpy_xscale.S b/lib/libc/arm/string/memcpy_xscale.S
index 02cca5e129a4..4902cb3edcb5 100644
--- a/lib/libc/arm/string/memcpy_xscale.S
+++ b/lib/libc/arm/string/memcpy_xscale.S
@@ -36,7 +36,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_xscale.S,v 1.2 2004/09/23 23:11:32 cognet Exp $");
 
 /* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */
 ENTRY(memcpy)
diff --git a/lib/libc/arm/string/memmove.S b/lib/libc/arm/string/memmove.S
index f65a2544f372..db7277dc9b6d 100644
--- a/lib/libc/arm/string/memmove.S
+++ b/lib/libc/arm/string/memmove.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memmove.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 #ifndef _BCOPY
 /* LINTSTUB: Func: void *memmove(void *, const void *, size_t) */
diff --git a/lib/libc/arm/string/memset.S b/lib/libc/arm/string/memset.S
index 1e978460b68d..1f96ee618bc3 100644
--- a/lib/libc/arm/string/memset.S
+++ b/lib/libc/arm/string/memset.S
@@ -67,7 +67,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 /*
  * memset: Sets a block of memory to the specified value
diff --git a/lib/libc/arm/string/strcmp.S b/lib/libc/arm/string/strcmp.S
index e5cba7d2d665..f3599ee79706 100644
--- a/lib/libc/arm/string/strcmp.S
+++ b/lib/libc/arm/string/strcmp.S
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/strcmp.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(strcmp)
 1:
diff --git a/lib/libc/arm/string/strncmp.S b/lib/libc/arm/string/strncmp.S
index d172264bd868..eb9fbd896dc3 100644
--- a/lib/libc/arm/string/strncmp.S
+++ b/lib/libc/arm/string/strncmp.S
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/strncmp.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(strncmp)
 /* if ((len - 1) < 0) return 0 */
diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libc/arm/sys/Makefile.inc
index 28aabb34f5b9..5f978032a9e3 100644
--- a/lib/libc/arm/sys/Makefile.inc
+++ b/lib/libc/arm/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/sys/Makefile.inc,v 1.2 2004/11/05 23:52:05 cognet Exp $
 
 MDASM= Ovfork.S brk.S cerror.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
 
diff --git a/lib/libc/arm/sys/Ovfork.S b/lib/libc/arm/sys/Ovfork.S
index 0082bbc5217b..ac754b8e5832 100644
--- a/lib/libc/arm/sys/Ovfork.S
+++ b/lib/libc/arm/sys/Ovfork.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/Ovfork.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 WARN_REFERENCES(vfork, \
diff --git a/lib/libc/arm/sys/brk.S b/lib/libc/arm/sys/brk.S
index 9141cf06ad6a..7500ec48b10f 100644
--- a/lib/libc/arm/sys/brk.S
+++ b/lib/libc/arm/sys/brk.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/brk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 	.globl	_C_LABEL(end)
diff --git a/lib/libc/arm/sys/cerror.S b/lib/libc/arm/sys/cerror.S
index e657248a6768..9b9fb3eb067d 100644
--- a/lib/libc/arm/sys/cerror.S
+++ b/lib/libc/arm/sys/cerror.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/cerror.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 .globl  _C_LABEL(__error)
diff --git a/lib/libc/arm/sys/fork.S b/lib/libc/arm/sys/fork.S
index a5ae1f0aa419..2cff9000f374 100644
--- a/lib/libc/arm/sys/fork.S
+++ b/lib/libc/arm/sys/fork.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/fork.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/arm/sys/pipe.S b/lib/libc/arm/sys/pipe.S
index 83518fc2cbba..1ab2a1c94b66 100644
--- a/lib/libc/arm/sys/pipe.S
+++ b/lib/libc/arm/sys/pipe.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/pipe.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 #ifdef WEAK_ALIAS
diff --git a/lib/libc/arm/sys/ptrace.S b/lib/libc/arm/sys/ptrace.S
index 46b31bc6d4e7..11aa4890eeed 100644
--- a/lib/libc/arm/sys/ptrace.S
+++ b/lib/libc/arm/sys/ptrace.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/ptrace.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 ENTRY(ptrace)
diff --git a/lib/libc/arm/sys/sbrk.S b/lib/libc/arm/sys/sbrk.S
index 20821fe18e0d..b43de1f0e224 100644
--- a/lib/libc/arm/sys/sbrk.S
+++ b/lib/libc/arm/sys/sbrk.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 	.globl	_C_LABEL(end)
diff --git a/lib/libc/arm/sys/shmat.S b/lib/libc/arm/sys/shmat.S
index 3fc3d02c6e47..75833d0b1294 100644
--- a/lib/libc/arm/sys/shmat.S
+++ b/lib/libc/arm/sys/shmat.S
@@ -1,7 +1,7 @@
 /*	$NetBSD: shmat.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/shmat.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 RSYSCALL(shmat)
diff --git a/lib/libc/arm/sys/sigreturn.S b/lib/libc/arm/sys/sigreturn.S
index 1e0f245a5efc..3946e39fa4ce 100644
--- a/lib/libc/arm/sys/sigreturn.S
+++ b/lib/libc/arm/sys/sigreturn.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sigreturn.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/arm/sys/syscall.S b/lib/libc/arm/sys/syscall.S
index 73e6b8318182..1f670f3b9ab3 100644
--- a/lib/libc/arm/sys/syscall.S
+++ b/lib/libc/arm/sys/syscall.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/syscall.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 RSYSCALL(syscall)
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index 2eca9535d96e..e4abb4d637d4 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $
 
 # compat-43 sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43
diff --git a/lib/libc/compat-43/creat.2 b/lib/libc/compat-43/creat.2
index 6f8fc6f901d1..b62365a3700f 100644
--- a/lib/libc/compat-43/creat.2
+++ b/lib/libc/compat-43/creat.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)creat.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/creat.2,v 1.10 2002/12/18 12:45:08 ru Exp $
 .\"
 .Dd June 2, 1993
 .Dt CREAT 2
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index 0030e5097a28..7af5b25d043f 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)creat.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/creat.c,v 1.7 2002/03/22 21:51:56 obrien Exp $");
 
 #include "namespace.h"
 #include <fcntl.h>
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
index 4b5446dcfe1f..250ae7eac954 100644
--- a/lib/libc/compat-43/gethostid.3
+++ b/lib/libc/compat-43/gethostid.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostid.3	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/gethostid.3,v 1.13 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd June 2, 1993
 .Dt GETHOSTID 3
diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c
index cc1b905028e9..0f08fad14bf3 100644
--- a/lib/libc/compat-43/gethostid.c
+++ b/lib/libc/compat-43/gethostid.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/gethostid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
index 5d413a66f092..9d52a4a107e5 100644
--- a/lib/libc/compat-43/getwd.c
+++ b/lib/libc/compat-43/getwd.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getwd.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/getwd.c,v 1.5 2005/02/27 18:39:02 phantom Exp $");
 
 #include <sys/param.h>
 #include <unistd.h>
diff --git a/lib/libc/compat-43/killpg.2 b/lib/libc/compat-43/killpg.2
index fe78a9670fdb..dc48c2278cd6 100644
--- a/lib/libc/compat-43/killpg.2
+++ b/lib/libc/compat-43/killpg.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)killpg.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.12 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd June 2, 1993
 .Dt KILLPG 2
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
index 3eafc76259a5..a6220f708440 100644
--- a/lib/libc/compat-43/killpg.c
+++ b/lib/libc/compat-43/killpg.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)killpg.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/killpg.c,v 1.4 2002/05/28 16:56:57 alfred Exp $");
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c
index 55ad65854953..a23ec8ef4794 100644
--- a/lib/libc/compat-43/sethostid.c
+++ b/lib/libc/compat-43/sethostid.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)sethostid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/sethostid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
index 381c018f8009..0c07ce8e91ab 100644
--- a/lib/libc/compat-43/setpgrp.c
+++ b/lib/libc/compat-43/setpgrp.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)setpgrp.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/setpgrp.c,v 1.4 2002/05/28 16:56:57 alfred Exp $");
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
index 1617ab13b9bf..360e562e63f8 100644
--- a/lib/libc/compat-43/setrgid.c
+++ b/lib/libc/compat-43/setrgid.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)setrgid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/setrgid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
 
 #include <unistd.h>
 
diff --git a/lib/libc/compat-43/setruid.3 b/lib/libc/compat-43/setruid.3
index 31228dcbcbbf..aa9fd3bb8d6b 100644
--- a/lib/libc/compat-43/setruid.3
+++ b/lib/libc/compat-43/setruid.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setruid.3	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/setruid.3,v 1.11 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd June 2, 1993
 .Dt SETRUID 3
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
index a0a6e813da7b..5fb6d60b97c8 100644
--- a/lib/libc/compat-43/setruid.c
+++ b/lib/libc/compat-43/setruid.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)setruid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/setruid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
 
 #include <unistd.h>
 
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 67a741268ad3..37ba978d012f 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)sigcompat.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/sigcompat.c,v 1.10 2002/03/22 21:51:56 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/compat-43/sigpause.2 b/lib/libc/compat-43/sigpause.2
index 2711d18bde53..aad50f90885d 100644
--- a/lib/libc/compat-43/sigpause.2
+++ b/lib/libc/compat-43/sigpause.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigpause.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.13 2003/06/20 22:41:00 wollman Exp $
 .\"
 .Dd June 2, 1993
 .Dt SIGPAUSE 2
diff --git a/lib/libc/compat-43/sigsetmask.2 b/lib/libc/compat-43/sigsetmask.2
index 8e8d78f0a41f..438d308cb528 100644
--- a/lib/libc/compat-43/sigsetmask.2
+++ b/lib/libc/compat-43/sigsetmask.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigsetmask.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/sigsetmask.2,v 1.13 2002/12/18 12:45:08 ru Exp $
 .\"
 .Dd June 2, 1993
 .Dt SIGSETMASK 2
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index 4e5cedd893c6..a978a2068c32 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigvec.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/sigvec.2,v 1.25 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt SIGVEC 2
diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index 72fbb4f4a8c6..4b21fdb89e25 100644
--- a/lib/libc/db/Makefile.inc
+++ b/lib/libc/db/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc
index 76c223830027..97d3336c18e3 100644
--- a/lib/libc/db/btree/Makefile.inc
+++ b/lib/libc/db/btree/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/btree
 
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index 3bdb50597fdf..c211d5be48bf 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_close.c,v 1.8 2002/03/22 21:52:00 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index 18f377472403..7496a3c37604 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_conv.c,v 1.2 2002/03/21 22:46:25 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
index 14aadc6db879..bd9577494148 100644
--- a/lib/libc/db/btree/bt_debug.c
+++ b/lib/libc/db/btree/bt_debug.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.3 2004/09/10 05:41:41 kuriyama Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index 13e43df51574..6204464c6d2a 100644
--- a/lib/libc/db/btree/bt_delete.c
+++ b/lib/libc/db/btree/bt_delete.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_delete.c,v 1.2 2002/03/21 22:46:25 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c
index 1911731070ee..0d91ae44882d 100644
--- a/lib/libc/db/btree/bt_get.c
+++ b/lib/libc/db/btree/bt_get.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_get.c,v 1.2 2002/03/22 21:52:01 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index 40b00a581cda..c8a103a5fb9e 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_open.c	8.10 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.11 2002/03/22 21:52:01 obrien Exp $");
 
 /*
  * Implementation of btree access method for 4.4BSD.
diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c
index 7f479f50ece0..5e0f1ae94d60 100644
--- a/lib/libc/db/btree/bt_overflow.c
+++ b/lib/libc/db/btree/bt_overflow.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_overflow.c,v 1.3 2002/03/22 21:52:01 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
index 105ffa538e1b..339270931b31 100644
--- a/lib/libc/db/btree/bt_page.c
+++ b/lib/libc/db/btree/bt_page.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_page.c,v 1.3 2002/03/22 21:52:01 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index 42b6f7e4de21..0dca165693d9 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.4 2003/05/30 11:05:08 tmm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
index 4fc39e94acce..cee177da50b5 100644
--- a/lib/libc/db/btree/bt_search.c
+++ b/lib/libc/db/btree/bt_search.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_search.c,v 1.2 2002/03/21 22:46:25 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
index 8b0dae2f91e8..662e19535736 100644
--- a/lib/libc/db/btree/bt_seq.c
+++ b/lib/libc/db/btree/bt_seq.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_seq.c,v 1.3 2002/03/21 22:46:25 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index 1dd466692ac2..07373de8faa0 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_split.c	8.9 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.7 2004/09/13 22:07:24 kuriyama Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index 0f8ef3424cdb..e9acfb718655 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_utils.c,v 1.3 2003/01/01 18:48:42 schweikh Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
index 1ac6fe106efc..d5adeb7ea2d0 100644
--- a/lib/libc/db/btree/btree.h
+++ b/lib/libc/db/btree/btree.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)btree.h	8.11 (Berkeley) 8/17/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/btree/btree.h,v 1.3 2002/03/22 23:41:40 obrien Exp $
  */
 
 /* Macros to set/clear/test flags. */
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index a151acca066f..478f6afc3e62 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.10 (Berkeley) 7/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/btree/extern.h,v 1.3 2002/03/22 09:18:22 obrien Exp $
  */
 
 int	 __bt_close(DB *);
diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc
index 2bbac4e70250..db5340ecc200 100644
--- a/lib/libc/db/db/Makefile.inc
+++ b/lib/libc/db/db/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/db
 
diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c
index 830f581de183..9c65e5520f8f 100644
--- a/lib/libc/db/db/db.c
+++ b/lib/libc/db/db/db.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/db/db.c,v 1.2 2002/03/22 21:52:01 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/docs/hash.usenix.ps b/lib/libc/db/docs/hash.usenix.ps
index 3a0cf444b1ac..fe87f1d7f683 100644
--- a/lib/libc/db/docs/hash.usenix.ps
+++ b/lib/libc/db/docs/hash.usenix.ps
@@ -7,7 +7,7 @@
 % lib/psdit.pro -- prolog for psdit (ditroff) files
 % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
 % last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD$
+% RCSID: $FreeBSD: src/lib/libc/db/docs/hash.usenix.ps,v 1.2 1999/08/28 05:03:14 peter Exp $
 
 % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
 % 17 Feb, 87.
diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps
index b7e441a5755e..10a28cd30817 100644
--- a/lib/libc/db/docs/libtp.usenix.ps
+++ b/lib/libc/db/docs/libtp.usenix.ps
@@ -7,7 +7,7 @@
 % lib/psdit.pro -- prolog for psdit (ditroff) files
 % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
 % last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD$
+% RCSID: $FreeBSD: src/lib/libc/db/docs/libtp.usenix.ps,v 1.2 1999/08/28 05:03:15 peter Exp $
 
 % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
 % 17 Feb, 87.
diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc
index 2ecb81763f24..0ebdde956026 100644
--- a/lib/libc/db/hash/Makefile.inc
+++ b/lib/libc/db/hash/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/hash
 
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index 9ae583265fa2..2259ac07e5f6 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.4 (Berkeley) 6/16/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/hash/extern.h,v 1.3 2002/03/22 09:18:22 obrien Exp $
  */
 
 BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index 4dd12677a592..e4d40f9709a8 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
index 2c0a542ed4e4..33fefa7d298e 100644
--- a/lib/libc/db/hash/hash.h
+++ b/lib/libc/db/hash/hash.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.6 2002/03/21 22:46:26 obrien Exp $
  */
 
 /* Operations */
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index c70b375f4782..487df5b36d02 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
 
 /*
  * PACKAGE: hash
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index 1ec6b11e7e69..2a81cb6ceff5 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.7 2002/03/21 22:46:26 obrien Exp $");
 
 /*
  * PACKAGE: hash
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index 194c87233c67..d46d62086c9f 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_func.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
index c9634dcfc4fd..827dbef9e745 100644
--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_log2.c,v 1.2 2002/03/21 18:47:38 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index f0739fb655e9..8c4b0b52efa0 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_page.c,v 1.8 2002/03/21 22:46:26 obrien Exp $");
 
 /*
  * PACKAGE:  hashing
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index b1d825da9d46..8561c8c254cc 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ndbm.c	8.4 (Berkeley) 7/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/ndbm.c,v 1.6 2002/03/22 21:52:01 obrien Exp $");
 
 /*
  * This package provides a dbm compatible interface to the new hashing
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
index 6ad92484661d..2cf7460e0c30 100644
--- a/lib/libc/db/hash/page.h
+++ b/lib/libc/db/hash/page.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)page.h	8.2 (Berkeley) 5/31/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/hash/page.h,v 1.2 2002/03/22 23:41:40 obrien Exp $
  */
 
 /*
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index 349b02948219..2a0364adc9ac 100644
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/man
 
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 5712d18aaeda..7f04c3ade579 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/btree.3,v 1.8 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd August 18, 1994
 .Dt BTREE 3
diff --git a/lib/libc/db/man/dbm.3 b/lib/libc/db/man/dbm.3
index f2b7f465eae4..9585e6313ca6 100644
--- a/lib/libc/db/man/dbm.3
+++ b/lib/libc/db/man/dbm.3
@@ -13,7 +13,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/dbm.3,v 1.8 2003/09/08 19:57:13 ru Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index ef1a18207659..9eb337eb54fa 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.11 2005/02/13 22:25:11 ru Exp $
 .\"
 .Dd January 2, 1994
 .Dt DBOPEN 3
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index 6c2e93041da7..d60c809dead2 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/hash.3,v 1.8 2003/09/08 19:57:13 ru Exp $
 .\"
 .Dd August 18, 1994
 .Dt HASH 3
diff --git a/lib/libc/db/man/mpool.3 b/lib/libc/db/man/mpool.3
index 0c8a12a15ddf..a769e6f5cc31 100644
--- a/lib/libc/db/man/mpool.3
+++ b/lib/libc/db/man/mpool.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mpool.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/mpool.3,v 1.14 2005/02/13 22:25:11 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MPOOL 3
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 726f74f8b3cc..b5e6f5846671 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/recno.3,v 1.8 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd August 18, 1994
 .Dt RECNO 3
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
index 9fef71262b6d..0361f3f160ff 100644
--- a/lib/libc/db/mpool/Makefile.inc
+++ b/lib/libc/db/mpool/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
 .PATH: ${.CURDIR}/db/mpool
 
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index e1c503f7658d..3a1c29db40f1 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)mpool.c	8.5 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/db/mpool/mpool.libtp b/lib/libc/db/mpool/mpool.libtp
index bcd827dce29d..0d823684aa23 100644
--- a/lib/libc/db/mpool/mpool.libtp
+++ b/lib/libc/db/mpool/mpool.libtp
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-VERSION $FreeBSD$
+VERSION $FreeBSD: src/lib/libc/db/mpool/mpool.libtp,v 1.4 1999/08/27 23:58:23 peter Exp $
 PACKAGE: 	User Level Shared Memory Manager
 
 DESCRIPTION: 	
diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc
index 6e08e3f303bd..5492f0bffacf 100644
--- a/lib/libc/db/recno/Makefile.inc
+++ b/lib/libc/db/recno/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
 .PATH: ${.CURDIR}/db/recno
 
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
index ffa7243fde23..8c59f47e14d3 100644
--- a/lib/libc/db/recno/extern.h
+++ b/lib/libc/db/recno/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 6/4/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/recno/extern.h,v 1.2 2002/03/21 22:46:28 obrien Exp $
  */
 
 #include "../btree/extern.h"
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
index 326a943ea931..fea96ae5413d 100644
--- a/lib/libc/db/recno/rec_close.c
+++ b/lib/libc/db/recno/rec_close.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rec_close.c	8.6 (Berkeley) 8/18/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_close.c,v 1.7 2003/02/16 17:29:09 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index 9996c2d3c36b..12055940487f 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_delete.c,v 1.2 2002/03/21 22:46:28 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c
index e7ae1237406b..d9da658e1744 100644
--- a/lib/libc/db/recno/rec_get.c
+++ b/lib/libc/db/recno/rec_get.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_get.c,v 1.5 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
index 537057711fe7..a431f6f1da7c 100644
--- a/lib/libc/db/recno/rec_open.c
+++ b/lib/libc/db/recno/rec_open.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_open.c,v 1.6 2002/03/22 21:52:02 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
index 10210d5226fd..14cc8117112b 100644
--- a/lib/libc/db/recno/rec_put.c
+++ b/lib/libc/db/recno/rec_put.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_put.c,v 1.6 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
index 8e82917f9762..3353bfb38020 100644
--- a/lib/libc/db/recno/rec_search.c
+++ b/lib/libc/db/recno/rec_search.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_search.c,v 1.4 2002/03/21 18:47:38 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
index b75d44e9dd5d..6ed3384bd0e5 100644
--- a/lib/libc/db/recno/rec_seq.c
+++ b/lib/libc/db/recno/rec_seq.c
@@ -36,7 +36,7 @@
 /* XXX use __SCCSID */
 static char sccsid[] __unused = "@(#)rec_seq.c	8.3 (Berkeley) 7/14/94";
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_seq.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
index 1ace3ba18b31..81fa1d657a78 100644
--- a/lib/libc/db/recno/rec_utils.c
+++ b/lib/libc/db/recno/rec_utils.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_utils.c,v 1.2 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/recno/recno.h b/lib/libc/db/recno/recno.h
index 031857112915..b0c0af76867d 100644
--- a/lib/libc/db/recno/recno.h
+++ b/lib/libc/db/recno/recno.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)recno.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/recno/recno.h,v 1.2 2002/03/22 23:41:40 obrien Exp $
  */
 
 enum SRCHOP { SDELETE, SINSERT, SEARCH};	/* Rec_search operation. */
diff --git a/lib/libc/db/test/Makefile b/lib/libc/db/test/Makefile
index 712ad6258376..0b97a58e17c3 100644
--- a/lib/libc/db/test/Makefile
+++ b/lib/libc/db/test/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.15 (Berkeley) 7/28/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/test/Makefile,v 1.3 2001/08/03 21:43:26 bde Exp $
 
 PROG=	dbtest
 OBJS=	dbtest.o strerror.o
diff --git a/lib/libc/db/test/btree.tests/main.c b/lib/libc/db/test/btree.tests/main.c
index 6308dcb885c1..adb5d15dbe34 100644
--- a/lib/libc/db/test/btree.tests/main.c
+++ b/lib/libc/db/test/btree.tests/main.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/btree.tests/main.c,v 1.4 2002/03/21 22:46:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <fcntl.h>
diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c
index 4d81aee74aad..6552708dd69e 100644
--- a/lib/libc/db/test/dbtest.c
+++ b/lib/libc/db/test/dbtest.c
@@ -41,7 +41,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)dbtest.c	8.17 (Berkeley) 9/1/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/dbtest.c,v 1.10 2002/05/28 16:59:38 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c
index 8b1c644d43e7..3c9c26823714 100644
--- a/lib/libc/db/test/hash.tests/driver2.c
+++ b/lib/libc/db/test/hash.tests/driver2.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)driver2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/driver2.c,v 1.3 2002/03/22 21:52:02 obrien Exp $");
 
 /*
  * Test driver, to try to tackle the large ugly-split problem.
diff --git a/lib/libc/db/test/hash.tests/tcreat3.c b/lib/libc/db/test/hash.tests/tcreat3.c
index eff661af271c..a5712cf48fb6 100644
--- a/lib/libc/db/test/hash.tests/tcreat3.c
+++ b/lib/libc/db/test/hash.tests/tcreat3.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tcreat3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tcreat3.c,v 1.3 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c
index 0a5eabb32df1..5607899e01b7 100644
--- a/lib/libc/db/test/hash.tests/tdel.c
+++ b/lib/libc/db/test/hash.tests/tdel.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tdel.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tdel.c,v 1.3 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c
index 90b37839c377..27e84cc39415 100644
--- a/lib/libc/db/test/hash.tests/thash4.c
+++ b/lib/libc/db/test/hash.tests/thash4.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)thash4.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/thash4.c,v 1.3 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c
index 75f9fbb3fbe4..89b7d6595db5 100644
--- a/lib/libc/db/test/hash.tests/tread2.c
+++ b/lib/libc/db/test/hash.tests/tread2.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tread2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tread2.c,v 1.2 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c
index 4e5dc84a36c8..d2a29c6bfeeb 100644
--- a/lib/libc/db/test/hash.tests/tseq.c
+++ b/lib/libc/db/test/hash.tests/tseq.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tseq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tseq.c,v 1.3 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c
index 18505f534e90..a80dc287788f 100644
--- a/lib/libc/db/test/hash.tests/tverify.c
+++ b/lib/libc/db/test/hash.tests/tverify.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tverify.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tverify.c,v 1.2 2002/03/22 21:52:02 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index 399c3a8309ea..65e22adb8ce9 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.8 2005/01/27 05:44:16 das Exp $
 
 # netlib gdtoa sources
 .PATH: ${.CURDIR}/gdtoa
diff --git a/lib/libc/gdtoa/_hdtoa.c b/lib/libc/gdtoa/_hdtoa.c
index ff7ed5575be3..77e99ac3e233 100644
--- a/lib/libc/gdtoa/_hdtoa.c
+++ b/lib/libc/gdtoa/_hdtoa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.3 2005/01/18 18:44:07 das Exp $");
 
 #include <float.h>
 #include <limits.h>
diff --git a/lib/libc/gdtoa/_ldtoa.c b/lib/libc/gdtoa/_ldtoa.c
index 750a25226c12..ededc68d217c 100644
--- a/lib/libc/gdtoa/_ldtoa.c
+++ b/lib/libc/gdtoa/_ldtoa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.2 2004/01/18 07:53:49 das Exp $");
 
 #include <float.h>
 #include <inttypes.h>
diff --git a/lib/libc/gdtoa/glue.c b/lib/libc/gdtoa/glue.c
index 39e491a7a277..5178f593728f 100644
--- a/lib/libc/gdtoa/glue.c
+++ b/lib/libc/gdtoa/glue.c
@@ -2,7 +2,7 @@
  * Machine-independent glue to integrate David Gay's gdtoa
  * package into libc.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gdtoa/glue.c,v 1.2 2003/06/21 08:20:14 das Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc/gdtoa/machdep_ldisQ.c b/lib/libc/gdtoa/machdep_ldisQ.c
index e5cf6e63ad9d..fca9c291e898 100644
--- a/lib/libc/gdtoa/machdep_ldisQ.c
+++ b/lib/libc/gdtoa/machdep_ldisQ.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $");
 
 #include "gdtoaimp.h"
 
diff --git a/lib/libc/gdtoa/machdep_ldisd.c b/lib/libc/gdtoa/machdep_ldisd.c
index e2dbb609c359..2e20e1754c64 100644
--- a/lib/libc/gdtoa/machdep_ldisd.c
+++ b/lib/libc/gdtoa/machdep_ldisd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisd.c,v 1.1 2003/03/12 20:29:58 das Exp $");
 
 #include "gdtoaimp.h"
 
diff --git a/lib/libc/gdtoa/machdep_ldisx.c b/lib/libc/gdtoa/machdep_ldisx.c
index 0b61de653f7c..0ceea1b29de9 100644
--- a/lib/libc/gdtoa/machdep_ldisx.c
+++ b/lib/libc/gdtoa/machdep_ldisx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $");
 
 #include "gdtoaimp.h"
 
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 7257fafffc79..2e1c2b5e9343 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121 2005/05/11 14:07:25 delphij Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
index 4d1be8c04f10..359f8eae7ffb 100644
--- a/lib/libc/gen/__xuname.c
+++ b/lib/libc/gen/__xuname.c
@@ -35,7 +35,7 @@
 /*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.9 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c
index dd93752ac7f9..71c1a542bccf 100644
--- a/lib/libc/gen/_pthread_stubs.c
+++ b/lib/libc/gen/_pthread_stubs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.11 2004/07/29 18:07:08 kan Exp $");
 
 #include <signal.h>
 #include <pthread.h>
diff --git a/lib/libc/gen/_rand48.c b/lib/libc/gen/_rand48.c
index 279bbc362394..4dbf0d7681f8 100644
--- a/lib/libc/gen/_rand48.c
+++ b/lib/libc/gen/_rand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_rand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c
index 85faf285cbe3..78512b3f68b0 100644
--- a/lib/libc/gen/_spinlock_stub.c
+++ b/lib/libc/gen/_spinlock_stub.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/gen/_thread_init.c b/lib/libc/gen/_thread_init.c
index acaf65cf518c..afcd8563c320 100644
--- a/lib/libc/gen/_thread_init.c
+++ b/lib/libc/gen/_thread_init.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_thread_init.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
index b85b879d40a1..e9be94f4538e 100644
--- a/lib/libc/gen/alarm.3
+++ b/lib/libc/gen/alarm.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)alarm.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/alarm.3,v 1.16 2002/12/18 13:33:02 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt ALARM 3
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
index d3920cceae10..58cce208e24d 100644
--- a/lib/libc/gen/alarm.c
+++ b/lib/libc/gen/alarm.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)alarm.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/alarm.c,v 1.2 2002/02/01 01:08:47 obrien Exp $");
 
 /*
  * Backwards compatible alarm.
diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
index 27c6fd16c987..3e2aaa38c862 100644
--- a/lib/libc/gen/arc4random.3
+++ b/lib/libc/gen/arc4random.3
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" Manual page, using -mandoc macros
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.16 2003/07/31 06:18:24 das Exp $
 .\"
 .Dd April 15, 1997
 .Dt ARC4RANDOM 3
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index e2448d56cbe9..7d882b8154cc 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
index 117f0d8b10e2..f14e39c48774 100644
--- a/lib/libc/gen/assert.c
+++ b/lib/libc/gen/assert.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)assert.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/assert.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
index 6f03b4ae57db..d8dfd75fa803 100644
--- a/lib/libc/gen/basename.3
+++ b/lib/libc/gen/basename.3
@@ -25,7 +25,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd August 17, 1997
 .Dt BASENAME 3
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
index 9552ab348666..c5da4636d502 100644
--- a/lib/libc/gen/basename.c
+++ b/lib/libc/gen/basename.c
@@ -31,7 +31,7 @@ static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
 
 #include <errno.h>
 #include <libgen.h>
diff --git a/lib/libc/gen/check_utility_compat.3 b/lib/libc/gen/check_utility_compat.3
index 7a96bac15c5c..70242831902c 100644
--- a/lib/libc/gen/check_utility_compat.3
+++ b/lib/libc/gen/check_utility_compat.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/check_utility_compat.3,v 1.3 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd October 27, 2002
 .Os
diff --git a/lib/libc/gen/check_utility_compat.c b/lib/libc/gen/check_utility_compat.c
index 0ccdec115a87..716f5b2679d2 100644
--- a/lib/libc/gen/check_utility_compat.c
+++ b/lib/libc/gen/check_utility_compat.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.3 2003/05/01 19:03:13 nectar Exp $");
 
 /*
  * I din't use "namespace.h" here because none of the relevant utilities
diff --git a/lib/libc/gen/clock.3 b/lib/libc/gen/clock.3
index 2418762d26ee..cff60dc80937 100644
--- a/lib/libc/gen/clock.3
+++ b/lib/libc/gen/clock.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)clock.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/clock.3,v 1.11 2001/11/20 13:43:58 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt CLOCK 3
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
index 91d20db4a828..ddfccbe80aba 100644
--- a/lib/libc/gen/clock.c
+++ b/lib/libc/gen/clock.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)clock.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/clock.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index 11838d1b8bf8..31dedc034591 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.10 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 63440591bdf5..65a005c1d5d9 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)confstr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/confstr.3,v 1.13 2003/09/08 19:57:14 ru Exp $
 .\"
 .Dd June 18, 2001
 .Dt CONFSTR 3
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
index 966c3fe2ae19..7c4699c50519 100644
--- a/lib/libc/gen/confstr.c
+++ b/lib/libc/gen/confstr.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)confstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.9 2003/05/01 19:03:13 nectar Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index 5fee5373acca..f846343132c9 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -39,7 +39,7 @@
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/crypt.c,v 1.8 2002/10/18 16:24:20 markm Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
index c8f3c100e31f..c36d55f2da42 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctermid.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ctermid.3,v 1.11 2003/09/08 19:57:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt CTERMID 3
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index 4c2ffe3c67bf..6b2c6828b4ca 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ctermid.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ctermid.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
 
 #include <stdio.h>
 #include <paths.h>
diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3
index 5b4a5e03e976..04e0a5190025 100644
--- a/lib/libc/gen/daemon.3
+++ b/lib/libc/gen/daemon.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)daemon.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/daemon.3,v 1.14 2003/11/10 22:04:51 ghelmer Exp $
 .\"
 .Dd June 9, 1993
 .Dt DAEMON 3
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
index 01589768a37a..1b9b706e3174 100644
--- a/lib/libc/gen/daemon.c
+++ b/lib/libc/gen/daemon.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/daemon.c,v 1.6 2003/11/10 22:01:42 ghelmer Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/gen/devname.3 b/lib/libc/gen/devname.3
index 79bc7df6e644..1da4cc72ccbe 100644
--- a/lib/libc/gen/devname.3
+++ b/lib/libc/gen/devname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)devname.3	8.2 (Berkeley) 4/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.18 2005/02/23 02:02:38 trhodes Exp $
 .\"
 .Dd February 22, 2005
 .Dt DEVNAME 3
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index ca0d6a9b617f..bf5af30dbdee 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.9 2003/06/20 09:52:27 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index 2edf5dc228aa..506f6634223e 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.15 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt DIRECTORY 3
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
index eac042d173bb..b2d0f6fd879e 100644
--- a/lib/libc/gen/dirname.3
+++ b/lib/libc/gen/dirname.3
@@ -25,7 +25,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd August 17, 1997
 .Dt DIRNAME 3
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
index 56b75f63716e..8a4e1c948b40 100644
--- a/lib/libc/gen/dirname.c
+++ b/lib/libc/gen/dirname.c
@@ -31,7 +31,7 @@ static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
 
 #include <errno.h>
 #include <libgen.h>
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 2ff306139b64..82ef8006268b 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.16 2002/08/16 15:33:20 bmilekic Exp $");
 
 #include <sys/param.h>
 #define DKTYPENAMES
diff --git a/lib/libc/gen/dladdr.3 b/lib/libc/gen/dladdr.3
index 414fa49a3e90..0bb62759a624 100644
--- a/lib/libc/gen/dladdr.3
+++ b/lib/libc/gen/dladdr.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dladdr.3,v 1.8 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd February 5, 1998
 .Os
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
index be58e28c5cdd..971b2dcab56e 100644
--- a/lib/libc/gen/dlfcn.c
+++ b/lib/libc/gen/dlfcn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.12 2004/03/05 08:10:17 markm Exp $");
 
 /*
  * Linkage to services provided by the dynamic linker.
diff --git a/lib/libc/gen/dlfunc.c b/lib/libc/gen/dlfunc.c
index 72a683a055d1..933ea19c62bd 100644
--- a/lib/libc/gen/dlfunc.c
+++ b/lib/libc/gen/dlfunc.c
@@ -2,7 +2,7 @@
  * This source file is in the public domain.
  * Garrett A. Wollman, 2002-05-28.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.3 2002/09/11 05:05:48 mike Exp $
  */
 
 #include <dlfcn.h>
diff --git a/lib/libc/gen/dlinfo.3 b/lib/libc/gen/dlinfo.3
index 9433fb6e9d12..37195beca1e6 100644
--- a/lib/libc/gen/dlinfo.3
+++ b/lib/libc/gen/dlinfo.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.9 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd February 14, 2003
 .Os
diff --git a/lib/libc/gen/dllockinit.3 b/lib/libc/gen/dllockinit.3
index 98d10749485e..99811ab2724a 100644
--- a/lib/libc/gen/dllockinit.3
+++ b/lib/libc/gen/dllockinit.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dllockinit.3,v 1.14 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd July 5, 2000
 .Os
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 118e165ba433..3a3c87874f47 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -30,7 +30,7 @@
 .\" Copyright (c) 1991 Sun Microsystems, Inc.
 .\"
 .\" @(#) dlopen.3 1.6 90/01/31 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.28 2004/06/03 10:13:26 roam Exp $
 .\"
 .Dd September 10, 2002
 .Os
diff --git a/lib/libc/gen/drand48.c b/lib/libc/gen/drand48.c
index 672b5eef6b19..92aeb80f9ca2 100644
--- a/lib/libc/gen/drand48.c
+++ b/lib/libc/gen/drand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/drand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/erand48.c b/lib/libc/gen/erand48.c
index cdb3ec85052b..4b0c1dfe989b 100644
--- a/lib/libc/gen/erand48.c
+++ b/lib/libc/gen/erand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/erand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index 1e2d7c3d5598..997df58e1040 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.20 2004/10/04 14:04:37 jkoshy Exp $
 .\"
 .Dd March 6, 1999
 .Dt ERR 3
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 9365d7dac696..aa0d30681f07 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.13 2002/03/29 22:43:41 markm Exp $");
 
 #include "namespace.h"
 #include <err.h>
diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c
index 2e5a684fa75f..28f99d83f48e 100644
--- a/lib/libc/gen/errlst.c
+++ b/lib/libc/gen/errlst.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.8 2005/04/02 12:33:28 das Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
index 02e0351badc2..7d98857d6363 100644
--- a/lib/libc/gen/errno.c
+++ b/lib/libc/gen/errno.c
@@ -25,6 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errno.c,v 1.1 2002/10/09 08:04:24 peter Exp $");
 
 int errno;
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index 3fbf2b52736a..615867093144 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exec.3	8.3 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.25 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd January 24, 1994
 .Dt EXEC 3
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index a832bdc7c0cf..211eb78f2efd 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.22 2003/07/01 12:30:03 bde Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/fmtcheck.3 b/lib/libc/gen/fmtcheck.3
index 366355849fdb..1a5bb5468299 100644
--- a/lib/libc/gen/fmtcheck.3
+++ b/lib/libc/gen/fmtcheck.3
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fmtcheck.3,v 1.9 2004/07/02 23:52:10 ru Exp $
 .Dd October 16, 2002
 .Os
 .Dt FMTCHECK 3
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
index ca93983d9e0d..f6673aa8f69d 100644
--- a/lib/libc/gen/fmtcheck.c
+++ b/lib/libc/gen/fmtcheck.c
@@ -35,7 +35,7 @@
 
 /*	$NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.8 2005/03/21 08:00:55 das Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/gen/fmtmsg.3 b/lib/libc/gen/fmtmsg.3
index 7995d7bd31c5..3320bd045e7b 100644
--- a/lib/libc/gen/fmtmsg.3
+++ b/lib/libc/gen/fmtmsg.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fmtmsg.3,v 1.4 2002/12/04 18:57:44 ru Exp $
 .\"
 .Dd August 5, 2002
 .Dt FMTMSG 3
diff --git a/lib/libc/gen/fmtmsg.c b/lib/libc/gen/fmtmsg.c
index 6caabbbb884d..4db35dc9c102 100644
--- a/lib/libc/gen/fmtmsg.c
+++ b/lib/libc/gen/fmtmsg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.5 2003/05/01 19:03:13 nectar Exp $");
 
 #include <fmtmsg.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index db27033c339e..3d268ccdadb7 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.18 2004/07/18 06:56:40 tjr Exp $
 .\"
 .Dd July 18, 2004
 .Dt FNMATCH 3
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index f041df826432..814bf2266e9d 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.17 2005/04/08 21:24:23 stefanf Exp $");
 
 /*
  * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
diff --git a/lib/libc/gen/fpclassify.3 b/lib/libc/gen/fpclassify.3
index a547eeb45466..decb473f457d 100644
--- a/lib/libc/gen/fpclassify.3
+++ b/lib/libc/gen/fpclassify.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.6 2005/01/27 05:46:16 das Exp $
 .\"
 .Dd January 26, 2005
 .Dt FPCLASSIFY 3
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
index 754a1df50a2f..1dafcfc74c63 100644
--- a/lib/libc/gen/fpclassify.c
+++ b/lib/libc/gen/fpclassify.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/fpclassify.c,v 1.2 2005/02/06 03:23:31 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/gen/frexp.3 b/lib/libc/gen/frexp.3
index f3bf8da15102..86293261a191 100644
--- a/lib/libc/gen/frexp.3
+++ b/lib/libc/gen/frexp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)frexp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/frexp.3,v 1.12 2005/03/07 05:00:54 das Exp $
 .\"
 .Dd March 4, 2005
 .Dt FREXP 3
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index 53483da88568..24e10697e5cc 100644
--- a/lib/libc/gen/frexp.c
+++ b/lib/libc/gen/frexp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/frexp.c,v 1.1 2004/07/18 21:23:39 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index beeb700f62fd..33fc30942b8f 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)fstab.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fstab.c,v 1.14 2003/04/07 12:55:00 mdodd Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index a1c7dde54589..436b77e8375f 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -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/lib/libc/gen/ftok.3,v 1.16 2004/07/02 23:52:10 ru Exp $
 .Dd June 24, 1994
 .Os
 .Dt FTOK 3
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 4269e370c9f4..6c7157ae70b9 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ftok.c,v 1.7 2004/06/01 06:53:07 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index b4fe3df192b6..1ad8ec1ff3cc 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.22 2005/01/07 07:03:19 pjd Exp $
 .\"
 .Dd January 7, 2005
 .Dt FTS 3
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 48f9e0bd49f4..28bf1774caa9 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.27 2004/06/08 06:23:23 das Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3
index 447272abb9d5..7c408f6e2010 100644
--- a/lib/libc/gen/ftw.3
+++ b/lib/libc/gen/ftw.3
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ftw.3,v 1.2 2004/07/07 20:11:35 ru Exp $
 .\"
 .Dd July 5, 2004
 .Dt FTW 3
diff --git a/lib/libc/gen/ftw.c b/lib/libc/gen/ftw.c
index 0177712143ee..959c9cc680a1 100644
--- a/lib/libc/gen/ftw.c
+++ b/lib/libc/gen/ftw.c
@@ -27,7 +27,7 @@ static const char rcsid[] = "$OpenBSD: ftw.c,v 1.4 2004/07/07 16:05:23 millert E
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ftw.c,v 1.4 2004/08/24 13:00:55 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/getbootfile.3 b/lib/libc/gen/getbootfile.3
index e9cc8b6d9a3d..8e3a8c737ecd 100644
--- a/lib/libc/gen/getbootfile.3
+++ b/lib/libc/gen/getbootfile.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getbootfile.3,v 1.13 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd September 23, 1994
 .Dt GETBOOTFILE 3
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index 739af153cd71..9b2444d88987 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getbootfile.c,v 1.8 2005/05/03 15:28:07 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
index cbf48630f94b..cf3bc8ae32ef 100644
--- a/lib/libc/gen/getbsize.3
+++ b/lib/libc/gen/getbsize.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getbsize.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.10 2002/12/30 11:12:16 obrien Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETBSIZE 3
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index 1a3a70d07ebb..b922f1c77f17 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getbsize.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 9cba02717cdc..87897eaa9807 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getcap.3	8.4 (Berkeley) 5/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.27 2005/02/13 23:45:46 ru Exp $
 .\"
 .Dd May 13, 1994
 .Dt GETCAP 3
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index af051135e239..3cf07fabc93f 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.19 2003/01/02 10:19:43 thomas Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/getcontext.3 b/lib/libc/gen/getcontext.3
index 2fda6b8ced42..c2963adebd96 100644
--- a/lib/libc/gen/getcontext.3
+++ b/lib/libc/gen/getcontext.3
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcontext.3,v 1.3 2004/12/03 14:10:04 rse Exp $
 .\"
 .Dd September 10, 2002
 .Dt GETCONTEXT 3
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index ba59c154e2a3..e7591d932bd2 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getcwd.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcwd.3,v 1.16 2003/09/08 19:57:14 ru Exp $
 .\"
 .Dd November 24, 1997
 .Dt GETCWD 3
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index b18921b9eb0b..2e8c1b9c855a 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.25.10.1 2005/10/04 14:33:09 ache Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getdiskbyname.3 b/lib/libc/gen/getdiskbyname.3
index 0dffef96eb0c..2a4eee87825c 100644
--- a/lib/libc/gen/getdiskbyname.3
+++ b/lib/libc/gen/getdiskbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getdiskbyname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getdiskbyname.3,v 1.9 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETDISKBYNAME 3
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index ec1e07a039b2..d26764e57b3d 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getdomainname.3,v 1.20 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd May 6, 1994
 .Dt GETDOMAINNAME 3
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index fa9679a6b446..05441d7fbd4f 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getdomainname.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index e08f798cd641..af43be234e17 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getfsent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.16 2004/06/21 19:30:45 mpp Exp $
 .\"
 .Dd April 7, 2003
 .Dt GETFSENT 3
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index 2f5dd7769d58..9f23eb3d0e49 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getgrent.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.27 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd April 16, 2003
 .Dt GETGRENT 3
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index c9b7474e78d7..bf86ecca5ccc 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -31,7 +31,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.32 2004/05/17 22:15:49 kientzle Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getgrouplist.3 b/lib/libc/gen/getgrouplist.3
index da949c7ebb2f..5a923e339b14 100644
--- a/lib/libc/gen/getgrouplist.3
+++ b/lib/libc/gen/getgrouplist.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgrouplist.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getgrouplist.3,v 1.8 2002/01/22 17:32:53 markm Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETGROUPLIST 3
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index 63446cf709a6..3fa62c592bfd 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.14 2005/05/03 16:20:03 delphij Exp $");
 
 /*
  * get credential
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 9a0afedca804..3a25abda4561 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/gethostname.3,v 1.16 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd August 18, 2003
 .Dt GETHOSTNAME 3
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
index acc338680633..9071be2e84ac 100644
--- a/lib/libc/gen/gethostname.c
+++ b/lib/libc/gen/gethostname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/gethostname.c,v 1.5 2003/08/19 23:01:46 wollman Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getloadavg.3 b/lib/libc/gen/getloadavg.3
index 37a8d678d255..24e7cdfe52b5 100644
--- a/lib/libc/gen/getloadavg.3
+++ b/lib/libc/gen/getloadavg.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getloadavg.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getloadavg.3,v 1.8 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETLOADAVG 3
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
index 5022d0de0060..c3450f1f58a8 100644
--- a/lib/libc/gen/getloadavg.c
+++ b/lib/libc/gen/getloadavg.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getloadavg.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getloadavg.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index 92af0d18555a..6e3208cadf51 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getlogin.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getlogin.c,v 1.9 2003/10/29 10:45:01 tjr Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
index 7a3cc0261c30..307d49471d55 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getmntinfo.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getmntinfo.3,v 1.12 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETMNTINFO 3
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index 636039a12aa3..383df1e72848 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getmntinfo.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/lib/libc/gen/getnetgrent.3 b/lib/libc/gen/getnetgrent.3
index aa933248ad73..c91aa52cb891 100644
--- a/lib/libc/gen/getnetgrent.3
+++ b/lib/libc/gen/getnetgrent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getnetgrent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getnetgrent.3,v 1.12 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETNETGRENT 3
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index abc318529ef0..de7d43b700b5 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)getnetgrent.c	8.2 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33.2.1 2005/10/07 19:38:07 jon Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getobjformat.3 b/lib/libc/gen/getobjformat.3
index 8705f0166622..69280bcf96aa 100644
--- a/lib/libc/gen/getobjformat.3
+++ b/lib/libc/gen/getobjformat.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.10 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd September 7, 1998
 .Dt GETOBJFORMAT 3
diff --git a/lib/libc/gen/getobjformat.c b/lib/libc/gen/getobjformat.c
index 7428f36b884b..d1ac7df1a004 100644
--- a/lib/libc/gen/getobjformat.c
+++ b/lib/libc/gen/getobjformat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.7 2002/09/17 01:48:50 peter Exp $");
 
 #include <sys/param.h>
 #include <objformat.h>
diff --git a/lib/libc/gen/getosreldate.3 b/lib/libc/gen/getosreldate.3
index 78dc7e5f0b46..d7b132151e47 100644
--- a/lib/libc/gen/getosreldate.3
+++ b/lib/libc/gen/getosreldate.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.2 2003/02/24 22:55:33 ru Exp $
 .\"
 .Dd January 30, 2003
 .Dt GETOSRELDATE 3
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index b0421a300795..97cd9bfe7cb8 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getosreldate.c,v 1.6 2002/05/28 16:59:39 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getpagesize.3 b/lib/libc/gen/getpagesize.3
index 80f2f19cf783..a8e57e141621 100644
--- a/lib/libc/gen/getpagesize.3
+++ b/lib/libc/gen/getpagesize.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpagesize.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpagesize.3,v 1.11 2002/12/27 12:15:28 schweikh Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPAGESIZE 3
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
index 6963cfdf0af0..3c8881ec88aa 100644
--- a/lib/libc/gen/getpagesize.c
+++ b/lib/libc/gen/getpagesize.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getpagesize.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getpagesize.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3
index 7a85fc3356ca..f3317bdce73d 100644
--- a/lib/libc/gen/getpass.3
+++ b/lib/libc/gen/getpass.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpass.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpass.3,v 1.11 2001/11/22 09:48:54 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPASS 3
diff --git a/lib/libc/gen/getpeereid.3 b/lib/libc/gen/getpeereid.3
index 12999e501b09..6b5aed038870 100644
--- a/lib/libc/gen/getpeereid.3
+++ b/lib/libc/gen/getpeereid.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpeereid.3,v 1.6 2002/12/18 10:13:54 ru Exp $
 .\"
 .Dd July 15, 2001
 .Dt GETPEEREID 3
diff --git a/lib/libc/gen/getpeereid.c b/lib/libc/gen/getpeereid.c
index 5ecb243b53c5..5608c4893230 100644
--- a/lib/libc/gen/getpeereid.c
+++ b/lib/libc/gen/getpeereid.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getpeereid.c,v 1.6 2002/12/16 13:42:13 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/gen/getprogname.3 b/lib/libc/gen/getprogname.3
index 53d39a60526b..5ea703ef8ed3 100644
--- a/lib/libc/gen/getprogname.3
+++ b/lib/libc/gen/getprogname.3
@@ -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/lib/libc/gen/getprogname.3,v 1.5 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd May 1, 2001
 .Dt GETPROGNAME 3
diff --git a/lib/libc/gen/getprogname.c b/lib/libc/gen/getprogname.c
index fd51d1322517..4be82e32152a 100644
--- a/lib/libc/gen/getprogname.c
+++ b/lib/libc/gen/getprogname.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getprogname.c,v 1.4 2002/03/29 22:43:41 markm Exp $");
 
 #include "namespace.h"
 #include <stdlib.h>
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index dc471811d469..a85a2ca2f7bb 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getpwent.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.29 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd April 16, 2003
 .Dt GETPWENT 3
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index a0867ddf8e1c..cba41daab69c 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -31,7 +31,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.89 2004/05/17 18:27:05 kientzle Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3
index 9c2be8f899ae..08eb9ac51f57 100644
--- a/lib/libc/gen/getttyent.3
+++ b/lib/libc/gen/getttyent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getttyent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getttyent.3,v 1.14 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd November 17, 1996
 .Dt GETTTYENT 3
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index 5578f04704f2..12d92a4d0857 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getttyent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.12.14.1 2005/07/25 20:19:39 mdodd Exp $");
 
 #include <ttyent.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
index 48eef79361f4..a04016fac983 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getusershell.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getusershell.3,v 1.11 2005/02/09 18:03:13 ru Exp $
 .\"
 .Dd January 16, 1999
 .Dt GETUSERSHELL 3
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index 62061c1d4eee..b8fd9b44f64c 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)getusershell.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 /*	$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getusershell.c,v 1.9 2003/04/24 20:16:21 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3
index a7cfa2e9c47f..0df69eaadd75 100644
--- a/lib/libc/gen/getvfsbyname.3
+++ b/lib/libc/gen/getvfsbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getvfsbyname.3	8.3 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getvfsbyname.3,v 1.15 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd May 4, 1995
 .Dt GETVFSBYNAME 3
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index 20f389dd35f0..be93b004a11a 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getvfsbyname.c,v 1.10 2003/10/29 10:45:01 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index a9f0458c4592..6baa5683a7b4 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)glob.3	8.3 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.30 2004/09/01 23:28:27 tjr Exp $
 .\"
 .Dd September 1, 2004
 .Dt GLOB 3
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 8e5ee69d885e..e237262c49b0 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.22.8.1 2005/10/04 14:31:10 ache Exp $");
 
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
diff --git a/lib/libc/gen/initgroups.3 b/lib/libc/gen/initgroups.3
index 3df1ffd49e93..beba09ee92a7 100644
--- a/lib/libc/gen/initgroups.3
+++ b/lib/libc/gen/initgroups.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)initgroups.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/initgroups.3,v 1.12 2002/01/22 17:32:53 markm Exp $
 .\"
 .Dd June 4, 1993
 .Dt INITGROUPS 3
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index 82bbb3af1fa6..50c910a7740d 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)initgroups.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/initgroups.c,v 1.8 2003/11/19 15:51:26 dds Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
index c70cb1a539d6..d16a9634ed1c 100644
--- a/lib/libc/gen/isatty.c
+++ b/lib/libc/gen/isatty.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)isatty.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/isatty.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 #include <termios.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/isgreater.3 b/lib/libc/gen/isgreater.3
index 010615530810..3f37cf59dc70 100644
--- a/lib/libc/gen/isgreater.3
+++ b/lib/libc/gen/isgreater.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.3 2005/02/06 03:23:31 das Exp $
 .\"
 .Dd February 12, 2003
 .Dt ISGREATER 3
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
index 4a4152a5a032..932675dc33dd 100644
--- a/lib/libc/gen/isinf.c
+++ b/lib/libc/gen/isinf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/isinf.c,v 1.2 2004/07/10 15:52:26 marcel Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
index ec81362f4f99..fd9f029f14e8 100644
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/isnan.c,v 1.2 2004/09/24 06:33:22 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c
index 17076205559a..f47bf2aa0a3f 100644
--- a/lib/libc/gen/jrand48.c
+++ b/lib/libc/gen/jrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/jrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/lcong48.c b/lib/libc/gen/lcong48.c
index ab0d1f762d80..8b11e08c57c4 100644
--- a/lib/libc/gen/lcong48.c
+++ b/lib/libc/gen/lcong48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/lcong48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/ldexp.3 b/lib/libc/gen/ldexp.3
index dcf34eb7e91a..29ee6bd9b180 100644
--- a/lib/libc/gen/ldexp.3
+++ b/lib/libc/gen/ldexp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ldexp.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ldexp.3,v 1.10 2005/03/07 05:00:54 das Exp $
 .\"
 .Dd March 4, 2005
 .Dt LDEXP 3
diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c
index 887f673ee9a5..3d59050ebdad 100644
--- a/lib/libc/gen/ldexp.c
+++ b/lib/libc/gen/ldexp.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ldexp.c,v 1.1 2005/01/22 06:03:40 das Exp $");
 
 #include <sys/types.h>
 #include <machine/endian.h>
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index cb3b8ef39d46..bf6b7b1ca623 100644
--- a/lib/libc/gen/lockf.3
+++ b/lib/libc/gen/lockf.3
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/lockf.3,v 1.13 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd December 19, 1997
 .Dt LOCKF 3
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index c448f1804072..375b2ce4d50e 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -36,7 +36,7 @@
 
 /*	$NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/lockf.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/gen/lrand48.c b/lib/libc/gen/lrand48.c
index 44a7f5d0e924..948b923a529d 100644
--- a/lib/libc/gen/lrand48.c
+++ b/lib/libc/gen/lrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/lrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/makecontext.3 b/lib/libc/gen/makecontext.3
index ad55e7abcb47..36e3ce811b2e 100644
--- a/lib/libc/gen/makecontext.3
+++ b/lib/libc/gen/makecontext.3
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/makecontext.3,v 1.4 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd September 10, 2002
 .Dt MAKECONTEXT 3
diff --git a/lib/libc/gen/modf.3 b/lib/libc/gen/modf.3
index 4afd4e6b47c7..891ae61a1079 100644
--- a/lib/libc/gen/modf.3
+++ b/lib/libc/gen/modf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)modf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/modf.3,v 1.8 2002/12/18 13:33:02 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MODF 3
diff --git a/lib/libc/gen/mrand48.c b/lib/libc/gen/mrand48.c
index ef20fb87bf50..f65ed779088a 100644
--- a/lib/libc/gen/mrand48.c
+++ b/lib/libc/gen/mrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/mrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index f049a1cf551a..8391de27bc11 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -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/lib/libc/gen/msgctl.3,v 1.19 2003/09/08 19:57:14 ru Exp $
 .\"/
 .Dd November 24, 1997
 .Dt MSGCTL 3
diff --git a/lib/libc/gen/msgget.3 b/lib/libc/gen/msgget.3
index e257c607d1ee..d87574734d74 100644
--- a/lib/libc/gen/msgget.3
+++ b/lib/libc/gen/msgget.3
@@ -28,7 +28,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgget.3,v 1.13 2002/12/18 10:13:54 ru Exp $
 .\"
 .\"/
 .Dd August 17, 1995
diff --git a/lib/libc/gen/msgrcv.3 b/lib/libc/gen/msgrcv.3
index e554dcdf4ba1..25a56905e260 100644
--- a/lib/libc/gen/msgrcv.3
+++ b/lib/libc/gen/msgrcv.3
@@ -28,7 +28,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgrcv.3,v 1.20 2005/06/14 10:56:02 ru Exp $
 .\"
 .\"/
 .Dd June 15, 2005
diff --git a/lib/libc/gen/msgsnd.3 b/lib/libc/gen/msgsnd.3
index 89e9d753ec11..57a9049b4076 100644
--- a/lib/libc/gen/msgsnd.3
+++ b/lib/libc/gen/msgsnd.3
@@ -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/lib/libc/gen/msgsnd.3,v 1.20 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd November 24, 1997
 .Dt MSGSND 3
diff --git a/lib/libc/gen/nftw.c b/lib/libc/gen/nftw.c
index 43110c1a3b4a..01b099a6871c 100644
--- a/lib/libc/gen/nftw.c
+++ b/lib/libc/gen/nftw.c
@@ -27,7 +27,7 @@ static const char rcsid[] = "$OpenBSD: nftw.c,v 1.4 2004/07/07 16:05:23 millert
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nftw.c,v 1.1 2004/08/24 13:00:55 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
index bfb01ae4620b..6a98d9eb6753 100644
--- a/lib/libc/gen/nice.3
+++ b/lib/libc/gen/nice.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nice.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/nice.3,v 1.11 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt NICE 3
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index 8ec41d1b50ae..453caa762c35 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)nice.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nice.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/nlist.3 b/lib/libc/gen/nlist.3
index d72dad603753..9a6309c22938 100644
--- a/lib/libc/gen/nlist.3
+++ b/lib/libc/gen/nlist.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nlist.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/nlist.3,v 1.7 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt NLIST 3
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index b52d7c2a82e3..ff20b50a0bc3 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.18 2003/02/27 13:40:00 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/nrand48.c b/lib/libc/gen/nrand48.c
index 16c8ca111b5e..3a21c3f2a546 100644
--- a/lib/libc/gen/nrand48.c
+++ b/lib/libc/gen/nrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index c076abb63b6c..9148240d7f3f 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)opendir.c	8.8 (Berkeley) 5/1/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.22 2004/08/14 17:46:10 stefanf Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/pause.3 b/lib/libc/gen/pause.3
index 1822283ee015..b8c257ec8f8d 100644
--- a/lib/libc/gen/pause.3
+++ b/lib/libc/gen/pause.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pause.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/pause.3,v 1.8 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt PAUSE 3
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index f1b5c25e3abc..4f56289c3d6c 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pause.c,v 1.6 2002/02/01 00:57:29 obrien Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/pmadvise.c b/lib/libc/gen/pmadvise.c
index 60cef637bf16..744c6e560e47 100644
--- a/lib/libc/gen/pmadvise.c
+++ b/lib/libc/gen/pmadvise.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pmadvise.c,v 1.3 2003/08/09 03:23:24 bms Exp $");
 
 #include <sys/mman.h>
 
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index ae020da3427c..690a2a1188b2 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)popen.3	8.2 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.17 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd May 3, 1995
 .Dt POPEN 3
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 5cb57fb45740..0ed56578cc93 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 5/3/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/popen.c,v 1.18 2003/01/04 00:15:15 tjr Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/posixshm.c b/lib/libc/gen/posixshm.c
index 05fc1c9bf403..0baa7006950a 100644
--- a/lib/libc/gen/posixshm.c
+++ b/lib/libc/gen/posixshm.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/posixshm.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/pselect.3 b/lib/libc/gen/pselect.3
index a56a0a80a884..4b12fb7374cb 100644
--- a/lib/libc/gen/pselect.3
+++ b/lib/libc/gen/pselect.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/pselect.3,v 1.4 2002/12/18 10:13:54 ru Exp $
 .\"
 .Dd June 16, 2002
 .Dt PSELECT 3
diff --git a/lib/libc/gen/pselect.c b/lib/libc/gen/pselect.c
index 28066a204aa4..13b25538e22e 100644
--- a/lib/libc/gen/pselect.c
+++ b/lib/libc/gen/pselect.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pselect.c,v 1.6 2002/10/12 16:13:37 mike Exp $");
 
 #include "namespace.h"
 #include <sys/select.h>
diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3
index 771de7d8cb0e..02013a453eea 100644
--- a/lib/libc/gen/psignal.3
+++ b/lib/libc/gen/psignal.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)psignal.3	8.2 (Berkeley) 2/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/psignal.3,v 1.16 2002/12/30 21:18:02 schweikh Exp $
 .\"
 .Dd February 27, 1995
 .Dt PSIGNAL 3
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index c0f63cdbdd91..832e04b902c2 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/psignal.c,v 1.7 2002/02/01 01:08:48 obrien Exp $");
 
 /*
  * Print the name of the signal indicated
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index 04cc388c8210..a5057f90ef07 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pw_scan.c,v 1.25 2004/01/18 21:33:25 charnier Exp $");
 
 /*
  * This module is used to "verify" password entries by chpass(1) and
diff --git a/lib/libc/gen/pw_scan.h b/lib/libc/gen/pw_scan.h
index f83df2cdec68..28669f797e08 100644
--- a/lib/libc/gen/pw_scan.h
+++ b/lib/libc/gen/pw_scan.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/pw_scan.h,v 1.6 2002/03/22 23:41:42 obrien Exp $
  */
 
 #define _PWSCAN_MASTER 0x01
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index dc8c77c653ac..ea2263ff2d78 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwcache.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/pwcache.3,v 1.12 2002/03/22 02:35:47 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt PWCACHE 3
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index cb2aa42123de..2d4b27291bd8 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)pwcache.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pwcache.c,v 1.10 2002/03/22 02:35:47 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/gen/raise.3 b/lib/libc/gen/raise.3
index 8dac8f5e87c0..1a8fcd7e9ad6 100644
--- a/lib/libc/gen/raise.3
+++ b/lib/libc/gen/raise.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)raise.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/raise.3,v 1.7 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RAISE 3
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index 2e50fd4fad62..4a94cb905076 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)raise.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/raise.c,v 1.4 2003/07/19 05:22:56 davidxu Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3
index a703ba08813f..d67f16347c2a 100644
--- a/lib/libc/gen/rand48.3
+++ b/lib/libc/gen/rand48.3
@@ -10,7 +10,7 @@
 .\" to anyone/anything when using this software.
 .\"
 .\"     @(#)rand48.3 V1.0 MB 8 Oct 1993
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/rand48.3,v 1.17 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd October 8, 1993
 .Dt RAND48 3
diff --git a/lib/libc/gen/rand48.h b/lib/libc/gen/rand48.h
index b6602dc5a9f7..0a3d83d3c0c7 100644
--- a/lib/libc/gen/rand48.h
+++ b/lib/libc/gen/rand48.h
@@ -10,7 +10,7 @@
  * of any kind. I shall in no event be liable for anything that happens
  * to anyone/anything when using this software.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/rand48.h,v 1.2 2002/02/01 01:32:19 obrien Exp $
  */
 
 #ifndef _RAND48_H_
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index 68d0ddd66385..fa0438cdadee 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.11 2002/02/26 21:39:32 alfred Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/readpassphrase.3 b/lib/libc/gen/readpassphrase.3
index 0d6a7ff38f16..3bd361742469 100644
--- a/lib/libc/gen/readpassphrase.3
+++ b/lib/libc/gen/readpassphrase.3
@@ -25,7 +25,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/lib/libc/gen/readpassphrase.3,v 1.7 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd December 7, 2001
 .Dt READPASSPHRASE 3
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c
index 983e01d89306..d100be408523 100644
--- a/lib/libc/gen/readpassphrase.c
+++ b/lib/libc/gen/readpassphrase.c
@@ -31,7 +31,7 @@
 static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readpassphrase.c,v 1.6 2002/03/09 03:16:41 green Exp $");
 
 #include "namespace.h"
 #include <ctype.h>
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 294301e7e26e..dae75cc31739 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rewinddir.c	8.1 (Berkeley) 6/8/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/rewinddir.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/lib/libc/gen/rfork_thread.3 b/lib/libc/gen/rfork_thread.3
index e985e1c99e7f..bd03d93d2e6c 100644
--- a/lib/libc/gen/rfork_thread.3
+++ b/lib/libc/gen/rfork_thread.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.7 2003/04/27 21:07:27 robert Exp $
 .\"
 .Dd July 29, 2000
 .Dt RFORK_THREAD 3
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index 045e4ececa09..b76eff8c209d 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)scandir.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/scandir.3,v 1.8 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SCANDIR 3
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index 6c7259fa79b7..cf79bcedea95 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/scandir.c,v 1.7 2002/02/01 01:32:19 obrien Exp $");
 
 /*
  * Scan the directory dirname calling select to make a list of selected
diff --git a/lib/libc/gen/seed48.c b/lib/libc/gen/seed48.c
index 5339b8c0c4e9..94167a7b1197 100644
--- a/lib/libc/gen/seed48.c
+++ b/lib/libc/gen/seed48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/seed48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index e6fbf10457f8..53858193003b 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/sem.c b/lib/libc/gen/sem.c
index 64ba05b70b8b..4054e3ad8a1d 100644
--- a/lib/libc/gen/sem.c
+++ b/lib/libc/gen/sem.c
@@ -26,7 +26,7 @@
  * 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/lib/libc/gen/sem.c,v 1.13 2004/02/06 15:15:44 deischen Exp $
  */
 
 /*
diff --git a/lib/libc/gen/sem_destroy.3 b/lib/libc/gen/sem_destroy.3
index f488b4efe08d..c10dbf3291d1 100644
--- a/lib/libc/gen/sem_destroy.3
+++ b/lib/libc/gen/sem_destroy.3
@@ -25,7 +25,7 @@
 .\" 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/lib/libc/gen/sem_destroy.3,v 1.14 2004/07/02 16:45:56 ru Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_DESTROY 3
diff --git a/lib/libc/gen/sem_getvalue.3 b/lib/libc/gen/sem_getvalue.3
index a8dd177ea381..ff5ab2711e08 100644
--- a/lib/libc/gen/sem_getvalue.3
+++ b/lib/libc/gen/sem_getvalue.3
@@ -25,7 +25,7 @@
 .\" 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/lib/libc/gen/sem_getvalue.3,v 1.14 2004/07/02 16:45:56 ru Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_GETVALUE 3
diff --git a/lib/libc/gen/sem_init.3 b/lib/libc/gen/sem_init.3
index d765a574e67b..df07ff99827b 100644
--- a/lib/libc/gen/sem_init.3
+++ b/lib/libc/gen/sem_init.3
@@ -25,7 +25,7 @@
 .\" 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/lib/libc/gen/sem_init.3,v 1.17.8.1 2005/07/17 19:28:55 rwatson Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_INIT 3
diff --git a/lib/libc/gen/sem_open.3 b/lib/libc/gen/sem_open.3
index f5ba249f126a..e9b0365e9add 100644
--- a/lib/libc/gen/sem_open.3
+++ b/lib/libc/gen/sem_open.3
@@ -25,7 +25,7 @@
 .\" 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/lib/libc/gen/sem_open.3,v 1.12 2004/07/02 16:45:56 ru Exp $
 .\"
 .Dd January 15, 2003
 .Dt SEM_OPEN 3
diff --git a/lib/libc/gen/sem_post.3 b/lib/libc/gen/sem_post.3
index 67559cc541bd..33f50e561764 100644
--- a/lib/libc/gen/sem_post.3
+++ b/lib/libc/gen/sem_post.3
@@ -25,7 +25,7 @@
 .\" 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/lib/libc/gen/sem_post.3,v 1.14.8.1 2005/07/17 19:28:55 rwatson Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_POST 3
diff --git a/lib/libc/gen/sem_wait.3 b/lib/libc/gen/sem_wait.3
index 43d6fad34d34..5255ed7c07d2 100644
--- a/lib/libc/gen/sem_wait.3
+++ b/lib/libc/gen/sem_wait.3
@@ -25,7 +25,7 @@
 .\" 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/lib/libc/gen/sem_wait.3,v 1.12.8.1 2005/07/17 19:28:55 rwatson Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_WAIT 3
diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c
index 4b5283f897c8..4c0b249f6d80 100644
--- a/lib/libc/gen/semctl.c
+++ b/lib/libc/gen/semctl.c
@@ -27,7 +27,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/semctl.c,v 1.9 2003/02/16 17:29:09 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/ipc.h>
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index 90d5be86a3df..571a73f12535 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setdomainname.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index 769401af6ed2..3a15727a7732 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sethostname.c,v 1.4 2002/05/28 16:59:39 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/setjmp.3 b/lib/libc/gen/setjmp.3
index 98202984e413..09f12507ca03 100644
--- a/lib/libc/gen/setjmp.3
+++ b/lib/libc/gen/setjmp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setjmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/setjmp.3,v 1.12 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETJMP 3
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
index 917a21c9b743..d5d8d065e0cc 100644
--- a/lib/libc/gen/setjmperr.c
+++ b/lib/libc/gen/setjmperr.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)setjmperr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setjmperr.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 /*
  * This routine is called from longjmp() when an error occurs.
diff --git a/lib/libc/gen/setmode.3 b/lib/libc/gen/setmode.3
index bca8e684826a..ac41f4c4c008 100644
--- a/lib/libc/gen/setmode.3
+++ b/lib/libc/gen/setmode.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/setmode.3,v 1.11 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt SETMODE 3
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index cfeb199a2b61..0ffa82de17f7 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.10 2005/04/08 21:15:38 stefanf Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index fe9f19acde6e..8792110b1c30 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/setproctitle.3,v 1.25 2004/07/02 23:52:10 ru Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd December 16, 1995
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index cd705fb60946..433bba233e2e 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setproctitle.c,v 1.18 2003/07/01 09:45:35 alfred Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/setprogname.c b/lib/libc/gen/setprogname.c
index 29a6cd025ec8..654bef4161b8 100644
--- a/lib/libc/gen/setprogname.c
+++ b/lib/libc/gen/setprogname.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setprogname.c,v 1.8 2002/03/29 22:43:41 markm Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/gen/shm_open.3 b/lib/libc/gen/shm_open.3
index b68e85b6bb49..e2567a3a8b11 100644
--- a/lib/libc/gen/shm_open.3
+++ b/lib/libc/gen/shm_open.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/shm_open.3,v 1.12 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd March 24, 2000
 .Dt SHM_OPEN 3
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
index 9680a1523d42..34e1a9c47ebb 100644
--- a/lib/libc/gen/siginterrupt.3
+++ b/lib/libc/gen/siginterrupt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)siginterrupt.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/siginterrupt.3,v 1.14 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGINTERRUPT 3
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
index 8269499d2599..8c719f8a61c4 100644
--- a/lib/libc/gen/siginterrupt.c
+++ b/lib/libc/gen/siginterrupt.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)siginterrupt.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/siginterrupt.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <signal.h>
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index d723e3eeae56..f2690262cbf7 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/siglist.c,v 1.4 2002/09/07 08:14:19 jmallett Exp $");
 
 #include <sys/cdefs.h>
 #include <signal.h>
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 7b99fab246b6..afbafd6de8d2 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)signal.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/signal.3,v 1.40 2004/12/29 19:40:56 keramida Exp $
 .\"
 .Dd June 7, 2004
 .Dt SIGNAL 3
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index d954cd4813a5..a958347cc9a8 100644
--- a/lib/libc/gen/signal.c
+++ b/lib/libc/gen/signal.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)signal.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/signal.c,v 1.3 2002/02/01 00:57:29 obrien Exp $");
 
 /*
  * Almost backwards compatible signal.
diff --git a/lib/libc/gen/sigsetops.3 b/lib/libc/gen/sigsetops.3
index 3fd72b6c671b..56093537a75e 100644
--- a/lib/libc/gen/sigsetops.3
+++ b/lib/libc/gen/sigsetops.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigsetops.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.9 2004/12/16 20:27:55 maxim Exp $
 .\"
 .Dd December 16, 2004
 .Dt SIGSETOPS 3
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index 38014da34e73..e345f2648de2 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sigsetops.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
 
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libc/gen/sleep.3 b/lib/libc/gen/sleep.3
index 4c204dc98d1e..b77a2c5f6f75 100644
--- a/lib/libc/gen/sleep.3
+++ b/lib/libc/gen/sleep.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sleep.3,v 1.16 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd February 13, 1998
 .Dt SLEEP 3
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index 71318ce01ae6..bd48358ccd0f 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)sleep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sleep.c,v 1.31 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/gen/statvfs.3 b/lib/libc/gen/statvfs.3
index f9c7430f6e99..82e4d0f83723 100644
--- a/lib/libc/gen/statvfs.3
+++ b/lib/libc/gen/statvfs.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.7 2003/06/08 10:01:51 charnier Exp $
 .\"
 .Dd July 13, 2002
 .Dt STATVFS 3
diff --git a/lib/libc/gen/statvfs.c b/lib/libc/gen/statvfs.c
index fe9462bd307b..303950bbfab8 100644
--- a/lib/libc/gen/statvfs.c
+++ b/lib/libc/gen/statvfs.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/statvfs.c,v 1.2 2002/09/06 11:23:40 tjr Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/stringlist.3 b/lib/libc/gen/stringlist.3
index 30dd299a7a44..d1dd2f43cf16 100644
--- a/lib/libc/gen/stringlist.3
+++ b/lib/libc/gen/stringlist.3
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/stringlist.3,v 1.11 2005/02/13 23:45:46 ru Exp $
 .\"
 .Dd November 28, 1999
 .Os
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
index 79e605df4304..1d977e4e41ec 100644
--- a/lib/libc/gen/stringlist.c
+++ b/lib/libc/gen/stringlist.c
@@ -33,7 +33,7 @@
 static char *rcsid = "$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/stringlist.c,v 1.7 2003/01/19 01:16:01 obrien Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/gen/strtofflags.3 b/lib/libc/gen/strtofflags.3
index 4b2d5c587412..355e81aea137 100644
--- a/lib/libc/gen/strtofflags.3
+++ b/lib/libc/gen/strtofflags.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/strtofflags.3,v 1.7 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd January 1, 2000
 .Dt STRTOFFLAGS 3
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
index be54f6a7570c..20a5c9fc9a2f 100644
--- a/lib/libc/gen/strtofflags.c
+++ b/lib/libc/gen/strtofflags.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.22 2002/04/16 11:03:22 joe Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/swapcontext.c b/lib/libc/gen/swapcontext.c
index c34cb235cffb..1725068a3e18 100644
--- a/lib/libc/gen/swapcontext.c
+++ b/lib/libc/gen/swapcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/swapcontext.c,v 1.5 2002/09/20 08:13:21 mini Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index cd6d3adf01fc..3c57af2c262f 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sysconf.3,v 1.21 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd June 18, 2001
 .Dt SYSCONF 3
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index 27729a6fa9d4..309e16329965 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.20 2002/11/17 08:54:29 dougb Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 9ac8cee87af3..78f945f2ca45 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.66 2005/06/15 19:04:03 ru Exp $
 .\"
 .Dd January 23, 2001
 .Dt SYSCTL 3
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index 525175a19a15..b6c89a093e0e 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)sysctl.c	8.2 (Berkeley) 1/4/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c
index 4510fe050c9e..e949a5cde122 100644
--- a/lib/libc/gen/sysctlbyname.c
+++ b/lib/libc/gen/sysctlbyname.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlbyname.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/sysctlnametomib.c b/lib/libc/gen/sysctlnametomib.c
index 1515784a5bec..1a932ec46504 100644
--- a/lib/libc/gen/sysctlnametomib.c
+++ b/lib/libc/gen/sysctlnametomib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlnametomib.c,v 1.4 2003/01/04 00:11:11 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 016361198df9..d02940925b55 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/syslog.3,v 1.24 2004/12/30 13:09:34 krion Exp $
 .\"
 .Dd December 30, 2004
 .Dt SYSLOG 3
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 44efdaca99d7..cc552cd5a8e1 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.35.2.1 2005/10/08 17:57:10 delphij Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/tcgetpgrp.3 b/lib/libc/gen/tcgetpgrp.3
index d6aaa7656552..b155763412f1 100644
--- a/lib/libc/gen/tcgetpgrp.3
+++ b/lib/libc/gen/tcgetpgrp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcgetpgrp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcgetpgrp.3,v 1.8 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt TCGETPGRP 3
diff --git a/lib/libc/gen/tcsendbreak.3 b/lib/libc/gen/tcsendbreak.3
index e85d104c15d9..c1be0bef357a 100644
--- a/lib/libc/gen/tcsendbreak.3
+++ b/lib/libc/gen/tcsendbreak.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsendbreak.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcsendbreak.3,v 1.9 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt TCSENDBREAK 3
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index 82df2a6f4995..56c9e0e623d2 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsetattr.3	8.3 (Berkeley) 1/2/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcsetattr.3,v 1.13 2003/09/08 19:57:14 ru Exp $
 .\"
 .Dd January 2, 1994
 .Dt TCSETATTR 3
diff --git a/lib/libc/gen/tcsetpgrp.3 b/lib/libc/gen/tcsetpgrp.3
index 8ddb4690a82b..b50e6a8715e9 100644
--- a/lib/libc/gen/tcsetpgrp.3
+++ b/lib/libc/gen/tcsetpgrp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsetpgrp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcsetpgrp.3,v 1.9 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt TCSETPGRP 3
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 170e54744312..f3219107042f 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/telldir.h b/lib/libc/gen/telldir.h
index 4fb4cb6ca8aa..82cf9c1b792b 100644
--- a/lib/libc/gen/telldir.h
+++ b/lib/libc/gen/telldir.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/telldir.h,v 1.2 2001/01/24 12:59:24 deischen Exp $
  */
 
 #ifndef _TELLDIR_H_
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
index cc57cf8b7246..65f814157fc0 100644
--- a/lib/libc/gen/termios.c
+++ b/lib/libc/gen/termios.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.13 2002/05/28 16:59:39 alfred Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
index 241494add83c..97c9c8f82ba8 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/time.3,v 1.14 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd July 18, 2003
 .Dt TIME 3
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index 4468b0154015..5bf0ce00a1d3 100644
--- a/lib/libc/gen/time.c
+++ b/lib/libc/gen/time.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/time.c,v 1.4 2003/07/19 02:53:46 wollman Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/times.3 b/lib/libc/gen/times.3
index 4ef554cf48ae..6aa58c3d45d1 100644
--- a/lib/libc/gen/times.3
+++ b/lib/libc/gen/times.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)times.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/times.3,v 1.10 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt TIMES 3
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index dd3152443543..8c3700a6b3b1 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/times.c,v 1.3 2005/03/08 08:12:35 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/timezone.3 b/lib/libc/gen/timezone.3
index 2a90c11793f9..27caaa20bfa1 100644
--- a/lib/libc/gen/timezone.3
+++ b/lib/libc/gen/timezone.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)timezone.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/timezone.3,v 1.9 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt TIMEZONE 3
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index c9d595702ae9..8d8139a56216 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)timezone.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/timezone.c,v 1.5 2002/02/01 01:08:48 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index 033c737f5b16..e42a7cffa43c 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/gen/tls.c,v 1.8 2005/03/21 13:17:16 davidxu Exp $
  */
 
 /*
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index 5f427fba8ccf..f1f5ffbf7345 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ttyname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ttyname.3,v 1.13 2005/06/15 19:04:03 ru Exp $
 .\"
 .Dd May 14, 2005
 .Dt TTYNAME 3
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index ed198eab5452..4341ed453781 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ttyname.c	8.2 (Berkeley) 1/27/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.23 2005/05/20 15:39:20 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index 2710e7074d2e..0d7359c46118 100644
--- a/lib/libc/gen/ttyslot.c
+++ b/lib/libc/gen/ttyslot.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ttyslot.c,v 1.4 2002/02/01 01:08:48 obrien Exp $");
 
 #include <ttyent.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 80c525da81e3..2297e3a0be9d 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tzset.3	8.2 (Berkeley) 11/17/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.15 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd November 17, 1993
 .Dt TZSET 3
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index 7783a30b6b5c..65cc711904ae 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ualarm.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.19 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt UALARM 3
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index f56a70d9c4fc..a9200ae84744 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.4 2002/12/29 00:59:09 mike Exp $");
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/ucontext.3 b/lib/libc/gen/ucontext.3
index 05743224a82b..86210de24bf0 100644
--- a/lib/libc/gen/ucontext.3
+++ b/lib/libc/gen/ucontext.3
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ucontext.3,v 1.3 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd September 10, 2002
 .Dt UCONTEXT 3
diff --git a/lib/libc/gen/ulimit.3 b/lib/libc/gen/ulimit.3
index e4c2d769323c..3dc745f52643 100644
--- a/lib/libc/gen/ulimit.3
+++ b/lib/libc/gen/ulimit.3
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ulimit.3,v 1.5 2003/01/04 01:11:49 tjr Exp $
 .\"
 .Dd January 4, 2003
 .Dt ULIMIT 3
diff --git a/lib/libc/gen/ulimit.c b/lib/libc/gen/ulimit.c
index e1bc02066209..d25ff4799ea6 100644
--- a/lib/libc/gen/ulimit.c
+++ b/lib/libc/gen/ulimit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/ulimit.c,v 1.3 2003/01/04 01:11:49 tjr Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index d88ba33cfd2d..cfca201a4669 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uname.3	8.1 (Berkeley) 1/4/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/uname.3,v 1.12 2003/09/08 19:57:14 ru Exp $
 .\"
 .Dd January 4, 1994
 .Dt UNAME 3
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index b5d5af3da323..699e7b2fe79e 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/uname.c,v 1.9 2002/02/01 00:57:29 obrien Exp $");
 
 #define uname wrapped_uname
 #include <sys/param.h>
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
index f371f9a0c481..8d160d83267e 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unvis.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/unvis.3,v 1.17 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt UNVIS 3
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
index c5bf6bb46ee0..35443d11545c 100644
--- a/lib/libc/gen/unvis.c
+++ b/lib/libc/gen/unvis.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/unvis.c,v 1.9 2004/08/02 08:46:23 stefanf Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
index ffdc9223b71d..72fb09815a62 100644
--- a/lib/libc/gen/usleep.3
+++ b/lib/libc/gen/usleep.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)usleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.18 2002/12/29 00:59:09 mike Exp $
 .\"
 .Dd February 13, 1998
 .Dt USLEEP 3
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index 1eefbdb73fd5..ba0820c34523 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)usleep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.28.12.1 2005/10/08 17:56:53 delphij Exp $");
 
 #include "namespace.h"
 #include <time.h>
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index aed098e3cf00..34274878e8fc 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/utime.3,v 1.13 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt UTIME 3
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index 7e544adc767d..cefa0205d4ad 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)utime.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/utime.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include <sys/time.h>
 
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
index fceec478ced0..e40f19fbbc5f 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)valloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.10 2002/12/18 13:33:02 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt VALLOC 3
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
index 456f31d21cfd..206a7e86a575 100644
--- a/lib/libc/gen/valloc.c
+++ b/lib/libc/gen/valloc.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)valloc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/valloc.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index d956f1379a11..b1b9433c5970 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)vis.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.27 2005/01/15 11:40:33 ru Exp $
 .\"
 .Dd March 21, 2004
 .Dt VIS 3
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index 1d7e860636b0..8b8287775811 100644
--- a/lib/libc/gen/vis.c
+++ b/lib/libc/gen/vis.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 7/19/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.13 2003/10/30 12:41:50 phk Exp $");
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index f1711cdfa5de..8cb80a41ef12 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)wait.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/wait.c,v 1.6 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index edfd227fa74e..a4b91a771782 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)wait3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/wait3.c,v 1.3 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index ecb0e4d1a2ad..273d1f3b8e3d 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)waitpid.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/waitpid.c,v 1.6 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/wordexp.3 b/lib/libc/gen/wordexp.3
index c3fb5e0aa606..495d8446c4f5 100644
--- a/lib/libc/gen/wordexp.3
+++ b/lib/libc/gen/wordexp.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.8 2004/07/28 15:43:33 tjr Exp $
 .\"
 .Dd July 29, 2004
 .Dt WORDEXP 3
diff --git a/lib/libc/gen/wordexp.c b/lib/libc/gen/wordexp.c
index a437543bca40..b09d397624ef 100644
--- a/lib/libc/gen/wordexp.c
+++ b/lib/libc/gen/wordexp.c
@@ -37,7 +37,7 @@
 #include <wordexp.h>
 #include "un-namespace.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.6 2004/06/30 13:55:08 tjr Exp $");
 
 static int	we_askshell(const char *, wordexp_t *, int);
 static int	we_check(const char *, int);
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
index 535e7dee2557..7a9a68384567 100644
--- a/lib/libc/gmon/Makefile.inc
+++ b/lib/libc/gmon/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.10 2004/05/18 22:49:15 peter Exp $
 
 # gmon sources
 .PATH: ${.CURDIR}/gmon
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index b1212f022e9a..d18abbd9586f 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)gmon.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.20 2004/10/16 06:32:43 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index b3b561c285e8..fd26a77f6ce7 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.21 2005/05/06 07:37:01 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/gmon.h>
diff --git a/lib/libc/gmon/moncontrol.3 b/lib/libc/gmon/moncontrol.3
index 1af4974a1d0c..1f027623b0fe 100644
--- a/lib/libc/gmon/moncontrol.3
+++ b/lib/libc/gmon/moncontrol.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)moncontrol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.15 2004/06/14 18:41:24 bms Exp $
 .\"
 .Dd June 14, 2004
 .Dt MONCONTROL 3
diff --git a/lib/libc/i386/Makefile.inc b/lib/libc/i386/Makefile.inc
index 50f2f0d0b3b1..1c2d539eef95 100644
--- a/lib/libc/i386/Makefile.inc
+++ b/lib/libc/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.1 2005/01/15 05:23:57 das Exp $
 
 # Long double is 80 bits
 GDTOASRCS+=strtopx.c
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 1483f9d8e763..209f0b232e05 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/SYS.h,v 1.24 2002/09/17 01:48:51 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/i386/_fpmath.h b/lib/libc/i386/_fpmath.h
index 80e764f8eacf..92719d9a8f1e 100644
--- a/lib/libc/i386/_fpmath.h
+++ b/lib/libc/i386/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/_fpmath.h,v 1.5 2005/03/07 04:55:22 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/i386/arith.h b/lib/libc/i386/arith.h
index 2d65061e82a7..c55a4df3ab29 100644
--- a/lib/libc/i386/arith.h
+++ b/lib/libc/i386/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
  */
 
 /*
diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc
index 709cf5d91516..70e7ed80517f 100644
--- a/lib/libc/i386/gen/Makefile.inc
+++ b/lib/libc/i386/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.22 2004/08/15 16:18:03 dfr Exp $
 
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.S \
 	flt_rounds.c infinity.c ldexp.c makecontext.c modf.S \
diff --git a/lib/libc/i386/gen/_ctx_start.S b/lib/libc/i386/gen/_ctx_start.S
index 91a06b863657..6bef78e74718 100644
--- a/lib/libc/i386/gen/_ctx_start.S
+++ b/lib/libc/i386/gen/_ctx_start.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.3 2004/07/02 14:19:44 davidxu Exp $");
 
 /*
  * _ctx_start((void *func)(int arg1, ..., argn),
diff --git a/lib/libc/i386/gen/_set_tp.c b/lib/libc/i386/gen/_set_tp.c
index 110e7e4ad814..9a83fda44012 100644
--- a/lib/libc/i386/gen/_set_tp.c
+++ b/lib/libc/i386/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.6 2005/06/29 23:15:35 peter Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index d2b7b6e1f67e..c2fa562ef244 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.16 2002/03/23 02:05:17 obrien Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S
index 657c11424bd9..dbf6fb85769e 100644
--- a/lib/libc/i386/gen/alloca.S
+++ b/lib/libc/i386/gen/alloca.S
@@ -41,7 +41,7 @@
 	.asciz "@(#)alloca.s	5.2 (Berkeley) 5/14/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.12 2003/06/25 19:06:40 obrien Exp $");
 
 
 /* like alloc, but automatic automatic free in return */
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
index 52784cf7b275..4350f188268c 100644
--- a/lib/libc/i386/gen/fabs.S
+++ b/lib/libc/i386/gen/fabs.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)fabs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/fabs.S,v 1.9 2002/03/23 02:44:18 obrien Exp $");
 
 ENTRY(fabs)
 	fldl	4(%esp)
diff --git a/lib/libc/i386/gen/flt_rounds.c b/lib/libc/i386/gen/flt_rounds.c
index 16417ffd46e2..2856636eb010 100644
--- a/lib/libc/i386/gen/flt_rounds.c
+++ b/lib/libc/i386/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $");
 
 #include <float.h>
 
diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c
index 464b4029b35a..dd54481e16f8 100644
--- a/lib/libc/i386/gen/infinity.c
+++ b/lib/libc/i386/gen/infinity.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/infinity.c,v 1.10 2003/02/08 20:37:52 mike Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c
index b01b9378c758..596c8dc4b346 100644
--- a/lib/libc/i386/gen/ldexp.c
+++ b/lib/libc/i386/gen/ldexp.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ldexp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.11 2004/02/16 10:03:02 das Exp $");
 
 /*
  * ldexp(value, exp): return value * (2 ** exp).
diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c
index 167cb12893dc..27e7f7333c52 100644
--- a/lib/libc/i386/gen/makecontext.c
+++ b/lib/libc/i386/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.5 2004/12/05 21:22:08 deischen Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S
index 426037bde933..de7c96a1b66c 100644
--- a/lib/libc/i386/gen/modf.S
+++ b/lib/libc/i386/gen/modf.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)modf.s	5.5 (Berkeley) 3/18/91"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.9 2002/03/23 02:05:17 obrien Exp $");
 
 /*
  * modf(value, iptr): return fractional part of value, and stores the
diff --git a/lib/libc/i386/gen/rfork_thread.S b/lib/libc/i386/gen/rfork_thread.S
index c0fc624f0ae3..04ad5495033a 100644
--- a/lib/libc/i386/gen/rfork_thread.S
+++ b/lib/libc/i386/gen/rfork_thread.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $");
 
 /*
  * With thanks to John Dyson for the original version of this.
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index f64c77fa9835..89c2b568dbec 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.22 2002/03/23 02:05:17 obrien Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/i386/gen/signalcontext.c b/lib/libc/i386/gen/signalcontext.c
index 877b6556a3f2..6beb809944b4 100644
--- a/lib/libc/i386/gen/signalcontext.c
+++ b/lib/libc/i386/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.7 2004/07/02 23:20:05 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 09b512d2be3d..f6ab301700b7 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -41,7 +41,7 @@
 	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.24 2002/03/23 02:05:19 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/net/Makefile.inc b/lib/libc/i386/net/Makefile.inc
index 96e559bf8027..68786442eac2 100644
--- a/lib/libc/i386/net/Makefile.inc
+++ b/lib/libc/i386/net/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/net/Makefile.inc,v 1.6 1999/08/27 23:59:24 peter Exp $
 
 SRCS+=	htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S
index 37f5c6049654..ceeaa91ae9da 100644
--- a/lib/libc/i386/net/htonl.S
+++ b/lib/libc/i386/net/htonl.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)htonl.s	5.3 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.11 2004/11/16 21:01:31 jhb Exp $");
 
 /* netorder = htonl(hostorder) */
 
diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S
index d5d63fc0c107..37b92a609a27 100644
--- a/lib/libc/i386/net/htons.S
+++ b/lib/libc/i386/net/htons.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)htons.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/net/htons.S,v 1.9 2002/03/23 02:06:08 obrien Exp $");
 
 /* netorder = htons(hostorder) */
 
diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S
index 497f3007f5da..dedcbbb2d189 100644
--- a/lib/libc/i386/net/ntohl.S
+++ b/lib/libc/i386/net/ntohl.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)ntohl.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.11 2004/11/16 21:01:31 jhb Exp $");
 
 /* hostorder = ntohl(netorder) */
 
diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S
index eb0668c4e1e5..676b3eaf46bd 100644
--- a/lib/libc/i386/net/ntohs.S
+++ b/lib/libc/i386/net/ntohs.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)ntohs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohs.S,v 1.9 2002/03/23 02:06:08 obrien Exp $");
 
 /* hostorder = ntohs(netorder) */
 
diff --git a/lib/libc/i386/stdlib/Makefile.inc b/lib/libc/i386/stdlib/Makefile.inc
index 0a6a6a89237c..1bb5c21e49e1 100644
--- a/lib/libc/i386/stdlib/Makefile.inc
+++ b/lib/libc/i386/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/stdlib/Makefile.inc,v 1.7 1999/08/27 23:59:26 peter Exp $
 
 MDSRCS+=abs.S div.S labs.S ldiv.S
diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S
index 55a929606bc6..31d7531bc09d 100644
--- a/lib/libc/i386/stdlib/abs.S
+++ b/lib/libc/i386/stdlib/abs.S
@@ -39,7 +39,7 @@
 	.asciz "@(#)abs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/abs.S,v 1.9 2002/03/23 02:07:11 obrien Exp $");
 
 
 ENTRY(abs)
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
index bafaf6a85e92..383b31f887bf 100644
--- a/lib/libc/i386/stdlib/div.S
+++ b/lib/libc/i386/stdlib/div.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.10 2002/12/22 06:41:09 kan Exp $");
 
 ENTRY(div)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S
index 9dd474d8521c..3268520839fe 100644
--- a/lib/libc/i386/stdlib/labs.S
+++ b/lib/libc/i386/stdlib/labs.S
@@ -39,7 +39,7 @@
 	.asciz "@(#)abs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/labs.S,v 1.9 2002/03/23 02:07:11 obrien Exp $");
 
 
 ENTRY(labs)
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
index 578eff0fe0fd..91e132a41934 100644
--- a/lib/libc/i386/stdlib/ldiv.S
+++ b/lib/libc/i386/stdlib/ldiv.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.10 2002/12/22 06:41:09 kan Exp $");
 
 ENTRY(ldiv)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc
index cd908a622597..753cc9829d8f 100644
--- a/lib/libc/i386/string/Makefile.inc
+++ b/lib/libc/i386/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/string/Makefile.inc,v 1.13 2003/04/05 04:17:05 tjr Exp $
 
 MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S memcpy.S \
 	memmove.S memset.S rindex.S strcat.S strchr.S strcmp.S strcpy.S \
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S
index aa6a6ab90d9b..5a09d7b6c44c 100644
--- a/lib/libc/i386/string/bcmp.S
+++ b/lib/libc/i386/string/bcmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.9 2005/04/21 23:07:20 alc Exp $");
 
 /*
  * bcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/bcopy.S b/lib/libc/i386/string/bcopy.S
index 1050ed2de7a4..be2f9f468e5d 100644
--- a/lib/libc/i386/string/bcopy.S
+++ b/lib/libc/i386/string/bcopy.S
@@ -34,7 +34,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcopy.S,v 1.10 2002/10/15 09:50:07 sobomax Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcopy.S,v 1.6 1996/11/12 00:50:06 jtc Exp $")
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
index f66bd780a8be..fb842011f032 100644
--- a/lib/libc/i386/string/bzero.S
+++ b/lib/libc/i386/string/bzero.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/bzero.S,v 1.9 2002/06/02 20:05:36 schweikh Exp $");
 
 /*
  * bzero (void *b, size_t len)
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
index 450f586c9eba..b64411d406c5 100644
--- a/lib/libc/i386/string/ffs.S
+++ b/lib/libc/i386/string/ffs.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/ffs.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * ffs(value)
diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S
index db0a162b2dab..4bdde0815e5e 100644
--- a/lib/libc/i386/string/index.S
+++ b/lib/libc/i386/string/index.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/index.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * index(s, c)
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index 639077d2696c..5f4951a39a6a 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memchr.S,v 1.12 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * memchr (b, c, len)
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
index 8aa2f4ea0413..27c479c904c6 100644
--- a/lib/libc/i386/string/memcmp.S
+++ b/lib/libc/i386/string/memcmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcmp.S,v 1.8 2002/03/23 02:44:19 obrien Exp $");
 
 /*
  * memcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/memcpy.S b/lib/libc/i386/string/memcpy.S
index f85a1a5b8021..5102bc7148e7 100644
--- a/lib/libc/i386/string/memcpy.S
+++ b/lib/libc/i386/string/memcpy.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcpy.S,v 1.2 2002/03/23 02:44:19 obrien Exp $");
 
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/i386/string/memmove.S b/lib/libc/i386/string/memmove.S
index 02330c44414b..42b526384db2 100644
--- a/lib/libc/i386/string/memmove.S
+++ b/lib/libc/i386/string/memmove.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memmove.S,v 1.7 2002/03/23 02:44:19 obrien Exp $");
 
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
index 52f0485e6368..27eca3612720 100644
--- a/lib/libc/i386/string/memset.S
+++ b/lib/libc/i386/string/memset.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memset.S,v 1.8 2002/03/23 02:44:19 obrien Exp $");
 
 /*
  * memset(void *b, int c, size_t len)
diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S
index f0d99f1569db..c76cf8f499c3 100644
--- a/lib/libc/i386/string/rindex.S
+++ b/lib/libc/i386/string/rindex.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/rindex.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * rindex(s, c)
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
index 3a667cac2bd8..a175d5b8eac7 100644
--- a/lib/libc/i386/string/strcat.S
+++ b/lib/libc/i386/string/strcat.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcat.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strcat(s, append)
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index 19ff5d4ad3ee..87d4fda79f48 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strchr.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strchr(s, c)
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
index 07a87b67a50e..6e98893f8d90 100644
--- a/lib/libc/i386/string/strcmp.S
+++ b/lib/libc/i386/string/strcmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcmp.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strcmp(s1, s2)
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
index a474ec1b722b..237175a97839 100644
--- a/lib/libc/i386/string/strcpy.S
+++ b/lib/libc/i386/string/strcpy.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcpy.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strcpy (dst, src)
diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S
index 22d683ef9f46..3f4ee5b953d3 100644
--- a/lib/libc/i386/string/strlen.S
+++ b/lib/libc/i386/string/strlen.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strlen.S,v 1.9 2002/06/02 20:05:38 schweikh Exp $");
 
 /*
  * strlen (s)
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
index e5953c520482..b6c1648528a4 100644
--- a/lib/libc/i386/string/strncmp.S
+++ b/lib/libc/i386/string/strncmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strncmp.S,v 1.9 2002/03/23 02:44:19 obrien Exp $");
 
 /*
  * strncmp(s1, s2, n)
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index 8b63ddf73cf1..9547d258076d 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strrchr.S,v 1.9 2002/06/02 20:05:38 schweikh Exp $");
 
 /*
  * strrchr(s, c)
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index 80b2f3c5507c..40a48a679241 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/swab.S,v 1.9 2003/01/01 18:48:42 schweikh Exp $");
 
 /*
  * void
diff --git a/lib/libc/i386/string/wcschr.S b/lib/libc/i386/string/wcschr.S
index c020d7417786..588a68b81a96 100644
--- a/lib/libc/i386/string/wcschr.S
+++ b/lib/libc/i386/string/wcschr.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcschr.S,v 1.1 2003/04/05 04:17:05 tjr Exp $");
 
 /*
  * wchar_t *
diff --git a/lib/libc/i386/string/wcscmp.S b/lib/libc/i386/string/wcscmp.S
index aa441404b805..c609544733ab 100644
--- a/lib/libc/i386/string/wcscmp.S
+++ b/lib/libc/i386/string/wcscmp.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcscmp.S,v 1.1 2003/03/10 10:54:36 tjr Exp $");
 
 /*
  * int
diff --git a/lib/libc/i386/string/wcslen.S b/lib/libc/i386/string/wcslen.S
index 2bebc1e39ed3..bb9c38002fb1 100644
--- a/lib/libc/i386/string/wcslen.S
+++ b/lib/libc/i386/string/wcslen.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcslen.S,v 1.1 2003/03/14 11:01:12 tjr Exp $");
 
 /*
  * size_t
diff --git a/lib/libc/i386/string/wmemchr.S b/lib/libc/i386/string/wmemchr.S
index a4ef08191156..9e0b41af95c4 100644
--- a/lib/libc/i386/string/wmemchr.S
+++ b/lib/libc/i386/string/wmemchr.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wmemchr.S,v 1.2 2003/03/12 06:46:16 tjr Exp $");
 
 /*
  * wchar_t *
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index ca487a6d3110..cf42038a5dca 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.31 2005/04/26 20:51:15 peter Exp $
 
 .if !defined(COMPAT_32BIT)
 SRCS+=	i386_clr_watch.c i386_get_ioperm.c \
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index 20ece5e470ec..a3ce2c931d76 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)Ovfork.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.19 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S
index 61f6cbebdd42..1bc535913b4a 100644
--- a/lib/libc/i386/sys/brk.S
+++ b/lib/libc/i386/sys/brk.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)brk.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.10 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S
index 1d625be58af3..5d7248b62105 100644
--- a/lib/libc/i386/sys/cerror.S
+++ b/lib/libc/i386/sys/cerror.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.12 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S
index 5848e611797c..a7a6888148b7 100644
--- a/lib/libc/i386/sys/exect.S
+++ b/lib/libc/i386/sys/exect.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)exect.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.9 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 #include <machine/psl.h>
diff --git a/lib/libc/i386/sys/getcontext.S b/lib/libc/i386/sys/getcontext.S
index b66ad30a754b..97f6a01db0f7 100644
--- a/lib/libc/i386/sys/getcontext.S
+++ b/lib/libc/i386/sys/getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/getcontext.S,v 1.1 2003/09/04 00:20:40 peter Exp $");
 
 #include <SYS.h>
 
diff --git a/lib/libc/i386/sys/i386_clr_watch.c b/lib/libc/i386/sys/i386_clr_watch.c
index 721c1b8cc46c..1b0e935ec314 100644
--- a/lib/libc/i386/sys/i386_clr_watch.c
+++ b/lib/libc/i386/sys/i386_clr_watch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_clr_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
 
 #include <machine/reg.h>
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_get_fsbase.c b/lib/libc/i386/sys/i386_get_fsbase.c
index 24c47648e431..bc040d7d1587 100644
--- a/lib/libc/i386/sys/i386_get_fsbase.c
+++ b/lib/libc/i386/sys/i386_get_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_fsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_get_gsbase.c b/lib/libc/i386/sys/i386_get_gsbase.c
index f524f310e02c..aca573809a2d 100644
--- a/lib/libc/i386/sys/i386_get_gsbase.c
+++ b/lib/libc/i386/sys/i386_get_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_gsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_get_ioperm.2 b/lib/libc/i386/sys/i386_get_ioperm.2
index 4d3bbf18262b..49023e7047ed 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.2
+++ b/lib/libc/i386/sys/i386_get_ioperm.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.2,v 1.11 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd July 27, 1998
 .Os
diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c
index 7bc27f812654..fb3f48b60785 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ b/lib/libc/i386/sys/i386_get_ioperm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.c,v 1.8 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index 135d8b8d4c53..3f40fe4bed44 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.21 2004/07/02 19:07:30 ru Exp $
 .\"
 .Dd September 20, 1993
 .Dt I386_GET_LDT 2
diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c
index 73d76670bb8b..51ac9ef585ec 100644
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ b/lib/libc/i386/sys/i386_get_ldt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.c,v 1.11 2004/01/09 16:52:09 nectar Exp $");
 
 #include <sys/cdefs.h>
 #include <machine/segments.h>
diff --git a/lib/libc/i386/sys/i386_set_fsbase.c b/lib/libc/i386/sys/i386_set_fsbase.c
index 6b5544641749..733a6584347c 100644
--- a/lib/libc/i386/sys/i386_set_fsbase.c
+++ b/lib/libc/i386/sys/i386_set_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_fsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_set_gsbase.c b/lib/libc/i386/sys/i386_set_gsbase.c
index aaf2312d2882..4013e9681662 100644
--- a/lib/libc/i386/sys/i386_set_gsbase.c
+++ b/lib/libc/i386/sys/i386_set_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_gsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index 258e2af417b0..cb3f7763ce80 100644
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ b/lib/libc/i386/sys/i386_set_ioperm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_ioperm.c,v 1.8 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c
index 0bb109aee970..df65f9fd7352 100644
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ b/lib/libc/i386/sys/i386_set_ldt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_ldt.c,v 1.11 2004/01/09 16:52:09 nectar Exp $");
 
 #include <sys/cdefs.h>
 #include <machine/segments.h>
diff --git a/lib/libc/i386/sys/i386_set_watch.3 b/lib/libc/i386/sys/i386_set_watch.3
index 15b8497acc95..ddb673bf0f3e 100644
--- a/lib/libc/i386/sys/i386_set_watch.3
+++ b/lib/libc/i386/sys/i386_set_watch.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_set_watch.3,v 1.7 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd August 24, 2000
 .Os
diff --git a/lib/libc/i386/sys/i386_set_watch.c b/lib/libc/i386/sys/i386_set_watch.c
index cc1b8ed03b7c..325aff7b2fdd 100644
--- a/lib/libc/i386/sys/i386_set_watch.c
+++ b/lib/libc/i386/sys/i386_set_watch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
 
 #include <machine/reg.h>
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_vm86.2 b/lib/libc/i386/sys/i386_vm86.2
index 03c1873c8984..56e4f458584d 100644
--- a/lib/libc/i386/sys/i386_vm86.2
+++ b/lib/libc/i386/sys/i386_vm86.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.15 2003/05/22 13:02:27 ru Exp $
 .\"
 .Dd July 27, 1998
 .Os
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
index c007608e6220..02b3446f78af 100644
--- a/lib/libc/i386/sys/i386_vm86.c
+++ b/lib/libc/i386/sys/i386_vm86.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_vm86.c,v 1.7 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S
index 99a7ff001143..c6042cadebcd 100644
--- a/lib/libc/i386/sys/pipe.S
+++ b/lib/libc/i386/sys/pipe.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)pipe.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.11 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S
index 71ce5c7a1633..fb35a4915573 100644
--- a/lib/libc/i386/sys/ptrace.S
+++ b/lib/libc/i386/sys/ptrace.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)ptrace.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.9 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S
index 80e3d36d4632..11bb98568339 100644
--- a/lib/libc/i386/sys/reboot.S
+++ b/lib/libc/i386/sys/reboot.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/reboot.S,v 1.7 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S
index 97c47690d069..917e1873d670 100644
--- a/lib/libc/i386/sys/sbrk.S
+++ b/lib/libc/i386/sys/sbrk.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)sbrk.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.11 2002/08/08 17:28:07 kan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S
index 013dc7eb3743..9dfd39e52c9c 100644
--- a/lib/libc/i386/sys/setlogin.S
+++ b/lib/libc/i386/sys/setlogin.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)setlogin.s	5.2 (Berkeley) 4/12/91"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/setlogin.S,v 1.9 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S
index 2556ab94e505..ff705c9dd426 100644
--- a/lib/libc/i386/sys/sigreturn.S
+++ b/lib/libc/i386/sys/sigreturn.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sigreturn.S,v 1.12 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S
index c6e908324565..3035e55f9fe0 100644
--- a/lib/libc/i386/sys/syscall.S
+++ b/lib/libc/i386/sys/syscall.S
@@ -38,7 +38,7 @@
 	.asciz "@(#)syscall.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/syscall.S,v 1.8 2002/03/23 02:10:28 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/Makefile.inc b/lib/libc/ia64/Makefile.inc
index aef1c282ca52..8a4b05c4d934 100644
--- a/lib/libc/ia64/Makefile.inc
+++ b/lib/libc/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.4 2005/01/15 05:23:58 das Exp $
 #
 # Machine dependent definitions for the alpha architecture.
 #
diff --git a/lib/libc/ia64/SYS.h b/lib/libc/ia64/SYS.h
index 64d50d2a18a6..b05a8cba0498 100644
--- a/lib/libc/ia64/SYS.h
+++ b/lib/libc/ia64/SYS.h
@@ -26,7 +26,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/SYS.h,v 1.4 2002/03/22 23:41:46 obrien Exp $
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/ia64/_fpmath.h b/lib/libc/ia64/_fpmath.h
index 7f24e768ff2d..b0e75ed0a598 100644
--- a/lib/libc/ia64/_fpmath.h
+++ b/lib/libc/ia64/_fpmath.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/_fpmath.h,v 1.6 2005/03/07 04:55:40 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/ia64/arith.h b/lib/libc/ia64/arith.h
index 67265284dbf0..2863185bfddd 100644
--- a/lib/libc/ia64/arith.h
+++ b/lib/libc/ia64/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
  */
 
 /*
diff --git a/lib/libc/ia64/gen/Makefile.inc b/lib/libc/ia64/gen/Makefile.inc
index 5358ea8c8e37..5d575f08dd72 100644
--- a/lib/libc/ia64/gen/Makefile.inc
+++ b/lib/libc/ia64/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.13 2004/08/25 07:42:34 marcel Exp $
 
 SRCS+=	__divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
 	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _mcount.S _set_tp.c \
diff --git a/lib/libc/ia64/gen/__divdf3.S b/lib/libc/ia64/gen/__divdf3.S
index 58425d92dbaa..e81c31d8aaf2 100644
--- a/lib/libc/ia64/gen/__divdf3.S
+++ b/lib/libc/ia64/gen/__divdf3.S
@@ -26,7 +26,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divdf3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
   .section .text
 
diff --git a/lib/libc/ia64/gen/__divdi3.S b/lib/libc/ia64/gen/__divdi3.S
index 92e29116f6e2..3711e597cbb0 100644
--- a/lib/libc/ia64/gen/__divdi3.S
+++ b/lib/libc/ia64/gen/__divdi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divdi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 .proc __divdi3#
diff --git a/lib/libc/ia64/gen/__divsf3.S b/lib/libc/ia64/gen/__divsf3.S
index fe7bcb4d68ee..8defe7459b69 100644
--- a/lib/libc/ia64/gen/__divsf3.S
+++ b/lib/libc/ia64/gen/__divsf3.S
@@ -26,7 +26,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divsf3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 ENTRY(__divsf3, 0)
 { .mfi
diff --git a/lib/libc/ia64/gen/__divsi3.S b/lib/libc/ia64/gen/__divsi3.S
index 4c82e32ddcf1..44485917453e 100644
--- a/lib/libc/ia64/gen/__divsi3.S
+++ b/lib/libc/ia64/gen/__divsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__moddi3.S b/lib/libc/ia64/gen/__moddi3.S
index e15f964c6ff9..6c62375a13e9 100644
--- a/lib/libc/ia64/gen/__moddi3.S
+++ b/lib/libc/ia64/gen/__moddi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__moddi3.S,v 1.3 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__modsi3.S b/lib/libc/ia64/gen/__modsi3.S
index 1939493eff38..9d5311e1e6de 100644
--- a/lib/libc/ia64/gen/__modsi3.S
+++ b/lib/libc/ia64/gen/__modsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__modsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__udivdi3.S b/lib/libc/ia64/gen/__udivdi3.S
index 1233e8aa4105..faaeb2c4e642 100644
--- a/lib/libc/ia64/gen/__udivdi3.S
+++ b/lib/libc/ia64/gen/__udivdi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__udivdi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 .proc __udivdi3#
diff --git a/lib/libc/ia64/gen/__udivsi3.S b/lib/libc/ia64/gen/__udivsi3.S
index 25959b88a922..a238ad63ee52 100644
--- a/lib/libc/ia64/gen/__udivsi3.S
+++ b/lib/libc/ia64/gen/__udivsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__udivsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__umoddi3.S b/lib/libc/ia64/gen/__umoddi3.S
index 509c62bb687e..9697a3a4bd92 100644
--- a/lib/libc/ia64/gen/__umoddi3.S
+++ b/lib/libc/ia64/gen/__umoddi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__umoddi3.S,v 1.3 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__umodsi3.S b/lib/libc/ia64/gen/__umodsi3.S
index 697db2e5d8c9..80590f50ccfc 100644
--- a/lib/libc/ia64/gen/__umodsi3.S
+++ b/lib/libc/ia64/gen/__umodsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__umodsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/_mcount.S b/lib/libc/ia64/gen/_mcount.S
index d9e9b76845d8..6c60a3aff1cd 100644
--- a/lib/libc/ia64/gen/_mcount.S
+++ b/lib/libc/ia64/gen/_mcount.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_mcount.S,v 1.1 2004/08/25 07:42:34 marcel Exp $");
 
 	.text
 
diff --git a/lib/libc/ia64/gen/_set_tp.c b/lib/libc/ia64/gen/_set_tp.c
index 2419e10209ec..6ac54b09d3c8 100644
--- a/lib/libc/ia64/gen/_set_tp.c
+++ b/lib/libc/ia64/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/ia64/gen/_set_tp.c,v 1.1 2004/08/15 16:18:03 dfr Exp $
  */
 
 void
diff --git a/lib/libc/ia64/gen/_setjmp.S b/lib/libc/ia64/gen/_setjmp.S
index 3966e836475f..02b2e99970c3 100644
--- a/lib/libc/ia64/gen/_setjmp.S
+++ b/lib/libc/ia64/gen/_setjmp.S
@@ -51,7 +51,7 @@
     .file   "setjmp.s"
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.11 2003/07/25 22:36:48 marcel Exp $");
 
 #define     LOCORE
 #include    <machine/setjmp.h>
diff --git a/lib/libc/ia64/gen/fabs.S b/lib/libc/ia64/gen/fabs.S
index 036d49201321..3ef9ad9db7af 100644
--- a/lib/libc/ia64/gen/fabs.S
+++ b/lib/libc/ia64/gen/fabs.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fabs.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 ENTRY(fabs, 1)
 	fabs	fret0=farg0
diff --git a/lib/libc/ia64/gen/flt_rounds.c b/lib/libc/ia64/gen/flt_rounds.c
index d65096545abc..759346a4ed4a 100644
--- a/lib/libc/ia64/gen/flt_rounds.c
+++ b/lib/libc/ia64/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $");
 
 #include <float.h>
 
diff --git a/lib/libc/ia64/gen/fpgetmask.c b/lib/libc/ia64/gen/fpgetmask.c
index ac166e249388..dcc49365c469 100644
--- a/lib/libc/ia64/gen/fpgetmask.c
+++ b/lib/libc/ia64/gen/fpgetmask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpgetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/ia64/gen/fpgetround.c b/lib/libc/ia64/gen/fpgetround.c
index 6f5e8cc86c4c..bbf30d06cc10 100644
--- a/lib/libc/ia64/gen/fpgetround.c
+++ b/lib/libc/ia64/gen/fpgetround.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/lib/libc/ia64/gen/fpgetround.c,v 1.1 2003/01/11 07:24:54 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/ia64/gen/fpsetmask.c b/lib/libc/ia64/gen/fpsetmask.c
index d959dc6281ab..46890ea1e2d7 100644
--- a/lib/libc/ia64/gen/fpsetmask.c
+++ b/lib/libc/ia64/gen/fpsetmask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpsetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/ia64/gen/fpsetround.c b/lib/libc/ia64/gen/fpsetround.c
index db2eef1e49c2..974b02f174b1 100644
--- a/lib/libc/ia64/gen/fpsetround.c
+++ b/lib/libc/ia64/gen/fpsetround.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/lib/libc/ia64/gen/fpsetround.c,v 1.1 2003/01/11 07:24:54 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/ia64/gen/infinity.c b/lib/libc/ia64/gen/infinity.c
index 1ae92a804d55..8c46c93cbb09 100644
--- a/lib/libc/ia64/gen/infinity.c
+++ b/lib/libc/ia64/gen/infinity.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/infinity.c,v 1.7 2003/02/26 16:04:34 mike Exp $");
 
 #include <sys/endian.h>
 #include <math.h>
diff --git a/lib/libc/ia64/gen/makecontext.c b/lib/libc/ia64/gen/makecontext.c
index bee47f11ce57..b3a401db742d 100644
--- a/lib/libc/ia64/gen/makecontext.c
+++ b/lib/libc/ia64/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/makecontext.c,v 1.3 2004/01/06 19:40:28 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/ia64/gen/modf.c b/lib/libc/ia64/gen/modf.c
index def3aadbad26..2b914baee258 100644
--- a/lib/libc/ia64/gen/modf.c
+++ b/lib/libc/ia64/gen/modf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/modf.c,v 1.3 2002/03/22 21:52:14 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/ia64/gen/setjmp.S b/lib/libc/ia64/gen/setjmp.S
index a2b56d6af9f0..785bf948f711 100644
--- a/lib/libc/ia64/gen/setjmp.S
+++ b/lib/libc/ia64/gen/setjmp.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/setjmp.S,v 1.10 2003/03/05 03:30:54 marcel Exp $");
 
 #define     LOCORE
 #include    <machine/setjmp.h>
diff --git a/lib/libc/ia64/gen/signalcontext.c b/lib/libc/ia64/gen/signalcontext.c
index b47daf37d9ea..9b7b49550577 100644
--- a/lib/libc/ia64/gen/signalcontext.c
+++ b/lib/libc/ia64/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/signalcontext.c,v 1.2 2004/01/06 19:40:28 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/ia64/gen/sigsetjmp.S b/lib/libc/ia64/gen/sigsetjmp.S
index 9f02a26a5a7a..ba9a20f3d13b 100644
--- a/lib/libc/ia64/gen/sigsetjmp.S
+++ b/lib/libc/ia64/gen/sigsetjmp.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/sigsetjmp.S,v 1.7 2003/03/03 01:09:45 obrien Exp $");
 
 #define LOCORE
 #include <machine/setjmp.h>
diff --git a/lib/libc/ia64/gen/unwind.c b/lib/libc/ia64/gen/unwind.c
index 7afd0eff496e..2eb362768076 100644
--- a/lib/libc/ia64/gen/unwind.c
+++ b/lib/libc/ia64/gen/unwind.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/lib/libc/ia64/gen/unwind.c,v 1.2 2003/11/08 05:29:49 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/ia64/net/Makefile.inc b/lib/libc/ia64/net/Makefile.inc
index b7178133b972..a4272433c247 100644
--- a/lib/libc/ia64/net/Makefile.inc
+++ b/lib/libc/ia64/net/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/net/Makefile.inc,v 1.1 2000/10/14 17:01:11 dfr Exp $
 
 SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/ia64/net/byte_swap_2.S b/lib/libc/ia64/net/byte_swap_2.S
index 34498b7bc200..72a4790f2158 100644
--- a/lib/libc/ia64/net/byte_swap_2.S
+++ b/lib/libc/ia64/net/byte_swap_2.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/net/byte_swap_2.S,v 1.5 2003/03/03 01:09:46 obrien Exp $");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/ia64/net/byte_swap_4.S b/lib/libc/ia64/net/byte_swap_4.S
index c5daa81d0213..1bd2deca4d9e 100644
--- a/lib/libc/ia64/net/byte_swap_4.S
+++ b/lib/libc/ia64/net/byte_swap_4.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/net/byte_swap_4.S,v 1.5 2003/03/03 01:09:46 obrien Exp $");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/ia64/net/htonl.S b/lib/libc/ia64/net/htonl.S
index 05c906c1bbbf..57da28339475 100644
--- a/lib/libc/ia64/net/htonl.S
+++ b/lib/libc/ia64/net/htonl.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/net/htonl.S,v 1.4 2003/03/03 01:09:46 obrien Exp $");
 
 #define	ALIAS	htonl
 #define	NAME	__htonl
diff --git a/lib/libc/ia64/net/htons.S b/lib/libc/ia64/net/htons.S
index 4bd3a8b61b60..2e4b135a6853 100644
--- a/lib/libc/ia64/net/htons.S
+++ b/lib/libc/ia64/net/htons.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/net/htons.S,v 1.4 2003/03/03 01:09:46 obrien Exp $");
 
 #define	ALIAS	htons
 #define	NAME	__htons
diff --git a/lib/libc/ia64/net/ntohl.S b/lib/libc/ia64/net/ntohl.S
index a08a1627e28e..6de18646e3ce 100644
--- a/lib/libc/ia64/net/ntohl.S
+++ b/lib/libc/ia64/net/ntohl.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/net/ntohl.S,v 1.4 2003/03/03 01:09:46 obrien Exp $");
 
 #define	ALIAS	ntohl
 #define	NAME	__ntohl
diff --git a/lib/libc/ia64/net/ntohs.S b/lib/libc/ia64/net/ntohs.S
index 79e6e0c73d09..b9b5c80074c4 100644
--- a/lib/libc/ia64/net/ntohs.S
+++ b/lib/libc/ia64/net/ntohs.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/net/ntohs.S,v 1.4 2003/03/03 01:09:46 obrien Exp $");
 
 #define	ALIAS	ntohs
 #define	NAME	__ntohs
diff --git a/lib/libc/ia64/stdlib/Makefile.inc b/lib/libc/ia64/stdlib/Makefile.inc
index dda8c76018d8..bf2bd66872e1 100644
--- a/lib/libc/ia64/stdlib/Makefile.inc
+++ b/lib/libc/ia64/stdlib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/stdlib/Makefile.inc,v 1.1 2000/10/14 17:01:12 dfr Exp $
 
 MDSRCS+=	abs.c div.c labs.c ldiv.c
diff --git a/lib/libc/ia64/string/Makefile.inc b/lib/libc/ia64/string/Makefile.inc
index 7bbcc8de10e9..47b5fc3f5b10 100644
--- a/lib/libc/ia64/string/Makefile.inc
+++ b/lib/libc/ia64/string/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/string/Makefile.inc,v 1.1 2000/10/14 17:01:12 dfr Exp $
 
 MDSRCS+=	bcopy.S bzero.S ffs.S memcpy.S memmove.S
diff --git a/lib/libc/ia64/string/bcopy.S b/lib/libc/ia64/string/bcopy.S
index 34aac1984cf4..ec9851d46f02 100644
--- a/lib/libc/ia64/string/bcopy.S
+++ b/lib/libc/ia64/string/bcopy.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/bcopy.S,v 1.3 2004/02/10 20:45:28 cperciva Exp $");
 
 /*
  * Not the fastest bcopy in the world.
diff --git a/lib/libc/ia64/string/bzero.S b/lib/libc/ia64/string/bzero.S
index 0963c36aac80..86c8cc25f98c 100644
--- a/lib/libc/ia64/string/bzero.S
+++ b/lib/libc/ia64/string/bzero.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/bzero.S,v 1.6 2004/02/10 20:45:28 cperciva Exp $");
 
 ENTRY(bzero, 2)
 	
diff --git a/lib/libc/ia64/string/ffs.S b/lib/libc/ia64/string/ffs.S
index d99d76581341..2f667eb26523 100644
--- a/lib/libc/ia64/string/ffs.S
+++ b/lib/libc/ia64/string/ffs.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/ffs.S,v 1.3 2003/03/03 01:09:46 obrien Exp $");
 
 ENTRY(ffs, 1)
 	sxt4	r14=in0 ;;
diff --git a/lib/libc/ia64/string/memcpy.S b/lib/libc/ia64/string/memcpy.S
index d7557c1f039f..9b579c391ac1 100644
--- a/lib/libc/ia64/string/memcpy.S
+++ b/lib/libc/ia64/string/memcpy.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/memcpy.S,v 1.3 2004/09/04 00:04:58 marcel Exp $");
 
 ENTRY(memcpy,3)
 	mov	r8 = in0
diff --git a/lib/libc/ia64/string/memmove.S b/lib/libc/ia64/string/memmove.S
index 19fa8affc399..07c989569d45 100644
--- a/lib/libc/ia64/string/memmove.S
+++ b/lib/libc/ia64/string/memmove.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/memmove.S,v 1.3 2004/09/04 00:23:15 marcel Exp $");
 
 ENTRY(memmove,3)
 	mov	r8 = in0
diff --git a/lib/libc/ia64/sys/Makefile.inc b/lib/libc/ia64/sys/Makefile.inc
index dacd2f904562..94f9521dd27b 100644
--- a/lib/libc/ia64/sys/Makefile.inc
+++ b/lib/libc/ia64/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.8 2003/08/11 07:14:06 bms Exp $
 
 MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \
 	sbrk.S setlogin.S sigreturn.S swapcontext.S
diff --git a/lib/libc/ia64/sys/Ovfork.S b/lib/libc/ia64/sys/Ovfork.S
index 6eb69583f7e9..cdcd776d7c60 100644
--- a/lib/libc/ia64/sys/Ovfork.S
+++ b/lib/libc/ia64/sys/Ovfork.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/Ovfork.S,v 1.6 2003/08/01 22:17:12 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/brk.S b/lib/libc/ia64/sys/brk.S
index fee1728bc0da..fa7f3d0f2d57 100644
--- a/lib/libc/ia64/sys/brk.S
+++ b/lib/libc/ia64/sys/brk.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/brk.S,v 1.4 2003/05/16 21:26:39 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/cerror.S b/lib/libc/ia64/sys/cerror.S
index ca0b0c735b1b..d7a31670a691 100644
--- a/lib/libc/ia64/sys/cerror.S
+++ b/lib/libc/ia64/sys/cerror.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/cerror.S,v 1.2 2003/03/03 01:09:46 obrien Exp $");
 
 
 ENTRY(.cerror, 0)
diff --git a/lib/libc/ia64/sys/exect.S b/lib/libc/ia64/sys/exect.S
index 817d3b1b3848..fe43441d87ca 100644
--- a/lib/libc/ia64/sys/exect.S
+++ b/lib/libc/ia64/sys/exect.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/exect.S,v 1.2 2003/03/03 01:09:46 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/fork.S b/lib/libc/ia64/sys/fork.S
index 5b09f7711820..601b023e9eca 100644
--- a/lib/libc/ia64/sys/fork.S
+++ b/lib/libc/ia64/sys/fork.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/fork.S,v 1.6 2003/08/01 22:17:12 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/getcontext.S b/lib/libc/ia64/sys/getcontext.S
index 0ec6f92e4f85..d2ee8d0af1a7 100644
--- a/lib/libc/ia64/sys/getcontext.S
+++ b/lib/libc/ia64/sys/getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/getcontext.S,v 1.1 2003/08/02 00:49:36 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/pipe.S b/lib/libc/ia64/sys/pipe.S
index a6413dfd464b..2ac4d239179e 100644
--- a/lib/libc/ia64/sys/pipe.S
+++ b/lib/libc/ia64/sys/pipe.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/pipe.S,v 1.4 2003/05/16 21:26:39 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/ptrace.S b/lib/libc/ia64/sys/ptrace.S
index b6d3abdedda9..0a6be54ccb71 100644
--- a/lib/libc/ia64/sys/ptrace.S
+++ b/lib/libc/ia64/sys/ptrace.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/ptrace.S,v 1.3 2003/03/03 01:09:46 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/sbrk.S b/lib/libc/ia64/sys/sbrk.S
index 98b5ce92c21f..a554f54a5dc2 100644
--- a/lib/libc/ia64/sys/sbrk.S
+++ b/lib/libc/ia64/sys/sbrk.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.5 2003/05/16 21:26:39 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/setlogin.S b/lib/libc/ia64/sys/setlogin.S
index 1d29a40664a3..1de787caf5dd 100644
--- a/lib/libc/ia64/sys/setlogin.S
+++ b/lib/libc/ia64/sys/setlogin.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/setlogin.S,v 1.4 2003/08/01 22:17:12 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/sigreturn.S b/lib/libc/ia64/sys/sigreturn.S
index 2c7a710a1461..da4a329f14b9 100644
--- a/lib/libc/ia64/sys/sigreturn.S
+++ b/lib/libc/ia64/sys/sigreturn.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sigreturn.S,v 1.3 2003/03/03 01:09:46 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/swapcontext.S b/lib/libc/ia64/sys/swapcontext.S
index 210189f6ff4f..e96751c9d45e 100644
--- a/lib/libc/ia64/sys/swapcontext.S
+++ b/lib/libc/ia64/sys/swapcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/swapcontext.S,v 1.1 2003/08/02 00:49:36 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/include/fpmath.h b/lib/libc/include/fpmath.h
index d33cfdc14817..b252b587fea8 100644
--- a/lib/libc/include/fpmath.h
+++ b/lib/libc/include/fpmath.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/fpmath.h,v 1.3 2005/02/06 03:23:31 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index 0f170dbb9b6d..e64b53c0bdda 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.12 2004/08/15 16:18:03 dfr Exp $
  *
  * Private definitions for libc, libc_r and libpthread.
  *
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index f369a755fc68..0c571adc63ca 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/namespace.h,v 1.16.12.1 2005/10/08 17:56:33 delphij Exp $
  */
 
 #ifndef _NAMESPACE_H_
diff --git a/lib/libc/include/nss_tls.h b/lib/libc/include/nss_tls.h
index 13ab367d06b5..7420f9225f9b 100644
--- a/lib/libc/include/nss_tls.h
+++ b/lib/libc/include/nss_tls.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/nss_tls.h,v 1.3 2004/03/30 15:56:15 nectar Exp $
  *
  * Macros which generate thread local storage handling code in NSS modules.
  */
diff --git a/lib/libc/include/reentrant.h b/lib/libc/include/reentrant.h
index 8ab328bc6279..07af90ab85d0 100644
--- a/lib/libc/include/reentrant.h
+++ b/lib/libc/include/reentrant.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/reentrant.h,v 1.3 2004/02/25 21:03:45 green Exp $
  */
 
 /*
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
index eee1969cffd7..8e9adb16042f 100644
--- a/lib/libc/include/spinlock.h
+++ b/lib/libc/include/spinlock.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.7 2003/11/05 18:17:30 deischen Exp $
  *
  * Lock definitions used in both libc and libpthread.
  *
diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
index d3d38d35fb00..a3d83183771d 100644
--- a/lib/libc/include/un-namespace.h
+++ b/lib/libc/include/un-namespace.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.13.12.1 2005/10/08 17:56:33 delphij Exp $
  */
 
 #ifndef _UN_NAMESPACE_H_
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index af9b0cacd766..89660c0c69b1 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.60 2005/01/09 03:55:13 tjr Exp $
 
 # locale sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale
diff --git a/lib/libc/locale/big5.5 b/lib/libc/locale/big5.5
index 13d0c7b64e53..8319d9f56d5c 100644
--- a/lib/libc/locale/big5.5
+++ b/lib/libc/locale/big5.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/big5.5,v 1.3 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt BIG5 5
diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c
index 44b9957b5978..7837591607d8 100644
--- a/lib/libc/locale/big5.c
+++ b/lib/libc/locale/big5.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)big5.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.17 2005/02/27 15:11:09 phantom Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/locale/btowc.3 b/lib/libc/locale/btowc.3
index 85ee7515f948..da9d1e5103b5 100644
--- a/lib/libc/locale/btowc.3
+++ b/lib/libc/locale/btowc.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/btowc.3,v 1.2 2002/11/10 11:14:58 tjr Exp $
 .\"
 .Dd August 3, 2002
 .Dt BTOWC 3
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
index 2c4d493b89a1..44b501e28479 100644
--- a/lib/libc/locale/btowc.c
+++ b/lib/libc/locale/btowc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/btowc.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
 #include <stdio.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index 683359800d61..184fac611409 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.35 2005/02/27 20:31:13 ru Exp $");
 
 #include "namespace.h"
 #include <arpa/inet.h>
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index 2f5f5d40eff0..a8d2176b2e26 100644
--- a/lib/libc/locale/collate.h
+++ b/lib/libc/locale/collate.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/collate.h,v 1.15 2005/02/27 20:31:13 ru Exp $
  */
 
 #ifndef _COLLATE_H_
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index 313e04384f2e..dde67a4e0948 100644
--- a/lib/libc/locale/collcmp.c
+++ b/lib/libc/locale/collcmp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.18 2005/02/27 14:54:23 phantom Exp $");
 
 #include <string.h>
 #include "collate.h"
diff --git a/lib/libc/locale/ctype.3 b/lib/libc/locale/ctype.3
index 44aeac7f3bdb..ab993754c130 100644
--- a/lib/libc/locale/ctype.3
+++ b/lib/libc/locale/ctype.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctype.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/ctype.3,v 1.15 2004/06/30 20:09:08 ru Exp $
 .\"
 .Dd March 30, 2004
 .Dt CTYPE 3
diff --git a/lib/libc/locale/digittoint.3 b/lib/libc/locale/digittoint.3
index 672e2460ab4f..9f49a46feec3 100644
--- a/lib/libc/locale/digittoint.3
+++ b/lib/libc/locale/digittoint.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)digittoint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/digittoint.3,v 1.3 2004/03/30 07:19:35 tjr Exp $
 .\"
 .Dd April 6, 2001
 .Dt DIGITTOINT 3
diff --git a/lib/libc/locale/euc.5 b/lib/libc/locale/euc.5
index d4e128b41673..3a4a689f1301 100644
--- a/lib/libc/locale/euc.5
+++ b/lib/libc/locale/euc.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)euc.4	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/euc.5,v 1.12 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd November 8, 2003
 .Dt EUC 5
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index b3b35edb5b6c..32f8fb87521a 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)euc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.21 2005/02/27 15:11:09 phantom Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
index 2e5bc047d592..ab08f3f2cbd5 100644
--- a/lib/libc/locale/fix_grouping.c
+++ b/lib/libc/locale/fix_grouping.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.8 2003/06/26 10:46:16 phantom Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/lib/libc/locale/gb18030.5 b/lib/libc/locale/gb18030.5
index 3a296c017844..5e708652d381 100644
--- a/lib/libc/locale/gb18030.5
+++ b/lib/libc/locale/gb18030.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/gb18030.5,v 1.6 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 10, 2003
 .Dt GB18030 5
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
index 3e43179d9213..b5c5240eb85d 100644
--- a/lib/libc/locale/gb18030.c
+++ b/lib/libc/locale/gb18030.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.7 2005/02/27 15:11:09 phantom Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/gb2312.5 b/lib/libc/locale/gb2312.5
index 5f1f712097d5..1524462b72ed 100644
--- a/lib/libc/locale/gb2312.5
+++ b/lib/libc/locale/gb2312.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/gb2312.5,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd November 7, 2003
 .Dt GB2312 5
diff --git a/lib/libc/locale/gb2312.c b/lib/libc/locale/gb2312.c
index 232dabae866e..0f89ddbd168d 100644
--- a/lib/libc/locale/gb2312.c
+++ b/lib/libc/locale/gb2312.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.9 2005/02/27 15:11:09 phantom Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/gbk.5 b/lib/libc/locale/gbk.5
index cec22c639540..c1f2539839a5 100644
--- a/lib/libc/locale/gbk.5
+++ b/lib/libc/locale/gbk.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/gbk.5,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 10, 2003
 .Dt GBK 5
diff --git a/lib/libc/locale/gbk.c b/lib/libc/locale/gbk.c
index 573fd08f34ef..33f5e4894b3a 100644
--- a/lib/libc/locale/gbk.c
+++ b/lib/libc/locale/gbk.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.12 2005/02/27 15:11:09 phantom Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/locale/isalnum.3 b/lib/libc/locale/isalnum.3
index b87c5bd0eb1e..72c11377dcfc 100644
--- a/lib/libc/locale/isalnum.3
+++ b/lib/libc/locale/isalnum.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalnum.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.19 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISALNUM 3
diff --git a/lib/libc/locale/isalpha.3 b/lib/libc/locale/isalpha.3
index 7ab4e3a2678d..08ba88e4a4ce 100644
--- a/lib/libc/locale/isalpha.3
+++ b/lib/libc/locale/isalpha.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalpha.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.18 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISALPHA 3
diff --git a/lib/libc/locale/isascii.3 b/lib/libc/locale/isascii.3
index a031d8b3f2e5..b93040190e72 100644
--- a/lib/libc/locale/isascii.3
+++ b/lib/libc/locale/isascii.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isascii.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isascii.3,v 1.13 2002/10/06 10:15:38 tjr Exp $
 .\"
 .Dd October 6, 2002
 .Dt ISASCII 3
diff --git a/lib/libc/locale/isblank.3 b/lib/libc/locale/isblank.3
index c03cfd30e78f..9ffe9ecfbe77 100644
--- a/lib/libc/locale/isblank.3
+++ b/lib/libc/locale/isblank.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isblank.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.20 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISBLANK 3
diff --git a/lib/libc/locale/iscntrl.3 b/lib/libc/locale/iscntrl.3
index 8e1e4e4cd73e..f2582bcda3e1 100644
--- a/lib/libc/locale/iscntrl.3
+++ b/lib/libc/locale/iscntrl.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)iscntrl.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.17 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISCNTRL 3
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index d25772bec279..d718b773af2b 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)isctype.c	8.3 (Berkeley) 2/24/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.9 2002/08/17 20:03:44 ache Exp $");
 
 #include <ctype.h>
 
diff --git a/lib/libc/locale/isdigit.3 b/lib/libc/locale/isdigit.3
index 483041fc497e..1c8bea863b8c 100644
--- a/lib/libc/locale/isdigit.3
+++ b/lib/libc/locale/isdigit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isdigit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.19 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISDIGIT 3
diff --git a/lib/libc/locale/isgraph.3 b/lib/libc/locale/isgraph.3
index e4e2c621c34d..a4b3ba37a3b5 100644
--- a/lib/libc/locale/isgraph.3
+++ b/lib/libc/locale/isgraph.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isgraph.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.19 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISGRAPH 3
diff --git a/lib/libc/locale/isideogram.3 b/lib/libc/locale/isideogram.3
index cbaa625e91df..e4fe16ba0cd6 100644
--- a/lib/libc/locale/isideogram.3
+++ b/lib/libc/locale/isideogram.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isideogram.3,v 1.2 2004/07/04 20:55:48 ru Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISIDEOGRAM 3
diff --git a/lib/libc/locale/islower.3 b/lib/libc/locale/islower.3
index 57ee9a99bf56..156e38d1b34e 100644
--- a/lib/libc/locale/islower.3
+++ b/lib/libc/locale/islower.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)islower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/islower.3,v 1.17 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISLOWER 3
diff --git a/lib/libc/locale/isphonogram.3 b/lib/libc/locale/isphonogram.3
index b0d82c428cba..66bd0062c399 100644
--- a/lib/libc/locale/isphonogram.3
+++ b/lib/libc/locale/isphonogram.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isphonogram.3,v 1.1 2004/03/30 07:23:54 tjr Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISPHONOGRAM 3
diff --git a/lib/libc/locale/isprint.3 b/lib/libc/locale/isprint.3
index 99133ea5d668..60a289fc17b3 100644
--- a/lib/libc/locale/isprint.3
+++ b/lib/libc/locale/isprint.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isprint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.20 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISPRINT 3
diff --git a/lib/libc/locale/ispunct.3 b/lib/libc/locale/ispunct.3
index c5ef60ff2e8d..420882c99a62 100644
--- a/lib/libc/locale/ispunct.3
+++ b/lib/libc/locale/ispunct.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ispunct.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/ispunct.3,v 1.18 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISPUNCT 3
diff --git a/lib/libc/locale/isrune.3 b/lib/libc/locale/isrune.3
index 424c367d2014..2b1f64f6cb35 100644
--- a/lib/libc/locale/isrune.3
+++ b/lib/libc/locale/isrune.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isrune.3,v 1.1 2004/03/30 07:23:54 tjr Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISRUNE 3
diff --git a/lib/libc/locale/isspace.3 b/lib/libc/locale/isspace.3
index db2775ffebaa..ab5a7716e7cf 100644
--- a/lib/libc/locale/isspace.3
+++ b/lib/libc/locale/isspace.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isspace.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isspace.3,v 1.17 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISSPACE 3
diff --git a/lib/libc/locale/isspecial.3 b/lib/libc/locale/isspecial.3
index de361d28f96b..57eefc8221c3 100644
--- a/lib/libc/locale/isspecial.3
+++ b/lib/libc/locale/isspecial.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isspecial.3,v 1.1 2004/03/30 07:23:54 tjr Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISSPECIAL 3
diff --git a/lib/libc/locale/isupper.3 b/lib/libc/locale/isupper.3
index c1fe6324326d..c533b9755861 100644
--- a/lib/libc/locale/isupper.3
+++ b/lib/libc/locale/isupper.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isupper.3,v 1.18 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISUPPER 3
diff --git a/lib/libc/locale/iswalnum.3 b/lib/libc/locale/iswalnum.3
index 8a2053286a28..4aafb25feec5 100644
--- a/lib/libc/locale/iswalnum.3
+++ b/lib/libc/locale/iswalnum.3
@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalnum.3	5.2 (Berkeley) 6/29/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/iswalnum.3,v 1.5 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd October 3, 2002
 .Dt ISWALNUM 3
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index 05d13299fcae..37e2656d9ebd 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.6 2002/08/17 20:30:34 ache Exp $");
 
 #include <wctype.h>
 
diff --git a/lib/libc/locale/isxdigit.3 b/lib/libc/locale/isxdigit.3
index 9dc3400f2855..5c932cbfe1af 100644
--- a/lib/libc/locale/isxdigit.3
+++ b/lib/libc/locale/isxdigit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isxdigit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isxdigit.3,v 1.20 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt ISXDIGIT 3
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
index ea7b3886ada8..932165ff67e4 100644
--- a/lib/libc/locale/ldpart.c
+++ b/lib/libc/locale/ldpart.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.15 2004/04/25 19:56:50 ache Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/locale/ldpart.h b/lib/libc/locale/ldpart.h
index 45f7339fe8fb..02e0c9502b09 100644
--- a/lib/libc/locale/ldpart.h
+++ b/lib/libc/locale/ldpart.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/ldpart.h,v 1.6 2003/06/13 00:14:07 jkh Exp $
  */
 
 #ifndef _LDPART_H_
diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c
index 3498be2a6e8e..488b5728c332 100644
--- a/lib/libc/locale/lmessages.c
+++ b/lib/libc/locale/lmessages.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.14 2003/06/26 10:46:16 phantom Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/locale/lmessages.h b/lib/libc/locale/lmessages.h
index 41dcfa98ca6b..ee690ae7c1cc 100644
--- a/lib/libc/locale/lmessages.h
+++ b/lib/libc/locale/lmessages.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/lmessages.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
  */
 
 #ifndef _LMESSAGES_H_
diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c
index 8d55ab2c6e5d..e3e709585c32 100644
--- a/lib/libc/locale/lmonetary.c
+++ b/lib/libc/locale/lmonetary.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.19 2003/06/26 10:46:16 phantom Exp $");
 
 #include <limits.h>
 #include <stddef.h>
diff --git a/lib/libc/locale/lmonetary.h b/lib/libc/locale/lmonetary.h
index 45ec3235b578..e278ea513511 100644
--- a/lib/libc/locale/lmonetary.h
+++ b/lib/libc/locale/lmonetary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/lmonetary.h,v 1.4 2002/10/09 09:19:28 tjr Exp $
  */
 
 #ifndef _LMONETARY_H_
diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c
index d4ed04f65945..ff9c94871e6a 100644
--- a/lib/libc/locale/lnumeric.c
+++ b/lib/libc/locale/lnumeric.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.16 2003/06/26 10:46:16 phantom Exp $");
 
 #include <limits.h>
 
diff --git a/lib/libc/locale/lnumeric.h b/lib/libc/locale/lnumeric.h
index cc6965b62cc7..9678c1f02c1a 100644
--- a/lib/libc/locale/lnumeric.h
+++ b/lib/libc/locale/lnumeric.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/lnumeric.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
  */
 
 #ifndef _LNUMERIC_H_
diff --git a/lib/libc/locale/localeconv.3 b/lib/libc/locale/localeconv.3
index d3a5783a8dfd..c73d59e1fc53 100644
--- a/lib/libc/locale/localeconv.3
+++ b/lib/libc/locale/localeconv.3
@@ -34,7 +34,7 @@
 .\"
 .\" From @(#)setlocale.3	8.1 (Berkeley) 6/9/93
 .\" From FreeBSD: src/lib/libc/locale/setlocale.3,v 1.28 2003/11/15 02:26:04 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/localeconv.3,v 1.2 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd November 21, 2003
 .Dt LOCALECONV 3
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
index 97c22dd1d134..1420aa88f578 100644
--- a/lib/libc/locale/localeconv.c
+++ b/lib/libc/locale/localeconv.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)localeconv.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $");
 
 #include <locale.h>
 
diff --git a/lib/libc/locale/mblen.3 b/lib/libc/locale/mblen.3
index 26f2c52beb6a..fbe01a9dc652 100644
--- a/lib/libc/locale/mblen.3
+++ b/lib/libc/locale/mblen.3
@@ -35,7 +35,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mblen.3,v 1.5 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd April 11, 2004
 .Dt MBLEN 3
diff --git a/lib/libc/locale/mblen.c b/lib/libc/locale/mblen.c
index 4a2cc5cbcde8..2891e90e99bd 100644
--- a/lib/libc/locale/mblen.c
+++ b/lib/libc/locale/mblen.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.9 2004/07/29 06:18:40 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/mblocal.h b/lib/libc/locale/mblocal.h
index e424ebe94fe5..63c5b16aa11b 100644
--- a/lib/libc/locale/mblocal.h
+++ b/lib/libc/locale/mblocal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/mblocal.h,v 1.5 2005/02/27 15:11:09 phantom Exp $
  */
 
 #ifndef _MBLOCAL_H_
diff --git a/lib/libc/locale/mbrlen.3 b/lib/libc/locale/mbrlen.3
index 524d2c7b4016..ce33175353b5 100644
--- a/lib/libc/locale/mbrlen.3
+++ b/lib/libc/locale/mbrlen.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.8 2004/06/30 19:32:41 ru Exp $
 .\"
 .Dd April 7, 2004
 .Dt MBRLEN 3
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
index b4c3a04694d4..33f7ea02c0b3 100644
--- a/lib/libc/locale/mbrlen.c
+++ b/lib/libc/locale/mbrlen.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/mbrtowc.3 b/lib/libc/locale/mbrtowc.3
index 10160d1916fd..ab7138eb5417 100644
--- a/lib/libc/locale/mbrtowc.3
+++ b/lib/libc/locale/mbrtowc.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.5 2004/06/30 19:32:41 ru Exp $
 .\"
 .Dd April 8, 2004
 .Dt MBRTOWC 3
diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c
index 42d5f7a178d6..9b19d1046b51 100644
--- a/lib/libc/locale/mbrtowc.c
+++ b/lib/libc/locale/mbrtowc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.7 2004/05/12 14:09:04 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/mbsinit.3 b/lib/libc/locale/mbsinit.3
index afc2500c3a77..e2a9e46143b0 100644
--- a/lib/libc/locale/mbsinit.3
+++ b/lib/libc/locale/mbsinit.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbsinit.3,v 1.3 2004/04/08 09:59:02 tjr Exp $
 .\"
 .Dd April 8, 2004
 .Dt MBSINIT 3
diff --git a/lib/libc/locale/mbsinit.c b/lib/libc/locale/mbsinit.c
index 24408c7f573e..cddb56726acd 100644
--- a/lib/libc/locale/mbsinit.c
+++ b/lib/libc/locale/mbsinit.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsinit.c,v 1.3 2004/05/12 14:09:04 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/mbsnrtowcs.c b/lib/libc/locale/mbsnrtowcs.c
index 5284087fb4c1..3e65b154b58b 100644
--- a/lib/libc/locale/mbsnrtowcs.c
+++ b/lib/libc/locale/mbsnrtowcs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsnrtowcs.c,v 1.1 2004/07/21 10:54:57 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/mbsrtowcs.3 b/lib/libc/locale/mbsrtowcs.3
index eaf9f9093056..dce9c781c87a 100644
--- a/lib/libc/locale/mbsrtowcs.3
+++ b/lib/libc/locale/mbsrtowcs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.6 2005/01/11 20:50:49 ru Exp $
 .Dd July 21, 2004
 .Dt MBSRTOWCS 3
 .Os
diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
index 1239c82c337f..12feaab5ead0 100644
--- a/lib/libc/locale/mbsrtowcs.c
+++ b/lib/libc/locale/mbsrtowcs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/mbstowcs.3 b/lib/libc/locale/mbstowcs.3
index 2e344f8a4b2b..634d972314a1 100644
--- a/lib/libc/locale/mbstowcs.3
+++ b/lib/libc/locale/mbstowcs.3
@@ -35,7 +35,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbstowcs.3,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd April 8, 2004
 .Dt MBSTOWCS 3
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c
index ad259d84dab3..ab2e849eeb7d 100644
--- a/lib/libc/locale/mbstowcs.c
+++ b/lib/libc/locale/mbstowcs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.11 2004/07/21 10:54:57 tjr Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/mbtowc.3 b/lib/libc/locale/mbtowc.3
index 1d5783a92986..c4bea65b6689 100644
--- a/lib/libc/locale/mbtowc.3
+++ b/lib/libc/locale/mbtowc.3
@@ -35,7 +35,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbtowc.3,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd April 11, 2004
 .Dt MBTOWC 3
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
index ad5b73525635..5e3a3683e62b 100644
--- a/lib/libc/locale/mbtowc.c
+++ b/lib/libc/locale/mbtowc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.11 2004/07/29 06:18:40 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/mskanji.5 b/lib/libc/locale/mskanji.5
index 8ebaccdd7af2..29802d5a7015 100644
--- a/lib/libc/locale/mskanji.5
+++ b/lib/libc/locale/mskanji.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mskanji.5,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt MSKANJI 5
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
index aba87e75ec86..9735d3a5f284 100644
--- a/lib/libc/locale/mskanji.c
+++ b/lib/libc/locale/mskanji.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)mskanji.c	1.0 (Phase One) 5/5/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.17 2005/02/27 15:11:09 phantom Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index 02b63425d276..34e269d486c8 100644
--- a/lib/libc/locale/multibyte.3
+++ b/lib/libc/locale/multibyte.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.27 2004/10/17 02:29:15 tjr Exp $
 .\"
 .Dd April 8, 2004
 .Dt MULTIBYTE 3
diff --git a/lib/libc/locale/nextwctype.3 b/lib/libc/locale/nextwctype.3
index cda88d56c18f..48b67de482f5 100644
--- a/lib/libc/locale/nextwctype.3
+++ b/lib/libc/locale/nextwctype.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/nextwctype.3,v 1.2 2005/01/15 11:22:13 ru Exp $
 .\"
 .Dd July 8, 2004
 .Dt NEXTWCTYPE 3
diff --git a/lib/libc/locale/nextwctype.c b/lib/libc/locale/nextwctype.c
index 9363b0a700cc..89c63df81889 100644
--- a/lib/libc/locale/nextwctype.c
+++ b/lib/libc/locale/nextwctype.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nextwctype.c,v 1.1 2004/07/08 06:43:37 tjr Exp $");
 
 #include <runetype.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/nl_langinfo.3 b/lib/libc/locale/nl_langinfo.3
index 8de168206c20..36652f1218b1 100644
--- a/lib/libc/locale/nl_langinfo.3
+++ b/lib/libc/locale/nl_langinfo.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.6 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd May 3, 2001
 .Dt NL_LANGINFO 3
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index 9bd508214e4b..22d27a3e450f 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $");
 
 #include <langinfo.h>
 #include <limits.h>
diff --git a/lib/libc/locale/nomacros.c b/lib/libc/locale/nomacros.c
index ba49a1fe0b37..eea37d01674a 100644
--- a/lib/libc/locale/nomacros.c
+++ b/lib/libc/locale/nomacros.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nomacros.c,v 1.5 2002/03/22 21:52:18 obrien Exp $");
 
 /*
  * Tell <ctype.h> to generate extern versions of all its inline
diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c
index 06b55b9071d5..638101926af2 100644
--- a/lib/libc/locale/none.c
+++ b/lib/libc/locale/none.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)none.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.13 2005/02/27 15:11:09 phantom Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/rpmatch.3 b/lib/libc/locale/rpmatch.3
index b34c5bfa199a..a07c10fb07c5 100644
--- a/lib/libc/locale/rpmatch.3
+++ b/lib/libc/locale/rpmatch.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/rpmatch.3,v 1.2.2.1 2005/09/10 14:10:52 brueffer Exp $
 .\"
 .Dd July 21, 2005
 .Dt RPMATCH 3
diff --git a/lib/libc/locale/rpmatch.c b/lib/libc/locale/rpmatch.c
index 4d90eb8dcf8b..370f23da6bde 100644
--- a/lib/libc/locale/rpmatch.c
+++ b/lib/libc/locale/rpmatch.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/rpmatch.c,v 1.1 2005/01/09 03:55:13 tjr Exp $");
 
 #include <langinfo.h>
 #include <regex.h>
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index 9acf67d6bac0..bcb70f9f5a9b 100644
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)rune.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/rune.c,v 1.14 2005/05/16 09:32:41 ru Exp $");
 
 #include "namespace.h"
 #include <arpa/inet.h>
diff --git a/lib/libc/locale/runefile.h b/lib/libc/locale/runefile.h
index ce1e47e5f92d..cacc66fd216e 100644
--- a/lib/libc/locale/runefile.h
+++ b/lib/libc/locale/runefile.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/runefile.h,v 1.1 2005/05/16 09:32:41 ru Exp $
  */
 
 #ifndef _RUNEFILE_H_
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index 71e9c862434f..d62ed9b88154 100644
--- a/lib/libc/locale/runetype.c
+++ b/lib/libc/locale/runetype.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/runetype.c,v 1.12 2005/02/27 14:54:23 phantom Exp $");
 
 #include <stdio.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index 0d958d02d914..7688e38be089 100644
--- a/lib/libc/locale/setlocale.3
+++ b/lib/libc/locale/setlocale.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)setlocale.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.34 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd November 21, 2003
 .Dt SETLOCALE 3
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 92c5dd3aa1f3..e42f53a6a20a 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)setlocale.c	8.1 (Berkeley) 7/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.50 2004/01/31 19:15:32 ache Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/locale/setlocale.h b/lib/libc/locale/setlocale.h
index 33b4b6e9aeea..82462ee8de6f 100644
--- a/lib/libc/locale/setlocale.h
+++ b/lib/libc/locale/setlocale.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/setlocale.h,v 1.6 2003/07/06 02:03:37 ache Exp $
  */
 
 #ifndef _SETLOCALE_H_
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index 398bfc5bb46d..fd719476cb57 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.45 2005/02/27 15:11:09 phantom Exp $");
 
 #include <runetype.h>
 #include <errno.h>
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 7db1b1386ff0..b393d3085842 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.27 2005/02/27 15:11:09 phantom Exp $");
 
 #include <ctype.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/toascii.3 b/lib/libc/locale/toascii.3
index 975b320ab150..b1a2425e7324 100644
--- a/lib/libc/locale/toascii.3
+++ b/lib/libc/locale/toascii.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toascii.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/toascii.3,v 1.7 2002/01/09 13:43:31 nik Exp $
 .\"
 .Dd June 4, 1993
 .Dt TOASCII 3
diff --git a/lib/libc/locale/tolower.3 b/lib/libc/locale/tolower.3
index 47dfb44cc03d..d3535c8a5db5 100644
--- a/lib/libc/locale/tolower.3
+++ b/lib/libc/locale/tolower.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tolower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/tolower.3,v 1.16 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt TOLOWER 3
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index faace3e73b98..24694e766031 100644
--- a/lib/libc/locale/tolower.c
+++ b/lib/libc/locale/tolower.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/tolower.c,v 1.11 2004/07/29 06:16:19 tjr Exp $");
 
 #include <stdio.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/toupper.3 b/lib/libc/locale/toupper.3
index d3008232f871..64b6ac3d64d3 100644
--- a/lib/libc/locale/toupper.3
+++ b/lib/libc/locale/toupper.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/toupper.3,v 1.16 2004/08/21 07:37:08 tjr Exp $
 .\"
 .Dd August 21, 2004
 .Dt TOUPPER 3
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index aca1ca1657dc..bb7f36a9e6b3 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/toupper.c,v 1.11 2004/07/29 06:16:19 tjr Exp $");
 
 #include <stdio.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/towlower.3 b/lib/libc/locale/towlower.3
index 63d643165f1b..6bdd3c85f3d7 100644
--- a/lib/libc/locale/towlower.3
+++ b/lib/libc/locale/towlower.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tolower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/towlower.3,v 1.5 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd October 3, 2002
 .Dt TOWLOWER 3
diff --git a/lib/libc/locale/towupper.3 b/lib/libc/locale/towupper.3
index 0fdefa9547c5..c771998dc1c4 100644
--- a/lib/libc/locale/towupper.3
+++ b/lib/libc/locale/towupper.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/towupper.3,v 1.2 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd October 3, 2002
 .Dt TOWUPPER 3
diff --git a/lib/libc/locale/utf8.5 b/lib/libc/locale/utf8.5
index 01a8a51c6f1e..e89f5e5bb327 100644
--- a/lib/libc/locale/utf8.5
+++ b/lib/libc/locale/utf8.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)utf2.4	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/utf8.5,v 1.6 2004/10/17 02:29:15 tjr Exp $
 .\"
 .Dd April 7, 2004
 .Dt UTF8 5
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index 2f537a5b6ec9..de76c85749d2 100644
--- a/lib/libc/locale/utf8.c
+++ b/lib/libc/locale/utf8.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.13 2005/02/27 15:11:09 phantom Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcrtomb.3 b/lib/libc/locale/wcrtomb.3
index c89614e2d34b..432eddf34f81 100644
--- a/lib/libc/locale/wcrtomb.3
+++ b/lib/libc/locale/wcrtomb.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcrtomb.3,v 1.4 2004/04/08 09:59:02 tjr Exp $
 .\"
 .Dd April 8, 2004
 .Dt WCRTOMB 3
diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c
index ef75b78f3760..4d7b11506722 100644
--- a/lib/libc/locale/wcrtomb.c
+++ b/lib/libc/locale/wcrtomb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.8 2004/05/12 14:09:04 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/wcsftime.3 b/lib/libc/locale/wcsftime.3
index 92aee9313f59..5f29f39c7130 100644
--- a/lib/libc/locale/wcsftime.3
+++ b/lib/libc/locale/wcsftime.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcsftime.3,v 1.2 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd September 8, 2002
 .Dt WCSFTIME 3
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c
index 7a54fc053c5a..2598043e6441 100644
--- a/lib/libc/locale/wcsftime.c
+++ b/lib/libc/locale/wcsftime.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcsnrtombs.c b/lib/libc/locale/wcsnrtombs.c
index e89969820957..89cd9b72b2b4 100644
--- a/lib/libc/locale/wcsnrtombs.c
+++ b/lib/libc/locale/wcsnrtombs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsnrtombs.c,v 1.3 2005/02/12 08:45:12 stefanf Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/wcsrtombs.3 b/lib/libc/locale/wcsrtombs.3
index ff607c2dad11..b38f3a4527b7 100644
--- a/lib/libc/locale/wcsrtombs.3
+++ b/lib/libc/locale/wcsrtombs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $
 .\"
 .Dd July 21, 2004
 .Dt WCSRTOMBS 3
diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c
index f3b38b71c4d8..61e5432de749 100644
--- a/lib/libc/locale/wcsrtombs.c
+++ b/lib/libc/locale/wcsrtombs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/wcstod.3 b/lib/libc/locale/wcstod.3
index f8c5135ee86b..e63a2c8e6880 100644
--- a/lib/libc/locale/wcstod.3
+++ b/lib/libc/locale/wcstod.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.4 2003/05/22 13:02:27 ru Exp $
 .\"
 .Dd February 22, 2003
 .Dt WCSTOD 3
diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c
index 68df1eddfedd..da90f16c28f4 100644
--- a/lib/libc/locale/wcstod.c
+++ b/lib/libc/locale/wcstod.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstod.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c
index ba238d459031..a68b382d989c 100644
--- a/lib/libc/locale/wcstof.c
+++ b/lib/libc/locale/wcstof.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstof.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c
index 0dadd5a13e29..09e7817f46e8 100644
--- a/lib/libc/locale/wcstoimax.c
+++ b/lib/libc/locale/wcstoimax.c
@@ -38,7 +38,7 @@ static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoimax.c,v 1.2 2003/01/01 18:48:43 schweikh Exp $");
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/lib/libc/locale/wcstol.3 b/lib/libc/locale/wcstol.3
index e69a72672d54..306f22302226 100644
--- a/lib/libc/locale/wcstol.3
+++ b/lib/libc/locale/wcstol.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.4 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd September 7, 2002
 .Dt WCSTOL 3
diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c
index fcf220ef391a..ae51c2e44b2f 100644
--- a/lib/libc/locale/wcstol.c
+++ b/lib/libc/locale/wcstol.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstol.c,v 1.1 2002/09/08 13:27:26 tjr Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c
index cf9d87464c5d..c50ffbdf6bca 100644
--- a/lib/libc/locale/wcstold.c
+++ b/lib/libc/locale/wcstold.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstold.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c
index feddbdfad4bd..a48056cddc8d 100644
--- a/lib/libc/locale/wcstoll.c
+++ b/lib/libc/locale/wcstoll.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoll.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcstombs.3 b/lib/libc/locale/wcstombs.3
index 0cb712a49a23..ee995bb9d01b 100644
--- a/lib/libc/locale/wcstombs.3
+++ b/lib/libc/locale/wcstombs.3
@@ -35,7 +35,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcstombs.3,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd April 8, 2004
 .Dt WCSTOMBS 3
diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c
index acd0051463b3..b798c9e1a5e5 100644
--- a/lib/libc/locale/wcstombs.c
+++ b/lib/libc/locale/wcstombs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.10 2004/07/21 10:54:57 tjr Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c
index 4be83a3ff724..f3b8b492a3ea 100644
--- a/lib/libc/locale/wcstoul.c
+++ b/lib/libc/locale/wcstoul.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoul.c,v 1.1 2002/09/08 13:27:26 tjr Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c
index e57a37a13195..fd9558beb286 100644
--- a/lib/libc/locale/wcstoull.c
+++ b/lib/libc/locale/wcstoull.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.18 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoull.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c
index 9793ba3098d7..01e25d528d59 100644
--- a/lib/libc/locale/wcstoumax.c
+++ b/lib/libc/locale/wcstoumax.c
@@ -38,7 +38,7 @@ static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoumax.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
index cb39adc45141..a8f00560b0d3 100644
--- a/lib/libc/locale/wctob.c
+++ b/lib/libc/locale/wctob.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctob.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/lib/libc/locale/wctomb.3 b/lib/libc/locale/wctomb.3
index a669f0e4d515..b7de6e5428a2 100644
--- a/lib/libc/locale/wctomb.3
+++ b/lib/libc/locale/wctomb.3
@@ -35,7 +35,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wctomb.3,v 1.3 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd April 8, 2004
 .Dt WCTOMB 3
diff --git a/lib/libc/locale/wctomb.c b/lib/libc/locale/wctomb.c
index 77b9043d61e1..701b3ca4cc61 100644
--- a/lib/libc/locale/wctomb.c
+++ b/lib/libc/locale/wctomb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.8 2004/07/29 06:18:40 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wctrans.3 b/lib/libc/locale/wctrans.3
index ce3e68c9eb34..0f2bc650b9c7 100644
--- a/lib/libc/locale/wctrans.3
+++ b/lib/libc/locale/wctrans.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wctrans.3,v 1.3 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd October 3, 2002
 .Dt WCTRANS 3
diff --git a/lib/libc/locale/wctrans.c b/lib/libc/locale/wctrans.c
index 6813e3304629..a86e5c782987 100644
--- a/lib/libc/locale/wctrans.c
+++ b/lib/libc/locale/wctrans.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctrans.c,v 1.3 2003/11/01 08:20:58 tjr Exp $");
 
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc/locale/wctype.3 b/lib/libc/locale/wctype.3
index 6dec7bbef3d6..30409f3a8db3 100644
--- a/lib/libc/locale/wctype.3
+++ b/lib/libc/locale/wctype.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.5 2004/03/27 08:59:21 tjr Exp $
 .\"
 .Dd March 27, 2004
 .Dt WCTYPE 3
diff --git a/lib/libc/locale/wctype.c b/lib/libc/locale/wctype.c
index f9aa8dd2fe48..a0e21bc87a78 100644
--- a/lib/libc/locale/wctype.c
+++ b/lib/libc/locale/wctype.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctype.c,v 1.3 2004/03/27 08:59:21 tjr Exp $");
 
 #include <ctype.h>
 #include <string.h>
diff --git a/lib/libc/locale/wcwidth.3 b/lib/libc/locale/wcwidth.3
index 0c7c74fed155..026813f20138 100644
--- a/lib/libc/locale/wcwidth.3
+++ b/lib/libc/locale/wcwidth.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.6 2004/08/17 04:56:03 trhodes Exp $
 .\"
 .Dd August 17, 2004
 .Dt WCWIDTH 3
diff --git a/lib/libc/locale/wcwidth.c b/lib/libc/locale/wcwidth.c
index f7dababfd796..288a60db6dba 100644
--- a/lib/libc/locale/wcwidth.c
+++ b/lib/libc/locale/wcwidth.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcwidth.c,v 1.7 2004/08/12 12:19:11 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 552de00815b2..bbee45a2a745 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.54 2005/04/06 12:45:51 ume Exp $
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net
diff --git a/lib/libc/net/addr2ascii.3 b/lib/libc/net/addr2ascii.3
index 675c39d7193f..d21ef896f14e 100644
--- a/lib/libc/net/addr2ascii.3
+++ b/lib/libc/net/addr2ascii.3
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/addr2ascii.3,v 1.18 2005/01/11 20:50:49 ru Exp $
 .\"
 .Dd June 13, 1996
 .Dt ADDR2ASCII 3
diff --git a/lib/libc/net/addr2ascii.c b/lib/libc/net/addr2ascii.c
index 4fad6a8a49a1..708b0f594f18 100644
--- a/lib/libc/net/addr2ascii.c
+++ b/lib/libc/net/addr2ascii.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/addr2ascii.c,v 1.2 2002/03/22 21:52:28 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/ascii2addr.c b/lib/libc/net/ascii2addr.c
index 5167a5136698..bf2263b03c1c 100644
--- a/lib/libc/net/ascii2addr.c
+++ b/lib/libc/net/ascii2addr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ascii2addr.c,v 1.4 2002/03/22 21:52:28 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index 43350303898e..0facc934e34e 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/base64.c,v 1.5 2002/03/22 21:52:28 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/byteorder.3 b/lib/libc/net/byteorder.3
index 71ccc4d3d31b..77876d11a9c9 100644
--- a/lib/libc/net/byteorder.3
+++ b/lib/libc/net/byteorder.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/byteorder.3,v 1.12 2005/03/20 17:27:57 simon Exp $
 .\"
 .Dd March 20, 2005
 .Dt BYTEORDER 3
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index e8bc8ba39ddf..08d6ca3c3900 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.15 2002/04/08 07:51:10 ru Exp $");
 
 #include <stdio.h>
 #include <paths.h>
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index a13244795fa4..2e79b25db461 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.23 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 3
diff --git a/lib/libc/net/eui64.3 b/lib/libc/net/eui64.3
index 3000c74e6d00..f90d5b544057 100644
--- a/lib/libc/net/eui64.3
+++ b/lib/libc/net/eui64.3
@@ -54,7 +54,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/eui64.3,v 1.4 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd March 4, 2004
 .Dt EUI64 3
diff --git a/lib/libc/net/eui64.c b/lib/libc/net/eui64.c
index 50851674de69..e842903ee542 100644
--- a/lib/libc/net/eui64.c
+++ b/lib/libc/net/eui64.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/eui64.c,v 1.2 2004/06/01 19:30:13 brooks Exp $");
 
 #include <stdio.h>
 #include <paths.h>
diff --git a/lib/libc/net/gai_strerror.3 b/lib/libc/net/gai_strerror.3
index 7c5503026ed1..59a7f9443e7a 100644
--- a/lib/libc/net/gai_strerror.3
+++ b/lib/libc/net/gai_strerror.3
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/gai_strerror.3,v 1.3 2005/06/16 19:01:06 ru Exp $
 .\"
 .Dd December 20, 2004
 .Dt GAI_STRERROR 3
diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c
index bd351abd1266..b90712766498 100644
--- a/lib/libc/net/gai_strerror.c
+++ b/lib/libc/net/gai_strerror.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gai_strerror.c,v 1.1 2005/04/06 12:45:51 ume Exp $");
 
 #include <netdb.h>
 
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 9c5a8b6254cd..a3c2bbb63389 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.32 2005/06/15 19:04:03 ru Exp $
 .\"
 .Dd December 20, 2004
 .Dt GETADDRINFO 3
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 45f8c870d6de..9f7a900fdc61 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.69.2.1 2005/07/22 20:17:30 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index 6cb43f046c60..a2f4eac97fef 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -58,7 +58,7 @@ static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.54 2005/04/29 19:55:23 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index d1ef23bc6477..c42a7f68efec 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -55,7 +55,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.23 2005/04/30 20:07:01 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 6f9ee0dce1f1..1b66b0d484d1 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.34 2005/04/28 18:03:43 ume Exp $
 .\"
 .Dd May 25, 1995
 .Dt GETHOSTBYNAME 3
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 1044fd65b406..9b4ea2799362 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.25 2005/05/01 07:39:45 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index 0646b0cb4b4b..f05b0e1196d1 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.28 2005/04/30 20:07:01 ume Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index a12cd00bfb4c..b217990505a2 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getifaddrs.3,v 1.10 2005/02/09 18:03:13 ru Exp $
 .\"
 .Dd October 12, 1995
 .Dt GETIFADDRS 3
diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c
index 41ef3f464ab6..81f365e8a90a 100644
--- a/lib/libc/net/getifaddrs.c
+++ b/lib/libc/net/getifaddrs.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getifaddrs.c,v 1.6 2002/07/25 08:08:30 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/getifmaddrs.3 b/lib/libc/net/getifmaddrs.3
index 2d2a93681297..56601cf71bb4 100644
--- a/lib/libc/net/getifmaddrs.3
+++ b/lib/libc/net/getifmaddrs.3
@@ -18,7 +18,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getifmaddrs.3,v 1.3 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt GETIFMADDRS 3
diff --git a/lib/libc/net/getifmaddrs.c b/lib/libc/net/getifmaddrs.c
index adbc4a5dde6e..9e7bb1d73e43 100644
--- a/lib/libc/net/getifmaddrs.c
+++ b/lib/libc/net/getifmaddrs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getifmaddrs.c,v 1.2 2005/04/08 21:24:23 stefanf Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/getipnodebyname.3 b/lib/libc/net/getipnodebyname.3
index dbef578c8040..3a4381c4ec96 100644
--- a/lib/libc/net/getipnodebyname.3
+++ b/lib/libc/net/getipnodebyname.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getipnodebyname.3,v 1.17 2005/04/28 18:21:11 ume Exp $
 .\"
 .Dd August 6, 2004
 .Dt GETIPNODEBYNAME 3
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 61479cf7b505..d30016b3a68d 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.24 2005/06/15 19:04:03 ru Exp $
 .\"
 .Dd December 20, 2004
 .Dt GETNAMEINFO 3
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index ab849a785233..1d703e5e4a59 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.17 2005/05/03 16:13:31 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index 7dbb725c1617..f22a7e5a82e5 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -62,7 +62,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.31 2005/06/03 03:32:06 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index 4696b1a0ee6f..cab3559e8307 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetbyht.c,v 1.16 2005/06/03 03:32:06 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index 200e7a4e269b..b0a78b575ba6 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetbynis.c,v 1.19 2005/06/03 03:32:06 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetent.3 b/lib/libc/net/getnetent.3
index 3c329a610d34..2aeb925c0033 100644
--- a/lib/libc/net/getnetent.3
+++ b/lib/libc/net/getnetent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getnetent.3,v 1.22 2005/06/15 19:04:03 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETNETENT 3
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index ef982bc4d03d..6ff008ed0c64 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.21 2005/06/03 03:32:06 ume Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
index 400fa7cfa3fb..15abf870a54d 100644
--- a/lib/libc/net/getproto.c
+++ b/lib/libc/net/getproto.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.4 2005/04/19 14:41:13 ume Exp $");
 
 #include <netdb.h>
 #include "netdb_private.h"
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
index e15ad016a923..db58b167bf27 100644
--- a/lib/libc/net/getprotoent.3
+++ b/lib/libc/net/getprotoent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getprotoent.3,v 1.11 2005/04/26 18:04:09 ume Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPROTOENT 3
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
index 705ba42df3ae..7c29638758d7 100644
--- a/lib/libc/net/getprotoent.c
+++ b/lib/libc/net/getprotoent.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.5 2005/04/28 15:32:55 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
index 99232a29ebb5..271e043c69e1 100644
--- a/lib/libc/net/getprotoname.c
+++ b/lib/libc/net/getprotoname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.4 2005/04/19 14:41:13 ume Exp $");
 
 #include <netdb.h>
 #include <string.h>
diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c
index efc3c26b79da..73135968e085 100644
--- a/lib/libc/net/getservbyname.c
+++ b/lib/libc/net/getservbyname.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.7 2005/04/18 18:34:58 ume Exp $");
 
 #include <netdb.h>
 #include <string.h>
diff --git a/lib/libc/net/getservbyport.c b/lib/libc/net/getservbyport.c
index 33524a2756ba..89535d2fd96f 100644
--- a/lib/libc/net/getservbyport.c
+++ b/lib/libc/net/getservbyport.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.7 2005/04/18 18:34:58 ume Exp $");
 
 #include <netdb.h>
 #include <string.h>
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index 8c43c8f510fa..2a3c245bbd85 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getservent.3,v 1.14 2005/04/26 18:04:09 ume Exp $
 .\"
 .Dd July 9, 1995
 .Dt GETSERVENT 3
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index e232e32a574b..ee611fbf6f1c 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.19 2005/04/28 15:32:55 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/herror.c b/lib/libc/net/herror.c
index b84c06c1069f..5f46bfc5b4fb 100644
--- a/lib/libc/net/herror.c
+++ b/lib/libc/net/herror.c
@@ -52,7 +52,7 @@
 static char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/herror.c,v 1.12 2004/02/25 21:03:45 green Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/hesiod.3 b/lib/libc/net/hesiod.3
index bae4e4419f82..6401e79227c4 100644
--- a/lib/libc/net/hesiod.3
+++ b/lib/libc/net/hesiod.3
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/hesiod.3,v 1.5 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd November 30, 1996
 .Dt HESIOD 3
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index c22bdbad836b..3afa0ab9c3a6 100644
--- a/lib/libc/net/hesiod.c
+++ b/lib/libc/net/hesiod.c
@@ -49,7 +49,7 @@
 static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/hesiod.c,v 1.9 2003/05/01 19:03:14 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index b1d1688081e5..6862a6c6ae1a 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/if_indextoname.3,v 1.10 2003/09/08 19:57:14 ru Exp $
 .\"
 .Dd July 15, 2002
 .Dt IF_NAMETOINDEX 3
diff --git a/lib/libc/net/if_indextoname.c b/lib/libc/net/if_indextoname.c
index 4dadce351ad9..33888cdb3c68 100644
--- a/lib/libc/net/if_indextoname.c
+++ b/lib/libc/net/if_indextoname.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/if_indextoname.c,v 1.1 2002/07/15 19:58:56 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/if_nameindex.c b/lib/libc/net/if_nameindex.c
index 7a12d34b58e7..f190f23f8b82 100644
--- a/lib/libc/net/if_nameindex.c
+++ b/lib/libc/net/if_nameindex.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/if_nameindex.c,v 1.1 2002/07/15 19:58:56 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/if_nametoindex.c b/lib/libc/net/if_nametoindex.c
index d0ca5212755d..e94463468ee5 100644
--- a/lib/libc/net/if_nametoindex.c
+++ b/lib/libc/net/if_nametoindex.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/if_nametoindex.c,v 1.5 2003/05/01 19:03:14 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3
index 28877f1f1980..3b5591615c4a 100644
--- a/lib/libc/net/inet.3
+++ b/lib/libc/net/inet.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.30 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd June 14, 2004
 .Dt INET 3
diff --git a/lib/libc/net/inet6_opt_init.3 b/lib/libc/net/inet6_opt_init.3
index fdfe93e8cfce..1c3fdc1532eb 100644
--- a/lib/libc/net/inet6_opt_init.3
+++ b/lib/libc/net/inet6_opt_init.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_opt_init.3,v 1.9 2005/01/24 18:14:18 ru Exp $
 .\"
 .Dd December 23, 2004
 .Dt INET6_OPT_INIT 3
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index e17855a32ba7..a22fd774c5f2 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.18 2005/01/24 18:14:18 ru Exp $
 .\"
 .Dd January 24, 2005
 .Dt INET6_OPTION_SPACE 3
diff --git a/lib/libc/net/inet6_rth_space.3 b/lib/libc/net/inet6_rth_space.3
index 2750170d33cd..0fa8353e5be5 100644
--- a/lib/libc/net/inet6_rth_space.3
+++ b/lib/libc/net/inet6_rth_space.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_rth_space.3,v 1.9.2.1 2005/08/18 15:01:22 keramida Exp $
 .\"
 .Dd December 24, 2004
 .Dt INET6_RTH_SPACE 3
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index bfb2f231a874..d44102d851ab 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_rthdr_space.3,v 1.16 2005/01/24 18:14:18 ru Exp $
 .\"
 .Dd January 24, 2005
 .Dt INET6_RTHDR_SPACE 3
diff --git a/lib/libc/net/inet_addr.c b/lib/libc/net/inet_addr.c
index eb97f84513e5..d53c9ea14dc4 100644
--- a/lib/libc/net/inet_addr.c
+++ b/lib/libc/net/inet_addr.c
@@ -59,7 +59,7 @@
 static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_addr.c,v 1.16 2002/04/19 04:46:20 suz Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/net/inet_lnaof.c b/lib/libc/net/inet_lnaof.c
index e45ea6e224f6..d107b27d6db3 100644
--- a/lib/libc/net/inet_lnaof.c
+++ b/lib/libc/net/inet_lnaof.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_lnaof.c,v 1.5 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/lib/libc/net/inet_makeaddr.c b/lib/libc/net/inet_makeaddr.c
index 4e975138c8f0..27544e7fd5ec 100644
--- a/lib/libc/net/inet_makeaddr.c
+++ b/lib/libc/net/inet_makeaddr.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_makeaddr.c,v 1.4 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/lib/libc/net/inet_net.3 b/lib/libc/net/inet_net.3
index 9ca00a6e86a7..220075f8693d 100644
--- a/lib/libc/net/inet_net.3
+++ b/lib/libc/net/inet_net.3
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet_net.3,v 1.2 2002/12/19 09:40:22 ru Exp $
 .\"
 .Dd June 18, 1997
 .Dt INET_NET 3
diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c
index 8f3b1d78a220..b97428acaa8d 100644
--- a/lib/libc/net/inet_net_ntop.c
+++ b/lib/libc/net/inet_net_ntop.c
@@ -19,7 +19,7 @@
 static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_net_ntop.c,v 1.7 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c
index 3a7145417663..6958f1729000 100644
--- a/lib/libc/net/inet_net_pton.c
+++ b/lib/libc/net/inet_net_pton.c
@@ -19,7 +19,7 @@
 static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_net_pton.c,v 1.9 2003/09/15 23:38:06 fenner Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/inet_neta.c b/lib/libc/net/inet_neta.c
index c91896277909..43b4af15c7f0 100644
--- a/lib/libc/net/inet_neta.c
+++ b/lib/libc/net/inet_neta.c
@@ -19,7 +19,7 @@
 static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_neta.c,v 1.9 2003/01/01 18:48:43 schweikh Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/inet_netof.c b/lib/libc/net/inet_netof.c
index 336eccdc3875..1f829a4fbfe6 100644
--- a/lib/libc/net/inet_netof.c
+++ b/lib/libc/net/inet_netof.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_netof.c,v 1.5 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/lib/libc/net/inet_network.c b/lib/libc/net/inet_network.c
index 631cb6a1e3ca..92ff831da0ea 100644
--- a/lib/libc/net/inet_network.c
+++ b/lib/libc/net/inet_network.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_network.c,v 1.9 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/lib/libc/net/inet_ntoa.c b/lib/libc/net/inet_ntoa.c
index 00f5492cdaaf..326a76a65ba5 100644
--- a/lib/libc/net/inet_ntoa.c
+++ b/lib/libc/net/inet_ntoa.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntoa.c,v 1.6 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c
index d73a33cf2cee..7c4652dd8de7 100644
--- a/lib/libc/net/inet_ntop.c
+++ b/lib/libc/net/inet_ntop.c
@@ -18,7 +18,7 @@
 static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.12 2002/09/06 11:23:49 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c
index 78dbf44d23a5..3025d1c2caf2 100644
--- a/lib/libc/net/inet_pton.c
+++ b/lib/libc/net/inet_pton.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.11.14.1 2005/07/29 16:10:35 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index 7b65d0607ce0..42bae15c150b 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.7.10.1 2005/10/08 20:58:29 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
index 1f1c21f6b450..5008a8526c33 100644
--- a/lib/libc/net/linkaddr.3
+++ b/lib/libc/net/linkaddr.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/linkaddr.3,v 1.14 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd June 17, 1996
 .Dt LINK_ADDR 3
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index c23559a16b0b..0161558ca975 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/linkaddr.c,v 1.3 2002/03/21 18:49:23 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
index dbbddc0fb5a8..681a2a820442 100644
--- a/lib/libc/net/map_v4v6.c
+++ b/lib/libc/net/map_v4v6.c
@@ -57,7 +57,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/map_v4v6.c,v 1.9 2005/04/28 18:52:40 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 9de33ed93256..12386c6ee242 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.54 2005/05/27 20:44:57 ume Exp $");
 
 #include "namespace.h"
 #ifdef ICMPNL
diff --git a/lib/libc/net/netdb_private.h b/lib/libc/net/netdb_private.h
index 0b3278015ab0..e4c1117ac475 100644
--- a/lib/libc/net/netdb_private.h
+++ b/lib/libc/net/netdb_private.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.9 2005/05/15 20:15:15 ume Exp $
  */
 
 #ifndef _NETDB_PRIVATE_H_
diff --git a/lib/libc/net/ns_name.c b/lib/libc/net/ns_name.c
index 5422875cc0c6..6c0aad48d29e 100644
--- a/lib/libc/net/ns_name.c
+++ b/lib/libc/net/ns_name.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ns_name.c,v 1.5 2003/02/18 13:39:52 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/net/ns_netint.c b/lib/libc/net/ns_netint.c
index 845a07e94677..3b4b1a5f9337 100644
--- a/lib/libc/net/ns_netint.c
+++ b/lib/libc/net/ns_netint.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ns_netint.c,v 1.3 2002/03/22 21:52:29 obrien Exp $");
 
 /* Import. */
 
diff --git a/lib/libc/net/ns_parse.c b/lib/libc/net/ns_parse.c
index 7b32fa4ce98a..3dce2a4aa388 100644
--- a/lib/libc/net/ns_parse.c
+++ b/lib/libc/net/ns_parse.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ns_parse.c,v 1.4 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/net/ns_print.c b/lib/libc/net/ns_print.c
index 52e5b03c22ed..a4433eb1bcbc 100644
--- a/lib/libc/net/ns_print.c
+++ b/lib/libc/net/ns_print.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ns_print.c,v 1.3 2002/03/22 21:52:29 obrien Exp $");
 
 /* Import. */
 
diff --git a/lib/libc/net/ns_ttl.c b/lib/libc/net/ns_ttl.c
index 79083b2e618c..86392dd1cdd4 100644
--- a/lib/libc/net/ns_ttl.c
+++ b/lib/libc/net/ns_ttl.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ns_ttl.c,v 1.4 2003/02/18 13:39:52 nectar Exp $");
 
 /* Import. */
 
diff --git a/lib/libc/net/nsap_addr.c b/lib/libc/net/nsap_addr.c
index 61b315fd270b..8fc9d2624a80 100644
--- a/lib/libc/net/nsap_addr.c
+++ b/lib/libc/net/nsap_addr.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nsap_addr.c,v 1.9 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
index 06af7af51070..a6865f368ef7 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.12 2005/02/09 18:03:13 ru Exp $
 .\"
 .Dd April 16, 2003
 .Dt NSDISPATCH 3
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index c9be76396567..8aa7040ea14a 100644
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -68,7 +68,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.12 2004/04/01 19:12:45 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l
index 34c79d925964..f87d66b44bb5 100644
--- a/lib/libc/net/nslexer.l
+++ b/lib/libc/net/nslexer.l
@@ -40,7 +40,7 @@
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = 
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/net/nslexer.l,v 1.5 2003/04/17 14:14:22 nectar Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
index 4806dea84628..a013a72b66b4 100644
--- a/lib/libc/net/nsparser.y
+++ b/lib/libc/net/nsparser.y
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nsparser.y,v 1.4 2003/04/17 14:14:22 nectar Exp $");
 
 #include "namespace.h"
 #define _NS_PRIVATE
diff --git a/lib/libc/net/nss_backends.h b/lib/libc/net/nss_backends.h
index 9bea37b1c24b..e39a25a19fd4 100644
--- a/lib/libc/net/nss_backends.h
+++ b/lib/libc/net/nss_backends.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/nss_backends.h,v 1.1 2003/04/17 14:14:22 nectar Exp $
  */
 /*
  * Eventually, the implementations of existing built-in NSS functions
diff --git a/lib/libc/net/nss_compat.c b/lib/libc/net/nss_compat.c
index 09a2d4f8f5cc..135bad40a3e2 100644
--- a/lib/libc/net/nss_compat.c
+++ b/lib/libc/net/nss_compat.c
@@ -32,7 +32,7 @@
  * Compatibility shims for the GNU C Library-style nsswitch interface.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nss_compat.c,v 1.3 2004/03/30 15:56:15 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 03403b8e66d0..8a7763851b5b 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.24.2.1 2005/09/24 01:59:36 keramida Exp $
 .\"
 .Dd March 3, 2000
 .Dt RCMD 3
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 422e9031d8f2..0e9a24197385 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.41 2005/05/13 16:31:09 ume Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/rcmdsh.3 b/lib/libc/net/rcmdsh.3
index 03e7dabb4243..73a024df9b69 100644
--- a/lib/libc/net/rcmdsh.3
+++ b/lib/libc/net/rcmdsh.3
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/rcmdsh.3,v 1.6 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd September 1, 1996
 .Dt RCMDSH 3
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
index bc4e87af9faf..8d93bcbeefd2 100644
--- a/lib/libc/net/rcmdsh.c
+++ b/lib/libc/net/rcmdsh.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/rcmdsh.c,v 1.5 2003/02/27 13:40:00 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c
index 267e171cae53..ee3509e7ae7c 100644
--- a/lib/libc/net/recv.c
+++ b/lib/libc/net/recv.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/recv.c,v 1.3 2002/03/22 21:52:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c
index 2e2248312b9b..5b3d6ff5cdca 100644
--- a/lib/libc/net/res_comp.c
+++ b/lib/libc/net/res_comp.c
@@ -73,7 +73,7 @@ static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_comp.c,v 1.18 2005/04/08 21:24:23 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/res_config.h b/lib/libc/net/res_config.h
index b17fd2de594d..b7deb38f9632 100644
--- a/lib/libc/net/res_config.h
+++ b/lib/libc/net/res_config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/net/res_config.h,v 1.8 2002/03/22 23:41:54 obrien Exp $ */
 
 #define	DEBUG	1	/* enable debugging code (needed for dig) */
 #define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
diff --git a/lib/libc/net/res_data.c b/lib/libc/net/res_data.c
index 70a7d9e2ad74..675f0251f0dd 100644
--- a/lib/libc/net/res_data.c
+++ b/lib/libc/net/res_data.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_data.c,v 1.8 2002/03/22 21:52:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c
index 3481419b5ab1..0b648d3a30f5 100644
--- a/lib/libc/net/res_debug.c
+++ b/lib/libc/net/res_debug.c
@@ -97,7 +97,7 @@
 static char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_debug.c,v 1.21 2003/02/18 13:39:52 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c
index ecbb5d5d94a7..3d1347cc54ab 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -73,7 +73,7 @@ static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_init.c,v 1.33 2004/09/09 17:42:18 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c
index 7ef1ace2f3f0..3ca9e0da8fa0 100644
--- a/lib/libc/net/res_mkquery.c
+++ b/lib/libc/net/res_mkquery.c
@@ -73,7 +73,7 @@ static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_mkquery.c,v 1.19 2002/09/14 17:28:40 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/res_mkupdate.c b/lib/libc/net/res_mkupdate.c
index 489223559921..442c3d4a236f 100644
--- a/lib/libc/net/res_mkupdate.c
+++ b/lib/libc/net/res_mkupdate.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_mkupdate.c,v 1.6 2005/04/08 21:24:23 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c
index 4158f9861278..ae150954e02c 100644
--- a/lib/libc/net/res_query.c
+++ b/lib/libc/net/res_query.c
@@ -73,7 +73,7 @@ static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_query.c,v 1.30 2005/04/15 14:42:29 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c
index 1775eadf969c..602cd24db458 100644
--- a/lib/libc/net/res_send.c
+++ b/lib/libc/net/res_send.c
@@ -73,7 +73,7 @@ static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_send.c,v 1.50 2005/05/13 16:31:09 ume Exp $");
 
 /*
  * Send query to name server and wait for reply.
diff --git a/lib/libc/net/res_send_private.h b/lib/libc/net/res_send_private.h
index df96dda27608..22c53b2b1a0f 100644
--- a/lib/libc/net/res_send_private.h
+++ b/lib/libc/net/res_send_private.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/net/res_send_private.h,v 1.1 2004/02/25 21:03:46 green Exp $ */
 
 /*
  * Copyright (c) 1985, 1989, 1993
diff --git a/lib/libc/net/res_update.c b/lib/libc/net/res_update.c
index fda6f776d276..6f805d2c524b 100644
--- a/lib/libc/net/res_update.c
+++ b/lib/libc/net/res_update.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_update.c,v 1.7 2002/09/15 16:51:09 nectar Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index 16f70067be9d..5fbefb141907 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.30 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RESOLVER 3
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index 5fbb4bb43616..40b7cc44e80d 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.6.10.2 2005/10/08 20:58:29 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
index f10d21be2cf6..8874f46e8fac 100644
--- a/lib/libc/net/send.c
+++ b/lib/libc/net/send.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/send.c,v 1.3 2002/03/22 21:52:30 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/sockatmark.3 b/lib/libc/net/sockatmark.3
index 61a1a9f52989..0bb874567949 100644
--- a/lib/libc/net/sockatmark.3
+++ b/lib/libc/net/sockatmark.3
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sockatmark.3,v 1.4 2002/12/19 09:40:22 ru Exp $
 .\"
 .Dd October 13, 2002
 .Dt SOCKATMARK 3
diff --git a/lib/libc/net/sockatmark.c b/lib/libc/net/sockatmark.c
index e416de80a9ca..497ce7f3ab83 100644
--- a/lib/libc/net/sockatmark.c
+++ b/lib/libc/net/sockatmark.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/sockatmark.c,v 1.1 2002/12/13 22:22:55 fenner Exp $
  */
 #include <sys/ioctl.h>
 
diff --git a/lib/libc/net/vars.c b/lib/libc/net/vars.c
index 42ee2054d4e7..8181b8193324 100644
--- a/lib/libc/net/vars.c
+++ b/lib/libc/net/vars.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/vars.c,v 1.3 2002/04/19 04:46:20 suz Exp $");
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/lib/libc/nls/C.msg b/lib/libc/nls/C.msg
index aa2c4cc881ae..4d8699e94131 100644
--- a/lib/libc/nls/C.msg
+++ b/lib/libc/nls/C.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/C.msg,v 1.1 2005/02/27 17:59:39 phantom Exp $
 $
 $ Message catalog for C locale (template)
 $
diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc
index 9adab3d647fa..80cb7c82b373 100644
--- a/lib/libc/nls/Makefile.inc
+++ b/lib/libc/nls/Makefile.inc
@@ -1,5 +1,5 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.10 2005/02/27 22:17:47 phantom Exp $
 
 .PATH: ${.CURDIR}/nls
 
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
index ed0f639d2393..cf238b5b7a17 100644
--- a/lib/libc/nls/catclose.3
+++ b/lib/libc/nls/catclose.3
@@ -26,7 +26,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/lib/libc/nls/catclose.3,v 1.15 2005/02/27 16:30:16 phantom Exp $
 .Dd February 12, 2005
 .Dt CATCLOSE 3
 .Os
diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3
index 38e92ba23c30..ba230334efe5 100644
--- a/lib/libc/nls/catgets.3
+++ b/lib/libc/nls/catgets.3
@@ -26,7 +26,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/lib/libc/nls/catgets.3,v 1.13 2005/06/15 19:04:04 ru Exp $
 .Dd February 12, 2005
 .Dt CATGETS 3
 .Os
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
index 7a16ee50408a..dad21aeafaae 100644
--- a/lib/libc/nls/catopen.3
+++ b/lib/libc/nls/catopen.3
@@ -26,7 +26,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/lib/libc/nls/catopen.3,v 1.17 2005/02/27 16:30:16 phantom Exp $
 .Dd February 12, 2005
 .Dt CATOPEN 3
 .Os
diff --git a/lib/libc/nls/ko_KR.UTF-8.msg b/lib/libc/nls/ko_KR.UTF-8.msg
index 00dce64eded9..7b7749ee02fc 100644
--- a/lib/libc/nls/ko_KR.UTF-8.msg
+++ b/lib/libc/nls/ko_KR.UTF-8.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.1 2005/03/07 13:57:24 phantom Exp $
 $
 $ Message catalog for ko_KR.UTF-8 locale
 $
diff --git a/lib/libc/nls/ko_KR.eucKR.msg b/lib/libc/nls/ko_KR.eucKR.msg
index ca04c77687bd..176a979b34e4 100644
--- a/lib/libc/nls/ko_KR.eucKR.msg
+++ b/lib/libc/nls/ko_KR.eucKR.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.1 2005/03/07 13:57:24 phantom Exp $
 $
 $ Message catalog for ko_KR.eucKR locale
 $
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 8689b7eaa0e7..afcbdda9be6d 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -31,7 +31,7 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.50 2005/02/27 16:26:49 phantom Exp $");
 
 #define _NLS_PRIVATE
 
diff --git a/lib/libc/nls/pl_PL.ISO8859-2.msg b/lib/libc/nls/pl_PL.ISO8859-2.msg
index b319c1d8c020..43e944fe66c4 100644
--- a/lib/libc/nls/pl_PL.ISO8859-2.msg
+++ b/lib/libc/nls/pl_PL.ISO8859-2.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/pl_PL.ISO8859-2.msg,v 1.1 2005/03/01 14:38:30 pjd Exp $
 $
 $ Message catalog for pl_PL.ISO8859-2 locale
 $
diff --git a/lib/libc/nls/ru_RU.KOI8-R.msg b/lib/libc/nls/ru_RU.KOI8-R.msg
index 55233b946abf..8400fca1b171 100644
--- a/lib/libc/nls/ru_RU.KOI8-R.msg
+++ b/lib/libc/nls/ru_RU.KOI8-R.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.1 2005/02/27 18:09:09 phantom Exp $
 $
 $ Message catalog for ru_RU.KOI8-R locale
 $
diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc
index 5bd119fc8a68..c567517734ad 100644
--- a/lib/libc/posix1e/Makefile.inc
+++ b/lib/libc/posix1e/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.17 2005/06/03 15:50:55 imp Exp $
 
 .PATH: ${.CURDIR}/posix1e
 
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index 1c824d047e70..eed1b9968d14 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.22 2003/02/06 11:04:46 charnier Exp $
 .\"
 .Dd December 18, 2002
 .Dt ACL 3
diff --git a/lib/libc/posix1e/acl_add_perm.3 b/lib/libc/posix1e/acl_add_perm.3
index 43d04f11fb0a..13a7047067fc 100644
--- a/lib/libc/posix1e/acl_add_perm.3
+++ b/lib/libc/posix1e/acl_add_perm.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.6 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_ADD_PERM 3
diff --git a/lib/libc/posix1e/acl_calc_mask.3 b/lib/libc/posix1e/acl_calc_mask.3
index 48d2678c2f5d..6a540e5fc3f8 100644
--- a/lib/libc/posix1e/acl_calc_mask.3
+++ b/lib/libc/posix1e/acl_calc_mask.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_calc_mask.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_CALC_MASK 3
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index 7e2f95580318..86c198e12dcd 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_calc_mask.c,v 1.8 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_clear_perms.3 b/lib/libc/posix1e/acl_clear_perms.3
index db026a3abcf4..ba24470b5dfb 100644
--- a/lib/libc/posix1e/acl_clear_perms.3
+++ b/lib/libc/posix1e/acl_clear_perms.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_clear_perms.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_CLEAR_PERMS 3
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index 6d1e0a86736b..137394484707 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_copy.c,v 1.5 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_copy_entry.3 b/lib/libc/posix1e/acl_copy_entry.3
index fead89ffe431..1656a4a4d9d1 100644
--- a/lib/libc/posix1e/acl_copy_entry.3
+++ b/lib/libc/posix1e/acl_copy_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_copy_entry.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_COPY_ENTRY 3
diff --git a/lib/libc/posix1e/acl_create_entry.3 b/lib/libc/posix1e/acl_create_entry.3
index fb856ad77bcb..8fdfeccb9515 100644
--- a/lib/libc/posix1e/acl_create_entry.3
+++ b/lib/libc/posix1e/acl_create_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_create_entry.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 16, 2001
 .Dt ACL_CREATE_ENTRY 3
diff --git a/lib/libc/posix1e/acl_delete.3 b/lib/libc/posix1e/acl_delete.3
index fb2958b73e49..347a885a4112 100644
--- a/lib/libc/posix1e/acl_delete.3
+++ b/lib/libc/posix1e/acl_delete.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_delete.3,v 1.18 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_DELETE 3
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index a93cd7b2ec9d..106242e45687 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_delete.c,v 1.8 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_delete_entry.3 b/lib/libc/posix1e/acl_delete_entry.3
index a931db03f04a..46ace13695ee 100644
--- a/lib/libc/posix1e/acl_delete_entry.3
+++ b/lib/libc/posix1e/acl_delete_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_entry.3,v 1.6 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_DELETE_ENTRY 3
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index 3195fac65a30..2a0c5f92c6bb 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_delete_entry.c,v 1.7 2004/01/06 20:29:40 nectar Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_delete_perm.3 b/lib/libc/posix1e/acl_delete_perm.3
index 0740d6133375..f7919ce6ce80 100644
--- a/lib/libc/posix1e/acl_delete_perm.3
+++ b/lib/libc/posix1e/acl_delete_perm.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_perm.3,v 1.6 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_DELETE_PERM 3
diff --git a/lib/libc/posix1e/acl_dup.3 b/lib/libc/posix1e/acl_dup.3
index ae4ff4f7b474..be42e4e5c9da 100644
--- a/lib/libc/posix1e/acl_dup.3
+++ b/lib/libc/posix1e/acl_dup.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_dup.3,v 1.13 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_DUP 3
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index f5bdbede9c5c..437acfd17f51 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_entry.c,v 1.7 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_free.3 b/lib/libc/posix1e/acl_free.3
index d64c72a7c7e2..654e57a01682 100644
--- a/lib/libc/posix1e/acl_free.3
+++ b/lib/libc/posix1e/acl_free.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_free.3,v 1.13 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_FREE 3
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index 6de41da8abfb..316c77cabd89 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_free.c,v 1.5 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_from_text.3 b/lib/libc/posix1e/acl_from_text.3
index 8b10784e502b..0be44862f915 100644
--- a/lib/libc/posix1e/acl_from_text.3
+++ b/lib/libc/posix1e/acl_from_text.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_from_text.3,v 1.16 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_FROM_TEXT 3
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index 59d9142a5283..6a427b579fae 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text.c,v 1.10 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
index fa915df3ec48..114d761d834d 100644
--- a/lib/libc/posix1e/acl_get.3
+++ b/lib/libc/posix1e/acl_get.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.18 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_GET 3
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 1f97baaecabc..a5d8da158c3c 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_get.c,v 1.12 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3
index 8b9f1357bd08..c1741c61437b 100644
--- a/lib/libc/posix1e/acl_get_entry.3
+++ b/lib/libc/posix1e/acl_get_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_entry.3,v 1.7.8.1 2005/08/18 15:01:22 keramida Exp $
 .\"
 .Dd April 13, 2001
 .Dt ACL_GET_ENTRY 3
diff --git a/lib/libc/posix1e/acl_get_perm_np.3 b/lib/libc/posix1e/acl_get_perm_np.3
index 7fe6c9c5b7ba..d576ef9c19cc 100644
--- a/lib/libc/posix1e/acl_get_perm_np.3
+++ b/lib/libc/posix1e/acl_get_perm_np.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_perm_np.3,v 1.4 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd April 10, 2001
 .Dt ACL_GET_PERM_NP 3
diff --git a/lib/libc/posix1e/acl_get_permset.3 b/lib/libc/posix1e/acl_get_permset.3
index 403b10a05904..e75437cc08e6 100644
--- a/lib/libc/posix1e/acl_get_permset.3
+++ b/lib/libc/posix1e/acl_get_permset.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_permset.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_GET_PERMSET 3
diff --git a/lib/libc/posix1e/acl_get_qualifier.3 b/lib/libc/posix1e/acl_get_qualifier.3
index 867809e52da6..3b2a1835ac3b 100644
--- a/lib/libc/posix1e/acl_get_qualifier.3
+++ b/lib/libc/posix1e/acl_get_qualifier.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_qualifier.3,v 1.7 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 13, 2001
 .Dt ACL_GET_QUALIFIER 3
diff --git a/lib/libc/posix1e/acl_get_tag_type.3 b/lib/libc/posix1e/acl_get_tag_type.3
index ff225114a394..47b81cf73c86 100644
--- a/lib/libc/posix1e/acl_get_tag_type.3
+++ b/lib/libc/posix1e/acl_get_tag_type.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_tag_type.3,v 1.7 2002/12/27 12:15:28 schweikh Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_GET_TAG_TYPE 3
diff --git a/lib/libc/posix1e/acl_init.3 b/lib/libc/posix1e/acl_init.3
index dba89231c44a..44db86ec374c 100644
--- a/lib/libc/posix1e/acl_init.3
+++ b/lib/libc/posix1e/acl_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_init.3,v 1.14 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_INIT 3
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index 6ce40de47969..c766ecda0ff6 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_init.c,v 1.10 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index c3375e000c21..06f069721575 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_perm.c,v 1.6 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_set.3 b/lib/libc/posix1e/acl_set.3
index a2d50b840dde..e5280908a9cf 100644
--- a/lib/libc/posix1e/acl_set.3
+++ b/lib/libc/posix1e/acl_set.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set.3,v 1.17 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_SET 3
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index 34d5a336e093..65a1d07b5725 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_set.c,v 1.12 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_set_permset.3 b/lib/libc/posix1e/acl_set_permset.3
index 152e226d5b97..222cb408a6aa 100644
--- a/lib/libc/posix1e/acl_set_permset.3
+++ b/lib/libc/posix1e/acl_set_permset.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set_permset.3,v 1.6 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_SET_PERMSET 3
diff --git a/lib/libc/posix1e/acl_set_qualifier.3 b/lib/libc/posix1e/acl_set_qualifier.3
index 3442a823f9ec..ed4091e4f19a 100644
--- a/lib/libc/posix1e/acl_set_qualifier.3
+++ b/lib/libc/posix1e/acl_set_qualifier.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set_qualifier.3,v 1.6 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_SET_QUALIFIER 3
diff --git a/lib/libc/posix1e/acl_set_tag_type.3 b/lib/libc/posix1e/acl_set_tag_type.3
index 3830be7c1d7f..04b4aa29636d 100644
--- a/lib/libc/posix1e/acl_set_tag_type.3
+++ b/lib/libc/posix1e/acl_set_tag_type.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set_tag_type.3,v 1.7 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_SET_TAG_TYPE 3
diff --git a/lib/libc/posix1e/acl_size.c b/lib/libc/posix1e/acl_size.c
index e8bd0a423fbf..a7a4e3ccc304 100644
--- a/lib/libc/posix1e/acl_size.c
+++ b/lib/libc/posix1e/acl_size.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_size.c,v 1.4 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index 61e4cf9ee8d9..b1e6452e1d57 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_support.c,v 1.13 2003/11/03 21:00:16 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_support.h b/lib/libc/posix1e/acl_support.h
index 6cccf0b434f9..6960ad5da9a5 100644
--- a/lib/libc/posix1e/acl_support.h
+++ b/lib/libc/posix1e/acl_support.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/acl_support.h,v 1.4 2001/04/24 22:45:38 jedgar Exp $
  */
 /*
  * Support functionality for the POSIX.1e ACL interface
diff --git a/lib/libc/posix1e/acl_to_text.3 b/lib/libc/posix1e/acl_to_text.3
index 833a6d2a575d..0da6278a3ea6 100644
--- a/lib/libc/posix1e/acl_to_text.3
+++ b/lib/libc/posix1e/acl_to_text.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_to_text.3,v 1.16 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_TO_TEXT 3
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index f2905c3a05c5..036828064400 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.11 2003/07/24 23:33:25 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_valid.3 b/lib/libc/posix1e/acl_valid.3
index 83f7746774a9..a93d7a2dd17c 100644
--- a/lib/libc/posix1e/acl_valid.3
+++ b/lib/libc/posix1e/acl_valid.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_valid.3,v 1.16 2005/01/15 12:21:03 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_VALID 3
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index 9b1f9b96c4d2..2c35a0a73097 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_valid.c,v 1.10 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/extattr.3 b/lib/libc/posix1e/extattr.3
index 5e606861c622..f37f7dfb121a 100644
--- a/lib/libc/posix1e/extattr.3
+++ b/lib/libc/posix1e/extattr.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/extattr.3,v 1.5 2002/12/12 17:25:53 ru Exp $
 .\"
 .Dd June 24, 2001
 .Dt EXTATTR 3
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index e9d28a3e4826..8e7046cecf9f 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/extattr.c,v 1.6 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/extattr.h>
diff --git a/lib/libc/posix1e/mac.3 b/lib/libc/posix1e/mac.3
index ac6affd52e52..a2528cd6c9c0 100644
--- a/lib/libc/posix1e/mac.3
+++ b/lib/libc/posix1e/mac.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.14.2.1 2005/08/18 15:01:22 keramida Exp $
 .\"
 .Dd April 19, 2003
 .Dt MAC 3
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index ded9059cdc6c..2d17148f83d2 100644
--- a/lib/libc/posix1e/mac.c
+++ b/lib/libc/posix1e/mac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac.c,v 1.12 2004/01/06 18:26:15 nectar Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac.conf.5 b/lib/libc/posix1e/mac.conf.5
index a8dfba214393..4ae527af6597 100644
--- a/lib/libc/posix1e/mac.conf.5
+++ b/lib/libc/posix1e/mac.conf.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.7 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd April 19, 2003
 .Dt MAC.CONF 5
diff --git a/lib/libc/posix1e/mac_exec.c b/lib/libc/posix1e/mac_exec.c
index fb3f994114db..b7325aca8fd1 100644
--- a/lib/libc/posix1e/mac_exec.c
+++ b/lib/libc/posix1e/mac_exec.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac_exec.c,v 1.2 2003/02/16 17:29:10 nectar Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3
index 33ef9ec785a8..c9673fde4f5a 100644
--- a/lib/libc/posix1e/mac_free.3
+++ b/lib/libc/posix1e/mac_free.3
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_free.3,v 1.6 2003/08/22 18:01:03 rwatson Exp $
 .\"
 .Dd December 21, 2001
 .Dt MAC_FREE 3
diff --git a/lib/libc/posix1e/mac_get.3 b/lib/libc/posix1e/mac_get.3
index cd498d0e4e7d..832bea5b90e5 100644
--- a/lib/libc/posix1e/mac_get.3
+++ b/lib/libc/posix1e/mac_get.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.10 2004/06/30 20:09:09 ru Exp $
 .\"
 .Dd December 21, 2001
 .Dt MAC_GET 3
diff --git a/lib/libc/posix1e/mac_get.c b/lib/libc/posix1e/mac_get.c
index 1913f5d21f44..7ccdc1d455d5 100644
--- a/lib/libc/posix1e/mac_get.c
+++ b/lib/libc/posix1e/mac_get.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac_get.c,v 1.5 2005/01/23 15:28:02 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac_is_present_np.3 b/lib/libc/posix1e/mac_is_present_np.3
index 6466488d7752..a8ee0ead60a2 100644
--- a/lib/libc/posix1e/mac_is_present_np.3
+++ b/lib/libc/posix1e/mac_is_present_np.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present_np.3,v 1.6 2003/08/22 18:01:03 rwatson Exp $
 .\"
 .Dd January 9, 2002
 .Dt MAC_IS_PRESENT_NP 3
diff --git a/lib/libc/posix1e/mac_prepare.3 b/lib/libc/posix1e/mac_prepare.3
index 2e5f25ae2311..4e8f107db097 100644
--- a/lib/libc/posix1e/mac_prepare.3
+++ b/lib/libc/posix1e/mac_prepare.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_prepare.3,v 1.6.2.1 2005/08/18 15:01:22 keramida Exp $
 .\"
 .Dd August 22, 2003
 .Os
diff --git a/lib/libc/posix1e/mac_set.3 b/lib/libc/posix1e/mac_set.3
index 175a25a11556..2337651c2d4b 100644
--- a/lib/libc/posix1e/mac_set.3
+++ b/lib/libc/posix1e/mac_set.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.10 2003/11/16 20:21:21 rwatson Exp $
 .\"
 .Dd January 14, 2003
 .Dt MAC_SET 3
diff --git a/lib/libc/posix1e/mac_set.c b/lib/libc/posix1e/mac_set.c
index 4353ee64f1d8..4b1c7d9364ee 100644
--- a/lib/libc/posix1e/mac_set.c
+++ b/lib/libc/posix1e/mac_set.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac_set.c,v 1.3 2003/02/27 13:40:01 nectar Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3
index 068533a215a6..20a5039c488c 100644
--- a/lib/libc/posix1e/mac_text.3
+++ b/lib/libc/posix1e/mac_text.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.11 2004/06/30 20:09:09 ru Exp $
 .\"
 .Dd December 21, 2001
 .Dt MAC_TEXT 3
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index 84f892826f40..0f9c338702d1 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.26 2002/12/13 16:53:50 ru Exp $
 .\"
 .Dd January 17, 2000
 .Dt POSIX1E 3
diff --git a/lib/libc/powerpc/Makefile.inc b/lib/libc/powerpc/Makefile.inc
index 605f9f4a9902..7d5109fa3281 100644
--- a/lib/libc/powerpc/Makefile.inc
+++ b/lib/libc/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/powerpc/Makefile.inc,v 1.1 2005/01/15 05:26:32 das Exp $
 
 # Long double is 64-bits
 MDSRCS+=machdep_ldisd.c
diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h
index 7ec3075fdf32..75de39cbd5c0 100644
--- a/lib/libc/powerpc/SYS.h
+++ b/lib/libc/powerpc/SYS.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	$NetBSD: SYS.h,v 1.8 2002/01/14 00:55:56 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/SYS.h,v 1.6 2003/01/18 23:26:04 obrien Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/powerpc/_fpmath.h b/lib/libc/powerpc/_fpmath.h
index 6d80eb4bdf4e..5285cb9b6f1e 100644
--- a/lib/libc/powerpc/_fpmath.h
+++ b/lib/libc/powerpc/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/_fpmath.h,v 1.7 2005/03/07 04:55:22 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/powerpc/arith.h b/lib/libc/powerpc/arith.h
index 8e2c9ec597b3..4c9b024fdec1 100644
--- a/lib/libc/powerpc/arith.h
+++ b/lib/libc/powerpc/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
  */
 
 /*
diff --git a/lib/libc/powerpc/gen/Makefile.inc b/lib/libc/powerpc/gen/Makefile.inc
index 4b381c3d9382..0e805ddd26db 100644
--- a/lib/libc/powerpc/gen/Makefile.inc
+++ b/lib/libc/powerpc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.8 2005/03/15 15:53:38 das Exp $
 
 SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \
 	fpgetsticky.c fpsetmask.c fpsetround.c \
diff --git a/lib/libc/powerpc/gen/_ctx_start.S b/lib/libc/powerpc/gen/_ctx_start.S
index a269e86eefc1..eb316b7a2e40 100644
--- a/lib/libc/powerpc/gen/_ctx_start.S
+++ b/lib/libc/powerpc/gen/_ctx_start.S
@@ -26,7 +26,7 @@
 
  #include <machine/asm.h>
 
- __FBSDID("$FreeBSD$");
+ __FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/_ctx_start.S,v 1.1 2004/03/02 06:22:24 grehan Exp $");
 
 	.globl  CNAME(_ctx_done)
 	.globl  CNAME(abort)
diff --git a/lib/libc/powerpc/gen/_set_tp.c b/lib/libc/powerpc/gen/_set_tp.c
index 045416ddafdf..40bf4e09cee8 100644
--- a/lib/libc/powerpc/gen/_set_tp.c
+++ b/lib/libc/powerpc/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/powerpc/gen/_set_tp.c,v 1.1 2004/08/15 16:18:03 dfr Exp $
  */
 
 void
diff --git a/lib/libc/powerpc/gen/_setjmp.S b/lib/libc/powerpc/gen/_setjmp.S
index 6d6e5e062a6f..60cc60c18050 100644
--- a/lib/libc/powerpc/gen/_setjmp.S
+++ b/lib/libc/powerpc/gen/_setjmp.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: _setjmp.S,v 1.1 1997/03/29 20:55:53 thorpej Exp $      */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/_setjmp.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/powerpc/gen/fabs.S b/lib/libc/powerpc/gen/fabs.S
index 79475ca9c0a8..f19d2fe58916 100644
--- a/lib/libc/powerpc/gen/fabs.S
+++ b/lib/libc/powerpc/gen/fabs.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fabs.S,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 /*
  * double fabs(double)
diff --git a/lib/libc/powerpc/gen/flt_rounds.c b/lib/libc/powerpc/gen/flt_rounds.c
index ec32a36ed28e..1179861f817a 100644
--- a/lib/libc/powerpc/gen/flt_rounds.c
+++ b/lib/libc/powerpc/gen/flt_rounds.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <machine/float.h>
diff --git a/lib/libc/powerpc/gen/fpgetmask.c b/lib/libc/powerpc/gen/fpgetmask.c
index 4d9a3b08c203..a21758470525 100644
--- a/lib/libc/powerpc/gen/fpgetmask.c
+++ b/lib/libc/powerpc/gen/fpgetmask.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpgetround.c b/lib/libc/powerpc/gen/fpgetround.c
index 2e4b92277af7..3b3e10661cc8 100644
--- a/lib/libc/powerpc/gen/fpgetround.c
+++ b/lib/libc/powerpc/gen/fpgetround.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpgetsticky.c b/lib/libc/powerpc/gen/fpgetsticky.c
index e8a21cab2202..4ff2694ba7bb 100644
--- a/lib/libc/powerpc/gen/fpgetsticky.c
+++ b/lib/libc/powerpc/gen/fpgetsticky.c
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.1 2004/02/12 09:11:06 grehan Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/powerpc/gen/fpsetmask.c b/lib/libc/powerpc/gen/fpsetmask.c
index 76a686730b28..8eb7ee41d9d5 100644
--- a/lib/libc/powerpc/gen/fpsetmask.c
+++ b/lib/libc/powerpc/gen/fpsetmask.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpsetround.c b/lib/libc/powerpc/gen/fpsetround.c
index 13377562b6cf..60a5d279a71a 100644
--- a/lib/libc/powerpc/gen/fpsetround.c
+++ b/lib/libc/powerpc/gen/fpsetround.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/infinity.c b/lib/libc/powerpc/gen/infinity.c
index cf1695e68028..a4b10ac93b46 100644
--- a/lib/libc/powerpc/gen/infinity.c
+++ b/lib/libc/powerpc/gen/infinity.c
@@ -4,7 +4,7 @@
 __RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/infinity.c,v 1.2 2003/02/08 20:37:53 mike Exp $");
 
 /* infinity.c */
 
diff --git a/lib/libc/powerpc/gen/makecontext.c b/lib/libc/powerpc/gen/makecontext.c
index d66e82457a4e..b8695ea3d8c5 100644
--- a/lib/libc/powerpc/gen/makecontext.c
+++ b/lib/libc/powerpc/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.2 2004/07/19 12:05:07 grehan Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/powerpc/gen/modf.c b/lib/libc/powerpc/gen/modf.c
index 37786dc1e19b..108b7f8e5c0b 100644
--- a/lib/libc/powerpc/gen/modf.c
+++ b/lib/libc/powerpc/gen/modf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/modf.c,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/powerpc/gen/setjmp.S b/lib/libc/powerpc/gen/setjmp.S
index a7961206f6cb..33ec9866710e 100644
--- a/lib/libc/powerpc/gen/setjmp.S
+++ b/lib/libc/powerpc/gen/setjmp.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: setjmp.S,v 1.3 1998/10/03 12:30:38 tsubai Exp $        */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/setjmp.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include <sys/syscall.h>
 	
diff --git a/lib/libc/powerpc/gen/signalcontext.c b/lib/libc/powerpc/gen/signalcontext.c
index 30e2be848b2b..fd828c7a6f79 100644
--- a/lib/libc/powerpc/gen/signalcontext.c
+++ b/lib/libc/powerpc/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/signalcontext.c,v 1.1 2004/07/19 12:08:03 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/powerpc/gen/sigsetjmp.S b/lib/libc/powerpc/gen/sigsetjmp.S
index 3d5d1e510e54..05fd2cceb795 100644
--- a/lib/libc/powerpc/gen/sigsetjmp.S
+++ b/lib/libc/powerpc/gen/sigsetjmp.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: sigsetjmp.S,v 1.4 1998/10/03 12:30:38 tsubai Exp $     */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/sigsetjmp.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 /*
  * C library -- sigsetjmp, siglongjmp
diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c
index e613f3a50985..6f5174a7d743 100644
--- a/lib/libc/powerpc/gen/syncicache.c
+++ b/lib/libc/powerpc/gen/syncicache.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.2 2004/01/21 05:04:25 grehan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/powerpc/net/Makefile.inc b/lib/libc/powerpc/net/Makefile.inc
index 96e559bf8027..3b6f388b6b8a 100644
--- a/lib/libc/powerpc/net/Makefile.inc
+++ b/lib/libc/powerpc/net/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/powerpc/net/Makefile.inc,v 1.1 2002/05/15 20:40:35 obrien Exp $
 
 SRCS+=	htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/powerpc/net/htonl.S b/lib/libc/powerpc/net/htonl.S
index b5a6d122a9cc..f31bb2e7bf36 100644
--- a/lib/libc/powerpc/net/htonl.S
+++ b/lib/libc/powerpc/net/htonl.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/net/htonl.S,v 1.1 2002/05/15 20:40:35 obrien Exp $");
 
 /* netorder = htonl(hostorder) */
 
diff --git a/lib/libc/powerpc/net/htons.S b/lib/libc/powerpc/net/htons.S
index 6aba09c8d67f..1e69d7eb2368 100644
--- a/lib/libc/powerpc/net/htons.S
+++ b/lib/libc/powerpc/net/htons.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/net/htons.S,v 1.1 2002/05/15 20:40:35 obrien Exp $");
 
 /* netorder = htons(hostorder) */
 
diff --git a/lib/libc/powerpc/net/ntohl.S b/lib/libc/powerpc/net/ntohl.S
index f85d59e82823..65b2e1e2c670 100644
--- a/lib/libc/powerpc/net/ntohl.S
+++ b/lib/libc/powerpc/net/ntohl.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/net/ntohl.S,v 1.1 2002/05/15 20:40:35 obrien Exp $");
 
 /* hostorder = ntohl(netorder) */
 
diff --git a/lib/libc/powerpc/net/ntohs.S b/lib/libc/powerpc/net/ntohs.S
index 21d41da25cb1..0cbcd5e36cc1 100644
--- a/lib/libc/powerpc/net/ntohs.S
+++ b/lib/libc/powerpc/net/ntohs.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/net/ntohs.S,v 1.1 2002/05/15 20:40:35 obrien Exp $");
 
 /* hostorder = ntohs(netorder) */
 
diff --git a/lib/libc/powerpc/sys/Makefile.inc b/lib/libc/powerpc/sys/Makefile.inc
index 84579ae5e038..82d9b1de7842 100644
--- a/lib/libc/powerpc/sys/Makefile.inc
+++ b/lib/libc/powerpc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/powerpc/sys/Makefile.inc,v 1.2 2003/08/11 07:14:07 bms Exp $
 
 MDASM+=	brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S
 
diff --git a/lib/libc/powerpc/sys/brk.S b/lib/libc/powerpc/sys/brk.S
index 9223db3d680b..365997139a8a 100644
--- a/lib/libc/powerpc/sys/brk.S
+++ b/lib/libc/powerpc/sys/brk.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: brk.S,v 1.9 2000/06/26 06:25:43 kleink Exp $   */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/brk.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/cerror.S b/lib/libc/powerpc/sys/cerror.S
index 91a30062b893..9b8f5fed723b 100644
--- a/lib/libc/powerpc/sys/cerror.S
+++ b/lib/libc/powerpc/sys/cerror.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: cerror.S,v 1.5 2000/01/27 14:58:48 kleink Exp $        */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/cerror.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 	
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/exect.S b/lib/libc/powerpc/sys/exect.S
index d5f9c201b676..bb510c73b432 100644
--- a/lib/libc/powerpc/sys/exect.S
+++ b/lib/libc/powerpc/sys/exect.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: exect.S,v 1.3 1998/05/25 15:28:03 ws Exp $     */
 	
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/exect.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/pipe.S b/lib/libc/powerpc/sys/pipe.S
index 3ca2358321e2..b0ad198913f4 100644
--- a/lib/libc/powerpc/sys/pipe.S
+++ b/lib/libc/powerpc/sys/pipe.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: pipe.S,v 1.6 2000/09/28 08:38:54 kleink Exp $  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/pipe.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/ptrace.S b/lib/libc/powerpc/sys/ptrace.S
index f47fc67c70e9..dd36833cf74d 100644
--- a/lib/libc/powerpc/sys/ptrace.S
+++ b/lib/libc/powerpc/sys/ptrace.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: ptrace.S,v 1.3 2000/02/23 20:16:57 kleink Exp $        */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/ptrace.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/sbrk.S b/lib/libc/powerpc/sys/sbrk.S
index 47fc0fe62028..efd889e194f6 100644
--- a/lib/libc/powerpc/sys/sbrk.S
+++ b/lib/libc/powerpc/sys/sbrk.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:44 kleink Exp $  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/sbrk.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/setlogin.S b/lib/libc/powerpc/sys/setlogin.S
index c65e639ba55f..3ec868b33bd0 100644
--- a/lib/libc/powerpc/sys/setlogin.S
+++ b/lib/libc/powerpc/sys/setlogin.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: setlogin.S,v 1.3 1998/11/24 11:14:57 tsubai Exp $      */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/setlogin.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 	
 #include "SYS.h"
 
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index c2e225561934..94396d6e8126 100644
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.9 2002/11/18 09:50:56 ru Exp $
 
 # Quad support, if needed
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad
diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c
index d0cd68a15f00..57397eebadc1 100644
--- a/lib/libc/quad/TESTS/divrem.c
+++ b/lib/libc/quad/TESTS/divrem.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)divrem.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/TESTS/divrem.c,v 1.2 2002/03/22 21:52:44 obrien Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c
index 8992c7cfd5fc..5e27a92f0d3c 100644
--- a/lib/libc/quad/TESTS/mul.c
+++ b/lib/libc/quad/TESTS/mul.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/TESTS/mul.c,v 1.2 2002/03/22 21:52:44 obrien Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/quad/adddi3.c b/lib/libc/quad/adddi3.c
index 9fdf16c4a3ad..d97059e27da3 100644
--- a/lib/libc/quad/adddi3.c
+++ b/lib/libc/quad/adddi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)adddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/adddi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/anddi3.c b/lib/libc/quad/anddi3.c
index 37a3e7750b86..7d58cf17c23c 100644
--- a/lib/libc/quad/anddi3.c
+++ b/lib/libc/quad/anddi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)anddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/anddi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/ashldi3.c b/lib/libc/quad/ashldi3.c
index 85dcb908ac05..6e9d493ae686 100644
--- a/lib/libc/quad/ashldi3.c
+++ b/lib/libc/quad/ashldi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ashldi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/ashldi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c
index 62bb90695dcc..0d57b20edd27 100644
--- a/lib/libc/quad/ashrdi3.c
+++ b/lib/libc/quad/ashrdi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ashrdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/ashrdi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/cmpdi2.c b/lib/libc/quad/cmpdi2.c
index 7e4d5f73be2f..495a8eece3a2 100644
--- a/lib/libc/quad/cmpdi2.c
+++ b/lib/libc/quad/cmpdi2.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)cmpdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/cmpdi2.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/divdi3.c b/lib/libc/quad/divdi3.c
index 5390e07a3339..a8290d8237f3 100644
--- a/lib/libc/quad/divdi3.c
+++ b/lib/libc/quad/divdi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)divdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/divdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
index fa947efdf784..10c2d51c86ac 100644
--- a/lib/libc/quad/fixdfdi.c
+++ b/lib/libc/quad/fixdfdi.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fixdfdi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixdfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
index 953c6b6b54ad..647a4a1ce0a4 100644
--- a/lib/libc/quad/fixsfdi.c
+++ b/lib/libc/quad/fixsfdi.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fixsfdi.c	5.1 (Berkeley) 7/7/92";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixsfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
index 632b1967e98d..694cd6229669 100644
--- a/lib/libc/quad/fixunsdfdi.c
+++ b/lib/libc/quad/fixunsdfdi.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fixunsdfdi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixunsdfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
index 928e251ecea8..1263feea33dd 100644
--- a/lib/libc/quad/fixunssfdi.c
+++ b/lib/libc/quad/fixunssfdi.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fixunssfdi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixunssfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
index 59ceb150a6dc..ba0b6a79a1ab 100644
--- a/lib/libc/quad/floatdidf.c
+++ b/lib/libc/quad/floatdidf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)floatdidf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/floatdidf.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
index ef53b6b7a8ca..bac96c288c85 100644
--- a/lib/libc/quad/floatdisf.c
+++ b/lib/libc/quad/floatdisf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)floatdisf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/floatdisf.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c
index f149dc3ce479..66bf63bf1d02 100644
--- a/lib/libc/quad/floatunsdidf.c
+++ b/lib/libc/quad/floatunsdidf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)floatunsdidf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/floatunsdidf.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/iordi3.c b/lib/libc/quad/iordi3.c
index d41a53ec837b..be16676f5615 100644
--- a/lib/libc/quad/iordi3.c
+++ b/lib/libc/quad/iordi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)iordi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/iordi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/lshldi3.c b/lib/libc/quad/lshldi3.c
index aab64f8342b8..261f4b0a8a0a 100644
--- a/lib/libc/quad/lshldi3.c
+++ b/lib/libc/quad/lshldi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)lshldi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/lshldi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/lshrdi3.c b/lib/libc/quad/lshrdi3.c
index a31f3e1323b2..9f35ed6311ec 100644
--- a/lib/libc/quad/lshrdi3.c
+++ b/lib/libc/quad/lshrdi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)lshrdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/lshrdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/moddi3.c b/lib/libc/quad/moddi3.c
index 410e6d66d12b..7a51dd34faac 100644
--- a/lib/libc/quad/moddi3.c
+++ b/lib/libc/quad/moddi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)moddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/moddi3.c,v 1.3 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/muldi3.c b/lib/libc/quad/muldi3.c
index 38cc42ea83a1..cc0c887af1fa 100644
--- a/lib/libc/quad/muldi3.c
+++ b/lib/libc/quad/muldi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/muldi3.c,v 1.3 2002/03/21 18:40:57 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/negdi2.c b/lib/libc/quad/negdi2.c
index 657319fa536e..f1de706077fa 100644
--- a/lib/libc/quad/negdi2.c
+++ b/lib/libc/quad/negdi2.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)negdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/negdi2.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/notdi2.c b/lib/libc/quad/notdi2.c
index 80d082ca6832..354abe56d03b 100644
--- a/lib/libc/quad/notdi2.c
+++ b/lib/libc/quad/notdi2.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)notdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/notdi2.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index 9176b8e5cf42..b57077afd473 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)qdivrem.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/qdivrem.c,v 1.3 2002/03/21 18:40:57 obrien Exp $");
 
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index fd1f5cc8824d..60a2ffb400e5 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/quad/quad.h,v 1.6 2002/03/21 22:47:55 obrien Exp $
  */
 
 /*
diff --git a/lib/libc/quad/subdi3.c b/lib/libc/quad/subdi3.c
index 1c5690a085cf..64adfdadfcab 100644
--- a/lib/libc/quad/subdi3.c
+++ b/lib/libc/quad/subdi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)subdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/subdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/ucmpdi2.c b/lib/libc/quad/ucmpdi2.c
index 83f919546b44..d5958baab2a9 100644
--- a/lib/libc/quad/ucmpdi2.c
+++ b/lib/libc/quad/ucmpdi2.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ucmpdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/ucmpdi2.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/udivdi3.c b/lib/libc/quad/udivdi3.c
index 54a539cefafb..f7ce83afce6d 100644
--- a/lib/libc/quad/udivdi3.c
+++ b/lib/libc/quad/udivdi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)udivdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/udivdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/umoddi3.c b/lib/libc/quad/umoddi3.c
index ecc5bdc7d973..12703c76fe09 100644
--- a/lib/libc/quad/umoddi3.c
+++ b/lib/libc/quad/umoddi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)umoddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/umoddi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/xordi3.c b/lib/libc/quad/xordi3.c
index b10aee92910a..73594de90564 100644
--- a/lib/libc/quad/xordi3.c
+++ b/lib/libc/quad/xordi3.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)xordi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/xordi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
index 221400dbaea2..e89b466aa34d 100644
--- a/lib/libc/regex/Makefile.inc
+++ b/lib/libc/regex/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.7 2002/11/18 09:50:56 ru Exp $
 
 # regex sources
 .PATH: ${.CURDIR}/regex
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
index b03085e485cc..4f0d583d291e 100644
--- a/lib/libc/regex/cname.h
+++ b/lib/libc/regex/cname.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/cname.h,v 1.3 2002/03/22 23:41:56 obrien Exp $
  */
 
 /* character-name table */
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index 35bcb5a83801..cb48cfc54618 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.16 2004/12/30 14:27:57 dds Exp $");
 
 /*
  * The matching engine and friends.  This file is #included by regexec.c
diff --git a/lib/libc/regex/grot/Makefile b/lib/libc/regex/grot/Makefile
index 3e4172432f1c..be00e5d00ed1 100644
--- a/lib/libc/regex/grot/Makefile
+++ b/lib/libc/regex/grot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.4 2004/07/19 08:48:17 tjr Exp $
 # You probably want to take -DREDEBUG out of CFLAGS, and put something like
 # -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of
 # internal assertion checking).  Take -Dconst= out for an ANSI compiler.
diff --git a/lib/libc/regex/grot/debug.c b/lib/libc/regex/grot/debug.c
index caa2ca39612d..74bca4657331 100644
--- a/lib/libc/regex/grot/debug.c
+++ b/lib/libc/regex/grot/debug.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.4 2004/07/19 08:28:53 tjr Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/grot/main.c b/lib/libc/regex/grot/main.c
index 6b2bf386eed4..b43c0eb4f595 100644
--- a/lib/libc/regex/grot/main.c
+++ b/lib/libc/regex/grot/main.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/grot/main.c,v 1.3 2002/03/22 21:52:48 obrien Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/grot/mkh b/lib/libc/regex/grot/mkh
index 1deba7983d5c..72bf2215d05c 100755
--- a/lib/libc/regex/grot/mkh
+++ b/lib/libc/regex/grot/mkh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # mkh - pull headers out of C source
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/grot/mkh,v 1.3 2002/03/22 19:45:43 obrien Exp $
 PATH=/bin:/usr/bin ; export PATH
 
 # egrep pattern to pick out marked lines
diff --git a/lib/libc/regex/grot/split.c b/lib/libc/regex/grot/split.c
index 70e0ec5fca90..fbc8b012b999 100644
--- a/lib/libc/regex/grot/split.c
+++ b/lib/libc/regex/grot/split.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/grot/split.c,v 1.3 2002/03/22 21:52:48 obrien Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/grot/tests b/lib/libc/regex/grot/tests
index 07e9dfb8539d..7b7922b64078 100644
--- a/lib/libc/regex/grot/tests
+++ b/lib/libc/regex/grot/tests
@@ -1,5 +1,5 @@
 # regular expression test set
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.2 2000/07/09 18:14:39 dcs Exp $
 # Lines are at least three fields, separated by one or more tabs.  "" stands
 # for an empty field.  First field is an RE.  Second field is flags.  If
 # C flag given, regcomp() is expected to fail, and the third field is the
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index d4555a02d0a6..4527043f2a7d 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.11 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd March 20, 1994
 .Dt RE_FORMAT 7
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index e03c6c23b358..268a579a1d8b 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.34 2004/10/03 15:42:59 stefanf Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index 7942ef706940..4e43f3dd5045 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regerror.c,v 1.9 2004/07/12 06:07:26 tjr Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 9d101e95c2f1..6555c2ece338 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.19 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd July 12, 2004
 .Dt REGEX 3
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 6beea48e3050..c971c9c3b968 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.8 2004/07/12 07:35:59 tjr Exp $
  */
 
 /*
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index c596bdd1628c..c570369623e9 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regexec.c,v 1.6 2004/07/12 07:35:59 tjr Exp $");
 
 /*
  * the outer shell of regexec()
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
index b1e6a359a1d7..110879e637ab 100644
--- a/lib/libc/regex/regfree.c
+++ b/lib/libc/regex/regfree.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regfree.c,v 1.6 2004/07/12 07:35:59 tjr Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/regex/utils.h b/lib/libc/regex/utils.h
index 9d6eba3cf8cb..5439b6cd45e9 100644
--- a/lib/libc/regex/utils.h
+++ b/lib/libc/regex/utils.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/utils.h,v 1.2 2002/03/22 23:41:56 obrien Exp $
  */
 
 /* utility definitions */
diff --git a/lib/libc/rpc/DISCLAIMER b/lib/libc/rpc/DISCLAIMER
index 9a3a99161ae8..738db7df8298 100644
--- a/lib/libc/rpc/DISCLAIMER
+++ b/lib/libc/rpc/DISCLAIMER
@@ -1,5 +1,5 @@
 /*	$NetBSD: DISCLAIMER,v 1.2 1998/01/09 04:11:51 perry Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/lib/libc/rpc/DISCLAIMER,v 1.2 2001/03/19 12:49:49 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/lib/libc/rpc/LICENSE b/lib/libc/rpc/LICENSE
index 5f1205c7052d..6914461a7904 100644
--- a/lib/libc/rpc/LICENSE
+++ b/lib/libc/rpc/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libc/rpc/LICENSE,v 1.1 2002/07/11 16:23:04 alfred Exp $
 
 Sun Industry Standards Source License 1.0
 
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index 96b004b1d520..9153ad42fd7b 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile    5.11 (Berkeley) 9/6/90
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.26 2004/01/11 17:14:54 ru Exp $
 
 .PATH: ${.CURDIR}/rpc ${.CURDIR}/.
 SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
diff --git a/lib/libc/rpc/PSD.doc/nfs.rfc.ms b/lib/libc/rpc/PSD.doc/nfs.rfc.ms
index 13d761908a8e..75c25a6723ad 100644
--- a/lib/libc/rpc/PSD.doc/nfs.rfc.ms
+++ b/lib/libc/rpc/PSD.doc/nfs.rfc.ms
@@ -2,7 +2,7 @@
 .\" Must use  --  tbl  --  with this one
 .\"
 .\" @(#)nfs.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/nfs.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/rpc.prog.ms b/lib/libc/rpc/PSD.doc/rpc.prog.ms
index 8b791309747e..1fbde7d3fd5b 100644
--- a/lib/libc/rpc/PSD.doc/rpc.prog.ms
+++ b/lib/libc/rpc/PSD.doc/rpc.prog.ms
@@ -2,7 +2,7 @@
 .\" Must use -- tbl and pic -- with this one
 .\"
 .\" @(#)rpc.prog.ms	2.3 88/08/11 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpc.prog.ms,v 1.5 2003/01/01 18:48:43 schweikh Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/rpc.rfc.ms b/lib/libc/rpc/PSD.doc/rpc.rfc.ms
index 9a948bd445dc..a7652c0b8d19 100644
--- a/lib/libc/rpc/PSD.doc/rpc.rfc.ms
+++ b/lib/libc/rpc/PSD.doc/rpc.rfc.ms
@@ -2,7 +2,7 @@
 .\" Must use  --  tbl  --  with this one
 .\"
 .\" @(#)rpc.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpc.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/rpcgen.ms b/lib/libc/rpc/PSD.doc/rpcgen.ms
index e663e7fd4f94..de4f1ac05ee9 100644
--- a/lib/libc/rpc/PSD.doc/rpcgen.ms
+++ b/lib/libc/rpc/PSD.doc/rpcgen.ms
@@ -2,7 +2,7 @@
 .\" Must use  --  tbl -- for this one
 .\"
 .\" @(#)rpcgen.ms	2.2 88/08/04 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpcgen.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/stubs b/lib/libc/rpc/PSD.doc/stubs
index 78b0a2c815d3..d715d3a4afe1 100644
--- a/lib/libc/rpc/PSD.doc/stubs
+++ b/lib/libc/rpc/PSD.doc/stubs
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/stubs,v 1.3 2002/10/29 15:00:10 ru Exp $
 .\"
 .if t .ftr L CR
diff --git a/lib/libc/rpc/PSD.doc/xdr.nts.ms b/lib/libc/rpc/PSD.doc/xdr.nts.ms
index 260c7f37eb05..55f26c604c97 100644
--- a/lib/libc/rpc/PSD.doc/xdr.nts.ms
+++ b/lib/libc/rpc/PSD.doc/xdr.nts.ms
@@ -2,7 +2,7 @@
 .\" Must use --  eqn -- with this one
 .\"
 .\" @(#)xdr.nts.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/xdr.nts.ms,v 1.4 2003/01/01 18:48:43 schweikh Exp $
 .\"
 .EQ
 delim $$
diff --git a/lib/libc/rpc/PSD.doc/xdr.rfc.ms b/lib/libc/rpc/PSD.doc/xdr.rfc.ms
index 480a339bce57..aa09e2d433d0 100644
--- a/lib/libc/rpc/PSD.doc/xdr.rfc.ms
+++ b/lib/libc/rpc/PSD.doc/xdr.rfc.ms
@@ -2,7 +2,7 @@
 .\"  Must use -- tbl -- with this one
 .\"
 .\" @(#)xdr.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/xdr.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/README b/lib/libc/rpc/README
index c915fad283c6..45bbd529627c 100644
--- a/lib/libc/rpc/README
+++ b/lib/libc/rpc/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libc/rpc/README,v 1.2 2001/03/19 12:49:50 alfred Exp $
 
 PLEASE READ THE DISCLAIMER FILE.  DO NOT CALL THE SUN MICROSYSTEMS SUPPORT
 LINE WITH QUESTIONS ON THIS RELEASE.  THEY CANNOT ANSWER QUESTIONS ABOUT THIS
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index b4b7d549d1df..ccaf4223bb2c 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -57,7 +57,7 @@
 static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.9 2004/10/16 06:11:34 obrien Exp $");
 
 #define USEC_PER_SEC		1000000
 #define RTIME_TIMEOUT		5	/* seconds to wait for sync */
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 8546af317ab3..b8704ba70ee8 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.13 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * auth_none.c
diff --git a/lib/libc/rpc/auth_time.c b/lib/libc/rpc/auth_time.c
index ae108c28ef9f..a663917c17be 100644
--- a/lib/libc/rpc/auth_time.c
+++ b/lib/libc/rpc/auth_time.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_time.c,v 1.11 2005/03/10 00:57:01 stefanf Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 29082bd99102..2ce1e5ed358e 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.16 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * auth_unix.c, Implements UNIX style authentication parameters.
diff --git a/lib/libc/rpc/authdes_prot.c b/lib/libc/rpc/authdes_prot.c
index 19969b01819a..b9069c5a3067 100644
--- a/lib/libc/rpc/authdes_prot.c
+++ b/lib/libc/rpc/authdes_prot.c
@@ -2,7 +2,7 @@
 static char sccsid[] = 	"@(#)authdes_prot.c	2.1 88/07/29 4.0 RPCSRC; from 1.6 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/authdes_prot.c,v 1.4 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index 441ba40affa8..9b5b4cb536da 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.9 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * authunix_prot.c
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
index 28e86e5f2a6f..92ebf56b551c 100644
--- a/lib/libc/rpc/bindresvport.3
+++ b/lib/libc/rpc/bindresvport.3
@@ -1,6 +1,6 @@
 .\" @(#)bindresvport.3n	2.2 88/08/02 4.0 RPCSRC; from 1.7 88/03/14 SMI
 .\" $NetBSD: bindresvport.3,v 1.8 2000/07/05 15:45:33 msaitoh Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/bindresvport.3,v 1.15 2002/12/18 12:45:10 ru Exp $
 .\"
 .Dd November 22, 1987
 .Dt BINDRESVPORT 3
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 75a1c8fd1c3d..9ab2221d8a9f 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -35,7 +35,7 @@ static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";
 #endif
 /* from: $OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.16 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1987 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
index 5c48cf874b77..8fcb0aa51078 100644
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_bcast.c,v 1.8 2004/10/16 06:11:34 obrien Exp $");
 
 
 /*
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index ff97379935fc..7c92fdabf6a6 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_dg.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Implements a connectionless client side RPC.
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 302a30e96c60..9b74c6a53032 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -53,7 +53,7 @@ static char *sccsid2 = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
 static char *sccsid = "from: @(#)clnt_generic.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.15 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1986-1996,1998 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index 4b6d6b1e6e0f..e3e982bf3063 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -35,7 +35,7 @@ static char *sccsid2 = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * clnt_perror.c
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 5b11a5f2470b..77b38ad17964 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.19 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * clnt_raw.c
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index ae9c87f6e34f..f3ee6ed44eab 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -37,7 +37,7 @@ static char *sccsid2 = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Mic
 static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.19 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * clnt_simple.c
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index 10780a55523d..ef66d276233f 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -35,7 +35,7 @@ static char *sccsid = "@(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";
 static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_vc.c,v 1.18 2005/03/10 08:25:49 stefanf Exp $");
  
 /*
  * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
index 255b266f0567..cdb5a0dc991a 100644
--- a/lib/libc/rpc/crypt_client.c
+++ b/lib/libc/rpc/crypt_client.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/crypt_client.c,v 1.9 2003/02/16 17:29:10 nectar Exp $");
 
 #include "namespace.h"
 #include <err.h>
diff --git a/lib/libc/rpc/des_crypt.3 b/lib/libc/rpc/des_crypt.3
index b40a62c4ae29..51ebe40d83b6 100644
--- a/lib/libc/rpc/des_crypt.3
+++ b/lib/libc/rpc/des_crypt.3
@@ -1,5 +1,5 @@
 .\" @(#)des_crypt.3	2.1 88/08/11 4.0 RPCSRC; from 1.16 88/03/02 SMI;
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/des_crypt.3,v 1.9 2002/12/19 09:40:23 ru Exp $
 .\"
 .Dd October 6, 1987
 .Dt DES_CRYPT 3
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index 238d55af7b12..f1e4b9efb0d3 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.8 2004/10/16 06:11:34 obrien Exp $");
 
 static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
 int (*__des_crypt_LOCAL)() = 0;
diff --git a/lib/libc/rpc/des_soft.c b/lib/libc/rpc/des_soft.c
index daed2654e445..f5bef95103fb 100644
--- a/lib/libc/rpc/des_soft.c
+++ b/lib/libc/rpc/des_soft.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/des_soft.c,v 1.3 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Table giving odd parity in the low bit for ASCII characters
diff --git a/lib/libc/rpc/getnetconfig.3 b/lib/libc/rpc/getnetconfig.3
index e67b9bbb75c9..d6c2e5c38608 100644
--- a/lib/libc/rpc/getnetconfig.3
+++ b/lib/libc/rpc/getnetconfig.3
@@ -1,6 +1,6 @@
 .\" @(#)getnetconfig.3n 1.28 93/06/02 SMI; from SVr4
 .\" $NetBSD: getnetconfig.3,v 1.1 2000/06/02 23:11:11 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getnetconfig.3,v 1.4 2002/12/19 09:40:23 ru Exp $
 .\" Copyright 1989 AT&T
 .Dd April 22, 2000
 .Dt GETNETCONFIG 3
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index 0159e4b37212..ec091f3f9cb5 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetconfig.c,v 1.11 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getnetpath.3 b/lib/libc/rpc/getnetpath.3
index 5dfe68ad6ec9..c5717063402f 100644
--- a/lib/libc/rpc/getnetpath.3
+++ b/lib/libc/rpc/getnetpath.3
@@ -1,6 +1,6 @@
 .\" @(#)getnetpath.3n 1.26 93/05/07 SMI; from SVr4
 .\" $NetBSD: getnetpath.3,v 1.1 2000/06/02 23:11:11 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getnetpath.3,v 1.5 2002/12/18 12:45:10 ru Exp $
 .\" Copyright 1989 AT&T
 .Dd April 22, 2000
 .Dt GETNETPATH 3
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
index db4dfc55e327..d0f8187fb42f 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetpath.c,v 1.5 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
index 57b327e47b8c..b531b46bbaf2 100644
--- a/lib/libc/rpc/getpublickey.c
+++ b/lib/libc/rpc/getpublickey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getpublickey.c,v 1.7 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * publickey.c
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
index 1a999eb3f9cb..b33f874a4f54 100644
--- a/lib/libc/rpc/getrpcent.3
+++ b/lib/libc/rpc/getrpcent.3
@@ -1,6 +1,6 @@
 .\" @(#)getrpcent.3n	2.2 88/08/02 4.0 RPCSRC; from 1.11 88/03/14 SMI
 .\" $NetBSD: getrpcent.3,v 1.6 1998/02/05 18:49:06 perry Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getrpcent.3,v 1.18 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd December 14, 1987
 .Dt GETRPCENT 3
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index b20d80d3498e..927dc3f891a5 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -34,7 +34,7 @@
 static char *sccsid = "@(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcent.c,v 1.14 2003/02/27 13:40:01 nectar Exp $");
 
 /*
  * Copyright (c) 1984 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getrpcport.3 b/lib/libc/rpc/getrpcport.3
index 6e1f199e7b3c..e28ed3f5fb9f 100644
--- a/lib/libc/rpc/getrpcport.3
+++ b/lib/libc/rpc/getrpcport.3
@@ -1,5 +1,5 @@
 .\" @(#)getrpcport.3r	2.2 88/08/02 4.0 RPCSRC; from 1.12 88/02/26 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getrpcport.3,v 1.9 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd October 6, 1987
 .Dt GETRPCPORT 3
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 676a1f5ae145..155320f6a087 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 static char *sccsid = "@(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.13 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1985 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index be4cf82a9a46..23539855100a 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -32,7 +32,7 @@
 
 #ident	"@(#)key_call.c	1.25	94/04/24 SMI"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/key_call.c,v 1.15 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * key_call.c, Interface to keyserver
diff --git a/lib/libc/rpc/key_prot_xdr.c b/lib/libc/rpc/key_prot_xdr.c
index 18b132894eae..fe3c1074d98f 100644
--- a/lib/libc/rpc/key_prot_xdr.c
+++ b/lib/libc/rpc/key_prot_xdr.c
@@ -38,7 +38,7 @@
 
 /* #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.5 2004/10/16 06:11:34 obrien Exp $");
 
 /* 
  * Compiled from key_prot.x using rpcgen.
diff --git a/lib/libc/rpc/mt_misc.c b/lib/libc/rpc/mt_misc.c
index da9c96861334..adabbb824c43 100644
--- a/lib/libc/rpc/mt_misc.c
+++ b/lib/libc/rpc/mt_misc.c
@@ -2,7 +2,7 @@
 
 /* #pragma ident	"@(#)mt_misc.c	1.24	93/04/29 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/mt_misc.c,v 1.6 2004/10/16 06:11:34 obrien Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc/rpc/netconfig.5 b/lib/libc/rpc/netconfig.5
index 25738bcc2efe..5cbc810a469f 100644
--- a/lib/libc/rpc/netconfig.5
+++ b/lib/libc/rpc/netconfig.5
@@ -1,6 +1,6 @@
 .\"	$NetBSD: netconfig.5,v 1.2 2000/11/08 13:18:28 lukem Exp $
 .\" $NetBSD: netconfig.5,v 1.2 2000/11/08 13:18:28 lukem Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/netconfig.5,v 1.1 2001/03/19 12:49:51 alfred Exp $
 .Dd November 17, 2000
 .Dt NETCONFIG 5
 .Os
diff --git a/lib/libc/rpc/netname.c b/lib/libc/rpc/netname.c
index 2f305307b7bc..e8e72c3dd552 100644
--- a/lib/libc/rpc/netname.c
+++ b/lib/libc/rpc/netname.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)netname.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/netname.c,v 1.8 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * netname utility routines
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 7e567dffaf3d..d88793d17760 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.12 2005/03/10 00:58:21 stefanf Exp $");
 
 /*
  * netname utility routines convert from unix names to network names and
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index a0db013d3a81..81caea768453 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_clnt.c
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 42d3720b09db..dcb895c8f428 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.16 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_getmap.c
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index ca0aafde9b29..1fdda9a17e22 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Mic
 static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_getport.c
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index 2c01311815f0..d9b66e88a60c 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.9 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_prot.c
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index ae7c7c6fe4a8..e3c6c2fe2089 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.10 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_prot2.c
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index ddcde2e0587e..a74f75b6d466 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.20 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_rmt.c
diff --git a/lib/libc/rpc/publickey.3 b/lib/libc/rpc/publickey.3
index 369ae8be0833..2bbe9c751b6b 100644
--- a/lib/libc/rpc/publickey.3
+++ b/lib/libc/rpc/publickey.3
@@ -1,5 +1,5 @@
 .\" @(#)publickey.3r	2.1 88/08/07 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/publickey.3,v 1.7 2002/12/18 12:45:10 ru Exp $
 .\"
 .Dd October 6, 1987
 .Dt PUBLICKEY 3
diff --git a/lib/libc/rpc/publickey.5 b/lib/libc/rpc/publickey.5
index 71f4ef6aca40..674ad29b4625 100644
--- a/lib/libc/rpc/publickey.5
+++ b/lib/libc/rpc/publickey.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/publickey.5,v 1.7 2003/08/26 15:52:47 eivind Exp $
 .\" @(#)publickey.5	2.1 88/08/07 4.0 RPCSRC; from 1.6 88/02/29 SMI;
 .Dd October 19, 1987
 .Dt PUBLICKEY 5
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 81a24ca63163..17a3a5c1cebf 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,7 +1,7 @@
 .\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4
 .\" Copyright 1989 AT&T
 .\" $NetBSD: rpc.3,v 1.10 2000/06/02 23:11:12 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc.3,v 1.23 2004/07/03 22:30:09 ru Exp $
 .Dd May 7, 1993
 .Dt RPC 3
 .Os
diff --git a/lib/libc/rpc/rpc.5 b/lib/libc/rpc/rpc.5
index 398d9aa4b420..f8c0440366ef 100644
--- a/lib/libc/rpc/rpc.5
+++ b/lib/libc/rpc/rpc.5
@@ -1,5 +1,5 @@
 .\" $NetBSD: rpc.5,v 1.3 2000/06/15 20:05:54 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc.5,v 1.11 2005/01/20 09:17:04 ru Exp $
 .\" @(#)rpc.4 1.17 93/08/30 SMI; from SVr4
 .\" Copyright 1989 AT&T
 .Dd December 10, 1991
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index b9b64f5991ed..05595cc83452 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpc_callmsg.c
diff --git a/lib/libc/rpc/rpc_clnt_auth.3 b/lib/libc/rpc/rpc_clnt_auth.3
index 863707e3da5e..9671d108b876 100644
--- a/lib/libc/rpc/rpc_clnt_auth.3
+++ b/lib/libc/rpc/rpc_clnt_auth.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_clnt_auth 1.4 89/07/20 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_clnt_auth.3,v 1.1 2000/06/03 09:29:50 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_auth.3,v 1.6 2005/02/09 18:03:14 ru Exp $
 .Dd May 7, 1993
 .Dt RPC_CLNT_AUTH 3
 .Os
diff --git a/lib/libc/rpc/rpc_clnt_calls.3 b/lib/libc/rpc/rpc_clnt_calls.3
index 213a7d184811..b7ca9eab996e 100644
--- a/lib/libc/rpc/rpc_clnt_calls.3
+++ b/lib/libc/rpc/rpc_clnt_calls.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_clnt_calls 1.4 89/07/20 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_calls.3,v 1.8 2005/02/09 18:03:14 ru Exp $
 .Dd May 7, 1993
 .Dt RPC_CLNT_CALLS 3
 .Os
diff --git a/lib/libc/rpc/rpc_clnt_create.3 b/lib/libc/rpc/rpc_clnt_create.3
index 223b9af82a42..cd15c1a29a3c 100644
--- a/lib/libc/rpc/rpc_clnt_create.3
+++ b/lib/libc/rpc/rpc_clnt_create.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_clnt_create 1.5 89/07/24 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\" $NetBSD: rpc_clnt_create.3,v 1.2 2000/06/20 00:53:08 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_create.3,v 1.13 2005/02/13 22:25:12 ru Exp $
 .Dd May 7, 1993
 .Dt RPC_CLNT_CREATE 3
 .Os
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h
index a7cfd9730d04..0c6a0688bdbe 100644
--- a/lib/libc/rpc/rpc_com.h
+++ b/lib/libc/rpc/rpc_com.h
@@ -28,7 +28,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/rpc/rpc_com.h,v 1.7 2003/02/27 13:40:01 nectar Exp $
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 679233a9521e..8f7e897a9c18 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -33,7 +33,7 @@
 static char *sccsid = "@(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_commondata.c,v 1.9 2002/03/22 23:18:37 obrien Exp $");
 
 #include "namespace.h"
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index 5e50ba8d8475..235809950aa1 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
 static char *sccsid = "@(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 #include "namespace.h"
 #include <unistd.h>
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index 4baa63315494..e6d78eadb985 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -34,7 +34,7 @@
 
 /* #pragma ident	"@(#)rpc_generic.c	1.17	94/04/24 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_generic.c,v 1.12 2003/10/29 09:20:33 mbr Exp $");
 
 /*
  * rpc_generic.c, Miscl routines for RPC.
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index 87278e7c5441..203e3fa3cfef 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpc_prot.c
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index 07c6314c9402..ca131cb71c72 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -1,5 +1,5 @@
 .\" @(#)rpc_secure.3n	2.1 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_secure.3,v 1.15 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd February 16, 1988
 .Dt RPC 3
diff --git a/lib/libc/rpc/rpc_soc.3 b/lib/libc/rpc/rpc_soc.3
index ebc666b7bcec..59058c06c6b5 100644
--- a/lib/libc/rpc/rpc_soc.3
+++ b/lib/libc/rpc/rpc_soc.3
@@ -1,6 +1,6 @@
 .\" @(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
 .\" $NetBSD: rpc_soc.3,v 1.2 2000/06/07 13:39:43 simonb Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_soc.3,v 1.12 2003/02/06 11:04:47 charnier Exp $
 .\"
 .Dd February 16, 1988
 .Dt RPC_SOC 3
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 7a9830186a70..b756ffa7b305 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_soc.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
 
 #ifdef PORTMAP
 /*
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
index 0596fdd71e44..ac6f89f25466 100644
--- a/lib/libc/rpc/rpc_svc_calls.3
+++ b/lib/libc/rpc/rpc_svc_calls.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_svc_calls 1.5 89/07/25 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_svc_calls.3,v 1.1 2000/06/02 23:11:13 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_calls.3,v 1.9 2005/02/09 18:03:14 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_CALLS 3
 .Os
diff --git a/lib/libc/rpc/rpc_svc_create.3 b/lib/libc/rpc/rpc_svc_create.3
index 4016a6c36b03..d47be2b2927b 100644
--- a/lib/libc/rpc/rpc_svc_create.3
+++ b/lib/libc/rpc/rpc_svc_create.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_svc_create 1.3 89/06/28 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_create.3,v 1.7 2003/09/08 19:57:15 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_CREATE 3
 .Os
diff --git a/lib/libc/rpc/rpc_svc_err.3 b/lib/libc/rpc/rpc_svc_err.3
index 7a6b1f132f4c..8af147520d97 100644
--- a/lib/libc/rpc/rpc_svc_err.3
+++ b/lib/libc/rpc/rpc_svc_err.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_svc_err 1.4 89/06/28 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_svc_err.3,v 1.1 2000/06/02 23:11:14 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_err.3,v 1.5 2005/02/09 18:03:14 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_ERR 3
 .Os
diff --git a/lib/libc/rpc/rpc_svc_reg.3 b/lib/libc/rpc/rpc_svc_reg.3
index aed2ba127a16..847487db481c 100644
--- a/lib/libc/rpc/rpc_svc_reg.3
+++ b/lib/libc/rpc/rpc_svc_reg.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_svc_call 1.6 89/07/20 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_svc_reg.3,v 1.1 2000/06/02 23:11:14 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_reg.3,v 1.6 2005/02/09 18:03:14 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_REG 3
 .Os
diff --git a/lib/libc/rpc/rpc_xdr.3 b/lib/libc/rpc/rpc_xdr.3
index 62754fe7e285..fb1229e17d9e 100644
--- a/lib/libc/rpc/rpc_xdr.3
+++ b/lib/libc/rpc/rpc_xdr.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_xdr.new 1.1 89/04/06 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_xdr.3,v 1.4 2005/02/09 18:03:14 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_XDR 3
 .Os
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index d92115814c7e..51f5450ef4c3 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -56,7 +56,7 @@
 static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_clnt.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpcb_clnt.c
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
index 17dc37565006..7d001936b8a3 100644
--- a/lib/libc/rpc/rpcb_prot.c
+++ b/lib/libc/rpc/rpcb_prot.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_prot.c,v 1.5 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpcb_prot.c
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
index 7ca2ba94ff74..92f391217df5 100644
--- a/lib/libc/rpc/rpcb_st_xdr.c
+++ b/lib/libc/rpc/rpcb_st_xdr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_st_xdr.c,v 1.3 2002/07/14 23:38:37 alfred Exp $");
 
 #include "namespace.h"
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/rpcbind.3 b/lib/libc/rpc/rpcbind.3
index 0b716ca7a2b6..b52399e32afe 100644
--- a/lib/libc/rpc/rpcbind.3
+++ b/lib/libc/rpc/rpcbind.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" Copyright (c) 1988 Sun Microsystem's, Inc. - All Right's Reserved.
 .\"	$NetBSD: rpcbind.3,v 1.2 2000/06/03 18:47:28 fvdl Exp	$
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpcbind.3,v 1.6 2005/02/09 18:03:14 ru Exp $
 .Dd May 7, 1993
 .Dt RPCBIND 3
 .Os
diff --git a/lib/libc/rpc/rpcdname.c b/lib/libc/rpc/rpcdname.c
index d4455f4088cd..fd97528763b3 100644
--- a/lib/libc/rpc/rpcdname.c
+++ b/lib/libc/rpc/rpcdname.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcdname.c,v 1.5 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpcdname.c
diff --git a/lib/libc/rpc/rtime.3 b/lib/libc/rpc/rtime.3
index 028d2beade14..6e61350c32bc 100644
--- a/lib/libc/rpc/rtime.3
+++ b/lib/libc/rpc/rtime.3
@@ -1,5 +1,5 @@
 .\" @(#)rtime.3n	2.1 88/08/08 4.0 RPCSRC; from 1.5 88/02/08 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rtime.3,v 1.8 2002/12/19 09:40:23 ru Exp $
 .\"
 .Dd November 22, 1987
 .Dt RTIME 3
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 39ac19ba4a1f..f8883ee08e6b 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -58,7 +58,7 @@
 static char sccsid[] = 	"@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rtime.c,v 1.9 2005/03/10 00:57:01 stefanf Exp $");
 
 extern int _rpc_dtablesize( void );
 
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 4241eecf07cd..38bd668d76a0 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.23 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc.c, Server-side remote procedure call interface.
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 05202d094ec2..ef37b179cb5e 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_auth.c, Server-side rpc authenticator interface.
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 84f1e19a1759..7529c2962ae9 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -68,7 +68,7 @@
 static char sccsid[] = 	"@(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.9 2002/03/22 23:18:37 obrien Exp $");
 
 extern int key_decryptsession_pk(const char *, netobj *, des_block *);
 
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 4d6f1021c814..d84afbbdb4b0 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -32,7 +32,7 @@ static char *sccsid2 = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.11 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_auth_unix.c
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index 14e927c5a33c..53598de92219 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -37,7 +37,7 @@
 #ident	"@(#)svc_dg.c	1.17	94/04/24 SMI"
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.7 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_dg.c, Server side for connectionless RPC.
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
index 6df52e686ef2..945a9ffefd9e 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.6 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_generic.c, Server side for RPC.
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index ba5b0170f2a1..f68313c9d420 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)svc_raw.c 1.25 89/01/31 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_raw.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_raw.c,   This a toy for simple testing and timing.
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 13ddac86a0a2..326ec026a9a6 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
 static char *sccsid = "from: @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_run.c,v 1.19 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * This is the rpc server side idle loop
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index 2acae4b3a5ff..008af575e926 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -34,7 +34,7 @@
 
 /* #pragma ident	"@(#)svc_simple.c	1.18	94/04/24 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_simple.c,v 1.14 2002/03/22 23:18:37 obrien Exp $");
 
 /*
  * svc_simple.c
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index 35846946479d..ab5bf0ee0ecc 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_vc.c,v 1.24 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_vc.c, Server side for Connection Oriented based RPC. 
diff --git a/lib/libc/softfloat/Makefile.inc b/lib/libc/softfloat/Makefile.inc
index 5e4091653b9c..4472b4c18c11 100644
--- a/lib/libc/softfloat/Makefile.inc
+++ b/lib/libc/softfloat/Makefile.inc
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.inc,v 1.3 2003/05/06 08:58:20 rearnsha Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/softfloat/Makefile.inc,v 1.2 2005/03/15 15:53:39 das Exp $
 
 SOFTFLOAT_BITS?=64
 .PATH:		${MACHINE_ARCH}/softfloat \
diff --git a/lib/libc/softfloat/README.NetBSD b/lib/libc/softfloat/README.NetBSD
index c6ca7a8753cc..29cfe8fd6443 100644
--- a/lib/libc/softfloat/README.NetBSD
+++ b/lib/libc/softfloat/README.NetBSD
@@ -1,5 +1,5 @@
 $NetBSD: README.NetBSD,v 1.2 2002/05/21 23:51:05 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/README.NetBSD,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 This is a modified version of part of John Hauser's SoftFloat 2a package.
 This version has been heavily modified to support its use with GCC to
diff --git a/lib/libc/softfloat/README.txt b/lib/libc/softfloat/README.txt
index fe28ccc294fb..99e662e48c82 100644
--- a/lib/libc/softfloat/README.txt
+++ b/lib/libc/softfloat/README.txt
@@ -1,5 +1,5 @@
 $NetBSD: README.txt,v 1.1 2000/06/06 08:15:02 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/README.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 Package Overview for SoftFloat Release 2a
 
diff --git a/lib/libc/softfloat/bits32/softfloat-macros b/lib/libc/softfloat/bits32/softfloat-macros
index 4fd4f2f9fc66..7c12aded2404 100644
--- a/lib/libc/softfloat/bits32/softfloat-macros
+++ b/lib/libc/softfloat/bits32/softfloat-macros
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/bits32/softfloat-macros,v 1.1 2004/05/14 12:13:05 cognet Exp $ */
 
 /*
 ===============================================================================
diff --git a/lib/libc/softfloat/bits32/softfloat.c b/lib/libc/softfloat/bits32/softfloat.c
index 7785c4ea11e8..75f1a99a9c99 100644
--- a/lib/libc/softfloat/bits32/softfloat.c
+++ b/lib/libc/softfloat/bits32/softfloat.c
@@ -52,7 +52,7 @@ this code that are retained.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.2 2004/12/08 18:41:42 cognet Exp $");
 
 #ifdef SOFTFLOAT_FOR_GCC
 #include "softfloat-for-gcc.h"
diff --git a/lib/libc/softfloat/bits64/softfloat-macros b/lib/libc/softfloat/bits64/softfloat-macros
index 9b478e884eba..f7c90c0631c0 100644
--- a/lib/libc/softfloat/bits64/softfloat-macros
+++ b/lib/libc/softfloat/bits64/softfloat-macros
@@ -1,5 +1,5 @@
 /* $NetBSD: softfloat-macros,v 1.1 2002/05/21 23:51:08 bjh21 Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/bits64/softfloat-macros,v 1.1 2004/05/14 12:13:05 cognet Exp $ */
 
 /*
 ===============================================================================
diff --git a/lib/libc/softfloat/bits64/softfloat.c b/lib/libc/softfloat/bits64/softfloat.c
index ffd5661d6719..66fd25aa182e 100644
--- a/lib/libc/softfloat/bits64/softfloat.c
+++ b/lib/libc/softfloat/bits64/softfloat.c
@@ -45,7 +45,7 @@ this code that are retained.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits64/softfloat.c,v 1.1 2004/05/14 12:13:05 cognet Exp $");
 
 #ifdef SOFTFLOAT_FOR_GCC
 #include "softfloat-for-gcc.h"
diff --git a/lib/libc/softfloat/eqdf2.c b/lib/libc/softfloat/eqdf2.c
index 68bb55c30e2c..98fc61a0fcdf 100644
--- a/lib/libc/softfloat/eqdf2.c
+++ b/lib/libc/softfloat/eqdf2.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/eqdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "softfloat-for-gcc.h"
 #include "milieu.h"
diff --git a/lib/libc/softfloat/eqsf2.c b/lib/libc/softfloat/eqsf2.c
index d45b806cc9f3..f07e124f319b 100644
--- a/lib/libc/softfloat/eqsf2.c
+++ b/lib/libc/softfloat/eqsf2.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/eqsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "softfloat-for-gcc.h"
 #include "milieu.h"
diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c
index 27f7460ff37a..41d31ca10c39 100644
--- a/lib/libc/softfloat/fpgetmask.c
+++ b/lib/libc/softfloat/fpgetmask.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpgetmask.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c
index 4ffb71f36464..cbf110731d60 100644
--- a/lib/libc/softfloat/fpgetround.c
+++ b/lib/libc/softfloat/fpgetround.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpgetround.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c
index c76f98521d17..2fb61b721725 100644
--- a/lib/libc/softfloat/fpgetsticky.c
+++ b/lib/libc/softfloat/fpgetsticky.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpgetsticky.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c
index fb8b44ddc018..00d44f6ba70c 100644
--- a/lib/libc/softfloat/fpsetmask.c
+++ b/lib/libc/softfloat/fpsetmask.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpsetmask.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c
index ce3ef9e96ac0..a5e621504412 100644
--- a/lib/libc/softfloat/fpsetround.c
+++ b/lib/libc/softfloat/fpsetround.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpsetround.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c
index 99379b3eb81f..9f33a00c6522 100644
--- a/lib/libc/softfloat/fpsetsticky.c
+++ b/lib/libc/softfloat/fpsetsticky.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpsetsticky.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/gedf2.c b/lib/libc/softfloat/gedf2.c
index 76e25de58a64..721617eeeb3f 100644
--- a/lib/libc/softfloat/gedf2.c
+++ b/lib/libc/softfloat/gedf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gedf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gedf2(float64, float64);
 
diff --git a/lib/libc/softfloat/gesf2.c b/lib/libc/softfloat/gesf2.c
index b22e13afb63d..6d47f7e299e4 100644
--- a/lib/libc/softfloat/gesf2.c
+++ b/lib/libc/softfloat/gesf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gesf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gesf2(float32, float32);
 
diff --git a/lib/libc/softfloat/gtdf2.c b/lib/libc/softfloat/gtdf2.c
index ff5764a519c6..57e4847c7aba 100644
--- a/lib/libc/softfloat/gtdf2.c
+++ b/lib/libc/softfloat/gtdf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gtdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gtdf2(float64, float64);
 
diff --git a/lib/libc/softfloat/gtsf2.c b/lib/libc/softfloat/gtsf2.c
index 8e7e7a9371c1..70a06ff8345c 100644
--- a/lib/libc/softfloat/gtsf2.c
+++ b/lib/libc/softfloat/gtsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gtsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gtsf2(float32, float32);
 
diff --git a/lib/libc/softfloat/ledf2.c b/lib/libc/softfloat/ledf2.c
index 7d3e8fb54855..f4509e4d9228 100644
--- a/lib/libc/softfloat/ledf2.c
+++ b/lib/libc/softfloat/ledf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/ledf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __ledf2(float64, float64);
 
diff --git a/lib/libc/softfloat/lesf2.c b/lib/libc/softfloat/lesf2.c
index 6fa13e5e2467..6e2b492fb1d1 100644
--- a/lib/libc/softfloat/lesf2.c
+++ b/lib/libc/softfloat/lesf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/lesf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __lesf2(float32, float32);
 
diff --git a/lib/libc/softfloat/ltdf2.c b/lib/libc/softfloat/ltdf2.c
index b8c668ccc01d..f0702a70bd9d 100644
--- a/lib/libc/softfloat/ltdf2.c
+++ b/lib/libc/softfloat/ltdf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/ltdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __ltdf2(float64, float64);
 
diff --git a/lib/libc/softfloat/ltsf2.c b/lib/libc/softfloat/ltsf2.c
index 8a1e8fa9e50b..829e942b43b8 100644
--- a/lib/libc/softfloat/ltsf2.c
+++ b/lib/libc/softfloat/ltsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/ltsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __ltsf2(float32, float32);
 
diff --git a/lib/libc/softfloat/nedf2.c b/lib/libc/softfloat/nedf2.c
index 61f50443c9c5..f9d2aa884dfd 100644
--- a/lib/libc/softfloat/nedf2.c
+++ b/lib/libc/softfloat/nedf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/nedf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __nedf2(float64, float64);
 
diff --git a/lib/libc/softfloat/negdf2.c b/lib/libc/softfloat/negdf2.c
index 2485d586c475..c07c7fafb3bc 100644
--- a/lib/libc/softfloat/negdf2.c
+++ b/lib/libc/softfloat/negdf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/negdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 float64 __negdf2(float64);
 
diff --git a/lib/libc/softfloat/negsf2.c b/lib/libc/softfloat/negsf2.c
index 78f6c6bd5f1f..3038f69b1b76 100644
--- a/lib/libc/softfloat/negsf2.c
+++ b/lib/libc/softfloat/negsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/negsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 float32 __negsf2(float32);
 
diff --git a/lib/libc/softfloat/nesf2.c b/lib/libc/softfloat/nesf2.c
index b8317cbf8dd8..880f314e2bfe 100644
--- a/lib/libc/softfloat/nesf2.c
+++ b/lib/libc/softfloat/nesf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/nesf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __nesf2(float32, float32);
 
diff --git a/lib/libc/softfloat/softfloat-for-gcc.h b/lib/libc/softfloat/softfloat-for-gcc.h
index fa5b3e8c9050..acc49780b0dc 100644
--- a/lib/libc/softfloat/softfloat-for-gcc.h
+++ b/lib/libc/softfloat/softfloat-for-gcc.h
@@ -1,5 +1,5 @@
 /* $NetBSD: softfloat-for-gcc.h,v 1.6 2003/07/26 19:24:51 salo Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/softfloat-for-gcc.h,v 1.1 2004/05/14 12:13:04 cognet Exp $ */
 
 /*
  * Move private identifiers with external linkage into implementation
diff --git a/lib/libc/softfloat/softfloat-history.txt b/lib/libc/softfloat/softfloat-history.txt
index d8c98db56ed4..9b22cc862450 100644
--- a/lib/libc/softfloat/softfloat-history.txt
+++ b/lib/libc/softfloat/softfloat-history.txt
@@ -1,5 +1,5 @@
 $NetBSD: softfloat-history.txt,v 1.1 2000/06/06 08:15:08 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/softfloat-history.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 History of Major Changes to SoftFloat, up to Release 2a
 
diff --git a/lib/libc/softfloat/softfloat-source.txt b/lib/libc/softfloat/softfloat-source.txt
index 06759664ebe6..79abe9a026aa 100644
--- a/lib/libc/softfloat/softfloat-source.txt
+++ b/lib/libc/softfloat/softfloat-source.txt
@@ -1,5 +1,5 @@
 $NetBSD: softfloat-source.txt,v 1.1 2000/06/06 08:15:10 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/softfloat-source.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 SoftFloat Release 2a Source Documentation
 
diff --git a/lib/libc/softfloat/softfloat-specialize b/lib/libc/softfloat/softfloat-specialize
index c8c8028d652f..88e6460c7742 100644
--- a/lib/libc/softfloat/softfloat-specialize
+++ b/lib/libc/softfloat/softfloat-specialize
@@ -1,5 +1,5 @@
 /*	$NetBSD: softfloat-specialize,v 1.3 2002/05/12 13:12:45 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/softfloat-specialize,v 1.1 2004/05/14 12:13:04 cognet Exp $ */
 
 /* This is a derivative work. */
 
diff --git a/lib/libc/softfloat/softfloat.txt b/lib/libc/softfloat/softfloat.txt
index bd63324faa96..47f59415bb3a 100644
--- a/lib/libc/softfloat/softfloat.txt
+++ b/lib/libc/softfloat/softfloat.txt
@@ -1,5 +1,5 @@
 $NetBSD: softfloat.txt,v 1.1 2000/06/06 08:15:10 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/softfloat.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 SoftFloat Release 2a General Documentation
 
diff --git a/lib/libc/softfloat/templates/milieu.h b/lib/libc/softfloat/templates/milieu.h
index b7bd8e5f5f41..d580b5f52ea5 100644
--- a/lib/libc/softfloat/templates/milieu.h
+++ b/lib/libc/softfloat/templates/milieu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */

+/* $FreeBSD: src/lib/libc/softfloat/templates/milieu.h,v 1.1 2004/05/14 12:13:06 cognet Exp $ */

 

 /*

 ===============================================================================

diff --git a/lib/libc/softfloat/templates/softfloat-specialize b/lib/libc/softfloat/templates/softfloat-specialize
index a1dc4de86a53..dbd1dbe92dcc 100644
--- a/lib/libc/softfloat/templates/softfloat-specialize
+++ b/lib/libc/softfloat/templates/softfloat-specialize
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */

+/* $FreeBSD: src/lib/libc/softfloat/templates/softfloat-specialize,v 1.1 2004/05/14 12:13:06 cognet Exp $ */

 

 /*

 ===============================================================================

diff --git a/lib/libc/softfloat/templates/softfloat.h b/lib/libc/softfloat/templates/softfloat.h
index 070aab231c60..c946bae1c357 100644
--- a/lib/libc/softfloat/templates/softfloat.h
+++ b/lib/libc/softfloat/templates/softfloat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */

+/* $FreeBSD: src/lib/libc/softfloat/templates/softfloat.h,v 1.1 2004/05/14 12:13:06 cognet Exp $ */

 

 /*

 ===============================================================================

diff --git a/lib/libc/softfloat/timesoftfloat.c b/lib/libc/softfloat/timesoftfloat.c
index 98b6ba2eb3b7..e7e3df890131 100644
--- a/lib/libc/softfloat/timesoftfloat.c
+++ b/lib/libc/softfloat/timesoftfloat.c
@@ -31,7 +31,7 @@ this code that are retained.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/timesoftfloat.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/lib/libc/softfloat/timesoftfloat.txt b/lib/libc/softfloat/timesoftfloat.txt
index addc64740c6d..1de3ae8baa78 100644
--- a/lib/libc/softfloat/timesoftfloat.txt
+++ b/lib/libc/softfloat/timesoftfloat.txt
@@ -1,5 +1,5 @@
 $NetBSD: timesoftfloat.txt,v 1.1 2000/06/06 08:15:11 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/timesoftfloat.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 Documentation for the `timesoftfloat' Program of SoftFloat Release 2a
 
diff --git a/lib/libc/softfloat/unorddf2.c b/lib/libc/softfloat/unorddf2.c
index 2986c8281475..b2ce6a79e200 100644
--- a/lib/libc/softfloat/unorddf2.c
+++ b/lib/libc/softfloat/unorddf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/unorddf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __unorddf2(float64, float64);
 
diff --git a/lib/libc/softfloat/unordsf2.c b/lib/libc/softfloat/unordsf2.c
index e2f4c8f0947c..be7cbe8b9d2a 100644
--- a/lib/libc/softfloat/unordsf2.c
+++ b/lib/libc/softfloat/unordsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/unordsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __unordsf2(float32, float32);
 
diff --git a/lib/libc/sparc64/Makefile.inc b/lib/libc/sparc64/Makefile.inc
index d47f8865b326..bc246edfd27b 100644
--- a/lib/libc/sparc64/Makefile.inc
+++ b/lib/libc/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.4 2005/01/15 05:23:58 das Exp $
 #
 # Machine dependent definitions for the ultra sparc architecture.
 #
diff --git a/lib/libc/sparc64/SYS.h b/lib/libc/sparc64/SYS.h
index 6fe4ccdb29d9..46d11e2b7fb1 100644
--- a/lib/libc/sparc64/SYS.h
+++ b/lib/libc/sparc64/SYS.h
@@ -35,7 +35,7 @@
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
  *	from: FreeBSD: src/lib/libc/i386/SYS.h,v 1.20 2001/01/29
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/SYS.h,v 1.4 2002/03/22 23:41:58 obrien Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/sparc64/_fpmath.h b/lib/libc/sparc64/_fpmath.h
index e5f2238ac8d1..4afaab998dbe 100644
--- a/lib/libc/sparc64/_fpmath.h
+++ b/lib/libc/sparc64/_fpmath.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/_fpmath.h,v 1.5 2005/03/07 04:55:22 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/sparc64/arith.h b/lib/libc/sparc64/arith.h
index 3c35b80f35c3..a32a3420fcac 100644
--- a/lib/libc/sparc64/arith.h
+++ b/lib/libc/sparc64/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
  */
 
 /*
diff --git a/lib/libc/sparc64/fpu/Makefile.inc b/lib/libc/sparc64/fpu/Makefile.inc
index 1974d8a0b319..eb9d3a536961 100644
--- a/lib/libc/sparc64/fpu/Makefile.inc
+++ b/lib/libc/sparc64/fpu/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.5 2002/11/18 09:50:56 ru Exp $
 
 .PATH: ${.CURDIR}/sparc64/fpu
 
diff --git a/lib/libc/sparc64/fpu/fpu.c b/lib/libc/sparc64/fpu/fpu.c
index 63a3c0d2ec2c..db11b1773ccf 100644
--- a/lib/libc/sparc64/fpu/fpu.c
+++ b/lib/libc/sparc64/fpu/fpu.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.8 2004/01/06 18:53:26 nectar Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/sparc64/fpu/fpu_add.c b/lib/libc/sparc64/fpu/fpu_add.c
index 405b9b83bed5..0ccffceec21d 100644
--- a/lib/libc/sparc64/fpu/fpu_add.c
+++ b/lib/libc/sparc64/fpu/fpu_add.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_add.c,v 1.4 2002/04/27 21:56:28 jake Exp $");
 
 /*
  * Perform an FPU add (return x + y).
diff --git a/lib/libc/sparc64/fpu/fpu_arith.h b/lib/libc/sparc64/fpu/fpu_arith.h
index 9cb7488454df..e0b30a10e679 100644
--- a/lib/libc/sparc64/fpu/fpu_arith.h
+++ b/lib/libc/sparc64/fpu/fpu_arith.h
@@ -41,7 +41,7 @@
  *
  *	@(#)fpu_arith.h	8.1 (Berkeley) 6/11/93
  *	$NetBSD: fpu_arith.h,v 1.3 2000/07/24 04:11:03 mycroft Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_arith.h,v 1.2 2002/03/22 23:41:59 obrien Exp $
  */
 
 /*
diff --git a/lib/libc/sparc64/fpu/fpu_compare.c b/lib/libc/sparc64/fpu/fpu_compare.c
index 428e8d39990f..58caddffc27f 100644
--- a/lib/libc/sparc64/fpu/fpu_compare.c
+++ b/lib/libc/sparc64/fpu/fpu_compare.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_compare.c,v 1.4 2002/03/22 21:52:58 obrien Exp $");
 
 /*
  * CMP and CMPE instructions.
diff --git a/lib/libc/sparc64/fpu/fpu_div.c b/lib/libc/sparc64/fpu/fpu_div.c
index a7b4782961b9..9bc6396493d0 100644
--- a/lib/libc/sparc64/fpu/fpu_div.c
+++ b/lib/libc/sparc64/fpu/fpu_div.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_div.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
 
 /*
  * Perform an FPU divide (return x / y).
diff --git a/lib/libc/sparc64/fpu/fpu_emu.h b/lib/libc/sparc64/fpu/fpu_emu.h
index 51996b16e3c2..53e4e2f3718a 100644
--- a/lib/libc/sparc64/fpu/fpu_emu.h
+++ b/lib/libc/sparc64/fpu/fpu_emu.h
@@ -41,7 +41,7 @@
  *
  *	@(#)fpu_emu.h	8.1 (Berkeley) 6/11/93
  *	$NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.4 2002/03/22 23:41:59 obrien Exp $
  */
 
 /*
diff --git a/lib/libc/sparc64/fpu/fpu_explode.c b/lib/libc/sparc64/fpu/fpu_explode.c
index 09f8908e1dea..53c68750ad4b 100644
--- a/lib/libc/sparc64/fpu/fpu_explode.c
+++ b/lib/libc/sparc64/fpu/fpu_explode.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.6 2005/05/27 10:00:22 stefanf Exp $");
 
 /*
  * FPU subroutines: `explode' the machine's `packed binary' format numbers
diff --git a/lib/libc/sparc64/fpu/fpu_extern.h b/lib/libc/sparc64/fpu/fpu_extern.h
index f22c46300a55..abc0fe3287cd 100644
--- a/lib/libc/sparc64/fpu/fpu_extern.h
+++ b/lib/libc/sparc64/fpu/fpu_extern.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: fpu_extern.h,v 1.4 2000/08/03 18:32:08 eeh Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_extern.h,v 1.6 2002/04/27 21:56:28 jake Exp $
  */
 
 #ifndef _SPARC64_FPU_FPU_EXTERN_H_
diff --git a/lib/libc/sparc64/fpu/fpu_implode.c b/lib/libc/sparc64/fpu/fpu_implode.c
index 2c3475ee52b7..0a41bb37decf 100644
--- a/lib/libc/sparc64/fpu/fpu_implode.c
+++ b/lib/libc/sparc64/fpu/fpu_implode.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_implode.c,v 1.6 2004/07/28 05:41:05 kan Exp $");
 
 /*
  * FPU subroutines: `implode' internal format numbers into the machine's
diff --git a/lib/libc/sparc64/fpu/fpu_mul.c b/lib/libc/sparc64/fpu/fpu_mul.c
index 0bdb6ff52c34..23d2e9e41af9 100644
--- a/lib/libc/sparc64/fpu/fpu_mul.c
+++ b/lib/libc/sparc64/fpu/fpu_mul.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_mul.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
 
 /*
  * Perform an FPU multiply (return x * y).
diff --git a/lib/libc/sparc64/fpu/fpu_qp.c b/lib/libc/sparc64/fpu/fpu_qp.c
index a5cc00a5876a..0fe0f80bab0f 100644
--- a/lib/libc/sparc64/fpu/fpu_qp.c
+++ b/lib/libc/sparc64/fpu/fpu_qp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.7 2005/06/21 21:13:07 stefanf Exp $");
 
 #include <sys/types.h>
 #include <machine/fsr.h>
diff --git a/lib/libc/sparc64/fpu/fpu_reg.S b/lib/libc/sparc64/fpu/fpu_reg.S
index 781b4fec8f9c..0c3093b2679e 100644
--- a/lib/libc/sparc64/fpu/fpu_reg.S
+++ b/lib/libc/sparc64/fpu/fpu_reg.S
@@ -24,7 +24,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_reg.S,v 1.2 2002/05/06 23:24:39 obrien Exp $");
 
 /*
  * Define arrays of leaf functions to load/store fp registers to memory. See
diff --git a/lib/libc/sparc64/fpu/fpu_reg.h b/lib/libc/sparc64/fpu/fpu_reg.h
index b8b72291b71f..5a91dc2751dd 100644
--- a/lib/libc/sparc64/fpu/fpu_reg.h
+++ b/lib/libc/sparc64/fpu/fpu_reg.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_reg.h,v 1.1 2002/02/23 21:37:10 tmm Exp $
  */
 
 #ifndef _LIBC_SPARC64_FPU_FPU_REG_H_
diff --git a/lib/libc/sparc64/fpu/fpu_sqrt.c b/lib/libc/sparc64/fpu/fpu_sqrt.c
index c35e2bc7a72e..30e36d100af0 100644
--- a/lib/libc/sparc64/fpu/fpu_sqrt.c
+++ b/lib/libc/sparc64/fpu/fpu_sqrt.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
 
 /*
  * Perform an FPU square root (return sqrt(x)).
diff --git a/lib/libc/sparc64/fpu/fpu_subr.c b/lib/libc/sparc64/fpu/fpu_subr.c
index 7e6308ff129e..3fc7534b48b9 100644
--- a/lib/libc/sparc64/fpu/fpu_subr.c
+++ b/lib/libc/sparc64/fpu/fpu_subr.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_subr.c,v 1.4 2002/04/27 21:56:28 jake Exp $");
 
 /*
  * FPU subroutines.
diff --git a/lib/libc/sparc64/gen/Makefile.inc b/lib/libc/sparc64/gen/Makefile.inc
index 979c1822ad6c..714285bb0537 100644
--- a/lib/libc/sparc64/gen/Makefile.inc
+++ b/lib/libc/sparc64/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.12 2005/03/15 15:53:39 das Exp $
 
 SRCS+=	_ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \
 	fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c \
diff --git a/lib/libc/sparc64/gen/_ctx_start.S b/lib/libc/sparc64/gen/_ctx_start.S
index 4ba3fd80624b..c35c0e55853a 100644
--- a/lib/libc/sparc64/gen/_ctx_start.S
+++ b/lib/libc/sparc64/gen/_ctx_start.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/_ctx_start.S,v 1.1 2003/04/01 23:28:50 jake Exp $");
 
 ENTRY(_ctx_start)
 	call	%g1
diff --git a/lib/libc/sparc64/gen/_set_tp.c b/lib/libc/sparc64/gen/_set_tp.c
index 6255fd33ce1d..a6ea1d0da5ea 100644
--- a/lib/libc/sparc64/gen/_set_tp.c
+++ b/lib/libc/sparc64/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/sparc64/gen/_set_tp.c,v 1.1 2004/08/15 16:18:03 dfr Exp $
  */
 
 void
diff --git a/lib/libc/sparc64/gen/_setjmp.S b/lib/libc/sparc64/gen/_setjmp.S
index c48876e89d1e..cf182adbde9f 100644
--- a/lib/libc/sparc64/gen/_setjmp.S
+++ b/lib/libc/sparc64/gen/_setjmp.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.5 2003/01/05 22:17:32 tmm Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/gen/assym.s b/lib/libc/sparc64/gen/assym.s
index 7b205db2b690..f3477bb3d654 100644
--- a/lib/libc/sparc64/gen/assym.s
+++ b/lib/libc/sparc64/gen/assym.s
@@ -2,7 +2,7 @@
  * Offsets into into structures used from asm.  Must be kept in sync with
  * appropriate headers.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/gen/assym.s,v 1.3 2002/03/11 03:13:02 tmm Exp $
  */
 
 #define	_JB_FP		0x0
diff --git a/lib/libc/sparc64/gen/fabs.S b/lib/libc/sparc64/gen/fabs.S
index bbc744af8a8b..c711689a9737 100644
--- a/lib/libc/sparc64/gen/fabs.S
+++ b/lib/libc/sparc64/gen/fabs.S
@@ -24,7 +24,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fabs.S,v 1.2 2004/02/10 20:45:28 cperciva Exp $");
 
 /*
  * double fabs(double);
diff --git a/lib/libc/sparc64/gen/fixunsdfsi.S b/lib/libc/sparc64/gen/fixunsdfsi.S
index 75fceb6b48f6..f110e600c312 100644
--- a/lib/libc/sparc64/gen/fixunsdfsi.S
+++ b/lib/libc/sparc64/gen/fixunsdfsi.S
@@ -45,7 +45,7 @@
 	RCSID("$NetBSD: fixunsdfsi.S,v 1.3 2000/07/25 04:26:12 mycroft Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.3 2002/06/29 03:23:51 obrien Exp $");
 
 /*
  * Convert double to unsigned integer (for gcc).
diff --git a/lib/libc/sparc64/gen/flt_rounds.c b/lib/libc/sparc64/gen/flt_rounds.c
index 706ef5a0dc6a..445c2da0db5d 100644
--- a/lib/libc/sparc64/gen/flt_rounds.c
+++ b/lib/libc/sparc64/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/flt_rounds.c,v 1.2 2005/01/18 15:29:28 das Exp $");
 
 #include <sys/types.h>
 #include <machine/float.h>
diff --git a/lib/libc/sparc64/gen/fpgetmask.c b/lib/libc/sparc64/gen/fpgetmask.c
index 05b151af0d10..1dbdfd012666 100644
--- a/lib/libc/sparc64/gen/fpgetmask.c
+++ b/lib/libc/sparc64/gen/fpgetmask.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpgetmask.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 
 #include <machine/fsr.h>
diff --git a/lib/libc/sparc64/gen/fpgetround.c b/lib/libc/sparc64/gen/fpgetround.c
index dbc90d728bd1..949e9ae487ee 100644
--- a/lib/libc/sparc64/gen/fpgetround.c
+++ b/lib/libc/sparc64/gen/fpgetround.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpgetround.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/fpgetsticky.c b/lib/libc/sparc64/gen/fpgetsticky.c
index 274566acd48a..842cf5ddc14b 100644
--- a/lib/libc/sparc64/gen/fpgetsticky.c
+++ b/lib/libc/sparc64/gen/fpgetsticky.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpgetsticky.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/fpsetmask.c b/lib/libc/sparc64/gen/fpsetmask.c
index 9aefb137837a..dd95579bf0e4 100644
--- a/lib/libc/sparc64/gen/fpsetmask.c
+++ b/lib/libc/sparc64/gen/fpsetmask.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpsetmask.c,v 1.2 2002/09/14 18:07:03 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/fpsetround.c b/lib/libc/sparc64/gen/fpsetround.c
index 1e27f596c16c..1bca4d0066d4 100644
--- a/lib/libc/sparc64/gen/fpsetround.c
+++ b/lib/libc/sparc64/gen/fpsetround.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpsetround.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/infinity.c b/lib/libc/sparc64/gen/infinity.c
index 6d0d9344b190..fabc24517abc 100644
--- a/lib/libc/sparc64/gen/infinity.c
+++ b/lib/libc/sparc64/gen/infinity.c
@@ -4,7 +4,7 @@
 __RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/infinity.c,v 1.7 2003/02/08 20:37:54 mike Exp $");
 
 /* infinity.c */
 
diff --git a/lib/libc/sparc64/gen/makecontext.c b/lib/libc/sparc64/gen/makecontext.c
index 95795de992cf..2fc4580ace11 100644
--- a/lib/libc/sparc64/gen/makecontext.c
+++ b/lib/libc/sparc64/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/makecontext.c,v 1.1 2003/04/01 23:28:50 jake Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/sparc64/gen/modf.S b/lib/libc/sparc64/gen/modf.S
index f578c459ce69..36678d8f6952 100644
--- a/lib/libc/sparc64/gen/modf.S
+++ b/lib/libc/sparc64/gen/modf.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.3 2002/06/29 03:23:51 obrien Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/gen/setjmp.S b/lib/libc/sparc64/gen/setjmp.S
index 5ad65a5a5f36..6f191fda24ee 100644
--- a/lib/libc/sparc64/gen/setjmp.S
+++ b/lib/libc/sparc64/gen/setjmp.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.4 2003/01/05 22:17:32 tmm Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/gen/signalcontext.c b/lib/libc/sparc64/gen/signalcontext.c
index 622f36f5bd75..44933a760725 100644
--- a/lib/libc/sparc64/gen/signalcontext.c
+++ b/lib/libc/sparc64/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/signalcontext.c,v 1.2 2004/01/06 18:53:26 nectar Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/sparc64/gen/sigsetjmp.S b/lib/libc/sparc64/gen/sigsetjmp.S
index 4e4456648c66..c141c3ebe59a 100644
--- a/lib/libc/sparc64/gen/sigsetjmp.S
+++ b/lib/libc/sparc64/gen/sigsetjmp.S
@@ -30,7 +30,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.5 2003/01/05 22:10:06 tmm Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/net/Makefile.inc b/lib/libc/sparc64/net/Makefile.inc
index b7178133b972..a99bf8083f02 100644
--- a/lib/libc/sparc64/net/Makefile.inc
+++ b/lib/libc/sparc64/net/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/net/Makefile.inc,v 1.2 2001/11/18 04:40:30 jake Exp $
 
 SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/sparc64/net/htonl.S b/lib/libc/sparc64/net/htonl.S
index 2ba02c439473..2f5a7dbf01e4 100644
--- a/lib/libc/sparc64/net/htonl.S
+++ b/lib/libc/sparc64/net/htonl.S
@@ -45,7 +45,7 @@
 	RCSID("$NetBSD: htonl.S,v 1.1 1998/09/11 04:56:30 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/net/htonl.S,v 1.4 2002/06/30 05:36:49 obrien Exp $");
 
 /* netorder = htonl(hostorder) */
         .weak CNAME(htonl)
diff --git a/lib/libc/sparc64/net/htons.S b/lib/libc/sparc64/net/htons.S
index 16035e05e305..20513e9ab0f2 100644
--- a/lib/libc/sparc64/net/htons.S
+++ b/lib/libc/sparc64/net/htons.S
@@ -45,7 +45,7 @@
 	RCSID("$NetBSD: htons.S,v 1.1 1998/09/11 04:56:30 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/net/htons.S,v 1.3 2002/06/30 05:36:49 obrien Exp $");
 
 /* netorder = htons(hostorder) */
         .weak CNAME(htons)
diff --git a/lib/libc/sparc64/net/ntohl.S b/lib/libc/sparc64/net/ntohl.S
index 4333f231dc1a..68e51c78a770 100644
--- a/lib/libc/sparc64/net/ntohl.S
+++ b/lib/libc/sparc64/net/ntohl.S
@@ -45,7 +45,7 @@
 	RCSID("$NetBSD: ntohl.S,v 1.1 1998/09/11 04:56:31 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/net/ntohl.S,v 1.4 2002/06/30 05:36:49 obrien Exp $");
 
 /* hostorder = ntohl(netorder) */
         .weak CNAME(ntohl)
diff --git a/lib/libc/sparc64/net/ntohs.S b/lib/libc/sparc64/net/ntohs.S
index 03a09b57a1ed..b878b3f17de3 100644
--- a/lib/libc/sparc64/net/ntohs.S
+++ b/lib/libc/sparc64/net/ntohs.S
@@ -45,7 +45,7 @@
 	RCSID("$NetBSD: ntohs.S,v 1.1 1998/09/11 04:56:31 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/net/ntohs.S,v 1.3 2002/06/30 05:36:49 obrien Exp $");
 
 /* hostorder = ntohs(netorder) */
         .weak CNAME(ntohs)
diff --git a/lib/libc/sparc64/stdlib/Makefile.inc b/lib/libc/sparc64/stdlib/Makefile.inc
index e8c0da7a1d7e..52a362a6255f 100644
--- a/lib/libc/sparc64/stdlib/Makefile.inc
+++ b/lib/libc/sparc64/stdlib/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/stdlib/Makefile.inc,v 1.1 2001/10/26 05:40:07 jake Exp $
diff --git a/lib/libc/sparc64/string/Makefile.inc b/lib/libc/sparc64/string/Makefile.inc
index e8c0da7a1d7e..c032c7f7f398 100644
--- a/lib/libc/sparc64/string/Makefile.inc
+++ b/lib/libc/sparc64/string/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/string/Makefile.inc,v 1.1 2001/10/26 05:40:07 jake Exp $
diff --git a/lib/libc/sparc64/sys/Makefile.inc b/lib/libc/sparc64/sys/Makefile.inc
index f677df19d1ba..576da64ab3b9 100644
--- a/lib/libc/sparc64/sys/Makefile.inc
+++ b/lib/libc/sparc64/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.9 2003/08/11 07:14:07 bms Exp $
 
 SRCS+=	__sparc_sigtramp_setup.c \
 	__sparc_utrap.c \
diff --git a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
index 4475c6d4632a..6b6b2ac6f75f 100644
--- a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c,v 1.5 2004/01/10 15:57:06 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/sparc64/sys/__sparc_utrap.c b/lib/libc/sparc64/sys/__sparc_utrap.c
index e556f830570f..fa7ea575623f 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap.c,v 1.6 2004/01/19 16:14:58 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_align.c b/lib/libc/sparc64/sys/__sparc_utrap_align.c
index 9b59826263cd..6d494dd3ce77 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_align.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_align.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_align.c,v 1.2 2002/05/13 22:48:01 jake Exp $");
 
 #include <sys/types.h>
 #include <machine/cpufunc.h>
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_emul.c b/lib/libc/sparc64/sys/__sparc_utrap_emul.c
index 6c6dd1b9b97a..2381a019c272 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_emul.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_emul.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_emul.c,v 1.2 2002/05/11 21:20:05 jake Exp $");
 
 #include <sys/types.h>
 #include <machine/cpufunc.h>
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S b/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
index 502f81a22510..159d62925eef 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
+++ b/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S,v 1.2 2002/06/30 05:36:49 obrien Exp $");
 
 #include <machine/utrap.h>
 
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_gen.S b/lib/libc/sparc64/sys/__sparc_utrap_gen.S
index 6f6f0e3d2c57..ca50d26608ef 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_gen.S
+++ b/lib/libc/sparc64/sys/__sparc_utrap_gen.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.4 2002/06/30 05:36:49 obrien Exp $");
 
 	.register	%g2, #ignore
 	.register	%g3, #ignore
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_install.c b/lib/libc/sparc64/sys/__sparc_utrap_install.c
index 7b1a5e7a0226..604fb3bf7cac 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_install.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_install.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_install.c,v 1.3 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/utrap.h>
 #include <machine/sysarch.h>
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_private.h b/lib/libc/sparc64/sys/__sparc_utrap_private.h
index 8b9ae9eefc96..c909e8945c4f 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_private.h
+++ b/lib/libc/sparc64/sys/__sparc_utrap_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_private.h,v 1.4 2002/05/13 04:35:08 jake Exp $
  */
 
 #ifndef	___SPARC_UTRAP_PRIVATE_H_
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_setup.c b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
index f4a624bfe4c7..14993bb542a4 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_setup.c,v 1.7 2004/01/09 16:52:09 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/sparc64/sys/assym.s b/lib/libc/sparc64/sys/assym.s
index 2e799f6566b8..e58fff03daba 100644
--- a/lib/libc/sparc64/sys/assym.s
+++ b/lib/libc/sparc64/sys/assym.s
@@ -2,7 +2,7 @@
  * Offsets into structures used from asm.  Must be kept in sync with
  * appropriate headers.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/sys/assym.s,v 1.3 2002/04/29 18:14:44 jake Exp $
  */
 
 #define	FPRS_FEF	0x4
diff --git a/lib/libc/sparc64/sys/brk.S b/lib/libc/sparc64/sys/brk.S
index 018c87732d2d..8f6d312dcdd6 100644
--- a/lib/libc/sparc64/sys/brk.S
+++ b/lib/libc/sparc64/sys/brk.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/brk.S,v 1.3 2002/06/30 05:36:49 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/cerror.S b/lib/libc/sparc64/sys/cerror.S
index c75f27cd2f92..6641ee398d31 100644
--- a/lib/libc/sparc64/sys/cerror.S
+++ b/lib/libc/sparc64/sys/cerror.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/cerror.S,v 1.3 2002/06/30 05:36:49 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/exect.S b/lib/libc/sparc64/sys/exect.S
index f8e38833e608..d6ea9e5de2de 100644
--- a/lib/libc/sparc64/sys/exect.S
+++ b/lib/libc/sparc64/sys/exect.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/exect.S,v 1.3 2002/06/30 05:36:49 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/pipe.S b/lib/libc/sparc64/sys/pipe.S
index 1168134b1937..c9853d4a4cb4 100644
--- a/lib/libc/sparc64/sys/pipe.S
+++ b/lib/libc/sparc64/sys/pipe.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/pipe.S,v 1.3 2002/06/30 05:36:49 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/ptrace.S b/lib/libc/sparc64/sys/ptrace.S
index b1d1ff2c8e2a..ff78a74e43fd 100644
--- a/lib/libc/sparc64/sys/ptrace.S
+++ b/lib/libc/sparc64/sys/ptrace.S
@@ -45,7 +45,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/ptrace.S,v 1.4 2002/07/11 15:48:02 tmm Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/sbrk.S b/lib/libc/sparc64/sys/sbrk.S
index 2ade2738d714..2ba2cdee541b 100644
--- a/lib/libc/sparc64/sys/sbrk.S
+++ b/lib/libc/sparc64/sys/sbrk.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/sbrk.S,v 1.4 2002/06/30 05:36:49 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/setlogin.S b/lib/libc/sparc64/sys/setlogin.S
index 480e9ecd6a49..f5d362242b1e 100644
--- a/lib/libc/sparc64/sys/setlogin.S
+++ b/lib/libc/sparc64/sys/setlogin.S
@@ -44,7 +44,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/setlogin.S,v 1.3 2002/06/30 05:36:49 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/sigaction.S b/lib/libc/sparc64/sys/sigaction.S
index 7d32f975af20..3105ec15e963 100644
--- a/lib/libc/sparc64/sys/sigaction.S
+++ b/lib/libc/sparc64/sys/sigaction.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/sigaction.S,v 1.1 2002/09/03 14:55:29 jake Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/sigcode.S b/lib/libc/sparc64/sys/sigcode.S
index be3cb451a8b3..21bcb66c3c74 100644
--- a/lib/libc/sparc64/sys/sigcode.S
+++ b/lib/libc/sparc64/sys/sigcode.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/sigcode.S,v 1.2 2002/10/22 15:15:39 jake Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index f8a90f820980..68376bcb6fde 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.33 2004/07/16 06:06:09 tjr Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/stdio
diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c
index 8abc8e3b6384..3a73ee1a6825 100644
--- a/lib/libc/stdio/_flock_stub.c
+++ b/lib/libc/stdio/_flock_stub.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.14 2004/03/09 04:51:58 jb Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index f14265179589..02362b0c23f0 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index 13538d522abf..bfac2c10b30f 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3
index 9d482285c989..8adc65ac6fac 100644
--- a/lib/libc/stdio/fclose.3
+++ b/lib/libc/stdio/fclose.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fclose.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fclose.3,v 1.12 2002/12/18 12:45:10 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FCLOSE 3
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index 3524f6094856..ad4dae7a531c 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fclose.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fclose.c,v 1.11 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
index 961c0d964d2f..15e7e8f731b1 100644
--- a/lib/libc/stdio/fdopen.c
+++ b/lib/libc/stdio/fdopen.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fdopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.7 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index 0bb12bead991..7c091871dc7c 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.9 2004/03/17 01:43:07 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/ferror.3 b/lib/libc/stdio/ferror.3
index 3fe283987466..6e7d1ba11502 100644
--- a/lib/libc/stdio/ferror.3
+++ b/lib/libc/stdio/ferror.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ferror.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/ferror.3,v 1.9 2003/02/23 01:47:47 ru Exp $
 .\"
 .Dd January 10, 2003
 .Dt FERROR 3
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index 5d4c187dd1df..0f960f7385d1 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.9 2004/03/17 01:43:07 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fflush.3 b/lib/libc/stdio/fflush.3
index 6fa6d23ea4a5..cc3e7e85ab41 100644
--- a/lib/libc/stdio/fflush.3
+++ b/lib/libc/stdio/fflush.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fflush.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fflush.3,v 1.10 2003/06/08 10:01:52 charnier Exp $
 .\"
 .Dd June 4, 1993
 .Dt FFLUSH 3
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index 3090dc96d532..59da908229ea 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fflush.c,v 1.13 2004/07/04 20:17:00 cperciva Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index 455c2ac771f0..5cd8c7ed98d1 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fgetc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetc.c,v 1.12 2004/03/19 09:04:56 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
index 59156ef810dd..e96dcf73508a 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.8 2004/07/16 06:07:12 tjr Exp $
 .\"
 .Dd April 19, 1994
 .Dt FGETLN 3
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index d2efe0993b77..a1b303e72688 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fgetln.c	8.2 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.10 2004/07/16 05:52:51 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index 295b20a8379e..581c5c834a10 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fgetpos.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetpos.c,v 1.12 2002/10/12 16:13:37 mike Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3
index fee8c9253089..1b43d4c1ff2a 100644
--- a/lib/libc/stdio/fgets.3
+++ b/lib/libc/stdio/fgets.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgets.3,v 1.19 2002/12/04 18:57:45 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FGETS 3
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index bb4ea4c70223..36ae4fd665be 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgets.c,v 1.13 2002/08/13 09:30:41 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c
index 719556ad9e1f..f4a273a6542a 100644
--- a/lib/libc/stdio/fgetwc.c
+++ b/lib/libc/stdio/fgetwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.12 2004/07/20 08:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fgetwln.3 b/lib/libc/stdio/fgetwln.3
index 991b4608a54f..9dca8e61ac00 100644
--- a/lib/libc/stdio/fgetwln.3
+++ b/lib/libc/stdio/fgetwln.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgetwln.3,v 1.1.8.1 2005/09/24 07:13:37 brueffer Exp $
 .\"
 .Dd July 16, 2004
 .Dt FGETWLN 3
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
index 1a1ad2ddeaa0..49b52af31442 100644
--- a/lib/libc/stdio/fgetwln.c
+++ b/lib/libc/stdio/fgetwln.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwln.c,v 1.2 2004/08/06 17:00:09 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetws.3 b/lib/libc/stdio/fgetws.3
index dc04275e9587..ac51398a420d 100644
--- a/lib/libc/stdio/fgetws.3
+++ b/lib/libc/stdio/fgetws.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/stdio/fgets.3,v 1.16 2002/05/31 05:01:17 archie Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.3 2003/03/09 02:56:54 tjr Exp $
 .\"
 .Dd August 6, 2002
 .Dt FGETWS 3
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
index b6ef01e5c0af..be180c9f4771 100644
--- a/lib/libc/stdio/fgetws.c
+++ b/lib/libc/stdio/fgetws.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 51c0464ecb6c..60bac45c87f8 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.10 2004/03/17 01:43:07 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 26d4dcf7797d..262196610944 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.29 2004/05/22 15:19:41 tjr Exp $");
 
 #include <sys/param.h>
 #include <machine/atomic.h>
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index 8a1c7d0430c7..cd90f837ab04 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)flags.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/flags.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/stdio/floatio.h b/lib/libc/stdio/floatio.h
index 2463a85b998e..83beec755f2b 100644
--- a/lib/libc/stdio/floatio.h
+++ b/lib/libc/stdio/floatio.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)floatio.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/floatio.h,v 1.5 2004/01/18 08:28:47 das Exp $
  */
 
 /*
diff --git a/lib/libc/stdio/flockfile.3 b/lib/libc/stdio/flockfile.3
index a895a0aae045..a8c9c26ecb68 100644
--- a/lib/libc/stdio/flockfile.3
+++ b/lib/libc/stdio/flockfile.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/flockfile.3,v 1.3 2003/01/13 01:29:14 tjr Exp $
 .\"
 .Dd January 10, 2003
 .Dt FLOCKFILE 3
diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3
index e0680da4c147..2b7bc05ced1a 100644
--- a/lib/libc/stdio/fopen.3
+++ b/lib/libc/stdio/fopen.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fopen.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fopen.3,v 1.19 2005/05/04 08:12:44 des Exp $
 .\"
 .Dd January 26, 2003
 .Dt FOPEN 3
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
index b7c84a72006c..5a043ca72c51 100644
--- a/lib/libc/stdio/fopen.c
+++ b/lib/libc/stdio/fopen.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.10 2002/10/12 16:13:37 mike Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index 27b82223e039..35093b03390d 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.10 2002/09/06 11:23:55 tjr Exp $");
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index b653bc5808d6..f191843c151e 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fpurge.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fpurge.c,v 1.10 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index 97de1c0b7fb1..a10af2b20714 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3
index 3ce20b25b58a..a0c034105f3e 100644
--- a/lib/libc/stdio/fputs.3
+++ b/lib/libc/stdio/fputs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.11 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FPUTS 3
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index 812c37da50df..58278abff268 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputs.c,v 1.11 2002/10/12 16:13:37 mike Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
index 0848b74998d1..dfe876f85fc8 100644
--- a/lib/libc/stdio/fputwc.c
+++ b/lib/libc/stdio/fputwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.10 2004/07/20 08:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fputws.3 b/lib/libc/stdio/fputws.3
index 52bae9610c3a..2642a74f78a4 100644
--- a/lib/libc/stdio/fputws.3
+++ b/lib/libc/stdio/fputws.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/stdio/fputs.3,v 1.8 2001/10/01 16:08:59 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fputws.3,v 1.5 2003/05/22 13:02:27 ru Exp $
 .\"
 .Dd August 6, 2002
 .Dt FPUTWS 3
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index 025e1c00d198..fea591490dbb 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fread.3 b/lib/libc/stdio/fread.3
index 925ef61fc949..b0bf09430442 100644
--- a/lib/libc/stdio/fread.3
+++ b/lib/libc/stdio/fread.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fread.3	8.2 (Berkeley) 3/8/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fread.3,v 1.9 2002/10/12 16:13:37 mike Exp $
 .\"
 .Dd March 8, 1994
 .Dt FREAD 3
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index 73c7c1922eb0..ad5d81bf3e84 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.12 2002/10/12 16:13:37 mike Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index 476f3efc856e..ddd978e720d0 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)freopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.13 2004/05/22 15:19:41 tjr Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index bb5ee4c06064..aaad50056c2e 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
index 96abc0ac83cc..2f3518663eae 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fseek.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.25 2004/03/20 08:38:27 tjr Exp $
 .\"
 .Dd March 19, 2004
 .Dt FSEEK 3
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index b346b5d6e949..e6a5bd6c0880 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fseek.c	8.3 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fseek.c,v 1.41 2004/05/22 15:19:41 tjr Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index 6eeffda9bbeb..6d75acdbac85 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fsetpos.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fsetpos.c,v 1.8 2002/03/22 21:53:04 obrien Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index 94e962c68db5..477e3a157033 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ftell.c,v 1.26 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index 80ce999041f1..e40a5dd5e8c1 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)funopen.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/funopen.3,v 1.15 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd March 19, 2004
 .Dt FUNOPEN 3
diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c
index 459cd5c7c353..040c80650ac8 100644
--- a/lib/libc/stdio/funopen.c
+++ b/lib/libc/stdio/funopen.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)funopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/funopen.c,v 1.5 2002/05/28 16:59:39 alfred Exp $");
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index 9cc4c5573a68..fd12da123211 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.17 2004/06/08 05:45:48 das Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h
index df59bf0b706b..5414ec8cc572 100644
--- a/lib/libc/stdio/fvwrite.h
+++ b/lib/libc/stdio/fvwrite.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fvwrite.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/fvwrite.h,v 1.3 2002/05/28 16:59:39 alfred Exp $
  */
 
 /*
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index 811fb54f1184..a8a49fccb431 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwalk.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/atomic.h>
diff --git a/lib/libc/stdio/fwide.3 b/lib/libc/stdio/fwide.3
index 6ff8d9264995..1c1961fbcc73 100644
--- a/lib/libc/stdio/fwide.3
+++ b/lib/libc/stdio/fwide.3
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Citrus: xpg4dl/FreeBSD/lib/libc/stdio/fwide.3,v 1.2 2001/12/07 04:47:08 yamt Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fwide.3,v 1.3 2002/12/18 12:45:10 ru Exp $
 .\"
 .Dd October 24, 2001
 .Dt FWIDE 3
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c
index 70309f56daa1..1386c48d4b4b 100644
--- a/lib/libc/stdio/fwide.c
+++ b/lib/libc/stdio/fwide.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwide.c,v 1.1 2002/08/13 09:30:41 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fwprintf.c b/lib/libc/stdio/fwprintf.c
index a22edaeb55f0..dcd6c3841fd3 100644
--- a/lib/libc/stdio/fwprintf.c
+++ b/lib/libc/stdio/fwprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index 0a74d8119485..27b660e8ca22 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)fwrite.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwrite.c,v 1.11 2002/10/12 16:13:41 mike Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
index f779c538518a..47e8550215d9 100644
--- a/lib/libc/stdio/fwscanf.c
+++ b/lib/libc/stdio/fwscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index 6b73e492c9ab..fd015af33f63 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.19 2004/03/17 12:37:28 tjr Exp $
 .\"
 .Dd January 10, 2003
 .Dt GETC 3
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index 61b2c54287e5..0aa9dca03ef4 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index baf587691d76..2ea530feedbb 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.12 2004/03/19 09:04:56 tjr Exp $");
 
 /*
  * A subroutine version of the macro getchar.
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index e24727150de0..5ef23ab8552e 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)gets.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/gets.c,v 1.16 2003/01/30 23:32:53 tjr Exp $");
 
 #include "namespace.h"
 #include <unistd.h>
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index e74823574bb3..c7ba04f676e5 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)getw.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getw.c,v 1.7 2002/03/22 21:53:04 obrien Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/getwc.3 b/lib/libc/stdio/getwc.3
index 6e4069c59bc3..c4705542886e 100644
--- a/lib/libc/stdio/getwc.3
+++ b/lib/libc/stdio/getwc.3
@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/getwc.3,v 1.6 2004/03/16 13:30:11 tjr Exp $
 .\"
 .Dd March 3, 2004
 .Dt GETWC 3
diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c
index ba5ab6011bfd..34a7de32584f 100644
--- a/lib/libc/stdio/getwc.c
+++ b/lib/libc/stdio/getwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getwc.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c
index 79dd7bc4b33b..1297cbb86f7f 100644
--- a/lib/libc/stdio/getwchar.c
+++ b/lib/libc/stdio/getwchar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getwchar.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/glue.h b/lib/libc/stdio/glue.h
index a6df6fd12287..fc5c6df4a395 100644
--- a/lib/libc/stdio/glue.h
+++ b/lib/libc/stdio/glue.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)glue.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/glue.h,v 1.3 2005/05/13 21:12:34 stefanf Exp $
  */
 
 /*
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 16a9e78db6ff..7cef096f643c 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.26 2004/07/16 05:52:51 tjr Exp $
  */
 
 #include <sys/types.h>	/* for off_t */
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
index bc8a468f2580..a4c5c36a0210 100644
--- a/lib/libc/stdio/makebuf.c
+++ b/lib/libc/stdio/makebuf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)makebuf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/makebuf.c,v 1.4 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
index 43cef21cbecd..f23bacf33fab 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mktemp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/mktemp.3,v 1.21 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd February 11, 1998
 .Dt MKTEMP 3
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 3bfad9dbc537..8207c17ca9bb 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/mktemp.c,v 1.28 2003/02/16 17:29:10 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
index 29016f742444..658b880cdb5a 100644
--- a/lib/libc/stdio/perror.c
+++ b/lib/libc/stdio/perror.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)perror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/perror.c,v 1.8 2002/12/19 09:53:26 tjr Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 1d300c6e3c2f..a14c8feff0f5 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.58 2004/10/16 16:00:01 stefanf Exp $
 .\"
 .Dd October 16, 2004
 .Dt PRINTF 3
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index cfd10d04bf47..86452e23b9d9 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.10 2002/09/06 11:23:55 tjr Exp $");
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/putc.3 b/lib/libc/stdio/putc.3
index e14963048d83..7c766b095d75 100644
--- a/lib/libc/stdio/putc.3
+++ b/lib/libc/stdio/putc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/putc.3,v 1.15 2004/03/17 12:46:17 tjr Exp $
 .\"
 .Dd January 10, 2003
 .Dt PUTC 3
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index 864df9f07389..e78bb42c556d 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index ead55652815c..d23161d0b9e0 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 3e7c4952b24d..9ac915ef1413 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/puts.c,v 1.10 2004/03/10 09:15:38 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index 717b14847b0c..ee0c23b7e9dd 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putw.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putwc.3 b/lib/libc/stdio/putwc.3
index 4e46834fd07f..aaaec12f4bc0 100644
--- a/lib/libc/stdio/putwc.3
+++ b/lib/libc/stdio/putwc.3
@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/putwc.3,v 1.7 2004/03/16 13:30:11 tjr Exp $
 .\"
 .Dd March 3, 2004
 .Dt PUTWC 3
diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c
index 8fe065bdfe32..0feec5b621c5 100644
--- a/lib/libc/stdio/putwc.c
+++ b/lib/libc/stdio/putwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putwc.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c
index 55030713c752..b983995d3e82 100644
--- a/lib/libc/stdio/putwchar.c
+++ b/lib/libc/stdio/putwchar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putwchar.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index b76bb701aca0..edd8bb60bbf5 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/refill.c,v 1.18 2002/08/13 09:30:41 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/remove.3 b/lib/libc/stdio/remove.3
index cf088c7e7187..8c9d65fe8cc0 100644
--- a/lib/libc/stdio/remove.3
+++ b/lib/libc/stdio/remove.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)remove.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/remove.3,v 1.9 2001/10/01 16:08:59 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt REMOVE 3
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index b17124c00085..2553f6426995 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/remove.c,v 1.8 2002/03/22 21:53:04 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index a9b91dbe30d9..76f2ed370c60 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)rewind.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/rewind.c,v 1.11 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
index 9a0bd975cc59..9b7f5866c86a 100644
--- a/lib/libc/stdio/rget.c
+++ b/lib/libc/stdio/rget.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)rget.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/rget.c,v 1.5 2002/03/22 21:53:04 obrien Exp $");
 
 #include <stdio.h>
 #include "local.h"
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index 4b74826ce847..3f5913ac6fa8 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.24 2003/06/28 09:03:25 das Exp $
 .\"
 .Dd January 4, 2003
 .Dt SCANF 3
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index 37236cd9a5dc..b4fb1a3c2e6e 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/scanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
index 4dccb4a0a394..57722beb9a11 100644
--- a/lib/libc/stdio/setbuf.3
+++ b/lib/libc/stdio/setbuf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setbuf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.16 2005/01/11 20:50:50 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETBUF 3
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
index 348104c0dace..5eb6fb13e127 100644
--- a/lib/libc/stdio/setbuf.c
+++ b/lib/libc/stdio/setbuf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)setbuf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.4 2002/09/06 11:23:55 tjr Exp $");
 
 #include <stdio.h>
 #include "local.h"
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index ec779179ba27..6ec437651ef7 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)setbuffer.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuffer.c,v 1.7 2002/03/22 21:53:04 obrien Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index 7ab91e501454..166d5b129c31 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.13 2002/09/06 11:23:55 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index ee5219e9a565..b381852818c3 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.20 2002/09/06 11:23:55 tjr Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index cf1587fdf733..6b9ed994fb88 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)sprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.14 2002/09/06 11:23:55 tjr Exp $");
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index 4db0d2963aff..b4850cd50d25 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.11 2002/10/12 16:13:41 mike Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index e839bea58f09..28392862ce6f 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stdio.3	8.7 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/stdio.3,v 1.27 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd January 10, 2003
 .Dt STDIO 3
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index daae1a2cc98a..233427cc1d58 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.24 2003/01/07 06:17:13 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
index d66531820d30..190326a7b6e9 100644
--- a/lib/libc/stdio/swprintf.c
+++ b/lib/libc/stdio/swprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/swprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
index 728a3d6957c5..81ac9f1256a2 100644
--- a/lib/libc/stdio/swscanf.c
+++ b/lib/libc/stdio/swscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/swscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 8ac39edea5cd..d4dbaa3faaf1 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)tempnam.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/tempnam.c,v 1.10 2002/03/22 21:53:04 obrien Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c
index 22d0eb1c5f0c..cf5b70a12cc9 100644
--- a/lib/libc/stdio/tmpfile.c
+++ b/lib/libc/stdio/tmpfile.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)tmpfile.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpfile.c,v 1.9 2003/02/06 01:08:19 mtm Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index 825c3c9b07e7..cc6943e5b03b 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tmpnam.3	8.2 (Berkeley) 11/17/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/tmpnam.3,v 1.17 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd November 17, 1993
 .Dt TMPFILE 3
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index 7c75b5495239..38fcdd65cffd 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)tmpnam.c	8.3 (Berkeley) 3/28/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpnam.c,v 1.5 2002/03/22 21:53:04 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
index 3ffab32fc064..0c0bf83e1f4b 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/ungetc.3,v 1.13 2002/10/10 04:12:40 tjr Exp $
 .\"
 .Dd June 4, 1993
 .Dt UNGETC 3
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 01131619d63a..221725967999 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.16 2004/03/10 12:41:11 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/ungetwc.3 b/lib/libc/stdio/ungetwc.3
index 40907afc22d6..0ffe7e83ac0c 100644
--- a/lib/libc/stdio/ungetwc.3
+++ b/lib/libc/stdio/ungetwc.3
@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/ungetwc.3,v 1.5 2004/03/16 13:30:11 tjr Exp $
 .\"
 .Dd March 3, 2004
 .Dt UNGETWC 3
diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c
index bae2c3ebcea4..b90671acfce3 100644
--- a/lib/libc/stdio/ungetwc.c
+++ b/lib/libc/stdio/ungetwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.9 2004/07/20 08:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/unlocked.c b/lib/libc/stdio/unlocked.c
index 083d26f24ffd..6b1c0ef44fc5 100644
--- a/lib/libc/stdio/unlocked.c
+++ b/lib/libc/stdio/unlocked.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/unlocked.c,v 1.1 2003/01/10 04:35:08 tjr Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 01ac06889c3e..197c42714bab 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.18 2002/09/26 13:11:24 tjr Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 790f687a31fe..05ab77871fb3 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.69 2005/04/16 22:36:51 das Exp $");
 
 /*
  * Actual printf innards.
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index ea3004cf15b1..a2bc154b922a 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.38 2005/04/08 20:58:47 stefanf Exp $");
 
 #include "namespace.h"
 #include <ctype.h>
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index 2a332e7ff693..631374febb2d 100644
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.24 2005/04/16 22:36:51 das Exp $");
 
 /*
  * Actual wprintf innards.
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index 6a9c9faa767e..8bc96364596e 100644
--- a/lib/libc/stdio/vfwscanf.c
+++ b/lib/libc/stdio/vfwscanf.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.12 2004/05/02 20:13:29 obrien Exp $");
 
 #include "namespace.h"
 #include <ctype.h>
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 15c32412f188..329bbf094787 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vprintf.c,v 1.10 2002/09/06 11:23:56 tjr Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index cd273e38c2cd..694573663f9a 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index 16d46eeaae02..3a439393ab98 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.22 2003/07/02 07:08:44 jkh Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index b3150e51c2e5..698f7527c550 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.14 2002/09/06 11:23:56 tjr Exp $");
 
 #include <stdio.h>
 #include <limits.h>
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 40d494737b7d..e7bbe2543c95 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.12 2002/10/12 16:13:41 mike Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/stdio/vswprintf.c b/lib/libc/stdio/vswprintf.c
index 1d8a64ed4c11..a4b6306a00e8 100644
--- a/lib/libc/stdio/vswprintf.c
+++ b/lib/libc/stdio/vswprintf.c
@@ -31,7 +31,7 @@
 #if 0
 __FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.6 2005/02/21 19:41:44 fjoe Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
index 7b17e2f39779..03675d469957 100644
--- a/lib/libc/stdio/vswscanf.c
+++ b/lib/libc/stdio/vswscanf.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.11 2002/08/21 16:19:57 mike Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vswscanf.c,v 1.3 2004/04/07 09:55:05 tjr Exp $");
 
 #include <limits.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/vwprintf.c b/lib/libc/stdio/vwprintf.c
index 91212a8bf3d0..4390c0696fda 100644
--- a/lib/libc/stdio/vwprintf.c
+++ b/lib/libc/stdio/vwprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
index 4a21af2d8356..6e103d5485d2 100644
--- a/lib/libc/stdio/vwscanf.c
+++ b/lib/libc/stdio/vwscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index 4a123052c789..3697be82280e 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.11 2004/06/08 05:45:32 das Exp $");
 
 #include <stdio.h>
 #include "local.h"
diff --git a/lib/libc/stdio/wprintf.3 b/lib/libc/stdio/wprintf.3
index 7a3f952b01b5..def25bd613fe 100644
--- a/lib/libc/stdio/wprintf.3
+++ b/lib/libc/stdio/wprintf.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/stdio/printf.3,v 1.47 2002/09/06 11:23:55 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/wprintf.3,v 1.5 2003/07/05 07:55:34 tjr Exp $
 .\"
 .Dd July 5, 2003
 .Dt WPRINTF 3
diff --git a/lib/libc/stdio/wprintf.c b/lib/libc/stdio/wprintf.c
index 92426f6c207b..4b5596e1da2c 100644
--- a/lib/libc/stdio/wprintf.c
+++ b/lib/libc/stdio/wprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/wscanf.3 b/lib/libc/stdio/wscanf.3
index bc8729febb78..b7eac3c8244d 100644
--- a/lib/libc/stdio/wscanf.3
+++ b/lib/libc/stdio/wscanf.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
 .\" FreeBSD: src/lib/libc/stdio/scanf.3,v 1.24 2003/06/28 09:03:25 das Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/wscanf.3,v 1.6 2003/07/05 07:47:55 tjr Exp $
 .\"
 .Dd July 5, 2003
 .Dt WSCANF 3
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
index 5e27b401fa84..86290272cd5c 100644
--- a/lib/libc/stdio/wscanf.c
+++ b/lib/libc/stdio/wscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index 4c18dd48bb11..7b120fff7dbc 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.9 2004/06/08 05:44:52 das Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index bebbc63792fa..0e8b4481a979 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.48 2004/05/12 08:13:40 ru Exp $
 
 # machine-independent stdlib sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib
diff --git a/lib/libc/stdlib/_Exit.c b/lib/libc/stdlib/_Exit.c
index e7f0f5104f93..3a2e94e78c9f 100644
--- a/lib/libc/stdlib/_Exit.c
+++ b/lib/libc/stdlib/_Exit.c
@@ -2,7 +2,7 @@
  * This file is in the public domain.  Written by Garrett A. Wollman,
  * 2002-09-07.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/_Exit.c,v 1.1 2002/09/10 02:04:49 wollman Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/abort.3 b/lib/libc/stdlib/abort.3
index 51b6f1bc716e..07ca798283ce 100644
--- a/lib/libc/stdlib/abort.3
+++ b/lib/libc/stdlib/abort.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)abort.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/abort.3,v 1.9 2001/09/09 18:52:00 asmodai Exp $
 .\"
 .Dd June 4, 1993
 .Dt ABORT 3
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index 36cd15ba62bb..18d0c73eac54 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)abort.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/abort.c,v 1.9 2003/08/16 11:43:57 davidxu Exp $");
 
 #include "namespace.h"
 #include <signal.h>
diff --git a/lib/libc/stdlib/abs.3 b/lib/libc/stdlib/abs.3
index d9296ef6c571..f2556e87faaf 100644
--- a/lib/libc/stdlib/abs.3
+++ b/lib/libc/stdlib/abs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)abs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/abs.3,v 1.12 2002/12/18 13:33:03 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt ABS 3
diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c
index 0cca02b8c91f..26f87eb587d2 100644
--- a/lib/libc/stdlib/abs.c
+++ b/lib/libc/stdlib/abs.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)abs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/abs.c,v 1.2 2002/03/22 21:53:09 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/alloca.3 b/lib/libc/stdlib/alloca.3
index e87cd9fb098c..c5be9fff6614 100644
--- a/lib/libc/stdlib/alloca.3
+++ b/lib/libc/stdlib/alloca.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)alloca.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/alloca.3,v 1.11 2003/06/28 22:12:30 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt ALLOCA 3
diff --git a/lib/libc/stdlib/atexit.3 b/lib/libc/stdlib/atexit.3
index b3dec68bc0b4..72a997725755 100644
--- a/lib/libc/stdlib/atexit.3
+++ b/lib/libc/stdlib/atexit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atexit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atexit.3,v 1.10 2002/12/18 13:33:03 ru Exp $
 .\"
 .Dd September 6, 2002
 .Dt ATEXIT 3
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index 43a0e7495fac..bd94bcd7230d 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)atexit.c	8.2 (Berkeley) 7/3/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.7 2003/12/19 17:11:20 kan Exp $");
 
 #include "namespace.h"
 #include <stddef.h>
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h
index 704c2e168939..cd30b3f3fbe6 100644
--- a/lib/libc/stdlib/atexit.h
+++ b/lib/libc/stdlib/atexit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)atexit.h	8.2 (Berkeley) 7/3/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/atexit.h,v 1.3 2003/12/19 17:11:20 kan Exp $
  */
 
 /* must be at least 32 to guarantee ANSI conformance */
diff --git a/lib/libc/stdlib/atof.3 b/lib/libc/stdlib/atof.3
index d338e3d9766a..785f9d1de567 100644
--- a/lib/libc/stdlib/atof.3
+++ b/lib/libc/stdlib/atof.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atof.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atof.3,v 1.16 2002/12/18 13:33:03 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt ATOF 3
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
index 2ce0012253bd..ca69ab64bc08 100644
--- a/lib/libc/stdlib/atof.c
+++ b/lib/libc/stdlib/atof.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)atof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atof.c,v 1.5 2004/02/10 20:42:32 cperciva Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/atoi.3 b/lib/libc/stdlib/atoi.3
index 34a1b2d5216a..6f71dc1a0700 100644
--- a/lib/libc/stdlib/atoi.3
+++ b/lib/libc/stdlib/atoi.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atoi.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.12 2002/12/18 13:33:03 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt ATOI 3
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
index 7190da723eaa..3da2fda9be05 100644
--- a/lib/libc/stdlib/atoi.c
+++ b/lib/libc/stdlib/atoi.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)atoi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoi.c,v 1.5 2002/03/22 21:53:09 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/atol.3 b/lib/libc/stdlib/atol.3
index 10b8cf7081ec..bbd7ddbc25c2 100644
--- a/lib/libc/stdlib/atol.3
+++ b/lib/libc/stdlib/atol.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atol.3,v 1.13 2002/01/09 14:03:54 ru Exp $
 .\"
 .Dd November 28, 2001
 .Dt ATOL 3
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
index f4d8d1f20abf..c66c04e9b0a2 100644
--- a/lib/libc/stdlib/atol.c
+++ b/lib/libc/stdlib/atol.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)atol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atol.c,v 1.4 2002/03/22 21:53:09 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c
index 463677dd8536..b7c38b8f68a8 100644
--- a/lib/libc/stdlib/atoll.c
+++ b/lib/libc/stdlib/atoll.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoll.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/bsearch.3 b/lib/libc/stdlib/bsearch.3
index b8a18d37fc6f..25c608db2a5b 100644
--- a/lib/libc/stdlib/bsearch.3
+++ b/lib/libc/stdlib/bsearch.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bsearch.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/bsearch.3,v 1.8 2001/09/07 14:46:35 asmodai Exp $
 .\"
 .Dd April 19, 1994
 .Dt BSEARCH 3
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index 10888963fc6c..771758232c72 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/bsearch.c,v 1.3 2002/03/21 22:48:41 obrien Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/calloc.c b/lib/libc/stdlib/calloc.c
index 9e7850c84ca7..0bdbb2369ad1 100644
--- a/lib/libc/stdlib/calloc.c
+++ b/lib/libc/stdlib/calloc.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)calloc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/calloc.c,v 1.7 2002/08/04 04:11:48 ache Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3
index 05567fbd3949..49f2b4fe21fe 100644
--- a/lib/libc/stdlib/div.3
+++ b/lib/libc/stdlib/div.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)div.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/div.3,v 1.8 2002/12/18 13:33:03 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt DIV 3
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
index 0c3c48498a64..54278d6d8590 100644
--- a/lib/libc/stdlib/div.c
+++ b/lib/libc/stdlib/div.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)div.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/div.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stdlib.h>		/* div_t */
 
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
index 8a5231bc49f6..aa07fda9e456 100644
--- a/lib/libc/stdlib/exit.3
+++ b/lib/libc/stdlib/exit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/exit.3,v 1.15 2004/07/04 20:55:48 ru Exp $
 .\"
 .Dd September 9, 2002
 .Dt EXIT 3
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
index 83abdbd5d506..e71b3db4ff8f 100644
--- a/lib/libc/stdlib/exit.c
+++ b/lib/libc/stdlib/exit.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)exit.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/exit.c,v 1.7 2003/12/19 17:11:20 kan Exp $");
 
 #include "namespace.h"
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index a75e49fc1155..c11c63363962 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getenv.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.17 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt GETENV 3
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 1643db0eb488..aa1598926524 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getenv.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.4 2002/03/21 22:48:41 obrien Exp $");
 
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index 88fb51f38fec..b24a75cf6c81 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getopt.3,v 1.25 2004/07/31 01:00:50 imp Exp $
 .\"
 .Dd April 27, 1995
 .Dt GETOPT 3
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
index af0c5cab2139..efcfa0a68744 100644
--- a/lib/libc/stdlib/getopt.c
+++ b/lib/libc/stdlib/getopt.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt.c,v 1.7 2004/03/06 17:05:45 ache Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdlib/getopt_long.3 b/lib/libc/stdlib/getopt_long.3
index 352af083f924..fd33cfca7617 100644
--- a/lib/libc/stdlib/getopt_long.3
+++ b/lib/libc/stdlib/getopt_long.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.13 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd April 1, 2000
 .Dt GETOPT_LONG 3
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 47eab1ffbc75..ef306bc2ab13 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -62,7 +62,7 @@ static char *rcsid = "$OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.12 2004/07/06 13:58:45 ache Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index 1688426da08b..651f357a17ca 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getsubopt.3,v 1.10 2004/02/23 03:32:10 ache Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETSUBOPT 3
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
index 6d76f78dd1c7..488706a365de 100644
--- a/lib/libc/stdlib/getsubopt.c
+++ b/lib/libc/stdlib/getsubopt.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getsubopt.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getsubopt.c,v 1.6 2004/02/23 03:30:02 ache Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/stdlib/grantpt.3 b/lib/libc/stdlib/grantpt.3
index b4ad8c4edf41..795f4af7ae11 100644
--- a/lib/libc/stdlib/grantpt.3
+++ b/lib/libc/stdlib/grantpt.3
@@ -29,7 +29,7 @@
 .\" 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/lib/libc/stdlib/grantpt.3,v 1.3 2003/09/14 13:41:57 ru Exp $
 .\"
 .Dd December 23, 2002
 .Os
diff --git a/lib/libc/stdlib/grantpt.c b/lib/libc/stdlib/grantpt.c
index a466cba0766a..fd213829be88 100644
--- a/lib/libc/stdlib/grantpt.c
+++ b/lib/libc/stdlib/grantpt.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.4 2005/07/07 17:48:40 marcus Exp $");
 #endif /* not lint */
 
 #include "namespace.h"
diff --git a/lib/libc/stdlib/hcreate.3 b/lib/libc/stdlib/hcreate.3
index 38743afb4746..b638f5a2ea4b 100644
--- a/lib/libc/stdlib/hcreate.3
+++ b/lib/libc/stdlib/hcreate.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.5 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd May 8, 2001
 .Os
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index 58780850be6d..6ab33e5be801 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -52,7 +52,7 @@
 __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.3 2002/06/27 13:18:27 deischen Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index d37d199e4327..e846be2a8380 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)heapsort.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/heapsort.c,v 1.4 2002/03/21 22:48:41 obrien Exp $");
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/lib/libc/stdlib/imaxabs.3 b/lib/libc/stdlib/imaxabs.3
index 430f873280f5..ac520b299d14 100644
--- a/lib/libc/stdlib/imaxabs.3
+++ b/lib/libc/stdlib/imaxabs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/imaxabs.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt IMAXABS 3
diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c
index 35e3dee79d36..531de24fb81a 100644
--- a/lib/libc/stdlib/imaxabs.c
+++ b/lib/libc/stdlib/imaxabs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/imaxabs.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <inttypes.h>
 
diff --git a/lib/libc/stdlib/imaxdiv.3 b/lib/libc/stdlib/imaxdiv.3
index 0ee0971a81be..2a6bad57fecf 100644
--- a/lib/libc/stdlib/imaxdiv.3
+++ b/lib/libc/stdlib/imaxdiv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/imaxdiv.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt IMAXDIV 3
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
index 7dae4675e2b1..ff3087b6315e 100644
--- a/lib/libc/stdlib/imaxdiv.c
+++ b/lib/libc/stdlib/imaxdiv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/imaxdiv.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <inttypes.h>
 
diff --git a/lib/libc/stdlib/insque.3 b/lib/libc/stdlib/insque.3
index a54434c6d316..06f93bf20fc3 100644
--- a/lib/libc/stdlib/insque.3
+++ b/lib/libc/stdlib/insque.3
@@ -6,7 +6,7 @@
 .\" As long as the above copyright statement and this notice remain
 .\" unchanged, you can do what ever you want with this file.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/insque.3,v 1.3 2003/02/25 21:59:36 robert Exp $
 .\"
 .Dd October 10, 2002
 .Dt INSQUE 3
diff --git a/lib/libc/stdlib/insque.c b/lib/libc/stdlib/insque.c
index 388e4d592617..92984b07d784 100644
--- a/lib/libc/stdlib/insque.c
+++ b/lib/libc/stdlib/insque.c
@@ -7,7 +7,7 @@
  * unchanged, you can do what ever you want with this file. 
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/insque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
 
 #define	_SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/labs.3 b/lib/libc/stdlib/labs.3
index 2c8db6e89109..d496b30552a6 100644
--- a/lib/libc/stdlib/labs.3
+++ b/lib/libc/stdlib/labs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)labs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/labs.3,v 1.9 2002/12/18 13:33:03 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt LABS 3
diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c
index 36ae55d4a1f7..42e63d11b37d 100644
--- a/lib/libc/stdlib/labs.c
+++ b/lib/libc/stdlib/labs.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)labs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/labs.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3
index eddf9db07ae3..c75b8be73223 100644
--- a/lib/libc/stdlib/ldiv.3
+++ b/lib/libc/stdlib/ldiv.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ldiv.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/ldiv.3,v 1.9 2002/12/18 13:33:03 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt LDIV 3
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
index 37e95fa7bdfe..560d5c2841e0 100644
--- a/lib/libc/stdlib/ldiv.c
+++ b/lib/libc/stdlib/ldiv.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ldiv.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/ldiv.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stdlib.h>		/* ldiv_t */
 
diff --git a/lib/libc/stdlib/llabs.3 b/lib/libc/stdlib/llabs.3
index 8c031a940d6f..a8238dacea5a 100644
--- a/lib/libc/stdlib/llabs.3
+++ b/lib/libc/stdlib/llabs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/llabs.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt LLABS 3
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
index 2bfbada80d93..4721fcee54e8 100644
--- a/lib/libc/stdlib/llabs.c
+++ b/lib/libc/stdlib/llabs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/llabs.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/lldiv.3 b/lib/libc/stdlib/lldiv.3
index 976a997b9cc8..96ecf1aeec70 100644
--- a/lib/libc/stdlib/lldiv.3
+++ b/lib/libc/stdlib/lldiv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/lldiv.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt LLDIV 3
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
index b34b65e8632d..c9a4853329ce 100644
--- a/lib/libc/stdlib/lldiv.c
+++ b/lib/libc/stdlib/lldiv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/lldiv.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/lsearch.3 b/lib/libc/stdlib/lsearch.3
index 5e76724dc115..3ad6f6c790dd 100644
--- a/lib/libc/stdlib/lsearch.3
+++ b/lib/libc/stdlib/lsearch.3
@@ -6,7 +6,7 @@
 .\" As long as the above copyright statement and this notice remain
 .\" unchanged, you can do what ever you want with this file.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/lsearch.3,v 1.5 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd October 11, 2002
 .Dt LSEARCH 3
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
index e4d1dd59c54d..791bc4934d51 100644
--- a/lib/libc/stdlib/lsearch.c
+++ b/lib/libc/stdlib/lsearch.c
@@ -8,7 +8,7 @@
  */
 #include <sys/types.h>
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/lsearch.c,v 1.1 2002/10/16 14:29:22 robert Exp $");
 
 #define	_SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 8974f7c00b59..92ff0f1c1283 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.63 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd August 19, 2004
 .Dt MALLOC 3
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 384adc1a5175..05b238e5f9b8 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.90.2.1 2005/09/18 03:45:24 scottl Exp $");
 
 /*
  * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related
diff --git a/lib/libc/stdlib/memory.3 b/lib/libc/stdlib/memory.3
index a33904341042..25222d40c385 100644
--- a/lib/libc/stdlib/memory.3
+++ b/lib/libc/stdlib/memory.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memory.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/memory.3,v 1.11 2001/09/07 14:46:35 asmodai Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMORY 3
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index baf566b1f1b4..de3440a95a86 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/merge.c,v 1.7 2005/01/12 03:39:34 brian Exp $");
 
 /*
  * Hybrid exponential search/linear search merge sort with hybrid
diff --git a/lib/libc/stdlib/putenv.c b/lib/libc/stdlib/putenv.c
index 1aa9998855cd..c8f3b6049c82 100644
--- a/lib/libc/stdlib/putenv.c
+++ b/lib/libc/stdlib/putenv.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)putenv.c	8.2 (Berkeley) 3/27/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/putenv.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3
index a55b2e30ad41..eda83b31049d 100644
--- a/lib/libc/stdlib/qsort.3
+++ b/lib/libc/stdlib/qsort.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)qsort.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/qsort.3,v 1.16 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd September 30, 2003
 .Dt QSORT 3
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 47e563ad703e..f1add73c5a4c 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/qsort.c,v 1.12 2002/09/10 02:04:49 wollman Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/qsort_r.c b/lib/libc/stdlib/qsort_r.c
index d86873604f59..f7c0e54f7433 100644
--- a/lib/libc/stdlib/qsort_r.c
+++ b/lib/libc/stdlib/qsort_r.c
@@ -2,7 +2,7 @@
  * This file is in the public domain.  Originally written by Garrett
  * A. Wollman.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/qsort_r.c,v 1.1 2002/09/10 02:04:49 wollman Exp $
  */
 #define I_AM_QSORT_R
 #include "qsort.c"
diff --git a/lib/libc/stdlib/radixsort.3 b/lib/libc/stdlib/radixsort.3
index da4ed165cfea..a1421c649483 100644
--- a/lib/libc/stdlib/radixsort.3
+++ b/lib/libc/stdlib/radixsort.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)radixsort.3	8.2 (Berkeley) 1/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/radixsort.3,v 1.11 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd January 27, 1994
 .Dt RADIXSORT 3
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 933474470a27..5f9eaebc6ec4 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)radixsort.c	8.2 (Berkeley) 4/28/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/radixsort.c,v 1.7 2003/11/11 04:59:23 kientzle Exp $");
 
 /*
  * Radixsort routines.
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
index ee24dbaaafd8..346b2c988ec9 100644
--- a/lib/libc/stdlib/rand.3
+++ b/lib/libc/stdlib/rand.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rand.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/rand.3,v 1.15 2004/11/10 17:25:49 imp Exp $
 .\"
 .Dd May 25, 1999
 .Dt RAND 3
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index c412133d9363..359e12a93b61 100644
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)rand.c	8.1 (Berkeley) 6/14/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.15 2003/02/17 03:52:35 ache Exp $");
 
 #include "namespace.h"
 #include <sys/time.h>          /* for sranddev() */
diff --git a/lib/libc/stdlib/random.3 b/lib/libc/stdlib/random.3
index 70709ca84b28..4421f297ccdd 100644
--- a/lib/libc/stdlib/random.3
+++ b/lib/libc/stdlib/random.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)random.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/random.3,v 1.21 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RANDOM 3
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 768d125f7bbc..f42436ab72f4 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)random.c	8.2 (Berkeley) 5/19/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/random.c,v 1.24 2004/01/20 03:02:18 das Exp $");
 
 #include "namespace.h"
 #include <sys/time.h>          /* for srandomdev() */
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index 5320926ce4bc..d502006229da 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/reallocf.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/realpath.3 b/lib/libc/stdlib/realpath.3
index 3593df76377d..5fe8c16ae049 100644
--- a/lib/libc/stdlib/realpath.3
+++ b/lib/libc/stdlib/realpath.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)realpath.3	8.2 (Berkeley) 2/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/realpath.3,v 1.13 2003/03/27 20:48:53 fjoe Exp $
 .\"
 .Dd February 16, 1994
 .Dt REALPATH 3
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 3082f5f4b95a..31e097787b8f 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -30,7 +30,7 @@
 static char sccsid[] = "@(#)realpath.c	8.1 (Berkeley) 2/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/realpath.c,v 1.20 2003/05/28 08:23:01 fjoe Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/stdlib/remque.c b/lib/libc/stdlib/remque.c
index 0a2f28f77c7c..068a75fc0e16 100644
--- a/lib/libc/stdlib/remque.c
+++ b/lib/libc/stdlib/remque.c
@@ -7,7 +7,7 @@
  * unchanged, you can do what ever you want with this file. 
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/remque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
 
 #define	_SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
index 5c6d906482f7..d7c039407512 100644
--- a/lib/libc/stdlib/setenv.c
+++ b/lib/libc/stdlib/setenv.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)setenv.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/setenv.c,v 1.9 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3
index 11b8e211bf66..739a79877299 100644
--- a/lib/libc/stdlib/strfmon.3
+++ b/lib/libc/stdlib/strfmon.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strfmon.3,v 1.7 2003/01/06 06:21:25 tjr Exp $
 .\"
 .Dd October 12, 2002
 .Dt STRFMON 3
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index 37200ad5f1ab..db569d512405 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14 2003/03/20 08:18:55 ache Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index 37092bfa044c..b3742ab1d9a0 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtod.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.20 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd March 2, 2003
 .Dt STRTOD 3
diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
index 46ef2ba06fd9..f5bc3b40fb45 100644
--- a/lib/libc/stdlib/strtoimax.c
+++ b/lib/libc/stdlib/strtoimax.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.11 2005/01/21 13:31:02 ache Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index f814547f750b..aa9271752156 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strtol.3,v 1.20 2005/01/22 18:02:58 ache Exp $
 .\"
 .Dd November 28, 2001
 .Dt STRTOL 3
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index 1a6e818435be..53a746e3bd2e 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtol.c,v 1.19 2005/01/21 13:31:02 ache Exp $");
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index f9658921d829..a24f6f81dd9d 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.21 2005/01/21 13:31:02 ache Exp $");
 
 #include <limits.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
index a3e37afab85f..6e8bcb8e18ec 100644
--- a/lib/libc/stdlib/strtoq.c
+++ b/lib/libc/stdlib/strtoq.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoq.c,v 1.11 2002/08/15 09:25:04 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 3ac7438b2204..4cf6eb40479e 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtoul.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strtoul.3,v 1.21 2005/01/22 18:02:58 ache Exp $
 .\"
 .Dd November 28, 2001
 .Dt STRTOUL 3
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index 8bcc2a4f3531..13deb3229c24 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoul.c,v 1.18 2005/01/21 13:31:02 ache Exp $");
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 2a454b9c02e1..51c08a07558d 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.20 2005/01/21 13:31:02 ache Exp $");
 
 #include <limits.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c
index c81b9d1ef7e3..442b2812bde4 100644
--- a/lib/libc/stdlib/strtoumax.c
+++ b/lib/libc/stdlib/strtoumax.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.10 2005/01/21 13:31:02 ache Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
index 1a14f3676ae7..c0e0bef4d321 100644
--- a/lib/libc/stdlib/strtouq.c
+++ b/lib/libc/stdlib/strtouq.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtouq.c,v 1.11 2002/08/15 09:25:04 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/stdlib/system.3 b/lib/libc/stdlib/system.3
index 60707b400cfc..f0557c867cb7 100644
--- a/lib/libc/stdlib/system.3
+++ b/lib/libc/stdlib/system.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)system.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.11 2002/05/27 03:45:27 dd Exp $
 .\"
 .Dd June 4, 1993
 .Dt SYSTEM 3
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
index ac14ae99f096..fd2cc2a16ec1 100644
--- a/lib/libc/stdlib/system.c
+++ b/lib/libc/stdlib/system.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)system.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/system.c,v 1.10 2002/03/22 21:53:10 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
index c83afb8cf3f1..7fb6893466a0 100644
--- a/lib/libc/stdlib/tdelete.c
+++ b/lib/libc/stdlib/tdelete.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/tdelete.c,v 1.6 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index c5d66cf41612..b58ed8873579 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/tfind.c,v 1.5 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
index c0af27f79aa0..59543afc1875 100644
--- a/lib/libc/stdlib/tsearch.3
+++ b/lib/libc/stdlib/tsearch.3
@@ -25,7 +25,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	OpenBSD: tsearch.3,v 1.2 1998/06/21 22:13:49 millert Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/tsearch.3,v 1.14 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd June 15, 1997
 .Dt TSEARCH 3
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 149c2bb00f16..edeccde809d5 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/tsearch.c,v 1.4 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c
index 55f220f38750..516ef44e006c 100644
--- a/lib/libc/stdlib/twalk.c
+++ b/lib/libc/stdlib/twalk.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/twalk.c,v 1.5 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index 003b62b453e9..ae3cd6ddb8a5 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -1,5 +1,5 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.14 2002/11/18 09:50:56 ru Exp $
 
 .PATH:	${.CURDIR}/stdtime ${.CURDIR}/../locale
 
diff --git a/lib/libc/stdtime/asctime.c b/lib/libc/stdtime/asctime.c
index 0f4212f81c14..c28abae9826f 100644
--- a/lib/libc/stdtime/asctime.c
+++ b/lib/libc/stdtime/asctime.c
@@ -9,7 +9,7 @@
 static char	elsieid[] __unused = "@(#)asctime.c	7.9";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.12 2004/06/14 10:31:52 stefanf Exp $");
 
 /*LINTLIBRARY*/
 
diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3
index ec480eca3efc..11c1f9fea0dd 100644
--- a/lib/libc/stdtime/ctime.3
+++ b/lib/libc/stdtime/ctime.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ctime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/ctime.3,v 1.23 2005/02/13 23:45:46 ru Exp $
 .\"
 .Dd January 2, 1999
 .Dt CTIME 3
diff --git a/lib/libc/stdtime/difftime.c b/lib/libc/stdtime/difftime.c
index 596ea82f67ca..df557534ff5c 100644
--- a/lib/libc/stdtime/difftime.c
+++ b/lib/libc/stdtime/difftime.c
@@ -9,7 +9,7 @@
 static char	elsieid[] __unused = "@(#)difftime.c	7.9";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/difftime.c,v 1.8 2004/06/14 10:31:52 stefanf Exp $");
 
 /*LINTLIBRARY*/
 
diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
index d7b5a3636aaa..c07f298157a6 100644
--- a/lib/libc/stdtime/localtime.c
+++ b/lib/libc/stdtime/localtime.c
@@ -9,7 +9,7 @@
 static char	elsieid[] __unused = "@(#)localtime.c	7.78";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.40 2004/08/24 00:15:37 peter Exp $");
 
 /*
 ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu).
diff --git a/lib/libc/stdtime/private.h b/lib/libc/stdtime/private.h
index a3c777834e3d..9878a1a4428f 100644
--- a/lib/libc/stdtime/private.h
+++ b/lib/libc/stdtime/private.h
@@ -6,7 +6,7 @@
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
-** $FreeBSD$
+** $FreeBSD: src/lib/libc/stdtime/private.h,v 1.10 2004/06/14 10:31:52 stefanf Exp $
 */
 
 /* Stuff moved from Makefile.inc to reduce clutter */
diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3
index 10beb7c2923f..0e4ef090c8d5 100644
--- a/lib/libc/stdtime/strftime.3
+++ b/lib/libc/stdtime/strftime.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strftime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.36.2.1 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd November 4, 2004
 .Dt STRFTIME 3
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 3f66ea25eb9a..7e8a3dcdf8d3 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -32,7 +32,7 @@ static const char	elsieid[] = "@(#)strftime.c	7.64";
 static const char	sccsid[] = "@(#)strftime.c	5.4 (Berkeley) 3/14/89";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.41 2004/11/04 08:34:57 delphij Exp $");
 
 #include "tzfile.h"
 #include <fcntl.h>
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index d763fbcab5d6..00e6b57932c9 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -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/lib/libc/stdtime/strptime.3,v 1.24 2005/01/20 09:17:04 ru Exp $
 .\" "
 .Dd January 4, 2003
 .Dt STRPTIME 3
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index ddf6b57e38fc..901a74257045 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -59,7 +59,7 @@ static char copyright[] __unused =
 static char sccsid[] __unused = "@(#)strptime.c	0.1 (Powerdog) 94/03/27";
 #endif /* !defined NOID */
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.35 2003/11/17 04:19:15 nectar Exp $");
 
 #include "namespace.h"
 #include <time.h>
diff --git a/lib/libc/stdtime/time2posix.3 b/lib/libc/stdtime/time2posix.3
index 219bb5f320d3..cd8f49b3af2f 100644
--- a/lib/libc/stdtime/time2posix.3
+++ b/lib/libc/stdtime/time2posix.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/time2posix.3,v 1.14 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd May 1, 1996
 .Dt TIME2POSIX 3
diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c
index e852a4f279e4..5085dd7d9bf1 100644
--- a/lib/libc/stdtime/time32.c
+++ b/lib/libc/stdtime/time32.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/time32.c,v 1.5 2002/06/17 01:42:29 wollman Exp $");
 
 #include <sys/types.h>
 #include <timeconv.h>
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index 6917e6b6ccee..2aba03c58ae9 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/timelocal.c,v 1.25 2003/06/13 00:14:07 jkh Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/stdtime/timelocal.h b/lib/libc/stdtime/timelocal.h
index 5d26bf938d97..0b0a59a483d4 100644
--- a/lib/libc/stdtime/timelocal.h
+++ b/lib/libc/stdtime/timelocal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdtime/timelocal.h,v 1.11 2002/01/24 15:07:44 phantom Exp $
  */
 
 #ifndef _TIMELOCAL_H_
diff --git a/lib/libc/stdtime/tzfile.5 b/lib/libc/stdtime/tzfile.5
index cc7e65966060..04ecce86136d 100644
--- a/lib/libc/stdtime/tzfile.5
+++ b/lib/libc/stdtime/tzfile.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/tzfile.5,v 1.10 2001/07/10 13:41:23 ru Exp $
 .Dd September 13, 1994
 .Dt TZFILE 5
 .Os
diff --git a/lib/libc/stdtime/tzfile.h b/lib/libc/stdtime/tzfile.h
index 89c569453c21..378d7ae606c6 100644
--- a/lib/libc/stdtime/tzfile.h
+++ b/lib/libc/stdtime/tzfile.h
@@ -6,7 +6,7 @@
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
-** $FreeBSD$
+** $FreeBSD: src/lib/libc/stdtime/tzfile.h,v 1.8 2002/03/22 23:42:05 obrien Exp $
 */
 
 /*
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 28f88ccc0e0a..b48ad2ca0abe 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.34.8.1 2005/08/29 18:46:39 andre Exp $
 
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
 
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index cc75ac17964f..a3709e53d1f6 100644
--- a/lib/libc/string/bcmp.3
+++ b/lib/libc/string/bcmp.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bcmp.3,v 1.10 2003/09/08 19:57:15 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt BCMP 3
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 6c757671d0c0..f5227dfbb987 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)bcmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/bcmp.c,v 1.5 2002/08/30 21:07:40 robert Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/bcopy.3 b/lib/libc/string/bcopy.3
index c7e9706f0d7b..6513af4041cf 100644
--- a/lib/libc/string/bcopy.3
+++ b/lib/libc/string/bcopy.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bcopy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bcopy.3,v 1.9 2003/09/08 19:57:15 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt BCOPY 3
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index 0c2ec94fc43a..983b2fbb160f 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)bcopy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/bcopy.c,v 1.6 2003/10/26 03:55:58 peter Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index 40526551110e..3629a3eb3daa 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bstring.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bstring.3,v 1.7 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt BSTRING 3
diff --git a/lib/libc/string/bzero.3 b/lib/libc/string/bzero.3
index a8c4a2752955..8a10597e7b90 100644
--- a/lib/libc/string/bzero.3
+++ b/lib/libc/string/bzero.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bzero.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bzero.3,v 1.9 2003/09/08 19:57:15 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt BZERO 3
diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 201bd64f808d..85bc5e834e98 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/bzero.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	BZERO
 #include "memset.c"
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
index 7199bf5c9c26..93e7148704de 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ffs.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.9 2004/06/30 20:09:09 ru Exp $
 .\"
 .Dd January 13, 2004
 .Dt FFS 3
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index f8da99629c61..ef4d0f0a6885 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ffs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.7 2004/01/14 07:46:36 des Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/ffsl.c b/lib/libc/string/ffsl.c
index 3ef9afaf900b..1c25a0a94580 100644
--- a/lib/libc/string/ffsl.c
+++ b/lib/libc/string/ffsl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/ffsl.c,v 1.2 2004/01/14 07:46:36 des Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/fls.c b/lib/libc/string/fls.c
index e27f3ff2f176..8550cf8a64a7 100644
--- a/lib/libc/string/fls.c
+++ b/lib/libc/string/fls.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/fls.c,v 1.2 2004/01/14 07:46:36 des Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/flsl.c b/lib/libc/string/flsl.c
index 127e311071cb..f9612b51e978 100644
--- a/lib/libc/string/flsl.c
+++ b/lib/libc/string/flsl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/flsl.c,v 1.2 2004/01/14 07:46:36 des Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/index.3 b/lib/libc/string/index.3
index 124597002a99..c47e96473fc0 100644
--- a/lib/libc/string/index.3
+++ b/lib/libc/string/index.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)index.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/index.3,v 1.11 2003/09/08 19:57:15 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt INDEX 3
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index 5d79f4f7741c..be2c0520342b 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)index.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.7 2003/12/18 07:44:53 jkh Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index 84f385d3be6b..44a457fc14c4 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memccpy.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memccpy.3,v 1.6 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt MEMCCPY 3
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index 62c47a1d7983..0bc6a11160dc 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)memccpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memccpy.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memchr.3 b/lib/libc/string/memchr.3
index 7179cbda590a..a8e908435de7 100644
--- a/lib/libc/string/memchr.3
+++ b/lib/libc/string/memchr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memchr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.7.14.1 2005/08/29 18:46:39 andre Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCHR 3
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index a217a80f5c27..e3c66791386b 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)memchr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memchr.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
index d38154a4d255..980af28433f8 100644
--- a/lib/libc/string/memcmp.3
+++ b/lib/libc/string/memcmp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memcmp.3,v 1.8 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCMP 3
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index 6b28c31d09f6..045e4d9a0f06 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)memcmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memcmp.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memcpy.3 b/lib/libc/string/memcpy.3
index c970d7ce7a0b..ba9cae999a54 100644
--- a/lib/libc/string/memcpy.3
+++ b/lib/libc/string/memcpy.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memcpy.3,v 1.7 2002/01/07 06:03:37 dd Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCPY 3
diff --git a/lib/libc/string/memcpy.c b/lib/libc/string/memcpy.c
index ed03856e54b4..dfc03aed80e3 100644
--- a/lib/libc/string/memcpy.c
+++ b/lib/libc/string/memcpy.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memcpy.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	MEMCOPY
 #include "bcopy.c"
diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3
index 678ae3d07f0c..628cedd4b2e2 100644
--- a/lib/libc/string/memmem.3
+++ b/lib/libc/string/memmem.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-\" $FreeBSD$
+\" $FreeBSD: src/lib/libc/string/memmem.3,v 1.1.2.1 2005/08/29 18:46:39 andre Exp $
 .\"
 .Dd August 24, 2005
 .Dt MEMMEM 3
diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c
index 0ac0a6dfc80e..b5c02b62a272 100644
--- a/lib/libc/string/memmem.c
+++ b/lib/libc/string/memmem.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memmem.c,v 1.1.2.1 2005/08/29 18:46:39 andre Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memmove.3 b/lib/libc/string/memmove.3
index 39543c3b486c..8f4f2cc45dfb 100644
--- a/lib/libc/string/memmove.3
+++ b/lib/libc/string/memmove.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memmove.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memmove.3,v 1.6 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMMOVE 3
diff --git a/lib/libc/string/memmove.c b/lib/libc/string/memmove.c
index 05cf75a2ce6a..8f44e82cc366 100644
--- a/lib/libc/string/memmove.c
+++ b/lib/libc/string/memmove.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memmove.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	MEMMOVE
 #include "bcopy.c"
diff --git a/lib/libc/string/memset.3 b/lib/libc/string/memset.3
index 71ab4d58c55f..3f1ba5e65095 100644
--- a/lib/libc/string/memset.3
+++ b/lib/libc/string/memset.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memset.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memset.3,v 1.7 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMSET 3
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 17683aeda183..1cb8644e3eab 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)memset.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memset.c,v 1.8 2002/09/01 21:53:46 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
index 641c00f7ee89..697b69a5c202 100644
--- a/lib/libc/string/rindex.c
+++ b/lib/libc/string/rindex.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rindex.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.7 2003/12/18 07:44:53 jkh Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/string/stpcpy.c b/lib/libc/string/stpcpy.c
index 0bee74629057..2742bf7a93ad 100644
--- a/lib/libc/string/stpcpy.c
+++ b/lib/libc/string/stpcpy.c
@@ -33,7 +33,7 @@
 static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/stpcpy.c,v 1.1 2002/10/03 19:39:20 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index 346b9e3414d6..4da0d235821a 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcasecmp.3,v 1.11 2003/09/08 19:57:15 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRCASECMP 3
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index cb031ceec3cf..6f400d7d679e 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strcasecmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.6 2002/08/30 15:40:01 robert Exp $");
 
 #include <strings.h>
 #include <ctype.h>
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index d950766cf5a8..dafcb79e2138 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcasestr.c,v 1.3 2002/03/21 18:44:54 obrien Exp $");
 
 #include <ctype.h>
 #include <string.h>
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
index ac4f7b0da968..73678954d66c 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcat.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcat.3,v 1.13 2002/09/06 11:24:06 tjr Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRCAT 3
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index d30389dbacf7..5d28c865d7cc 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strcat.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcat.c,v 1.7 2002/09/06 11:24:06 tjr Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3
index 5d801ef7f66e..c3141a11c5d7 100644
--- a/lib/libc/string/strchr.3
+++ b/lib/libc/string/strchr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strchr.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strchr.3,v 1.11.10.1 2005/08/29 18:46:39 andre Exp $
 .\"
 .Dd April 19, 1994
 .Dt STRCHR 3
diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c
index 1d82abe86fd5..2fb91140984c 100644
--- a/lib/libc/string/strchr.c
+++ b/lib/libc/string/strchr.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	STRCHR
 #include "index.c"
diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3
index 08adad0cac0b..101d71bd54c7 100644
--- a/lib/libc/string/strcmp.3
+++ b/lib/libc/string/strcmp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcmp.3,v 1.10 2001/10/11 17:02:44 mike Exp $
 .\"
 .Dd October 11, 2001
 .Dt STRCMP 3
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index a6bb0d507935..1befcbce16e2 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3
index a62010818c56..d2e1ae47c681 100644
--- a/lib/libc/string/strcoll.3
+++ b/lib/libc/string/strcoll.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcoll.3,v 1.12 2002/10/15 10:11:53 tjr Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRCOLL 3
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index a0daf8dc182f..b93ce4861423 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcoll.c,v 1.13 2001/11/07 19:55:16 obrien Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3
index f40e79205894..138bace16a1f 100644
--- a/lib/libc/string/strcpy.3
+++ b/lib/libc/string/strcpy.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.24 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd August 9, 2001
 .Dt STRCPY 3
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index 630ae23e799c..5cd2f45c1707 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcpy.c,v 1.7 2002/09/06 11:24:06 tjr Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strcspn.3 b/lib/libc/string/strcspn.3
index ef905a5c332b..e4aaf2d9fc0a 100644
--- a/lib/libc/string/strcspn.3
+++ b/lib/libc/string/strcspn.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcspn.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcspn.3,v 1.7.14.1 2005/09/07 16:41:51 garys Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRCSPN 3
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 3879a3b085c7..55acb8bd99cf 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcspn.c,v 1.5 2005/04/02 18:52:44 das Exp $");
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index ec91f3568608..3bb2516b1f0e 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strdup.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strdup.3,v 1.10 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRDUP 3
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
index 788a185e54d1..a9881a193bdc 100644
--- a/lib/libc/string/strdup.c
+++ b/lib/libc/string/strdup.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strdup.c,v 1.4 2001/11/07 19:55:16 obrien Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 9f486ed25b51..3abe2371b6aa 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strerror.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.23 2004/10/12 14:52:52 keramida Exp $
 .\"
 .Dd October 12, 2004
 .Dt STRERROR 3
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index 38a484f724d0..13ce92c52f85 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strerror.c,v 1.15 2005/02/27 21:17:22 phantom Exp $");
 
 #if defined(NLS)
 #include <nl_types.h>
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 2be58b8063c2..0a59cec23ce0 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)string.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/string.3,v 1.13 2002/10/19 13:41:22 tjr Exp $
 .\"
 .Dd December 11, 1993
 .Dt STRING 3
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
index 7f19f6bda144..b8f0ff3e557e 100644
--- a/lib/libc/string/strlcat.c
+++ b/lib/libc/string/strlcat.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strlcat.c,v 1.10 2004/10/16 06:32:43 obrien Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index f674fe2ac49b..c33c0dd90896 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -25,7 +25,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/lib/libc/string/strlcpy.3,v 1.13 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 22, 1998
 .Dt STRLCPY 3
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index 77180a58fd2c..938323601bff 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.8 2004/10/14 21:31:42 stefanf Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
index 69b89453321c..b490cede4916 100644
--- a/lib/libc/string/strlen.3
+++ b/lib/libc/string/strlen.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strlen.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strlen.3,v 1.6 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRLEN 3
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 841c7c24792a..c67667df056b 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strlen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strlen.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index 8c315cde04f4..f306a5be80df 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strmode.3	8.3 (Berkeley) 7/28/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strmode.3,v 1.9 2003/07/01 15:28:05 maxim Exp $
 .\"
 .Dd July 28, 1994
 .Dt STRMODE 3
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index fe2cf9ee9958..2409b4e4f578 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strmode.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index 4218ae292971..e05e030b8fd7 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)strncat.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strncat.c,v 1.6 2002/09/06 11:24:06 tjr Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index 60d09c15a740..6b0cfc88b9ed 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strncmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 7759e61a05d0..2fcc9579f179 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strncpy.c,v 1.6 2002/09/06 11:24:06 tjr Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c
index 749c43baca8a..abe2f8d88520 100644
--- a/lib/libc/string/strnstr.c
+++ b/lib/libc/string/strnstr.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strnstr.c,v 1.3 2005/02/11 21:07:51 pjd Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3
index 92a3388ab1a9..715bb7193e24 100644
--- a/lib/libc/string/strpbrk.3
+++ b/lib/libc/string/strpbrk.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strpbrk.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strpbrk.3,v 1.7 2001/10/01 16:09:00 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRPBRK 3
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index 42e8c626bbb1..fb0e1d4ca3e5 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strpbrk.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strpbrk.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strrchr.c b/lib/libc/string/strrchr.c
index 11cbd31e3847..b8c05007c938 100644
--- a/lib/libc/string/strrchr.c
+++ b/lib/libc/string/strrchr.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strrchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	STRRCHR
 #include "rindex.c"
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 7a2b0f88d320..ca235200a4bf 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)strsep.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strsep.3,v 1.14 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRSEP 3
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index dd5ec0bc2ed1..d0bccce94c69 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strsep.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 #include <stdio.h>
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index 11efb0787bf4..7211a5499ac0 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strsignal.c,v 1.7 2005/03/06 03:19:19 mux Exp $");
 
 #if defined(NLS)
 #include <nl_types.h>
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
index 475fab89f37b..fc5513e80966 100644
--- a/lib/libc/string/strspn.3
+++ b/lib/libc/string/strspn.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strspn.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strspn.3,v 1.8.14.1 2005/09/07 16:41:02 garys Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRSPN 3
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index 5dbac0a67857..3b96365dd660 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strspn.c,v 1.5 2005/04/02 18:52:44 das Exp $");
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3
index a2136c80a488..5a87781a0b5b 100644
--- a/lib/libc/string/strstr.3
+++ b/lib/libc/string/strstr.3
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strstr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strstr.3,v 1.12.14.1 2005/08/29 18:46:39 andre Exp $
 .\"
 .Dd October 11, 2001
 .Dt STRSTR 3
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index 3f6d81c3ac35..f51d17024e03 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strstr.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index e5c8e3381c78..94a0e4089000 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -48,7 +48,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtok.3	8.2 (Berkeley) 2/3/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strtok.3,v 1.25 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd November 27, 1998
 .Dt STRTOK 3
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index 1a29cc53a66b..6aec194f87bc 100644
--- a/lib/libc/string/strtok.c
+++ b/lib/libc/string/strtok.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)strtok.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strtok.c,v 1.9 2002/09/07 02:53:19 tjr Exp $");
 
 #include <stddef.h>
 #ifdef DEBUG_STRTOK
diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3
index 6f4acf4fd6b7..14b6bbcdae89 100644
--- a/lib/libc/string/strxfrm.3
+++ b/lib/libc/string/strxfrm.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strxfrm.3,v 1.17 2002/10/15 10:11:53 tjr Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRXFRM 3
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index 81e05af6ab7b..3ab7b720a4de 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/string/swab.3 b/lib/libc/string/swab.3
index 05fdaddc6592..602e1b0ad8fe 100644
--- a/lib/libc/string/swab.3
+++ b/lib/libc/string/swab.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swab.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.9 2004/12/10 15:27:06 trhodes Exp $
 .\"
 .Dd December 10, 2004
 .Dt SWAB 3
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index 8c0c43febfde..9877a089f1e1 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)swab.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.6 2004/12/10 15:24:40 trhodes Exp $");
 
 #include <unistd.h>
 
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 1c965335e4d2..cf7812ffd139 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscat.c,v 1.8 2002/09/26 09:28:55 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index 1df1fe6cd520..0fae13224770 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.7 2002/10/23 10:47:47 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
index 7b9f7029542e..20152b2e17d5 100644
--- a/lib/libc/string/wcscmp.c
+++ b/lib/libc/string/wcscmp.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
 __RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcscoll.3 b/lib/libc/string/wcscoll.3
index 3270952c862d..18a9ef7a440e 100644
--- a/lib/libc/string/wcscoll.3
+++ b/lib/libc/string/wcscoll.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/string/strcoll.3,v 1.11 2001/10/01 16:09:00 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcscoll.3,v 1.2 2002/12/09 14:04:05 ru Exp $
 .\"
 .Dd October 4, 2002
 .Dt WCSCOLL 3
diff --git a/lib/libc/string/wcscoll.c b/lib/libc/string/wcscoll.c
index dbfbcfa919a7..5095158efaf4 100644
--- a/lib/libc/string/wcscoll.c
+++ b/lib/libc/string/wcscoll.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscoll.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index 180bbd1b192d..b4c236a780f3 100644
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscpy.c,v 1.8 2002/09/26 09:23:07 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
index 57a804c0c639..c16f27083afc 100644
--- a/lib/libc/string/wcscspn.c
+++ b/lib/libc/string/wcscspn.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscspn.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
index 6466f0690fd7..f3b9a63608a2 100644
--- a/lib/libc/string/wcslcat.c
+++ b/lib/libc/string/wcslcat.c
@@ -33,7 +33,7 @@
 __RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcslcat.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <sys/types.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
index 1b9459a0c19e..273c8fd937c8 100644
--- a/lib/libc/string/wcslcpy.c
+++ b/lib/libc/string/wcslcpy.c
@@ -33,7 +33,7 @@
 __RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcslcpy.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <sys/types.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
index 1636d98cd276..5e462a183daf 100644
--- a/lib/libc/string/wcslen.c
+++ b/lib/libc/string/wcslen.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcslen.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
index ba49a9eab98a..5abb442f8067 100644
--- a/lib/libc/string/wcsncat.c
+++ b/lib/libc/string/wcsncat.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsncat.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
index 7544cc71a7cf..7043e066fcb5 100644
--- a/lib/libc/string/wcsncmp.c
+++ b/lib/libc/string/wcsncmp.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
 __RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsncmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index e9c9110fb63d..fb9cef045350 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsncpy.c,v 1.9 2002/10/24 02:48:45 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index 7315c4445dda..550244081b88 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcspbrk.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index 37c81ec8cdb7..093dd082aaca 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsrchr.c,v 1.7 2002/10/23 10:52:04 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
index 584a9d352850..d4101c7f2510 100644
--- a/lib/libc/string/wcsspn.c
+++ b/lib/libc/string/wcsspn.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsspn.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index e391e9f57d7b..0533e59bbece 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsstr.c,v 1.8 2002/10/24 02:53:45 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcstok.3 b/lib/libc/string/wcstok.3
index 0de24d8366c8..4ddfb040e09d 100644
--- a/lib/libc/string/wcstok.3
+++ b/lib/libc/string/wcstok.3
@@ -47,7 +47,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcstok.3,v 1.4 2002/10/15 09:49:54 tjr Exp $
 .\"
 .Dd October 3, 2002
 .Dt WCSTOK 3
diff --git a/lib/libc/string/wcstok.c b/lib/libc/string/wcstok.c
index 0dbdfe0e2836..5781adbda28b 100644
--- a/lib/libc/string/wcstok.c
+++ b/lib/libc/string/wcstok.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcstok.c,v 1.2 2003/03/12 06:41:49 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcswidth.3 b/lib/libc/string/wcswidth.3
index 76d32ad8e4b9..973bfe067bed 100644
--- a/lib/libc/string/wcswidth.3
+++ b/lib/libc/string/wcswidth.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcswidth.3,v 1.2 2002/12/09 14:04:05 ru Exp $
 .\"
 .Dd August 20, 2002
 .Dt WCSWIDTH 3
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index 553e6d2f813d..98a095d18c0d 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcswidth.c,v 1.6 2002/08/20 02:06:28 ache Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsxfrm.3 b/lib/libc/string/wcsxfrm.3
index 9e626479c3d1..e85ebb0b3cd0 100644
--- a/lib/libc/string/wcsxfrm.3
+++ b/lib/libc/string/wcsxfrm.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/string/strxfrm.3,v 1.16 2002/09/06 11:24:06 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcsxfrm.3,v 1.2 2002/12/09 14:04:05 ru Exp $
 .\"
 .Dd October 4, 2002
 .Dt WCSXFRM 3
diff --git a/lib/libc/string/wcsxfrm.c b/lib/libc/string/wcsxfrm.c
index 5e47ad946ee6..7aea3d13bf1f 100644
--- a/lib/libc/string/wcsxfrm.c
+++ b/lib/libc/string/wcsxfrm.c
@@ -29,7 +29,7 @@
 #if 0
 __FBSDID("FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsxfrm.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3
index a448064418a2..de091a617bb7 100644
--- a/lib/libc/string/wmemchr.3
+++ b/lib/libc/string/wmemchr.3
@@ -37,7 +37,7 @@
 .\"
 .\"     from: @(#)strcpy.3	8.1 (Berkeley) 6/4/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wmemchr.3,v 1.6 2002/09/07 04:07:00 tjr Exp $
 .\"
 .Dd December 22, 2000
 .Dt WMEMCHR 3
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index 2d96708fd6c4..0b09f9421079 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemchr.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
index c9a9095b8eb2..30140416b716 100644
--- a/lib/libc/string/wmemcmp.c
+++ b/lib/libc/string/wmemcmp.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemcmp.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
index 38d563d8053c..4391309ea5df 100644
--- a/lib/libc/string/wmemcpy.c
+++ b/lib/libc/string/wmemcpy.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemcpy.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
 
 #include <string.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
index 6b3ee94e3a90..dd2036c953e4 100644
--- a/lib/libc/string/wmemmove.c
+++ b/lib/libc/string/wmemmove.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemmove.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <string.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
index b923f14637f1..df9153765e83 100644
--- a/lib/libc/string/wmemset.c
+++ b/lib/libc/string/wmemset.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemset.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 53ac26b8d898..d93cfeb1631b 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113 2005/07/07 18:17:55 jhb Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c
index 8dcf8942701b..4219db2389c0 100644
--- a/lib/libc/sys/__error.c
+++ b/lib/libc/sys/__error.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/__error.c,v 1.4 2002/03/22 21:53:24 obrien Exp $");
 
 extern int errno;
 
diff --git a/lib/libc/sys/_exit.2 b/lib/libc/sys/_exit.2
index 1a4329504ccb..614f5a2736ef 100644
--- a/lib/libc/sys/_exit.2
+++ b/lib/libc/sys/_exit.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)_exit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/_exit.2,v 1.18 2004/12/22 16:20:12 keramida Exp $
 .\"
 .Dd June 4, 1993
 .Dt EXIT 2
diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
index 800d9a2a2ace..b4475063aa1e 100644
--- a/lib/libc/sys/accept.2
+++ b/lib/libc/sys/accept.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)accept.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.31 2005/05/04 11:09:26 keramida Exp $
 .\"
 .Dd December 11, 1993
 .Dt ACCEPT 2
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 94e78317252e..ad564bed0288 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/access.2,v 1.18 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd September 21, 2001
 .Dt ACCESS 2
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index 4f371d3fdf65..b8faad86b37f 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acct.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/acct.2,v 1.21 2004/12/23 23:45:25 keramida Exp $
 .\"
 .Dd April 17, 2004
 .Dt ACCT 2
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
index 5794a3295563..6f7e0e05d48c 100644
--- a/lib/libc/sys/adjtime.2
+++ b/lib/libc/sys/adjtime.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)adjtime.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/adjtime.2,v 1.15 2004/12/23 23:45:25 keramida Exp $
 .\"
 .Dd June 4, 1993
 .Dt ADJTIME 2
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 08102cf9d861..a5f1392c64f5 100644
--- a/lib/libc/sys/aio_cancel.2
+++ b/lib/libc/sys/aio_cancel.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.22 2003/01/13 10:37:11 tjr Exp $
 .\"
 .Dd January 19, 2000
 .Dt AIO_CANCEL 2
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index 91bb0974d01c..20b5a07f7507 100644
--- a/lib/libc/sys/aio_error.2
+++ b/lib/libc/sys/aio_error.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_error.2,v 1.19 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_ERROR 2
diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2
index 07c28cfd2810..ac66d6b54be6 100644
--- a/lib/libc/sys/aio_read.2
+++ b/lib/libc/sys/aio_read.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.21 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd November 17, 1998
 .Dt AIO_READ 2
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 4d7282f8623b..8c2b5ceb78b9 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.17 2003/01/13 10:37:11 tjr Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_RETURN 2
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2
index db704f137d1c..6f9fbf169cf2 100644
--- a/lib/libc/sys/aio_suspend.2
+++ b/lib/libc/sys/aio_suspend.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.22 2004/12/23 23:45:25 keramida Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_SUSPEND 2
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index 5145f78118ab..d0547fb74d68 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_waitcomplete.2,v 1.13 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd January 19, 2000
 .Dt AIO_WAITCOMPLETE 2
diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2
index 5e9cda2a0a0f..e63f1f0fbff8 100644
--- a/lib/libc/sys/aio_write.2
+++ b/lib/libc/sys/aio_write.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_write.2,v 1.18 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_WRITE 2
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index 9cad89740b91..36bb0f6511f0 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/bind.2,v 1.27 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt BIND 2
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index ba97987c8c34..6402230b3cff 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)brk.2	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/brk.2,v 1.25 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd July 12, 1999
 .Dt BRK 2
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
index 8e8214e447f5..89df1269e315 100644
--- a/lib/libc/sys/chdir.2
+++ b/lib/libc/sys/chdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chdir.2,v 1.15 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt CHDIR 2
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 0160878807ba..658525b2ccc6 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chflags.2,v 1.25 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd May 5, 2002
 .Dt CHFLAGS 2
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index fc6a932ead22..ed25f86eec8b 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chmod.2,v 1.32 2004/12/29 20:00:29 trhodes Exp $
 .\"
 .Dd December 29, 2004
 .Dt CHMOD 2
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 555ee38441e1..ea7195db0604 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chown.2,v 1.21 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt CHOWN 2
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index 7142e0d4ea90..9481e1115ee8 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chroot.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chroot.2,v 1.20 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt CHROOT 2
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index a60887011460..2229c1145ea2 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.20 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 17, 2004
 .Dt CLOCK_GETTIME 2
diff --git a/lib/libc/sys/close.2 b/lib/libc/sys/close.2
index 04dbe3df1ab2..0826ea280657 100644
--- a/lib/libc/sys/close.2
+++ b/lib/libc/sys/close.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)close.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/close.2,v 1.24 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLOSE 2
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index 5b74fbef80a0..c989b656fd71 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.26 2004/07/02 19:07:30 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt CONNECT 2
diff --git a/lib/libc/sys/dup.2 b/lib/libc/sys/dup.2
index ef903f946a48..eaa0a1801292 100644
--- a/lib/libc/sys/dup.2
+++ b/lib/libc/sys/dup.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dup.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/dup.2,v 1.21 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt DUP 2
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 45d4baea76fc..b27d2d5a0c6f 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)execve.2	8.5 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/execve.2,v 1.39 2004/07/04 20:55:48 ru Exp $
 .\"
 .Dd June 1, 1994
 .Dt EXECVE 2
diff --git a/lib/libc/sys/extattr_get_file.2 b/lib/libc/sys/extattr_get_file.2
index e55d94d638ea..e83990eaad29 100644
--- a/lib/libc/sys/extattr_get_file.2
+++ b/lib/libc/sys/extattr_get_file.2
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.17 2005/06/10 16:54:17 rodrigc Exp $
 .\"
 .Dd February 23, 2005
 .Dt EXTATTR 2
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 804b4abda454..b4e4c5e6d02f 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fcntl.2	8.2 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.44 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd January 12, 1994
 .Dt FCNTL 2
diff --git a/lib/libc/sys/fhopen.2 b/lib/libc/sys/fhopen.2
index 2a609c1c2cd2..b5bca44d0676 100644
--- a/lib/libc/sys/fhopen.2
+++ b/lib/libc/sys/fhopen.2
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.16 2005/06/30 13:18:15 hmp Exp $
 .\"
 .Dd June 29, 1999
 .Dt FHOPEN 2
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
index 654f7dfe186a..9aaa6c75720f 100644
--- a/lib/libc/sys/flock.2
+++ b/lib/libc/sys/flock.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)flock.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/flock.2,v 1.24 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt FLOCK 2
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
index 5dd641360dd0..53440fbbfa3a 100644
--- a/lib/libc/sys/fork.2
+++ b/lib/libc/sys/fork.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fork.2,v 1.19 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FORK 2
diff --git a/lib/libc/sys/fsync.2 b/lib/libc/sys/fsync.2
index 644f33708607..c62433142c1b 100644
--- a/lib/libc/sys/fsync.2
+++ b/lib/libc/sys/fsync.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fsync.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fsync.2,v 1.18 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FSYNC 2
diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c
index 28acc5879c16..ac6f58ed24ed 100644
--- a/lib/libc/sys/ftruncate.c
+++ b/lib/libc/sys/ftruncate.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ftruncate.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/ftruncate.c,v 1.5 2002/03/22 21:53:24 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index d739549eb4ba..5e2e0ebbac73 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getdirentries.2	8.2 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getdirentries.2,v 1.23 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd May 3, 1995
 .Dt GETDIRENTRIES 2
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libc/sys/getdtablesize.2
index b53571e91ab8..e3df18c4f95e 100644
--- a/lib/libc/sys/getdtablesize.2
+++ b/lib/libc/sys/getdtablesize.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getdtablesize.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getdtablesize.2,v 1.9 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETDTABLESIZE 2
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index 389671630bee..a2c26ace86e0 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getfh.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getfh.2,v 1.15 2004/04/06 09:06:45 dfr Exp $
 .\"
 .Dd April 6, 2004
 .Dt GETFH 2
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index 3100d93586f1..dfeaf9767ae2 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getfsstat.2	8.3 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.17 2004/07/16 01:18:13 alfred Exp $
 .\"
 .Dd November 20, 2003
 .Dt GETFSSTAT 2
diff --git a/lib/libc/sys/getgid.2 b/lib/libc/sys/getgid.2
index 00c64ea2dcef..599678ad30e0 100644
--- a/lib/libc/sys/getgid.2
+++ b/lib/libc/sys/getgid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getgid.2,v 1.13 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETGID 2
diff --git a/lib/libc/sys/getgroups.2 b/lib/libc/sys/getgroups.2
index 54b6959f18ab..ac0a1aabb37d 100644
--- a/lib/libc/sys/getgroups.2
+++ b/lib/libc/sys/getgroups.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgroups.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getgroups.2,v 1.12 2002/12/19 09:40:24 ru Exp $
 .\"
 .Dd March 5, 1999
 .Dt GETGROUPS 2
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index 90f49770bdfc..6304cc5f9d27 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getitimer.2	8.3 (Berkeley) 5/16/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getitimer.2,v 1.22 2004/12/23 23:45:25 keramida Exp $
 .\"
 .Dd May 16, 1995
 .Dt GETITIMER 2
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index cea8caf3d75f..3094e7e5d66c 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getlogin.2,v 1.28 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETLOGIN 2
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index a5d9bfe7f092..6bf6b74330a2 100644
--- a/lib/libc/sys/getpeername.2
+++ b/lib/libc/sys/getpeername.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpeername.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpeername.2,v 1.22 2003/12/24 18:52:41 alfred Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPEERNAME 2
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
index 1daffd2f769b..a08e60082cde 100644
--- a/lib/libc/sys/getpgrp.2
+++ b/lib/libc/sys/getpgrp.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpgrp.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpgrp.2,v 1.20 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPGRP 2
diff --git a/lib/libc/sys/getpid.2 b/lib/libc/sys/getpid.2
index 20e33192ac63..7810f94da245 100644
--- a/lib/libc/sys/getpid.2
+++ b/lib/libc/sys/getpid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpid.2,v 1.14 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPID 2
diff --git a/lib/libc/sys/getpriority.2 b/lib/libc/sys/getpriority.2
index 6e7ab2ad3869..bd4a88c26313 100644
--- a/lib/libc/sys/getpriority.2
+++ b/lib/libc/sys/getpriority.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpriority.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpriority.2,v 1.12 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPRIORITY 2
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index 1e670836dcf3..c47819d0de95 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrlimit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getrlimit.2,v 1.23 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 13, 2004
 .Dt GETRLIMIT 2
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index 512e6aade088..1d05ffe61d4b 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getrusage.2,v 1.21 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETRUSAGE 2
diff --git a/lib/libc/sys/getsid.2 b/lib/libc/sys/getsid.2
index 8d3107439601..a0119824fc49 100644
--- a/lib/libc/sys/getsid.2
+++ b/lib/libc/sys/getsid.2
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsid.2,v 1.10 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd August 19, 1997
 .Dt GETSID 2
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index b3de16fa21b0..57c0f271e3bd 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsockname.2,v 1.25 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETSOCKNAME 2
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 7177e1b55627..000b87e03d1e 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.32 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd May 2, 1995
 .Dt GETSOCKOPT 2
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index f10425340dce..6b47b17d946f 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.25 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd May 26, 1995
 .Dt GETTIMEOFDAY 2
diff --git a/lib/libc/sys/getuid.2 b/lib/libc/sys/getuid.2
index 3e32fb0a8e2a..4bb017bac2f1 100644
--- a/lib/libc/sys/getuid.2
+++ b/lib/libc/sys/getuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getuid.2,v 1.12 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETUID 2
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index ef1c998a802d..a7095f782e0a 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.44.2.1 2005/08/04 17:53:40 jmg Exp $
 .\"
 .Dd February 27, 1995
 .Dt INTRO 2
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index e5a902f3831d..773383d03f1f 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.26 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt IOCTL 2
diff --git a/lib/libc/sys/issetugid.2 b/lib/libc/sys/issetugid.2
index a9b234bef2db..6b202e55aaee 100644
--- a/lib/libc/sys/issetugid.2
+++ b/lib/libc/sys/issetugid.2
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/issetugid.2,v 1.13 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd August 25, 1996
 .Dt ISSETUGID 2
diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2
index 5cba4bf93d4d..41a5ca849160 100644
--- a/lib/libc/sys/jail.2
+++ b/lib/libc/sys/jail.2
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/jail.2,v 1.28 2005/02/09 18:03:14 ru Exp $
 .\"
 .Dd April 8, 2003
 .Dt JAIL 2
diff --git a/lib/libc/sys/kenv.2 b/lib/libc/sys/kenv.2
index 866c0d38a6f1..68f004928f44 100644
--- a/lib/libc/sys/kenv.2
+++ b/lib/libc/sys/kenv.2
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kenv.2,v 1.5 2005/06/30 13:18:15 hmp Exp $
 .\"
 .Dd April 17, 2002
 .Dt KENV 2
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index 51640664aa7d..22f1aa5f4084 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kill.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kill.2,v 1.22 2003/10/24 21:20:26 kensmith Exp $
 .\"
 .Dd April 19, 1994
 .Dt KILL 2
diff --git a/lib/libc/sys/kldfind.2 b/lib/libc/sys/kldfind.2
index a8892ed00650..27268dc03b03 100644
--- a/lib/libc/sys/kldfind.2
+++ b/lib/libc/sys/kldfind.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldfind.2,v 1.16 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDFIND 2
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libc/sys/kldfirstmod.2
index d9967ccd779c..1830a3190fcd 100644
--- a/lib/libc/sys/kldfirstmod.2
+++ b/lib/libc/sys/kldfirstmod.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldfirstmod.2,v 1.15 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDFIRSTMOD 2
diff --git a/lib/libc/sys/kldload.2 b/lib/libc/sys/kldload.2
index d31cc086e2f9..04518a7f1777 100644
--- a/lib/libc/sys/kldload.2
+++ b/lib/libc/sys/kldload.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldload.2,v 1.18 2003/06/03 12:29:34 hmp Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDLOAD 2
diff --git a/lib/libc/sys/kldnext.2 b/lib/libc/sys/kldnext.2
index 607761adec7c..d967703e2764 100644
--- a/lib/libc/sys/kldnext.2
+++ b/lib/libc/sys/kldnext.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldnext.2,v 1.16 2005/02/13 22:25:12 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDNEXT 2
diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2
index 946417a1b46d..0c65a0169d5e 100644
--- a/lib/libc/sys/kldstat.2
+++ b/lib/libc/sys/kldstat.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDSTAT 2
diff --git a/lib/libc/sys/kldsym.2 b/lib/libc/sys/kldsym.2
index acd6fcd77b14..37fc63454108 100644
--- a/lib/libc/sys/kldsym.2
+++ b/lib/libc/sys/kldsym.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldsym.2,v 1.6 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd July 26, 2001
 .Dt KLDSYM 2
diff --git a/lib/libc/sys/kldunload.2 b/lib/libc/sys/kldunload.2
index ef6282b238cc..c8e49e21f923 100644
--- a/lib/libc/sys/kldunload.2
+++ b/lib/libc/sys/kldunload.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.18 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDUNLOAD 2
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index b59795073bfe..65de61b4bf2a 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.42 2005/06/04 19:44:09 alc Exp $
 .\"
 .Dd June 4, 2005
 .Dt KQUEUE 2
diff --git a/lib/libc/sys/kse.2 b/lib/libc/sys/kse.2
index d4ef2fc26617..a7edd34c1807 100644
--- a/lib/libc/sys/kse.2
+++ b/lib/libc/sys/kse.2
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.15.2.1 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd September 10, 2002
 .Dt KSE 2
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index de0a3f2b9798..62e7f6580582 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ktrace.2,v 1.24 2003/12/14 14:54:53 jkoshy Exp $
 .\"
 .Dd June 4, 1993
 .Dt KTRACE 2
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index f39768a5d35d..a56680348c62 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)link.2	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/link.2,v 1.25 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd March 5, 1999
 .Dt LINK 2
diff --git a/lib/libc/sys/lio_listio.2 b/lib/libc/sys/lio_listio.2
index 011433ad6da9..5101f3e1d09c 100644
--- a/lib/libc/sys/lio_listio.2
+++ b/lib/libc/sys/lio_listio.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.2 2003/06/01 19:19:59 ru Exp $
 .\"
 .Dd January 12, 2003
 .Dt LIO_LISTIO 2
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index 4c324978dba9..003e5c46e74b 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/listen.2,v 1.27.12.1 2005/08/31 14:01:48 glebius Exp $
 .\"
 .Dd August 29, 2005
 .Dt LISTEN 2
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index e770142d82f1..0bf270dbb0bb 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/lseek.2,v 1.22 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt LSEEK 2
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
index 3544fbf059ad..161abfe77110 100644
--- a/lib/libc/sys/lseek.c
+++ b/lib/libc/sys/lseek.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)lseek.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/lseek.c,v 1.5 2002/03/22 21:53:24 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index ea7e8efe7504..0d7a18ae396a 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.31 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd July 19, 1996
 .Dt MADVISE 2
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 25ad07628fdf..dcd975568939 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.24 2003/09/08 19:57:16 ru Exp $
 .\"
 .Dd January 17, 2003
 .Dt MINCORE 2
diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2
index 1ec8b2d2fe70..577cc50049a3 100644
--- a/lib/libc/sys/minherit.2
+++ b/lib/libc/sys/minherit.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/minherit.2,v 1.20 2005/01/20 09:17:05 ru Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2
index e91c9ba9ec3a..2769cf46785f 100644
--- a/lib/libc/sys/mkdir.2
+++ b/lib/libc/sys/mkdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.19 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt MKDIR 2
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index 329c26b29dcd..a73a33119bad 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mkfifo.2,v 1.17 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MKFIFO 2
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index 1c9fca389f37..71b511570570 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mknod.2,v 1.16 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt MKNOD 2
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index cf2ed4c3d672..3ee17d0bd14a 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.21 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLOCK 2
diff --git a/lib/libc/sys/mlockall.2 b/lib/libc/sys/mlockall.2
index db4c4a933e4c..9f4fb35fc5b0 100644
--- a/lib/libc/sys/mlockall.2
+++ b/lib/libc/sys/mlockall.2
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mlockall.2,v 1.2 2004/07/03 23:14:34 ru Exp $
 .\"
 .Dd June 12, 1999
 .Dt MLOCKALL 2
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 522c559d6e70..2a1fe2628a12 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.50.8.1 2005/09/24 01:59:36 keramida Exp $
 .\"
 .Dd November 17, 2001
 .Dt MMAP 2
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
index 309d2bcb5978..00d5e2a7aff3 100644
--- a/lib/libc/sys/mmap.c
+++ b/lib/libc/sys/mmap.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/mmap.c,v 1.5 2002/12/22 03:20:16 jmallett Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/lib/libc/sys/modfind.2 b/lib/libc/sys/modfind.2
index 3f485798a6c9..8444d65e7164 100644
--- a/lib/libc/sys/modfind.2
+++ b/lib/libc/sys/modfind.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/modfind.2,v 1.9 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd September 28, 2000
 .Dt MODFIND 2
diff --git a/lib/libc/sys/modnext.2 b/lib/libc/sys/modnext.2
index c0c0a0d3a223..07cf9028cfa9 100644
--- a/lib/libc/sys/modnext.2
+++ b/lib/libc/sys/modnext.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/modnext.2,v 1.9 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd September 28, 2000
 .Dt MODNEXT 2
diff --git a/lib/libc/sys/modstat.2 b/lib/libc/sys/modstat.2
index 935623243c8c..fcfc0b703b86 100644
--- a/lib/libc/sys/modstat.2
+++ b/lib/libc/sys/modstat.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/modstat.2,v 1.10 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd September 28, 2000
 .Dt MODSTAT 2
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 480f7a94e6ea..e4c21d60b43d 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.2	8.3 (Berkeley) 5/24/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.44 2005/02/25 00:40:46 trhodes Exp $
 .\"
 .Dd February 23, 2005
 .Dt MOUNT 2
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index 909b2404834b..95b62f80541b 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mprotect.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mprotect.2,v 1.17 2003/02/23 01:47:48 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt MPROTECT 2
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index e7d50c3a6b26..315825d09b4c 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msync.2	8.2 (Berkeley) 6/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.28 2004/09/03 06:24:25 roam Exp $
 .\"
 .Dd June 21, 1994
 .Dt MSYNC 2
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index e748873dcdce..2ceeb2ae2e42 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)munmap.2	8.3 (Berkeley) 5/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/munmap.2,v 1.19 2003/11/10 08:02:05 des Exp $
 .\"
 .Dd May 27, 1994
 .Dt MUNMAP 2
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libc/sys/nanosleep.2
index f086305d2e5b..9f7cc65b8ddf 100644
--- a/lib/libc/sys/nanosleep.2
+++ b/lib/libc/sys/nanosleep.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/nanosleep.2,v 1.17 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd April 17, 1997
 .Dt NANOSLEEP 2
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index 2b33c72ac8d0..d1341df80550 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfssvc.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/nfssvc.2,v 1.17 2004/05/12 20:45:51 josef Exp $
 .\"
 .Dd June 9, 1993
 .Dt NFSSVC 2
diff --git a/lib/libc/sys/ntp_adjtime.2 b/lib/libc/sys/ntp_adjtime.2
index 6ed71cef00d1..bba808d30046 100644
--- a/lib/libc/sys/ntp_adjtime.2
+++ b/lib/libc/sys/ntp_adjtime.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.2 2003/06/20 21:14:59 imp Exp $
 .\"
 .Dd April 1, 2003
 .Dt NTP_ADJTIME 2
diff --git a/lib/libc/sys/ntp_gettime.2 b/lib/libc/sys/ntp_gettime.2
index f556d74f2795..6c5c75d5645c 100644
--- a/lib/libc/sys/ntp_gettime.2
+++ b/lib/libc/sys/ntp_gettime.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.4 2004/07/02 19:07:30 ru Exp $
 .\"
 .Dd June 21, 2003
 .Dt NTP_GETTIME 2
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index 14d8722a109d..1c95e9c42338 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)open.2	8.2 (Berkeley) 11/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.29 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd November 16, 1993
 .Dt OPEN 2
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index 763c7bdb6aa6..0f4c009a78b5 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/pathconf.2,v 1.18 2005/01/11 20:50:50 ru Exp $
 .\"
 .Dd November 4, 2002
 .Dt PATHCONF 2
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index 247b9990a52b..9ae51214aadd 100644
--- a/lib/libc/sys/pipe.2
+++ b/lib/libc/sys/pipe.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pipe.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/pipe.2,v 1.21 2004/07/03 22:30:09 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt PIPE 2
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index 932186d7fb84..4eee295ee7a8 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -1,5 +1,5 @@
 .\"	$NetBSD: poll.2,v 1.3 1996/09/07 21:53:08 mycroft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/poll.2,v 1.16 2005/01/20 09:17:05 ru Exp $
 .\"
 .\" Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
 .\"
diff --git a/lib/libc/sys/pread.c b/lib/libc/sys/pread.c
index c1a913636ca8..db1060194de1 100644
--- a/lib/libc/sys/pread.c
+++ b/lib/libc/sys/pread.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/pread.c,v 1.2 2002/03/22 21:53:24 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/profil.2 b/lib/libc/sys/profil.2
index 5dea7ab3786e..3864a59b51f7 100644
--- a/lib/libc/sys/profil.2
+++ b/lib/libc/sys/profil.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)profil.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/profil.2,v 1.14 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt PROFIL 2
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 0d6009f0e3e9..4839fd46d654 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.37 2005/02/13 22:25:13 ru Exp $
 .\"	$NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
 .\"
 .\" This file is in the public domain.
diff --git a/lib/libc/sys/pwrite.c b/lib/libc/sys/pwrite.c
index e6969cdaf7b4..dc1b060273eb 100644
--- a/lib/libc/sys/pwrite.c
+++ b/lib/libc/sys/pwrite.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/pwrite.c,v 1.2 2002/03/22 21:53:24 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index d0cee9bcbcf9..586c897c9407 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.24 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd March 5, 1999
 .Dt QUOTACTL 2
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
index 6304f0167f54..cb57d669242b 100644
--- a/lib/libc/sys/read.2
+++ b/lib/libc/sys/read.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)read.2	8.4 (Berkeley) 2/26/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.30.2.1 2005/09/24 01:59:36 keramida Exp $
 .\"
 .Dd October 16, 2004
 .Dt READ 2
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index 28ecc4b2c208..ee66ce3092af 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.13 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt READLINK 2
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index 6d9f096c47da..ff898b16504a 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)reboot.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/reboot.2,v 1.19 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt REBOOT 2
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index f0eb35cb4904..8c5e1a9a75c1 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.26.2.1 2005/09/24 01:59:36 keramida Exp $
 .\"
 .Dd February 21, 1994
 .Dt RECV 2
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 0080f409f6dd..6df763d77630 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.22 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RENAME 2
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
index 64de5569043b..96db97f97766 100644
--- a/lib/libc/sys/revoke.2
+++ b/lib/libc/sys/revoke.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)revoke.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/revoke.2,v 1.12 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt REVOKE 2
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index 9187a55b1346..d1212c55f15f 100644
--- a/lib/libc/sys/rfork.2
+++ b/lib/libc/sys/rfork.2
@@ -3,7 +3,7 @@
 .\" describe the actual BSD implementation. Permission for
 .\" use of this page comes from Rob Pike <rob@plan9.att.com>.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.34 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd January 31, 2003
 .Dt RFORK 2
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
index c2014fc1a998..0efb2224d23a 100644
--- a/lib/libc/sys/rmdir.2
+++ b/lib/libc/sys/rmdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rmdir.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rmdir.2,v 1.13 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RMDIR 2
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index afed81e2d98c..838dab5311ce 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rtprio.2,v 1.26 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 2
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libc/sys/sched_get_priority_max.2
index 88d1d6d1460d..512ce35622c3 100644
--- a/lib/libc/sys/sched_get_priority_max.2
+++ b/lib/libc/sys/sched_get_priority_max.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_get_priority_max.2,v 1.19 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd March 12, 1998
 .Dt SCHED_GET_PRIORITY_MAX 2
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libc/sys/sched_setparam.2
index 315fd826cc7d..f9b944d65226 100644
--- a/lib/libc/sys/sched_setparam.2
+++ b/lib/libc/sys/sched_setparam.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_setparam.2,v 1.17 2004/07/04 20:55:48 ru Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libc/sys/sched_setscheduler.2
index 21b34e038190..2d6fce6d84b8 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_setscheduler.2,v 1.17 2004/07/02 23:52:13 ru Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libc/sys/sched_yield.2
index 9db8942249e2..0e6c98dcd389 100644
--- a/lib/libc/sys/sched_yield.2
+++ b/lib/libc/sys/sched_yield.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_yield.2,v 1.13 2004/07/02 23:52:13 ru Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index 8d92563c5a32..ec0e2d983bb7 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)select.2	8.2 (Berkeley) 3/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.32 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd November 17, 2002
 .Dt SELECT 2
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 01a984ac4c84..b7f4d26fe108 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -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/lib/libc/sys/semctl.2,v 1.20 2005/01/15 12:28:00 ru Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMCTL 2
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index 945044da65bb..72ac42228228 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -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/lib/libc/sys/semget.2,v 1.16 2005/02/15 09:26:59 ru Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMGET 2
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 86200ee967ad..cc8b3b874d56 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -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/lib/libc/sys/semop.2,v 1.19 2005/01/15 12:28:00 ru Exp $
 .\"
 .Dd September 22, 1995
 .Dt SEMOP 2
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 20e005bb8774..2baedd66af8c 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.32 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd February 15, 1995
 .Dt SEND 2
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index ef824ef6efd6..0c7457deb3a4 100644
--- a/lib/libc/sys/sendfile.2
+++ b/lib/libc/sys/sendfile.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.27 2005/01/11 20:50:50 ru Exp $
 .\"
 .Dd October 16, 2004
 .Dt SENDFILE 2
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index cbc3a36b61f4..5a382b1ba349 100644
--- a/lib/libc/sys/setgroups.2
+++ b/lib/libc/sys/setgroups.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setgroups.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setgroups.2,v 1.13 2003/11/19 13:05:50 dds Exp $
 .\"
 .Dd April 16, 1994
 .Dt SETGROUPS 2
diff --git a/lib/libc/sys/setpgid.2 b/lib/libc/sys/setpgid.2
index 79ece67455de..6d85256769c7 100644
--- a/lib/libc/sys/setpgid.2
+++ b/lib/libc/sys/setpgid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setpgid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setpgid.2,v 1.15 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd February 8, 2004
 .Dt SETPGID 2
diff --git a/lib/libc/sys/setregid.2 b/lib/libc/sys/setregid.2
index fd27e71191e5..8648840ff77a 100644
--- a/lib/libc/sys/setregid.2
+++ b/lib/libc/sys/setregid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setregid.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setregid.2,v 1.14 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd April 16, 1994
 .Dt SETREGID 2
diff --git a/lib/libc/sys/setresuid.2 b/lib/libc/sys/setresuid.2
index 08d07f3b6776..8f4eeef93e31 100644
--- a/lib/libc/sys/setresuid.2
+++ b/lib/libc/sys/setresuid.2
@@ -17,7 +17,7 @@
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setresuid.2,v 1.14 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd April 13, 2001
 .Dt SETRESUID 2
diff --git a/lib/libc/sys/setreuid.2 b/lib/libc/sys/setreuid.2
index cd8b7187a58e..4b30572c90f3 100644
--- a/lib/libc/sys/setreuid.2
+++ b/lib/libc/sys/setreuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setreuid.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setreuid.2,v 1.16 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd February 8, 2001
 .Dt SETREUID 2
diff --git a/lib/libc/sys/setsid.2 b/lib/libc/sys/setsid.2
index 56506a6116a7..ddc716fcedee 100644
--- a/lib/libc/sys/setsid.2
+++ b/lib/libc/sys/setsid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)setsid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setsid.2,v 1.13 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETSID 2
diff --git a/lib/libc/sys/setuid.2 b/lib/libc/sys/setuid.2
index 57ccadb824b7..2ccc2fbc4a5d 100644
--- a/lib/libc/sys/setuid.2
+++ b/lib/libc/sys/setuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setuid.2,v 1.23 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETUID 2
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index 8fe340c9ae4a..de798c826258 100644
--- a/lib/libc/sys/shmat.2
+++ b/lib/libc/sys/shmat.2
@@ -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/lib/libc/sys/shmat.2,v 1.18 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd August 2, 1995
 .Dt SHMAT 2
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index 90c61c9a1946..95a919341b38 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -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/lib/libc/sys/shmctl.2,v 1.18 2005/02/13 23:45:46 ru Exp $
 .\"
 .Dd July 17, 1995
 .Dt SHMCTL 2
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index e7fd6d167217..c198085a5288 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -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/lib/libc/sys/shmget.2,v 1.18 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd July 3, 1995
 .Dt SHMGET 2
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
index 3d258cbabd68..0c2df14a06fc 100644
--- a/lib/libc/sys/shutdown.2
+++ b/lib/libc/sys/shutdown.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shutdown.2,v 1.15 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd February 27, 2001
 .Dt SHUTDOWN 2
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 2e87649df1d5..ca60a1d0fe2f 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.56 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 7, 2004
 .Dt SIGACTION 2
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index fe8fda534c89..37e6bc840082 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigaltstack.2	8.2 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigaltstack.2,v 1.21 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd May 1, 1995
 .Dt SIGALTSTACK 2
diff --git a/lib/libc/sys/sigpending.2 b/lib/libc/sys/sigpending.2
index 39565fdced80..41db236db87a 100644
--- a/lib/libc/sys/sigpending.2
+++ b/lib/libc/sys/sigpending.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigpending.2	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigpending.2,v 1.12 2003/06/24 15:41:19 yar Exp $
 .\"
 .Dd January 12, 1994
 .Dt SIGPENDING 2
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index 8f3a58631cb4..c341715b0a3f 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigprocmask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigprocmask.2,v 1.21 2003/09/08 19:57:16 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGPROCMASK 2
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index aed6a9126cbd..2c976eb6bfd8 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigreturn.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigreturn.2,v 1.16 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGRETURN 2
diff --git a/lib/libc/sys/sigstack.2 b/lib/libc/sys/sigstack.2
index 95c0db294b66..be72c409aaf6 100644
--- a/lib/libc/sys/sigstack.2
+++ b/lib/libc/sys/sigstack.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigstack.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigstack.2,v 1.8 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGSTACK 2
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
index bf946d36a78d..d5f2988fabca 100644
--- a/lib/libc/sys/sigsuspend.2
+++ b/lib/libc/sys/sigsuspend.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigsuspend.2	8.2 (Berkeley) 5/16/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigsuspend.2,v 1.16 2003/06/24 15:41:19 yar Exp $
 .\"
 .Dd May 16, 1995
 .Dt SIGSUSPEND 2
diff --git a/lib/libc/sys/sigwait.2 b/lib/libc/sys/sigwait.2
index 2d635cbb2cd2..01dfefe4ebf5 100644
--- a/lib/libc/sys/sigwait.2
+++ b/lib/libc/sys/sigwait.2
@@ -25,7 +25,7 @@
 .\" 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/lib/libc/sys/sigwait.2,v 1.11 2004/07/03 23:14:34 ru Exp $
 .\"
 .Dd April 27, 2000
 .Dt SIGWAIT 2
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index dadd6837360e..ffe635c46a8e 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.30 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd November 24, 1997
 .Dt SOCKET 2
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index 7f982c58c301..06828bfaf1cf 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)socketpair.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/socketpair.2,v 1.16 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SOCKETPAIR 2
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index bb5566568783..38031d0329e7 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.42 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd November 15, 2004
 .Dt STAT 2
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index 18736aba04ec..f283d5f7e408 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)statfs.2	8.5 (Berkeley) 5/24/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.26 2004/11/29 09:56:12 ru Exp $
 .\"
 .Dd November 26, 2004
 .Dt STATFS 2
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 29e9da5a136d..1d4f0e78b156 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/swapon.2,v 1.16 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SWAPON 2
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
index 19fa7fa04712..3e0cb9e1b11e 100644
--- a/lib/libc/sys/symlink.2
+++ b/lib/libc/sys/symlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)symlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/symlink.2,v 1.15 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SYMLINK 2
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index 6e9b78b6d21a..46397159dd77 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sync.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sync.2,v 1.15 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt SYNC 2
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
index 9d8f0509c635..7bd7723b9605 100644
--- a/lib/libc/sys/sysarch.2
+++ b/lib/libc/sys/sysarch.2
@@ -1,5 +1,5 @@
 .\"	$NetBSD: sysarch.2,v 1.6 1998/02/25 21:24:57 perry Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sysarch.2,v 1.9 2004/07/02 23:52:13 ru Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
diff --git a/lib/libc/sys/syscall.2 b/lib/libc/sys/syscall.2
index 4e7241e2679e..df3d180bc21f 100644
--- a/lib/libc/sys/syscall.2
+++ b/lib/libc/sys/syscall.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syscall.2	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/syscall.2,v 1.12 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 16, 1993
 .Dt SYSCALL 2
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index 08cc9477c0ae..5159b4022c37 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)truncate.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.17 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt TRUNCATE 2
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
index cedfd5b88e93..fe8ad8a2d4b6 100644
--- a/lib/libc/sys/truncate.c
+++ b/lib/libc/sys/truncate.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)truncate.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/truncate.c,v 1.3 2002/03/22 21:53:24 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/umask.2 b/lib/libc/sys/umask.2
index 983ce6536a27..28cda0de267c 100644
--- a/lib/libc/sys/umask.2
+++ b/lib/libc/sys/umask.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/umask.2,v 1.12.8.1 2005/09/12 09:19:25 rwatson Exp $
 .\"
 .Dd June 4, 1993
 .Dt UMASK 2
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
index 5faf50aec6de..d3f60fc121b6 100644
--- a/lib/libc/sys/undelete.2
+++ b/lib/libc/sys/undelete.2
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)undelete.2	8.4 (Berkeley) 10/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/undelete.2,v 1.15 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd October 18, 1994
 .Dt UNDELETE 2
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index 40bbc33a833b..c0a9273ef30e 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/unlink.2,v 1.18 2005/02/23 23:55:58 trhodes Exp $
 .\"
 .Dd February 23, 2005
 .Dt UNLINK 2
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 79dd2d068731..1a9ad81a05b2 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/utimes.2,v 1.17 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt UTIMES 2
diff --git a/lib/libc/sys/utrace.2 b/lib/libc/sys/utrace.2
index a83c18551ad0..aa7a96df8567 100644
--- a/lib/libc/sys/utrace.2
+++ b/lib/libc/sys/utrace.2
@@ -33,7 +33,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/lib/libc/sys/utrace.2,v 1.3 2004/07/03 23:14:34 ru Exp $
 .\"
 .Dd December 28, 2000
 .Dt UTRACE 2
diff --git a/lib/libc/sys/uuidgen.2 b/lib/libc/sys/uuidgen.2
index 9c90102b3e2f..82e8df1c0f96 100644
--- a/lib/libc/sys/uuidgen.2
+++ b/lib/libc/sys/uuidgen.2
@@ -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/lib/libc/sys/uuidgen.2,v 1.7.10.1 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd May 26, 2002
 .Dt UUIDGEN 2
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 498ee118984b..1edd8df0b034 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.26 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt VFORK 2
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index 2081e2d3996b..d1336ba8dbf4 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.20 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt WAIT 2
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index 050e2a0905df..7bfa93474463 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.2	8.5 (Berkeley) 4/2/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.30 2005/07/07 18:17:55 jhb Exp $
 .\"
 .Dd October 16, 2004
 .Dt WRITE 2
diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc
index 022d55666414..2f9ee04886bf 100644
--- a/lib/libc/uuid/Makefile.inc
+++ b/lib/libc/uuid/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.3 2002/11/18 09:50:57 ru Exp $
 
 # DCE 1.1 UUID implementation sources
 
diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3
index 0972c4befa4b..0a978efa7481 100644
--- a/lib/libc/uuid/uuid.3
+++ b/lib/libc/uuid/uuid.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.5 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd October 29, 2002
 .Dt UUID 3
diff --git a/lib/libc/uuid/uuid_compare.c b/lib/libc/uuid/uuid_compare.c
index f57a0944ca4a..254118409cca 100644
--- a/lib/libc/uuid/uuid_compare.c
+++ b/lib/libc/uuid/uuid_compare.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.4 2005/01/03 02:56:15 marcel Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c
index da3f1d39f78d..407e37156b98 100644
--- a/lib/libc/uuid/uuid_create.c
+++ b/lib/libc/uuid/uuid_create.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_create.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c
index 6e85ae7fb768..0dc6d5d3ba18 100644
--- a/lib/libc/uuid/uuid_create_nil.c
+++ b/lib/libc/uuid/uuid_create_nil.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_create_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <strings.h>
diff --git a/lib/libc/uuid/uuid_equal.c b/lib/libc/uuid/uuid_equal.c
index e4c48e5253a1..7c0936bf3cb0 100644
--- a/lib/libc/uuid/uuid_equal.c
+++ b/lib/libc/uuid/uuid_equal.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_equal.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c
index b09a04df875d..a2c7193279b3 100644
--- a/lib/libc/uuid/uuid_from_string.c
+++ b/lib/libc/uuid/uuid_from_string.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_from_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libc/uuid/uuid_hash.c b/lib/libc/uuid/uuid_hash.c
index e5695ee4f60e..81133f82c949 100644
--- a/lib/libc/uuid/uuid_hash.c
+++ b/lib/libc/uuid/uuid_hash.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_hash.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
index ee1865349dee..4d35d87c3ae9 100644
--- a/lib/libc/uuid/uuid_is_nil.c
+++ b/lib/libc/uuid/uuid_is_nil.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_is_nil.c,v 1.4 2005/05/11 13:18:10 delphij Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c
index f816391f2a4f..f524b484add5 100644
--- a/lib/libc/uuid/uuid_to_string.c
+++ b/lib/libc/uuid/uuid_to_string.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_to_string.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index 60bd69864d24..02cf5f0a7ba3 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.14 2002/11/18 09:50:57 ru Exp $
 
 .PATH: ${.CURDIR}/xdr ${.CURDIR}/.
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
diff --git a/lib/libc/xdr/xdr.3 b/lib/libc/xdr/xdr.3
index 25944ccd279b..029eb4f1df18 100644
--- a/lib/libc/xdr/xdr.3
+++ b/lib/libc/xdr/xdr.3
@@ -1,5 +1,5 @@
 .\" @(#)xdr.3n	2.2 88/08/03 4.0 RPCSRC; from 1.16 88/03/14 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/xdr/xdr.3,v 1.16 2002/12/19 09:40:28 ru Exp $
 .\"
 .Dd February 16, 1988
 .Dt XDR 3
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index c1e5eec25916..80f4eaf25c24 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr.c 1.35 87/08/12";
 static char *sccsid = "@(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr.c,v 1.14 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr.c, Generic XDR routines implementation.
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index 6c35452612f6..330b64105b5e 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.15 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_array.c, Generic XDR routines impelmentation.
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index 0a4f09f05f0d..a010d5d22235 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.14 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_float.c, Generic XDR routines implementation.
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index 138269c9d50b..cb48bb66ac65 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_mem.c,v 1.13 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_mem.h, XDR implementation using memory buffers.
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index a50d1414ad4a..eeb29b91e6b2 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.21 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index 5a497b6dc06a..bccb333e4d81 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 static char *sccsid = "@(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.12 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_reference.c, Generic XDR routines impelmentation.
diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c
index 20f1c3a20eb3..71322c810ef3 100644
--- a/lib/libc/xdr/xdr_sizeof.c
+++ b/lib/libc/xdr/xdr_sizeof.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_sizeof.c,v 1.5 2003/03/07 13:19:40 nectar Exp $");
 
 #include "namespace.h"
 #include <rpc/types.h>
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index 8c1724dd50e2..89c749640b25 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_stdio.c,v 1.13 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_stdio.c, XDR implementation on standard i/o file.
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index 0ce6dae06403..70810188c829 100644
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.9 2002/11/18 09:50:57 ru Exp $
 
 # yp sources
 .PATH: ${.CURDIR}/yp
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index 7aed6ad3af84..4a1c80fd71f1 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/yp/xdryp.c,v 1.14 2002/04/28 15:18:47 des Exp $");
 
 #include <rpc/rpc.h>
 #include <rpcsvc/yp.h>
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index 74a791e23517..4b0ce08680b7 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/yp/yplib.c,v 1.49 2005/05/03 20:30:31 ume Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index 496c7e62484f..3b2281f2be5d 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/Makefile,v 1.41.2.1 2005/07/22 17:29:04 kensmith Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libc_r/arch/alpha/_atomic_lock.S b/lib/libc_r/arch/alpha/_atomic_lock.S
index 1ddceb0865b9..ef42698d8c48 100644
--- a/lib/libc_r/arch/alpha/_atomic_lock.S
+++ b/lib/libc_r/arch/alpha/_atomic_lock.S
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.4 2003/07/02 13:27:54 ru Exp $
  *
  */
 
diff --git a/lib/libc_r/arch/amd64/_atomic_lock.S b/lib/libc_r/arch/amd64/_atomic_lock.S
index aaab0814d8c3..f9ffba7945c7 100644
--- a/lib/libc_r/arch/amd64/_atomic_lock.S
+++ b/lib/libc_r/arch/amd64/_atomic_lock.S
@@ -22,7 +22,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.6 2003/06/02 22:30:59 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>
diff --git a/lib/libc_r/arch/i386/_atomic_lock.S b/lib/libc_r/arch/i386/_atomic_lock.S
index af49aff68f03..7e32633e070f 100644
--- a/lib/libc_r/arch/i386/_atomic_lock.S
+++ b/lib/libc_r/arch/i386/_atomic_lock.S
@@ -22,7 +22,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.5 2001/10/25 01:30:54 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>
diff --git a/lib/libc_r/arch/ia64/_atomic_lock.S b/lib/libc_r/arch/ia64/_atomic_lock.S
index b4b84da9f652..4f6e0f1cb903 100644
--- a/lib/libc_r/arch/ia64/_atomic_lock.S
+++ b/lib/libc_r/arch/ia64/_atomic_lock.S
@@ -26,7 +26,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/ia64/_atomic_lock.S,v 1.3 2004/02/10 20:45:28 cperciva Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>
diff --git a/lib/libc_r/arch/sparc64/_atomic_lock.S b/lib/libc_r/arch/sparc64/_atomic_lock.S
index ce931df630fd..882486ed171d 100644
--- a/lib/libc_r/arch/sparc64/_atomic_lock.S
+++ b/lib/libc_r/arch/sparc64/_atomic_lock.S
@@ -28,7 +28,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc_r/arch/sparc64/_atomic_lock.S,v 1.1 2003/01/05 22:23:11 tmm Exp $");
 
 /*
  * long _atomic_lock(long *)
diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc
index e608afa69909..96d320e29644 100644
--- a/lib/libc_r/sys/Makefile.inc
+++ b/lib/libc_r/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/sys/Makefile.inc,v 1.10 1999/08/28 00:03:13 peter Exp $
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}
 
diff --git a/lib/libc_r/sys/uthread_error.c b/lib/libc_r/sys/uthread_error.c
index 8c52967427b1..45d531097007 100644
--- a/lib/libc_r/sys/uthread_error.c
+++ b/lib/libc_r/sys/uthread_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/sys/uthread_error.c,v 1.4 2003/01/24 01:46:30 fjoe Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/test/Makefile b/lib/libc_r/test/Makefile
index 0eb530c3ef14..b97f39803cd9 100644
--- a/lib/libc_r/test/Makefile
+++ b/lib/libc_r/test/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/Makefile,v 1.11 2003/06/02 00:21:41 rwatson Exp $
 #
 # Automated test suite for libc_r (pthreads).
 #
diff --git a/lib/libc_r/test/README b/lib/libc_r/test/README
index 507ea4e19f74..0a70ff4ee9ad 100644
--- a/lib/libc_r/test/README
+++ b/lib/libc_r/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libc_r/test/README,v 1.1 2000/04/24 21:07:36 jasone Exp $
 
 This test suite is meant to test general functionality of pthreads, as well as
 provide a simple framework for regression tests.  In general, this test suite
diff --git a/lib/libc_r/test/guard_b.c b/lib/libc_r/test/guard_b.c
index 35aa4067cc48..9e1740d30d75 100644
--- a/lib/libc_r/test/guard_b.c
+++ b/lib/libc_r/test/guard_b.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/test/guard_b.c,v 1.4 2003/06/04 20:36:08 marcel Exp $
  *
  * Test thread stack guard functionality.
  */
diff --git a/lib/libc_r/test/guard_s.pl b/lib/libc_r/test/guard_s.pl
index 7802ff3c38d6..45ea5a48d3c7 100755
--- a/lib/libc_r/test/guard_s.pl
+++ b/lib/libc_r/test/guard_s.pl
@@ -27,7 +27,7 @@
 # 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/lib/libc_r/test/guard_s.pl,v 1.1 2001/07/20 04:23:10 jasone Exp $
 #
 # Test thread stack guard functionality.  The C test program needs to be driven
 # by this script because it segfaults when the stack guard is hit.
diff --git a/lib/libc_r/test/hello_b.c b/lib/libc_r/test/hello_b.c
index 2eefa7f48bfe..a078faaa7349 100644
--- a/lib/libc_r/test/hello_b.c
+++ b/lib/libc_r/test/hello_b.c
@@ -2,7 +2,7 @@
  *
  * Back end C programs can be anything compilable.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/hello_b.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/hello_d.c b/lib/libc_r/test/hello_d.c
index 6d77526f16c7..3dbc0a9331b9 100644
--- a/lib/libc_r/test/hello_d.c
+++ b/lib/libc_r/test/hello_d.c
@@ -2,7 +2,7 @@
  *
  * Simple diff mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/hello_d.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/hello_s.c b/lib/libc_r/test/hello_s.c
index 942bf2dae0ae..0bfccd670526 100644
--- a/lib/libc_r/test/hello_s.c
+++ b/lib/libc_r/test/hello_s.c
@@ -2,7 +2,7 @@
  *
  * Simple sequence mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/hello_s.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/join_leak_d.c b/lib/libc_r/test/join_leak_d.c
index 9a351400e316..db1a45290bd7 100644
--- a/lib/libc_r/test/join_leak_d.c
+++ b/lib/libc_r/test/join_leak_d.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/test/join_leak_d.c,v 1.2 2003/06/04 08:16:32 mtm Exp $
  *
  * Test for leaked joined threads.
  */
diff --git a/lib/libc_r/test/mutex_d.c b/lib/libc_r/test/mutex_d.c
index 2f0c868aad85..7d0fe6dfc20d 100644
--- a/lib/libc_r/test/mutex_d.c
+++ b/lib/libc_r/test/mutex_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.4 2003/06/04 20:38:54 marcel Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/propagate_s.pl b/lib/libc_r/test/propagate_s.pl
index 9cd5fb054ae1..11c2317ea348 100755
--- a/lib/libc_r/test/propagate_s.pl
+++ b/lib/libc_r/test/propagate_s.pl
@@ -31,7 +31,7 @@
 #
 # Verify that no cancellation points are propagated inside of libc_r.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/propagate_s.pl,v 1.1 2000/04/26 23:25:58 jasone Exp $
 #
 
 @CPOINTS = ("aio_suspend", "close", "creat", "fcntl", "fsync", "mq_receive",
diff --git a/lib/libc_r/test/sem_d.c b/lib/libc_r/test/sem_d.c
index b834591852d9..2238b44888ee 100644
--- a/lib/libc_r/test/sem_d.c
+++ b/lib/libc_r/test/sem_d.c
@@ -31,7 +31,7 @@
  *
  * sem test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/sem_d.c,v 1.2 2001/05/20 23:11:09 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/sigsuspend_d.c b/lib/libc_r/test/sigsuspend_d.c
index d2420ed84456..349fb149aa3e 100644
--- a/lib/libc_r/test/sigsuspend_d.c
+++ b/lib/libc_r/test/sigsuspend_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/sigsuspend_d.c,v 1.1 2000/04/24 21:07:39 jasone Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/sigwait_d.c b/lib/libc_r/test/sigwait_d.c
index f3ccd6b98491..749cc2c341ab 100644
--- a/lib/libc_r/test/sigwait_d.c
+++ b/lib/libc_r/test/sigwait_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/sigwait_d.c,v 1.2 2001/05/20 23:10:30 jasone Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/verify b/lib/libc_r/test/verify
index 2863e5c3fa0c..450214826254 100755
--- a/lib/libc_r/test/verify
+++ b/lib/libc_r/test/verify
@@ -33,7 +33,7 @@
 #
 # Test harness.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/verify,v 1.2 2001/05/20 23:11:54 jasone Exp $
 #
 #############################################################################
 
diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc
index 6d457c172d84..60794d56c212 100644
--- a/lib/libc_r/uthread/Makefile.inc
+++ b/lib/libc_r/uthread/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.38 2004/12/10 03:36:45 grog Exp $
 
 # uthread sources
 .PATH: ${.CURDIR}/uthread
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h
index 9e3c2eee33c9..b87702a7c3d0 100644
--- a/lib/libc_r/uthread/pthread_private.h
+++ b/lib/libc_r/uthread/pthread_private.h
@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.87 2005/05/31 19:57:23 jhb Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H
diff --git a/lib/libc_r/uthread/uthread_accept.c b/lib/libc_r/uthread/uthread_accept.c
index f045fc15a7cb..968f8bf2588f 100644
--- a/lib/libc_r/uthread/uthread_accept.c
+++ b/lib/libc_r/uthread/uthread_accept.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_accept.c,v 1.17 2002/12/19 11:39:20 ru Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c b/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
index 19e9aaa6096d..35cbb33a9c52 100644
--- a/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c,v 1.3 2001/05/20 23:08:32 jasone Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_acl_delete_fd.c b/lib/libc_r/uthread/uthread_acl_delete_fd.c
index 2368c5f38bde..850bd76c1846 100644
--- a/lib/libc_r/uthread/uthread_acl_delete_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_delete_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_delete_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_acl_get_fd.c b/lib/libc_r/uthread/uthread_acl_get_fd.c
index f0fa8b18804b..525a549e6aa4 100644
--- a/lib/libc_r/uthread/uthread_acl_get_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_get_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_get_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_acl_set_fd.c b/lib/libc_r/uthread/uthread_acl_set_fd.c
index c68751a0d8a0..c38fe9e66345 100644
--- a/lib/libc_r/uthread/uthread_acl_set_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_set_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_set_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_aio_suspend.c b/lib/libc_r/uthread/uthread_aio_suspend.c
index 23d34f9aa52b..a922e1f64091 100644
--- a/lib/libc_r/uthread/uthread_aio_suspend.c
+++ b/lib/libc_r/uthread/uthread_aio_suspend.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_aio_suspend.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <aio.h>
diff --git a/lib/libc_r/uthread/uthread_atfork.c b/lib/libc_r/uthread/uthread_atfork.c
index 8a094686186e..b306bb0f164c 100644
--- a/lib/libc_r/uthread/uthread_atfork.c
+++ b/lib/libc_r/uthread/uthread_atfork.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_atfork.c,v 1.1 2004/12/10 03:36:45 grog Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_attr_destroy.c b/lib/libc_r/uthread/uthread_attr_destroy.c
index 420bd5a33969..9d57cd5f9803 100644
--- a/lib/libc_r/uthread/uthread_attr_destroy.c
+++ b/lib/libc_r/uthread/uthread_attr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_destroy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_attr_get_np.c b/lib/libc_r/uthread/uthread_attr_get_np.c
index ba6fd19655fc..9d2adac5db3a 100644
--- a/lib/libc_r/uthread/uthread_attr_get_np.c
+++ b/lib/libc_r/uthread/uthread_attr_get_np.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_get_np.c,v 1.3 2003/02/03 10:08:45 phantom Exp $
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getdetachstate.c b/lib/libc_r/uthread/uthread_attr_getdetachstate.c
index 515248d84a6d..d590c88634a1 100644
--- a/lib/libc_r/uthread/uthread_attr_getdetachstate.c
+++ b/lib/libc_r/uthread/uthread_attr_getdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getdetachstate.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getguardsize.c b/lib/libc_r/uthread/uthread_attr_getguardsize.c
index 849bf27a5025..66f94ef5ddcf 100644
--- a/lib/libc_r/uthread/uthread_attr_getguardsize.c
+++ b/lib/libc_r/uthread/uthread_attr_getguardsize.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_attr_getguardsize.c,v 1.1 2001/07/20 04:23:10 jasone Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getinheritsched.c b/lib/libc_r/uthread/uthread_attr_getinheritsched.c
index 6d6d3244e651..b2106c49ecf2 100644
--- a/lib/libc_r/uthread/uthread_attr_getinheritsched.c
+++ b/lib/libc_r/uthread/uthread_attr_getinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getinheritsched.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getschedparam.c b/lib/libc_r/uthread/uthread_attr_getschedparam.c
index cac86fa92882..e2c69b3a14d5 100644
--- a/lib/libc_r/uthread/uthread_attr_getschedparam.c
+++ b/lib/libc_r/uthread/uthread_attr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getschedparam.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getschedpolicy.c b/lib/libc_r/uthread/uthread_attr_getschedpolicy.c
index f2b74fccc8fd..6386984065ea 100644
--- a/lib/libc_r/uthread/uthread_attr_getschedpolicy.c
+++ b/lib/libc_r/uthread/uthread_attr_getschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getschedpolicy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getscope.c b/lib/libc_r/uthread/uthread_attr_getscope.c
index 8abf418cfdca..3747c1484fa5 100644
--- a/lib/libc_r/uthread/uthread_attr_getscope.c
+++ b/lib/libc_r/uthread/uthread_attr_getscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getscope.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getstack.c b/lib/libc_r/uthread/uthread_attr_getstack.c
index e63cd8f6ccd1..8222d0f8e7ca 100644
--- a/lib/libc_r/uthread/uthread_attr_getstack.c
+++ b/lib/libc_r/uthread/uthread_attr_getstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getstackaddr.c b/lib/libc_r/uthread/uthread_attr_getstackaddr.c
index 0cef0f3fbe98..41bc45da77a5 100644
--- a/lib/libc_r/uthread/uthread_attr_getstackaddr.c
+++ b/lib/libc_r/uthread/uthread_attr_getstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstackaddr.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getstacksize.c b/lib/libc_r/uthread/uthread_attr_getstacksize.c
index 091a0c78cd8e..44c982deef65 100644
--- a/lib/libc_r/uthread/uthread_attr_getstacksize.c
+++ b/lib/libc_r/uthread/uthread_attr_getstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstacksize.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_init.c b/lib/libc_r/uthread/uthread_attr_init.c
index 10423cec99f5..715265b1a0b3 100644
--- a/lib/libc_r/uthread/uthread_attr_init.c
+++ b/lib/libc_r/uthread/uthread_attr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_init.c,v 1.7 2002/11/13 18:13:26 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c b/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
index be6f8d76e324..7edbf174d3b0 100644
--- a/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
+++ b/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setdetachstate.c b/lib/libc_r/uthread/uthread_attr_setdetachstate.c
index e0e23c20e95a..66c5c8095853 100644
--- a/lib/libc_r/uthread/uthread_attr_setdetachstate.c
+++ b/lib/libc_r/uthread/uthread_attr_setdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setdetachstate.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setguardsize.c b/lib/libc_r/uthread/uthread_attr_setguardsize.c
index ad3e8bb9292f..404d1677d3e3 100644
--- a/lib/libc_r/uthread/uthread_attr_setguardsize.c
+++ b/lib/libc_r/uthread/uthread_attr_setguardsize.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_attr_setguardsize.c,v 1.3 2002/05/15 05:37:48 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setinheritsched.c b/lib/libc_r/uthread/uthread_attr_setinheritsched.c
index 3538131ca07a..03729d38fbe6 100644
--- a/lib/libc_r/uthread/uthread_attr_setinheritsched.c
+++ b/lib/libc_r/uthread/uthread_attr_setinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setinheritsched.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setschedparam.c b/lib/libc_r/uthread/uthread_attr_setschedparam.c
index c42973e9c0bc..2ab5964fa606 100644
--- a/lib/libc_r/uthread/uthread_attr_setschedparam.c
+++ b/lib/libc_r/uthread/uthread_attr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setschedparam.c,v 1.8 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setschedpolicy.c b/lib/libc_r/uthread/uthread_attr_setschedpolicy.c
index d9c83e64b3f7..642263f49c27 100644
--- a/lib/libc_r/uthread/uthread_attr_setschedpolicy.c
+++ b/lib/libc_r/uthread/uthread_attr_setschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setschedpolicy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setscope.c b/lib/libc_r/uthread/uthread_attr_setscope.c
index 3614615a3c01..6d739c4d5977 100644
--- a/lib/libc_r/uthread/uthread_attr_setscope.c
+++ b/lib/libc_r/uthread/uthread_attr_setscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setscope.c,v 1.7 2002/02/14 15:20:36 maxim Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setstack.c b/lib/libc_r/uthread/uthread_attr_setstack.c
index e03f6deefe16..c51f94307298 100644
--- a/lib/libc_r/uthread/uthread_attr_setstack.c
+++ b/lib/libc_r/uthread/uthread_attr_setstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setstackaddr.c b/lib/libc_r/uthread/uthread_attr_setstackaddr.c
index 60469324e22d..c06d34da67c5 100644
--- a/lib/libc_r/uthread/uthread_attr_setstackaddr.c
+++ b/lib/libc_r/uthread/uthread_attr_setstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstackaddr.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setstacksize.c b/lib/libc_r/uthread/uthread_attr_setstacksize.c
index 622ba7f93b0b..71cc726ed0f7 100644
--- a/lib/libc_r/uthread/uthread_attr_setstacksize.c
+++ b/lib/libc_r/uthread/uthread_attr_setstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstacksize.c,v 1.7 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_autoinit.c b/lib/libc_r/uthread/uthread_autoinit.c
index 03ee58d6f5a5..a8ba93298538 100644
--- a/lib/libc_r/uthread/uthread_autoinit.c
+++ b/lib/libc_r/uthread/uthread_autoinit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_autoinit.c,v 1.2 2002/11/13 18:13:26 deischen Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_bind.c b/lib/libc_r/uthread/uthread_bind.c
index bb076b0991ca..881645124a49 100644
--- a/lib/libc_r/uthread/uthread_bind.c
+++ b/lib/libc_r/uthread/uthread_bind.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_bind.c,v 1.11 2001/04/10 04:19:19 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_cancel.c b/lib/libc_r/uthread/uthread_cancel.c
index d9324abf01aa..68487da48f39 100644
--- a/lib/libc_r/uthread/uthread_cancel.c
+++ b/lib/libc_r/uthread/uthread_cancel.c
@@ -1,6 +1,6 @@
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_cancel.c,v 1.14 2002/05/24 04:32:28 deischen Exp $
  */
 #include <sys/errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_clean.c b/lib/libc_r/uthread/uthread_clean.c
index 6330cb9782d0..dc5f8fe38ebe 100644
--- a/lib/libc_r/uthread/uthread_clean.c
+++ b/lib/libc_r/uthread/uthread_clean.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_clean.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_close.c b/lib/libc_r/uthread/uthread_close.c
index ba291a3c884d..a7aa24ebe101 100644
--- a/lib/libc_r/uthread/uthread_close.c
+++ b/lib/libc_r/uthread/uthread_close.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.16 2003/06/09 16:45:37 netchild Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_concurrency.c b/lib/libc_r/uthread/uthread_concurrency.c
index ddb82c19ea33..8662bb5fc893 100644
--- a/lib/libc_r/uthread/uthread_concurrency.c
+++ b/lib/libc_r/uthread/uthread_concurrency.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_concurrency.c,v 1.1 2003/04/20 01:53:12 jdp Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_cond.c b/lib/libc_r/uthread/uthread_cond.c
index c3ca7410bed1..dee5cab263ff 100644
--- a/lib/libc_r/uthread/uthread_cond.c
+++ b/lib/libc_r/uthread/uthread_cond.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_cond.c,v 1.34 2002/11/13 18:13:26 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_condattr_destroy.c b/lib/libc_r/uthread/uthread_condattr_destroy.c
index 3a05487309c8..2cb83f398be4 100644
--- a/lib/libc_r/uthread/uthread_condattr_destroy.c
+++ b/lib/libc_r/uthread/uthread_condattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_condattr_destroy.c,v 1.6 2001/04/10 04:19:20 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_condattr_init.c b/lib/libc_r/uthread/uthread_condattr_init.c
index 92ce709f82df..2fb0bf5bb937 100644
--- a/lib/libc_r/uthread/uthread_condattr_init.c
+++ b/lib/libc_r/uthread/uthread_condattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_condattr_init.c,v 1.7 2002/11/13 18:13:26 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_connect.c b/lib/libc_r/uthread/uthread_connect.c
index dfdcb2109821..d65a50142deb 100644
--- a/lib/libc_r/uthread/uthread_connect.c
+++ b/lib/libc_r/uthread/uthread_connect.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_connect.c,v 1.14 2002/12/19 11:39:20 ru Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_creat.c b/lib/libc_r/uthread/uthread_creat.c
index 92da97179901..087d7a586aee 100644
--- a/lib/libc_r/uthread/uthread_creat.c
+++ b/lib/libc_r/uthread/uthread_creat.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_creat.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_create.c b/lib/libc_r/uthread/uthread_create.c
index 356bc07f0264..b333d7b031f4 100644
--- a/lib/libc_r/uthread/uthread_create.c
+++ b/lib/libc_r/uthread/uthread_create.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.38 2003/12/03 06:54:40 peter Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_detach.c b/lib/libc_r/uthread/uthread_detach.c
index 298fdb41b0db..7d586b9cb704 100644
--- a/lib/libc_r/uthread/uthread_detach.c
+++ b/lib/libc_r/uthread/uthread_detach.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_detach.c,v 1.17 2002/03/06 19:28:41 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_dup.c b/lib/libc_r/uthread/uthread_dup.c
index aaae6914679d..130a29b3f578 100644
--- a/lib/libc_r/uthread/uthread_dup.c
+++ b/lib/libc_r/uthread/uthread_dup.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_dup.c,v 1.11 2002/08/29 23:06:07 deischen Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_dup2.c b/lib/libc_r/uthread/uthread_dup2.c
index 739a7ad897db..01fab8c29951 100644
--- a/lib/libc_r/uthread/uthread_dup2.c
+++ b/lib/libc_r/uthread/uthread_dup2.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_dup2.c,v 1.14 2002/08/29 23:06:07 deischen Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_equal.c b/lib/libc_r/uthread/uthread_equal.c
index 0dfb63d980a7..45ed67b31c60 100644
--- a/lib/libc_r/uthread/uthread_equal.c
+++ b/lib/libc_r/uthread/uthread_equal.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_equal.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_execve.c b/lib/libc_r/uthread/uthread_execve.c
index c0aa31c559cc..d91cb0de7078 100644
--- a/lib/libc_r/uthread/uthread_execve.c
+++ b/lib/libc_r/uthread/uthread_execve.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_execve.c,v 1.16 2002/11/15 00:34:28 archie Exp $
  */
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_exit.c b/lib/libc_r/uthread/uthread_exit.c
index 44661e4650e2..7ab77414e944 100644
--- a/lib/libc_r/uthread/uthread_exit.c
+++ b/lib/libc_r/uthread/uthread_exit.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.29 2005/05/31 19:56:52 jhb Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fchflags.c b/lib/libc_r/uthread/uthread_fchflags.c
index cd076e2d21a9..4fdd502f3760 100644
--- a/lib/libc_r/uthread/uthread_fchflags.c
+++ b/lib/libc_r/uthread/uthread_fchflags.c
@@ -2,7 +2,7 @@
  * David Leonard <d@openbsd.org>, 1999. Public Domain.
  *
  * $OpenBSD: uthread_fchflags.c,v 1.1 1999/01/08 05:42:18 d Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fchflags.c,v 1.6 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <sys/stat.h>
diff --git a/lib/libc_r/uthread/uthread_fchmod.c b/lib/libc_r/uthread/uthread_fchmod.c
index 05dea245b6da..a5fe333d1032 100644
--- a/lib/libc_r/uthread/uthread_fchmod.c
+++ b/lib/libc_r/uthread/uthread_fchmod.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fchmod.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc_r/uthread/uthread_fchown.c b/lib/libc_r/uthread/uthread_fchown.c
index 5b27bcb7809a..a599a832ed78 100644
--- a/lib/libc_r/uthread/uthread_fchown.c
+++ b/lib/libc_r/uthread/uthread_fchown.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fchown.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fcntl.c b/lib/libc_r/uthread/uthread_fcntl.c
index a5b64054f6ef..6e400232fb28 100644
--- a/lib/libc_r/uthread/uthread_fcntl.c
+++ b/lib/libc_r/uthread/uthread_fcntl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.15 2002/08/29 23:06:07 deischen Exp $
  */
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fd.c b/lib/libc_r/uthread/uthread_fd.c
index 7b8bb717ab67..bc41528326be 100644
--- a/lib/libc_r/uthread/uthread_fd.c
+++ b/lib/libc_r/uthread/uthread_fd.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fd.c,v 1.22 2002/08/29 23:06:07 deischen Exp $
  *
  */
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_file.c b/lib/libc_r/uthread/uthread_file.c
index cbedbc7b2a81..61e99fde1129 100644
--- a/lib/libc_r/uthread/uthread_file.c
+++ b/lib/libc_r/uthread/uthread_file.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_file.c,v 1.18 2001/02/11 22:07:32 deischen Exp $
  *
  * POSIX stdio FILE locking functions. These assume that the locking
  * is only required at FILE structure level, not at file descriptor
diff --git a/lib/libc_r/uthread/uthread_find_thread.c b/lib/libc_r/uthread/uthread_find_thread.c
index e6e9294f2111..3eb207b4d2ce 100644
--- a/lib/libc_r/uthread/uthread_find_thread.c
+++ b/lib/libc_r/uthread/uthread_find_thread.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_find_thread.c,v 1.7 2001/06/27 11:41:13 jasone Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_flock.c b/lib/libc_r/uthread/uthread_flock.c
index 03312ff4b946..22965ce5067d 100644
--- a/lib/libc_r/uthread/uthread_flock.c
+++ b/lib/libc_r/uthread/uthread_flock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_flock.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/file.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_fork.c b/lib/libc_r/uthread/uthread_fork.c
index 0166a57d5051..8bf1e48ce808 100644
--- a/lib/libc_r/uthread/uthread_fork.c
+++ b/lib/libc_r/uthread/uthread_fork.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.28 2004/12/10 03:36:45 grog Exp $
  */
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_fpathconf.c b/lib/libc_r/uthread/uthread_fpathconf.c
index 97e1d65e3e98..5e78e952e034 100644
--- a/lib/libc_r/uthread/uthread_fpathconf.c
+++ b/lib/libc_r/uthread/uthread_fpathconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fpathconf.c,v 1.3 2001/04/10 04:19:20 deischen Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_fstat.c b/lib/libc_r/uthread/uthread_fstat.c
index 0aa49d129d84..2801ab073491 100644
--- a/lib/libc_r/uthread/uthread_fstat.c
+++ b/lib/libc_r/uthread/uthread_fstat.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fstat.c,v 1.12 2001/10/10 17:48:43 bde Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_fstatfs.c b/lib/libc_r/uthread/uthread_fstatfs.c
index 80a8fd5e4748..be51e978864e 100644
--- a/lib/libc_r/uthread/uthread_fstatfs.c
+++ b/lib/libc_r/uthread/uthread_fstatfs.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fstatfs.c,v 1.12 2001/10/10 17:48:43 bde Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_fsync.c b/lib/libc_r/uthread/uthread_fsync.c
index b8b9f3c6b910..884b23231bf1 100644
--- a/lib/libc_r/uthread/uthread_fsync.c
+++ b/lib/libc_r/uthread/uthread_fsync.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fsync.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_gc.c b/lib/libc_r/uthread/uthread_gc.c
index cdc5fa7515cd..3f8705adde72 100644
--- a/lib/libc_r/uthread/uthread_gc.c
+++ b/lib/libc_r/uthread/uthread_gc.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_gc.c,v 1.17 2002/11/13 18:13:26 deischen Exp $
  *
  * Garbage collector thread. Frees memory allocated for dead threads.
  *
diff --git a/lib/libc_r/uthread/uthread_getdirentries.c b/lib/libc_r/uthread/uthread_getdirentries.c
index b633c08c8de6..1455ad08000f 100644
--- a/lib/libc_r/uthread/uthread_getdirentries.c
+++ b/lib/libc_r/uthread/uthread_getdirentries.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getdirentries.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/lib/libc_r/uthread/uthread_getpeername.c b/lib/libc_r/uthread/uthread_getpeername.c
index 8ff8b43b02f9..141694958da1 100644
--- a/lib/libc_r/uthread/uthread_getpeername.c
+++ b/lib/libc_r/uthread/uthread_getpeername.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getpeername.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_getprio.c b/lib/libc_r/uthread/uthread_getprio.c
index a10c88973439..53ee11d0ed78 100644
--- a/lib/libc_r/uthread/uthread_getprio.c
+++ b/lib/libc_r/uthread/uthread_getprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getprio.c,v 1.8 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_getschedparam.c b/lib/libc_r/uthread/uthread_getschedparam.c
index 0d1ffe924ccd..595b5e1cca61 100644
--- a/lib/libc_r/uthread/uthread_getschedparam.c
+++ b/lib/libc_r/uthread/uthread_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getschedparam.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_getsockname.c b/lib/libc_r/uthread/uthread_getsockname.c
index 745ba239499a..af76ef0832ae 100644
--- a/lib/libc_r/uthread/uthread_getsockname.c
+++ b/lib/libc_r/uthread/uthread_getsockname.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getsockname.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_getsockopt.c b/lib/libc_r/uthread/uthread_getsockopt.c
index ad2d10eedb07..34d3c45638ed 100644
--- a/lib/libc_r/uthread/uthread_getsockopt.c
+++ b/lib/libc_r/uthread/uthread_getsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getsockopt.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_info.c b/lib/libc_r/uthread/uthread_info.c
index 71a9747e7f00..a38dbb17939d 100644
--- a/lib/libc_r/uthread/uthread_info.c
+++ b/lib/libc_r/uthread/uthread_info.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_info.c,v 1.24 2002/12/28 05:20:03 deischen Exp $
  */
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c
index caed63fd4ee9..32b01829525a 100644
--- a/lib/libc_r/uthread/uthread_init.c
+++ b/lib/libc_r/uthread/uthread_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.49 2005/02/28 17:15:31 marcus Exp $
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libc_r/uthread/uthread_ioctl.c b/lib/libc_r/uthread/uthread_ioctl.c
index 7199372b6e18..408af95e3c54 100644
--- a/lib/libc_r/uthread/uthread_ioctl.c
+++ b/lib/libc_r/uthread/uthread_ioctl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_ioctl.c,v 1.12 2002/08/29 23:06:07 deischen Exp $
  */
 #include <stdarg.h>
 #include <sys/ioctl.h>
diff --git a/lib/libc_r/uthread/uthread_jmp.c b/lib/libc_r/uthread/uthread_jmp.c
index 5aa0001819ba..6697ea2fcc6a 100644
--- a/lib/libc_r/uthread/uthread_jmp.c
+++ b/lib/libc_r/uthread/uthread_jmp.c
@@ -28,7 +28,7 @@
  * 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/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_join.c b/lib/libc_r/uthread/uthread_join.c
index a410a01e1ac1..f26f0b59cdcd 100644
--- a/lib/libc_r/uthread/uthread_join.c
+++ b/lib/libc_r/uthread/uthread_join.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_join.c,v 1.22 2003/12/31 13:41:54 deischen Exp $
  */
 #include <errno.h>
 #include "namespace.h"
diff --git a/lib/libc_r/uthread/uthread_kern.c b/lib/libc_r/uthread/uthread_kern.c
index 35953a5fbb64..b0de5a15769e 100644
--- a/lib/libc_r/uthread/uthread_kern.c
+++ b/lib/libc_r/uthread/uthread_kern.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kern.c,v 1.45 2002/10/05 02:22:26 deischen Exp $
  *
  */
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_kevent.c b/lib/libc_r/uthread/uthread_kevent.c
index 17aeaea4583e..c383003c6865 100644
--- a/lib/libc_r/uthread/uthread_kevent.c
+++ b/lib/libc_r/uthread/uthread_kevent.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kevent.c,v 1.6 2001/12/08 00:53:37 sobomax Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_kill.c b/lib/libc_r/uthread/uthread_kill.c
index 29e181425c31..9f692b6455b3 100644
--- a/lib/libc_r/uthread/uthread_kill.c
+++ b/lib/libc_r/uthread/uthread_kill.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kill.c,v 1.12 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libc_r/uthread/uthread_kqueue.c b/lib/libc_r/uthread/uthread_kqueue.c
index 15aceb0b1389..fee328bc7742 100644
--- a/lib/libc_r/uthread/uthread_kqueue.c
+++ b/lib/libc_r/uthread/uthread_kqueue.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kqueue.c,v 1.1 2003/07/25 17:02:33 mp Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_listen.c b/lib/libc_r/uthread/uthread_listen.c
index 0b73ab2ea0f5..573fc8cdd4e9 100644
--- a/lib/libc_r/uthread/uthread_listen.c
+++ b/lib/libc_r/uthread/uthread_listen.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_listen.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_main_np.c b/lib/libc_r/uthread/uthread_main_np.c
index 1c9c30b8a751..ab53524274da 100644
--- a/lib/libc_r/uthread/uthread_main_np.c
+++ b/lib/libc_r/uthread/uthread_main_np.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc_r/uthread/uthread_main_np.c,v 1.4 2002/10/15 16:40:57 fjoe Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_mattr_init.c b/lib/libc_r/uthread/uthread_mattr_init.c
index 5c1fb6fd42ef..cdedd304df80 100644
--- a/lib/libc_r/uthread/uthread_mattr_init.c
+++ b/lib/libc_r/uthread/uthread_mattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mattr_init.c,v 1.10 2005/01/08 17:16:43 hsu Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_mattr_kind_np.c b/lib/libc_r/uthread/uthread_mattr_kind_np.c
index 59aa738ce9ce..90200b4fdbab 100644
--- a/lib/libc_r/uthread/uthread_mattr_kind_np.c
+++ b/lib/libc_r/uthread/uthread_mattr_kind_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mattr_kind_np.c,v 1.9 2005/01/08 17:16:43 hsu Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_msync.c b/lib/libc_r/uthread/uthread_msync.c
index 24cbaa6053bb..1b3098c7d05f 100644
--- a/lib/libc_r/uthread/uthread_msync.c
+++ b/lib/libc_r/uthread/uthread_msync.c
@@ -3,7 +3,7 @@
  *
  * $OpenBSD: uthread_msync.c,v 1.2 1999/06/09 07:16:17 d Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_msync.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_multi_np.c b/lib/libc_r/uthread/uthread_multi_np.c
index bd42365621a6..7cabc7018087 100644
--- a/lib/libc_r/uthread/uthread_multi_np.c
+++ b/lib/libc_r/uthread/uthread_multi_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_multi_np.c,v 1.7 2002/05/24 04:32:28 deischen Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libc_r/uthread/uthread_mutex.c b/lib/libc_r/uthread/uthread_mutex.c
index dc94d45eda17..ac4defb2dcce 100644
--- a/lib/libc_r/uthread/uthread_mutex.c
+++ b/lib/libc_r/uthread/uthread_mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex.c,v 1.33 2002/11/13 18:13:26 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_mutex_prioceiling.c b/lib/libc_r/uthread/uthread_mutex_prioceiling.c
index eccc9e46f382..a62bc160223c 100644
--- a/lib/libc_r/uthread/uthread_mutex_prioceiling.c
+++ b/lib/libc_r/uthread/uthread_mutex_prioceiling.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex_prioceiling.c,v 1.6 2002/11/13 18:13:26 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_mutex_protocol.c b/lib/libc_r/uthread/uthread_mutex_protocol.c
index 4d020d6c5360..79d0e03c9013 100644
--- a/lib/libc_r/uthread/uthread_mutex_protocol.c
+++ b/lib/libc_r/uthread/uthread_mutex_protocol.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex_protocol.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_mutexattr_destroy.c b/lib/libc_r/uthread/uthread_mutexattr_destroy.c
index bdc85a526130..a3b8c1f336ac 100644
--- a/lib/libc_r/uthread/uthread_mutexattr_destroy.c
+++ b/lib/libc_r/uthread/uthread_mutexattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutexattr_destroy.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_nanosleep.c b/lib/libc_r/uthread/uthread_nanosleep.c
index e5569e71e150..bfe30965b93b 100644
--- a/lib/libc_r/uthread/uthread_nanosleep.c
+++ b/lib/libc_r/uthread/uthread_nanosleep.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_nanosleep.c,v 1.16 2001/04/10 04:19:20 deischen Exp $
  */
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_once.c b/lib/libc_r/uthread/uthread_once.c
index 1815f2a34499..e626e1096e86 100644
--- a/lib/libc_r/uthread/uthread_once.c
+++ b/lib/libc_r/uthread/uthread_once.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_once.c,v 1.7 2002/11/13 18:13:26 deischen Exp $
  */
 #include "namespace.h"
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_open.c b/lib/libc_r/uthread/uthread_open.c
index 380761b9881e..56e26b94c41a 100644
--- a/lib/libc_r/uthread/uthread_open.c
+++ b/lib/libc_r/uthread/uthread_open.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_open.c,v 1.12 2001/04/18 12:42:11 deischen Exp $
  *
  */
 #include <stdarg.h>
diff --git a/lib/libc_r/uthread/uthread_pause.c b/lib/libc_r/uthread/uthread_pause.c
index 57b508f266f6..6807f9c6f11b 100644
--- a/lib/libc_r/uthread/uthread_pause.c
+++ b/lib/libc_r/uthread/uthread_pause.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_pause.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_pipe.c b/lib/libc_r/uthread/uthread_pipe.c
index f47e7d61b64a..638c48ebe66d 100644
--- a/lib/libc_r/uthread/uthread_pipe.c
+++ b/lib/libc_r/uthread/uthread_pipe.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_pipe.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_poll.c b/lib/libc_r/uthread/uthread_poll.c
index 62b261394dbb..b22f0397d38a 100644
--- a/lib/libc_r/uthread/uthread_poll.c
+++ b/lib/libc_r/uthread/uthread_poll.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_poll.c,v 1.12 2002/05/02 19:58:43 archie Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_priority_queue.c b/lib/libc_r/uthread/uthread_priority_queue.c
index b700d97f7955..2481357b6ec1 100644
--- a/lib/libc_r/uthread/uthread_priority_queue.c
+++ b/lib/libc_r/uthread/uthread_priority_queue.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_priority_queue.c,v 1.8 2002/05/24 04:32:28 deischen Exp $
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libc_r/uthread/uthread_pselect.c b/lib/libc_r/uthread/uthread_pselect.c
index 9848863325b2..a48f2cce757b 100644
--- a/lib/libc_r/uthread/uthread_pselect.c
+++ b/lib/libc_r/uthread/uthread_pselect.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc_r/uthread/uthread_pselect.c,v 1.2 2002/11/13 18:13:26 deischen Exp $");
 
 #include <sys/select.h>
 #include <sys/time.h>
diff --git a/lib/libc_r/uthread/uthread_read.c b/lib/libc_r/uthread/uthread_read.c
index 067befa0c176..35a98670918c 100644
--- a/lib/libc_r/uthread/uthread_read.c
+++ b/lib/libc_r/uthread/uthread_read.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_read.c,v 1.14 2002/08/29 23:06:07 deischen Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_readv.c b/lib/libc_r/uthread/uthread_readv.c
index e2b79d73696c..ba392218caaa 100644
--- a/lib/libc_r/uthread/uthread_readv.c
+++ b/lib/libc_r/uthread/uthread_readv.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_readv.c,v 1.15 2002/08/29 23:06:07 deischen Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_recvfrom.c b/lib/libc_r/uthread/uthread_recvfrom.c
index e18d44990886..e862b0bbb74c 100644
--- a/lib/libc_r/uthread/uthread_recvfrom.c
+++ b/lib/libc_r/uthread/uthread_recvfrom.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_recvfrom.c,v 1.13 2002/12/19 11:39:20 ru Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_recvmsg.c b/lib/libc_r/uthread/uthread_recvmsg.c
index 3ecae3f04f7d..e63c04de4a95 100644
--- a/lib/libc_r/uthread/uthread_recvmsg.c
+++ b/lib/libc_r/uthread/uthread_recvmsg.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_recvmsg.c,v 1.11 2002/12/19 11:39:20 ru Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_resume_np.c b/lib/libc_r/uthread/uthread_resume_np.c
index ed20b6a8d2f5..a4da7a2d4b06 100644
--- a/lib/libc_r/uthread/uthread_resume_np.c
+++ b/lib/libc_r/uthread/uthread_resume_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_resume_np.c,v 1.13 2002/05/24 04:32:28 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_rwlock.c b/lib/libc_r/uthread/uthread_rwlock.c
index fdda04cd46ed..fc87c298ab8c 100644
--- a/lib/libc_r/uthread/uthread_rwlock.c
+++ b/lib/libc_r/uthread/uthread_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlock.c,v 1.9 2004/01/08 15:39:12 deischen Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_rwlockattr.c b/lib/libc_r/uthread/uthread_rwlockattr.c
index bc1b9eec0307..c304e6e18ed6 100644
--- a/lib/libc_r/uthread/uthread_rwlockattr.c
+++ b/lib/libc_r/uthread/uthread_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlockattr.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_select.c b/lib/libc_r/uthread/uthread_select.c
index 2776cb2c80fc..46f9fc4cf444 100644
--- a/lib/libc_r/uthread/uthread_select.c
+++ b/lib/libc_r/uthread/uthread_select.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.21 2002/08/29 21:39:19 archie Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_self.c b/lib/libc_r/uthread/uthread_self.c
index 1c09e3d206b8..1e6b7746a158 100644
--- a/lib/libc_r/uthread/uthread_self.c
+++ b/lib/libc_r/uthread/uthread_self.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_self.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_sem.c b/lib/libc_r/uthread/uthread_sem.c
index f85bb91ea0e5..6216855d5a30 100644
--- a/lib/libc_r/uthread/uthread_sem.c
+++ b/lib/libc_r/uthread/uthread_sem.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_sem.c,v 1.11 2002/11/13 18:13:26 deischen Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_sendfile.c b/lib/libc_r/uthread/uthread_sendfile.c
index ddaddeb3ff1e..64fdf8e13b82 100644
--- a/lib/libc_r/uthread/uthread_sendfile.c
+++ b/lib/libc_r/uthread/uthread_sendfile.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_sendfile.c,v 1.10 2002/08/29 23:06:07 deischen Exp $
  */
 
 #include <sys/fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_sendmsg.c b/lib/libc_r/uthread/uthread_sendmsg.c
index 5bb825c247b4..041f148c566b 100644
--- a/lib/libc_r/uthread/uthread_sendmsg.c
+++ b/lib/libc_r/uthread/uthread_sendmsg.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sendmsg.c,v 1.11 2002/12/19 11:39:20 ru Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sendto.c b/lib/libc_r/uthread/uthread_sendto.c
index 17c2907619c8..9174b3af8028 100644
--- a/lib/libc_r/uthread/uthread_sendto.c
+++ b/lib/libc_r/uthread/uthread_sendto.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sendto.c,v 1.13 2002/12/19 11:39:20 ru Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_seterrno.c b/lib/libc_r/uthread/uthread_seterrno.c
index 0d9474fc26a5..1308341c36a4 100644
--- a/lib/libc_r/uthread/uthread_seterrno.c
+++ b/lib/libc_r/uthread/uthread_seterrno.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_seterrno.c,v 1.5 2001/01/24 13:03:35 deischen Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_setprio.c b/lib/libc_r/uthread/uthread_setprio.c
index 9099a6e73815..cab53495ecce 100644
--- a/lib/libc_r/uthread/uthread_setprio.c
+++ b/lib/libc_r/uthread/uthread_setprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_setprio.c,v 1.9 2001/04/10 04:19:20 deischen Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_setschedparam.c b/lib/libc_r/uthread/uthread_setschedparam.c
index 7696762cc5f8..1c6d8471f975 100644
--- a/lib/libc_r/uthread/uthread_setschedparam.c
+++ b/lib/libc_r/uthread/uthread_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_setschedparam.c,v 1.9 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_setsockopt.c b/lib/libc_r/uthread/uthread_setsockopt.c
index 081518c833f1..d99675ed854e 100644
--- a/lib/libc_r/uthread/uthread_setsockopt.c
+++ b/lib/libc_r/uthread/uthread_setsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_setsockopt.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_shutdown.c b/lib/libc_r/uthread/uthread_shutdown.c
index a148d85b6785..41f3999dc86d 100644
--- a/lib/libc_r/uthread/uthread_shutdown.c
+++ b/lib/libc_r/uthread/uthread_shutdown.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_shutdown.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sig.c b/lib/libc_r/uthread/uthread_sig.c
index 3617b36f7335..11ae1f592097 100644
--- a/lib/libc_r/uthread/uthread_sig.c
+++ b/lib/libc_r/uthread/uthread_sig.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.46 2003/12/03 06:54:40 peter Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigaction.c b/lib/libc_r/uthread/uthread_sigaction.c
index a4765427a583..77786046d4f6 100644
--- a/lib/libc_r/uthread/uthread_sigaction.c
+++ b/lib/libc_r/uthread/uthread_sigaction.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigaction.c,v 1.16 2002/09/30 08:47:42 deischen Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_sigmask.c b/lib/libc_r/uthread/uthread_sigmask.c
index 040e7aad2dba..719c908518db 100644
--- a/lib/libc_r/uthread/uthread_sigmask.c
+++ b/lib/libc_r/uthread/uthread_sigmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigmask.c,v 1.9 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigpending.c b/lib/libc_r/uthread/uthread_sigpending.c
index 5eaf6ff38e51..d9ed24dbb1a9 100644
--- a/lib/libc_r/uthread/uthread_sigpending.c
+++ b/lib/libc_r/uthread/uthread_sigpending.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigpending.c,v 1.9 2002/06/28 13:28:41 deischen Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigprocmask.c b/lib/libc_r/uthread/uthread_sigprocmask.c
index cc0b8da8db8a..b741b5bcf786 100644
--- a/lib/libc_r/uthread/uthread_sigprocmask.c
+++ b/lib/libc_r/uthread/uthread_sigprocmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigprocmask.c,v 1.12 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigsuspend.c b/lib/libc_r/uthread/uthread_sigsuspend.c
index 42f174b262f5..3ac4d9340eaa 100644
--- a/lib/libc_r/uthread/uthread_sigsuspend.c
+++ b/lib/libc_r/uthread/uthread_sigsuspend.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigsuspend.c,v 1.12 2002/06/28 13:28:41 deischen Exp $
  */
 #include <signal.h>
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_sigwait.c b/lib/libc_r/uthread/uthread_sigwait.c
index c245e5da6ebb..29c90ac3b2d2 100644
--- a/lib/libc_r/uthread/uthread_sigwait.c
+++ b/lib/libc_r/uthread/uthread_sigwait.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigwait.c,v 1.20 2002/10/02 10:53:44 robert Exp $
  */
 #include <signal.h>
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_single_np.c b/lib/libc_r/uthread/uthread_single_np.c
index 1ee5e7918bd9..7a85bc275852 100644
--- a/lib/libc_r/uthread/uthread_single_np.c
+++ b/lib/libc_r/uthread/uthread_single_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_single_np.c,v 1.6 2002/05/24 04:32:28 deischen Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libc_r/uthread/uthread_sleep.c b/lib/libc_r/uthread/uthread_sleep.c
index 9e09db775a0a..4583a9dac2de 100644
--- a/lib/libc_r/uthread/uthread_sleep.c
+++ b/lib/libc_r/uthread/uthread_sleep.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_sleep.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_socket.c b/lib/libc_r/uthread/uthread_socket.c
index 28b5a72f8cc9..51cf0dd1aa2b 100644
--- a/lib/libc_r/uthread/uthread_socket.c
+++ b/lib/libc_r/uthread/uthread_socket.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_socket.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_socketpair.c b/lib/libc_r/uthread/uthread_socketpair.c
index 6cd9cb683567..ebcffb2f021a 100644
--- a/lib/libc_r/uthread/uthread_socketpair.c
+++ b/lib/libc_r/uthread/uthread_socketpair.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_socketpair.c,v 1.12 2001/04/10 04:19:20 deischen Exp $
  *
  */
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_spec.c b/lib/libc_r/uthread/uthread_spec.c
index e71f75fb02cb..c3cd5d2dca16 100644
--- a/lib/libc_r/uthread/uthread_spec.c
+++ b/lib/libc_r/uthread/uthread_spec.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_spec.c,v 1.17 2002/03/19 22:58:56 deischen Exp $
  */
 #include <signal.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_spinlock.c b/lib/libc_r/uthread/uthread_spinlock.c
index 0c8eae33ecae..23bc330866a3 100644
--- a/lib/libc_r/uthread/uthread_spinlock.c
+++ b/lib/libc_r/uthread/uthread_spinlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.12 2003/03/26 04:02:24 jeff Exp $
  *
  */
 
diff --git a/lib/libc_r/uthread/uthread_stack.c b/lib/libc_r/uthread/uthread_stack.c
index 0b176cede64d..7336cf114474 100644
--- a/lib/libc_r/uthread/uthread_stack.c
+++ b/lib/libc_r/uthread/uthread_stack.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.7 2005/02/28 17:15:31 marcus Exp $
  */
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_suspend_np.c b/lib/libc_r/uthread/uthread_suspend_np.c
index 952baa350ec5..f9dcb05a6b65 100644
--- a/lib/libc_r/uthread/uthread_suspend_np.c
+++ b/lib/libc_r/uthread/uthread_suspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_suspend_np.c,v 1.14 2002/05/24 04:32:28 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_switch_np.c b/lib/libc_r/uthread/uthread_switch_np.c
index f24d99f74a4a..2e5dde2d09f1 100644
--- a/lib/libc_r/uthread/uthread_switch_np.c
+++ b/lib/libc_r/uthread/uthread_switch_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_switch_np.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_system.c b/lib/libc_r/uthread/uthread_system.c
index d63969b08505..733c366c1561 100644
--- a/lib/libc_r/uthread/uthread_system.c
+++ b/lib/libc_r/uthread/uthread_system.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_system.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_tcdrain.c b/lib/libc_r/uthread/uthread_tcdrain.c
index 272bdf6e2747..4ccccc6539ad 100644
--- a/lib/libc_r/uthread/uthread_tcdrain.c
+++ b/lib/libc_r/uthread/uthread_tcdrain.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_tcdrain.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <termios.h>
diff --git a/lib/libc_r/uthread/uthread_vfork.c b/lib/libc_r/uthread/uthread_vfork.c
index dbefc6521802..87f2aa13a2bb 100644
--- a/lib/libc_r/uthread/uthread_vfork.c
+++ b/lib/libc_r/uthread/uthread_vfork.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_vfork.c,v 1.3 2001/04/10 04:19:20 deischen Exp $
  */
 #include <unistd.h>
 
diff --git a/lib/libc_r/uthread/uthread_wait.c b/lib/libc_r/uthread/uthread_wait.c
index e61138b21451..7464a0fbe588 100644
--- a/lib/libc_r/uthread/uthread_wait.c
+++ b/lib/libc_r/uthread/uthread_wait.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_wait.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_wait4.c b/lib/libc_r/uthread/uthread_wait4.c
index 05ed065dd925..3f00ba8cffe8 100644
--- a/lib/libc_r/uthread/uthread_wait4.c
+++ b/lib/libc_r/uthread/uthread_wait4.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_wait4.c,v 1.14 2002/05/02 19:58:43 archie Exp $
  */
 #include <sys/types.h>
 
diff --git a/lib/libc_r/uthread/uthread_waitpid.c b/lib/libc_r/uthread/uthread_waitpid.c
index fcbbc9fa44ff..72ccdc31272f 100644
--- a/lib/libc_r/uthread/uthread_waitpid.c
+++ b/lib/libc_r/uthread/uthread_waitpid.c
@@ -26,7 +26,7 @@
  * 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/lib/libc_r/uthread/uthread_waitpid.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_write.c b/lib/libc_r/uthread/uthread_write.c
index 0b1e4a047cc3..908a2abcd488 100644
--- a/lib/libc_r/uthread/uthread_write.c
+++ b/lib/libc_r/uthread/uthread_write.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.24 2004/08/14 17:46:10 stefanf Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_writev.c b/lib/libc_r/uthread/uthread_writev.c
index 31d2b8cc1080..fec0f2984223 100644
--- a/lib/libc_r/uthread/uthread_writev.c
+++ b/lib/libc_r/uthread/uthread_writev.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.22 2004/08/14 17:46:10 stefanf Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_yield.c b/lib/libc_r/uthread/uthread_yield.c
index ec89255fb92c..8b3417744f5e 100644
--- a/lib/libc_r/uthread/uthread_yield.c
+++ b/lib/libc_r/uthread/uthread_yield.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_yield.c,v 1.7 2001/04/10 04:19:21 deischen Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile
index 8bba20b726ba..ea85d18ea41d 100644
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcalendar/Makefile,v 1.6 2001/07/15 06:46:01 dd Exp $
 
 LIB=	calendar
 WARNS?=	2
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 469f1c9e70c5..71c176e0324e 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcalendar/calendar.3,v 1.13 2004/07/02 23:52:14 ru Exp $
 .\"
 .Dd November 29, 1997
 .Dt CALENDAR 3
diff --git a/lib/libcalendar/calendar.c b/lib/libcalendar/calendar.c
index fca63eebd9ec..02e32f8817a4 100644
--- a/lib/libcalendar/calendar.c
+++ b/lib/libcalendar/calendar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcalendar/calendar.c,v 1.4 2001/09/30 21:09:57 dillon Exp $");
 
 #include "calendar.h"
 
diff --git a/lib/libcalendar/calendar.h b/lib/libcalendar/calendar.h
index 2c42d6c2214e..378382a040b9 100644
--- a/lib/libcalendar/calendar.h
+++ b/lib/libcalendar/calendar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcalendar/calendar.h,v 1.4 1999/08/28 00:04:04 peter Exp $
  */
 struct date {
 	int y;	/* year */
diff --git a/lib/libcalendar/easter.c b/lib/libcalendar/easter.c
index 8bb3e1c46a97..d11ee576a9ff 100644
--- a/lib/libcalendar/easter.c
+++ b/lib/libcalendar/easter.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcalendar/easter.c,v 1.5 2001/09/30 21:09:57 dillon Exp $");
 
 #include "calendar.h"
 
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 92be69db120f..9e41141c740f 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcam/Makefile,v 1.12 2004/02/05 22:44:22 ru Exp $
 
 LIB=		cam
 SHLIBDIR?=	/lib
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index 539709f265ab..63d350da835e 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcam/cam.3,v 1.14 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd October 10, 1998
 .Os
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index 891652dca927..d3bcfea6b22c 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcam/cam_cdbparse.3,v 1.21 2005/02/13 22:25:13 ru Exp $
 .\"
 .\" This man page borrows heavily from the old scsi(3) man page, which had
 .\" the following copyright:
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index c62d3a6c8ce0..ece5dc1b88a5 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.12.8.1 2005/07/17 17:28:26 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index e505c77c43af..a0d1817c3085 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcam/camlib.h,v 1.5 2002/04/23 23:58:20 obrien Exp $
  */
 /*
  * Buffer encoding/decoding routines taken from the original FreeBSD SCSI
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index 3d977e10ad83..24faab2d9975 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcam/scsi_cmdparse.c,v 1.7 2002/09/16 07:18:27 mike Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 65a3ffd212ad..cdd9477791a6 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcom_err/Makefile,v 1.12 2001/03/27 17:26:58 ru Exp $
 
 LIB=	com_err
 SRCS=	com_err.c error.c
diff --git a/lib/libcom_err/doc/Makefile b/lib/libcom_err/doc/Makefile
index 4c3c0bb0c744..39b4f9513a22 100644
--- a/lib/libcom_err/doc/Makefile
+++ b/lib/libcom_err/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcom_err/doc/Makefile,v 1.8 1999/08/28 00:04:09 peter Exp $
 
 INFO=	com_err
 INFOSECTION= "Programming & development tools."
diff --git a/lib/libcom_err/doc/com_err.texinfo b/lib/libcom_err/doc/com_err.texinfo
index 6c71da8122e8..466a6583f088 100644
--- a/lib/libcom_err/doc/com_err.texinfo
+++ b/lib/libcom_err/doc/com_err.texinfo
@@ -1,6 +1,6 @@
 \input texinfo @c -*-texinfo-*-
 
-@c $FreeBSD$
+@c $FreeBSD: src/lib/libcom_err/doc/com_err.texinfo,v 1.4 1999/09/06 07:41:34 peter Exp $
 
 @c Note that although this source file is in texinfo format (more
 @c or less), it is not yet suitable for turning into an ``info''
diff --git a/lib/libcompat/4.1/ascftime.c b/lib/libcompat/4.1/ascftime.c
index b3c15e43f326..ac917b3a9451 100644
--- a/lib/libcompat/4.1/ascftime.c
+++ b/lib/libcompat/4.1/ascftime.c
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/ascftime.c,v 1.5 2002/05/28 17:00:42 alfred Exp $
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/cftime.3 b/lib/libcompat/4.1/cftime.3
index 116f5de5dfad..61a04c84aa4f 100644
--- a/lib/libcompat/4.1/cftime.3
+++ b/lib/libcompat/4.1/cftime.3
@@ -32,7 +32,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/cftime.3,v 1.16 2005/02/13 23:45:47 ru Exp $
 .\"
 .Dd June 15, 1993
 .Os
diff --git a/lib/libcompat/4.1/cftime.c b/lib/libcompat/4.1/cftime.c
index 8033e446eb92..40dc98b65263 100644
--- a/lib/libcompat/4.1/cftime.c
+++ b/lib/libcompat/4.1/cftime.c
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/cftime.c,v 1.5 2002/05/28 17:00:42 alfred Exp $
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
index 87ee1b00f3e1..091e8ee2af75 100644
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libcompat/4.1/ftime.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/ftime.3,v 1.12 2003/09/08 19:57:16 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FTIME 3
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index cc4a7f9ca071..204f0ec3aa44 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/ftime.c,v 1.5 1999/08/28 00:04:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/getpw.3 b/lib/libcompat/4.1/getpw.3
index 3897136b9123..02bdeddfb0b6 100644
--- a/lib/libcompat/4.1/getpw.3
+++ b/lib/libcompat/4.1/getpw.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpw.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/getpw.3,v 1.11 2001/10/01 16:09:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPW 3
diff --git a/lib/libcompat/4.1/getpw.c b/lib/libcompat/4.1/getpw.c
index d6f4f8b5c213..12a778d028d6 100644
--- a/lib/libcompat/4.1/getpw.c
+++ b/lib/libcompat/4.1/getpw.c
@@ -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/lib/libcompat/4.1/getpw.c,v 1.6 2002/05/28 17:00:42 alfred Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/gtty.c b/lib/libcompat/4.1/gtty.c
index 524f1a64753d..25fdd650d225 100644
--- a/lib/libcompat/4.1/gtty.c
+++ b/lib/libcompat/4.1/gtty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/gtty.c,v 1.5 1999/08/28 00:04:13 peter Exp $";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.1/stty.3 b/lib/libcompat/4.1/stty.3
index 71b46147d800..7b2d9e9f78ed 100644
--- a/lib/libcompat/4.1/stty.3
+++ b/lib/libcompat/4.1/stty.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/stty.3,v 1.9 2001/10/01 16:09:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt STTY 3
diff --git a/lib/libcompat/4.1/stty.c b/lib/libcompat/4.1/stty.c
index cf0137f7ac19..75a6ac864fba 100644
--- a/lib/libcompat/4.1/stty.c
+++ b/lib/libcompat/4.1/stty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/stty.c,v 1.5 1999/08/28 00:04:13 peter Exp $";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.3/cfree.3 b/lib/libcompat/4.3/cfree.3
index 4d380e4a2898..86c292e0b8c5 100644
--- a/lib/libcompat/4.3/cfree.3
+++ b/lib/libcompat/4.3/cfree.3
@@ -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/lib/libcompat/4.3/cfree.3,v 1.7 2000/11/21 12:03:27 ben Exp $
 .\" " <- this is for hilit19 :)
 .Dd November 23, 1995
 .Dt CFREE 3
diff --git a/lib/libcompat/4.3/re_comp.3 b/lib/libcompat/4.3/re_comp.3
index 902ef3d5e400..756d6dc51b66 100644
--- a/lib/libcompat/4.3/re_comp.3
+++ b/lib/libcompat/4.3/re_comp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)re_comp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.3/re_comp.3,v 1.10 2001/10/01 16:09:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RE_COMP 3
diff --git a/lib/libcompat/4.3/rexec.3 b/lib/libcompat/4.3/rexec.3
index 5faf8eae5a04..2c42ca2cbfad 100644
--- a/lib/libcompat/4.3/rexec.3
+++ b/lib/libcompat/4.3/rexec.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexec.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.3/rexec.3,v 1.12 2004/07/02 23:52:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt REXEC 3
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 2fc85dad9b84..66d293229e8b 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.3/rexec.c,v 1.6 2000/08/04 11:15:48 kris Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 72811d5196d6..3382b9ba240b 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -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/lib/libcompat/4.4/cuserid.3,v 1.19 2004/07/02 23:52:14 ru Exp $
 .\"
 .Dd April 10, 1995
 .Os
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index e2f0988f0668..1fb66ca38f32 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)cuserid.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/4.4/cuserid.c,v 1.2 2002/03/21 23:37:30 obrien Exp $");
 
 #include <pwd.h>
 #include <stdio.h>
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index b9b174daa89a..fa1f7f7005b3 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libcompat/Makefile,v 1.24 2004/12/21 09:33:46 ru Exp $
 
 LIB=compat
 CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
diff --git a/lib/libcompat/regexp/regexp.3 b/lib/libcompat/regexp/regexp.3
index 7e30611aceae..5578a35d5d0d 100644
--- a/lib/libcompat/regexp/regexp.3
+++ b/lib/libcompat/regexp/regexp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)regexp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/regexp/regexp.3,v 1.12 2005/02/13 23:45:47 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt REGEXP 3
diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c
index 8276ffcf6866..b02b5dbfa414 100644
--- a/lib/libcompat/regexp/regexp.c
+++ b/lib/libcompat/regexp/regexp.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/regexp/regexp.c,v 1.7 2002/03/21 23:37:30 obrien Exp $");
 
 #include <limits.h>
 #include <regexp.h>
diff --git a/lib/libcompat/regexp/regsub.c b/lib/libcompat/regexp/regsub.c
index 4ab921cf6f20..d580e7ece440 100644
--- a/lib/libcompat/regexp/regsub.c
+++ b/lib/libcompat/regexp/regsub.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/regexp/regsub.c,v 1.2 2002/03/21 23:37:30 obrien Exp $");
 
 #include <regexp.h>
 #include <stdio.h>
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 6082f6ae307f..063669ecae48 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libcrypt/Makefile,v 1.35.2.1 2005/07/22 17:29:04 kensmith Exp $
 #
 
 SHLIB_MAJOR=	3
diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c
index 33186cd4de95..14a085d4665c 100644
--- a/lib/libcrypt/crypt-md5.c
+++ b/lib/libcrypt/crypt-md5.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/crypt-md5.c,v 1.13 2003/06/02 21:43:14 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c
index 19b84ceb831d..705a461c183e 100644
--- a/lib/libcrypt/crypt-nthash.c
+++ b/lib/libcrypt/crypt-nthash.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/crypt-nthash.c,v 1.1 2003/06/02 19:29:27 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3
index 27ff75081cb9..bf6aa217ecd3 100644
--- a/lib/libcrypt/crypt.3
+++ b/lib/libcrypt/crypt.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.31 2005/02/09 18:03:14 ru Exp $
 .\"
 .Dd January 19, 1997
 .Dt CRYPT 3
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index a6b91f58ced5..be503ac39237 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/crypt.c,v 1.23 2003/06/02 19:29:27 markm Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libcrypt/crypt.h b/lib/libcrypt/crypt.h
index c6771605dc2f..62ad53f58fb6 100644
--- a/lib/libcrypt/crypt.h
+++ b/lib/libcrypt/crypt.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcrypt/crypt.h,v 1.8 2003/06/02 19:29:27 markm Exp $
  *
  */
 
diff --git a/lib/libcrypt/misc.c b/lib/libcrypt/misc.c
index 594c5801c425..8135b8d73b05 100644
--- a/lib/libcrypt/misc.c
+++ b/lib/libcrypt/misc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/misc.c,v 1.3 2002/03/06 17:18:08 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libdevinfo/Makefile b/lib/libdevinfo/Makefile
index 0615195f9385..fb5cce0e5ccf 100644
--- a/lib/libdevinfo/Makefile
+++ b/lib/libdevinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdevinfo/Makefile,v 1.4 2002/05/13 12:11:54 ru Exp $
 
 LIB=	devinfo
 SRCS=	devinfo.c
diff --git a/lib/libdevinfo/devinfo.3 b/lib/libdevinfo/devinfo.3
index 49516ccb9adf..538c449a18be 100644
--- a/lib/libdevinfo/devinfo.3
+++ b/lib/libdevinfo/devinfo.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libdevinfo/devinfo.3,v 1.10 2004/07/26 19:35:20 charnier Exp $
 .\"
 .Dd April 19, 2001
 .Dt DEVINFO 3
diff --git a/lib/libdevinfo/devinfo.c b/lib/libdevinfo/devinfo.c
index 5ad68c3f046f..fbf4ca87919b 100644
--- a/lib/libdevinfo/devinfo.c
+++ b/lib/libdevinfo/devinfo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdevinfo/devinfo.c,v 1.8 2005/06/22 15:20:11 jhb Exp $");
 
 /*
  * An interface to the FreeBSD kernel's bus/device information interface.
diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index 91930a44008c..fcfc97f9a966 100644
--- a/lib/libdevinfo/devinfo.h
+++ b/lib/libdevinfo/devinfo.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.4.14.1 2005/09/02 03:16:30 rodrigc Exp $
  */
 
 #ifndef _DEVINFO_H_INCLUDED
diff --git a/lib/libdevinfo/devinfo_var.h b/lib/libdevinfo/devinfo_var.h
index b409671e1d4d..3ff9bcdd7fc8 100644
--- a/lib/libdevinfo/devinfo_var.h
+++ b/lib/libdevinfo/devinfo_var.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libdevinfo/devinfo_var.h,v 1.3 2003/02/17 18:56:00 imp Exp $
  */
 
 #include <sys/rman.h>
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 61b19947fb23..230857bb2db6 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdevstat/Makefile,v 1.14.8.1 2005/07/22 17:29:04 kensmith Exp $
 
 LIB=	devstat
 SHLIBDIR?= /lib
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 849a149edf43..9b98e79ac933 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.26.2.2 2005/08/18 04:46:26 ken Exp $
 .\"
 .Dd March 18, 2003
 .Dt DEVSTAT 3
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index c50c90b95e80..359e13337a81 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.28 2005/04/26 15:02:01 mux Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index 61b8ccbe9777..b9a6723ec339 100644
--- a/lib/libdevstat/devstat.h
+++ b/lib/libdevstat/devstat.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdevstat/devstat.h,v 1.10.12.1 2005/07/22 17:29:04 kensmith Exp $
  */
 
 #ifndef _DEVSTAT_H
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index ebc59918d597..9b7614a1b017 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdisk/Makefile,v 1.44 2004/12/21 09:33:46 ru Exp $
 
 .if ${MACHINE_ARCH} == "ia64"
 _open_disk=	open_ia64_disk.c
diff --git a/lib/libdisk/blocks.c b/lib/libdisk/blocks.c
index 313c5cca357e..96d31e2937c0 100644
--- a/lib/libdisk/blocks.c
+++ b/lib/libdisk/blocks.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/blocks.c,v 1.15 2002/10/31 07:56:40 phk Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/change.c b/lib/libdisk/change.c
index 7b6356156733..175cec30c894 100644
--- a/lib/libdisk/change.c
+++ b/lib/libdisk/change.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.26 2005/03/30 13:03:33 nyan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index fb43ef5192a0..dd1defc2b8b9 100644
--- a/lib/libdisk/chunk.c
+++ b/lib/libdisk/chunk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.52 2004/10/31 01:28:59 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/stdint.h>
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index 7f1453e6fcd1..d5503ea1188d 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.86 2005/01/05 14:07:31 delphij Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 4f21cad59922..490f4ce85b0c 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.125 2005/04/13 13:42:38 nyan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index b57f6e759f29..8ccf2a58ff5e 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -25,7 +25,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/lib/libdisk/libdisk.3,v 1.34 2005/02/13 22:25:13 ru Exp $
 .\" "
 .Dd March 15, 1996
 .Dt LIBDISK 3
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index 36866edc4d44..5c0734f3ea54 100644
--- a/lib/libdisk/libdisk.h
+++ b/lib/libdisk/libdisk.h
@@ -6,7 +6,7 @@
 * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 * ----------------------------------------------------------------------------
 *
-* $FreeBSD$
+* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.62 2004/04/21 23:21:13 grehan Exp $
 *
 */
 
diff --git a/lib/libdisk/open_disk.c b/lib/libdisk/open_disk.c
index 745065202f0c..838490450a5b 100644
--- a/lib/libdisk/open_disk.c
+++ b/lib/libdisk/open_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.10 2005/03/08 21:46:18 stefanf Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/open_ia64_disk.c b/lib/libdisk/open_ia64_disk.c
index 8fc9f64817ee..e396b7ed2fbc 100644
--- a/lib/libdisk/open_ia64_disk.c
+++ b/lib/libdisk/open_ia64_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/open_ia64_disk.c,v 1.3 2004/08/05 17:44:07 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c
index 1f12f4c8a384..842cb26b9c0a 100644
--- a/lib/libdisk/rules.c
+++ b/lib/libdisk/rules.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.34 2004/03/30 01:39:00 kuriyama Exp $");
 
 #include <sys/types.h>
 #include <sys/stdint.h>
diff --git a/lib/libdisk/tst01.c b/lib/libdisk/tst01.c
index 7bb757959971..41b34ddba250 100644
--- a/lib/libdisk/tst01.c
+++ b/lib/libdisk/tst01.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/tst01.c,v 1.35 2003/11/02 08:01:18 marcel Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_alpha_disk.c b/lib/libdisk/write_alpha_disk.c
index 251282e40596..765cc3a5384c 100644
--- a/lib/libdisk/write_alpha_disk.c
+++ b/lib/libdisk/write_alpha_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_alpha_disk.c,v 1.12 2004/06/04 11:49:11 brian Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_amd64_disk.c b/lib/libdisk/write_amd64_disk.c
index 98992583fdff..93b8d2bb5d69 100644
--- a/lib/libdisk/write_amd64_disk.c
+++ b/lib/libdisk/write_amd64_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_amd64_disk.c,v 1.8 2004/06/04 11:49:11 brian Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index 024981beff23..e0d5864b3158 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_disk.c,v 1.53 2003/11/02 08:07:25 marcel Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_i386_disk.c b/lib/libdisk/write_i386_disk.c
index 15317d384f53..4f7469f62fe8 100644
--- a/lib/libdisk/write_i386_disk.c
+++ b/lib/libdisk/write_i386_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.9 2004/06/04 11:49:11 brian Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_ia64_disk.c b/lib/libdisk/write_ia64_disk.c
index 0b57fdff5f59..a040dfb4bfac 100644
--- a/lib/libdisk/write_ia64_disk.c
+++ b/lib/libdisk/write_ia64_disk.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.15 2004/01/30 20:52:54 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/lib/libdisk/write_pc98_disk.c b/lib/libdisk/write_pc98_disk.c
index 8f2a45da91f0..582d0ee09f33 100644
--- a/lib/libdisk/write_pc98_disk.c
+++ b/lib/libdisk/write_pc98_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_pc98_disk.c,v 1.11 2004/06/04 11:49:11 brian Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_powerpc_disk.c b/lib/libdisk/write_powerpc_disk.c
index ec955e2d35e4..31c89bb736c6 100644
--- a/lib/libdisk/write_powerpc_disk.c
+++ b/lib/libdisk/write_powerpc_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_powerpc_disk.c,v 1.1 2004/04/21 23:21:13 grehan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_sparc64_disk.c b/lib/libdisk/write_sparc64_disk.c
index 9832b0d32a1b..5e354eba9792 100644
--- a/lib/libdisk/write_sparc64_disk.c
+++ b/lib/libdisk/write_sparc64_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_sparc64_disk.c,v 1.8 2003/04/22 05:34:35 phk Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 5ec70efc7a85..56879b6e5227 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.34 2005/05/28 12:02:53 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libedit/Makefile,v 1.28.10.2 2005/10/09 03:44:01 delphij Exp $
 
 LIB=	edit
 SHLIB_MAJOR=	5
diff --git a/lib/libedit/TEST/test.c b/lib/libedit/TEST/test.c
index facbdaa7e3df..c247899b4ceb 100644
--- a/lib/libedit/TEST/test.c
+++ b/lib/libedit/TEST/test.c
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 static char sccsid[] = "@(#)test.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 __RCSID("$NetBSD: test.c,v 1.18 2005/06/01 11:37:52 lukem Exp $");
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/TEST/test.c,v 1.4.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * test.c: A little test program
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index ffaaaa77d0ae..c323267e2c86 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/chared.c,v 1.8.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * chared.c: Character editor utilities
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
index 826c76786810..c94e66d2de1a 100644
--- a/lib/libedit/chared.h
+++ b/lib/libedit/chared.h
@@ -31,7 +31,7 @@
  *
  *	@(#)chared.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: chared.h,v 1.16 2005/08/08 14:05:37 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/chared.h,v 1.6.12.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 3259f0ab6972..ea0efed16b9d 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/common.c,v 1.9.12.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * common.c: Common Editor functions
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 40b1c2d7d5e9..be32d5d7c155 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libedit/editline.3,v 1.23.2.1 2005/10/09 03:44:01 delphij Exp $
 .\"
 .Dd October 4, 2005
 .Os
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 35d30cc671a4..36a7f6e5dfef 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libedit/editrc.5,v 1.17.2.1 2005/10/09 03:44:01 delphij Exp $
 .\"
 .Dd October 18, 2003
 .Os
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
index 4da311387852..3c43bbde461a 100644
--- a/lib/libedit/el.c
+++ b/lib/libedit/el.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/el.c,v 1.11.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * el.c: EditLine interface functions
diff --git a/lib/libedit/el.h b/lib/libedit/el.h
index fb07e26ed0df..eee97dfb63fc 100644
--- a/lib/libedit/el.h
+++ b/lib/libedit/el.h
@@ -31,7 +31,7 @@
  *
  *	@(#)el.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: el.h,v 1.16 2003/10/18 23:48:42 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/el.h,v 1.4.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index c17788e1b84a..60e9ac7c3ac1 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)emacs.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/emacs.c,v 1.8.12.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * emacs.c: Emacs functions
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
index 601e10272dce..6fd88194d45e 100644
--- a/lib/libedit/hist.c
+++ b/lib/libedit/hist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/hist.c,v 1.5.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * hist.c: History access functions
diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h
index 4f2824aff200..149e286e1621 100644
--- a/lib/libedit/hist.h
+++ b/lib/libedit/hist.h
@@ -31,7 +31,7 @@
  *
  *	@(#)hist.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: hist.h,v 1.10 2003/08/07 16:44:31 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/hist.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index af4892a92a21..12c445366308 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/history.c,v 1.7.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * hist.c: History access functions
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index 16bfde699554..b26e44d87507 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/key.c,v 1.9.12.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * key.c: This module contains the procedures for maintaining
diff --git a/lib/libedit/key.h b/lib/libedit/key.h
index 0301f928cd30..848553eb5e9b 100644
--- a/lib/libedit/key.h
+++ b/lib/libedit/key.h
@@ -31,7 +31,7 @@
  *
  *	@(#)key.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: key.h,v 1.8 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/key.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/makelist b/lib/libedit/makelist
index e44a0e701cba..17fe96071e9c 100644
--- a/lib/libedit/makelist
+++ b/lib/libedit/makelist
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #	$NetBSD: makelist,v 1.10 2005/08/08 14:04:49 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libedit/makelist,v 1.8.10.1 2005/10/09 03:44:01 delphij Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
index 76c9e4d74f66..2b0e4c20179f 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/map.c,v 1.8.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * map.c: Editor function definitions
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
index a76d8727b92a..e2712595a42a 100644
--- a/lib/libedit/map.h
+++ b/lib/libedit/map.h
@@ -31,7 +31,7 @@
  *
  *	@(#)map.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: map.h,v 1.8 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/map.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
index 0ffe51d8ec45..20951ec10281 100644
--- a/lib/libedit/parse.c
+++ b/lib/libedit/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/parse.c,v 1.9.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * parse.c: parse an editline extended command
diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h
index cca4abf1999c..0fdfd79a3054 100644
--- a/lib/libedit/parse.h
+++ b/lib/libedit/parse.h
@@ -31,7 +31,7 @@
  *
  *	@(#)parse.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: parse.h,v 1.6 2005/05/29 04:58:15 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/parse.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 3d72da73e947..2bab480fe3e6 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/prompt.c,v 1.5.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * prompt.c: Prompt printing functions
diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h
index 6523add855cd..7d5031840b8f 100644
--- a/lib/libedit/prompt.h
+++ b/lib/libedit/prompt.h
@@ -31,7 +31,7 @@
  *
  *	@(#)prompt.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: prompt.h,v 1.6 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/prompt.h,v 1.2.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
index 4d0b39460cfe..6817b1b4ba68 100644
--- a/lib/libedit/read.c
+++ b/lib/libedit/read.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/read.c,v 1.11.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * read.c: Clean this junk up! This is horrible code.
diff --git a/lib/libedit/read.h b/lib/libedit/read.h
index e4a87991f7d9..9bb5eac8086a 100644
--- a/lib/libedit/read.h
+++ b/lib/libedit/read.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: read.h,v 1.4 2004/02/27 14:52:18 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/read.h,v 1.1.2.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index 72556545507e..76e14bf15919 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/refresh.c,v 1.9.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * refresh.c: Lower level screen refreshing functions
diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h
index e44ef9c5f274..9496995e211c 100644
--- a/lib/libedit/refresh.h
+++ b/lib/libedit/refresh.h
@@ -31,7 +31,7 @@
  *
  *	@(#)refresh.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: refresh.h,v 1.5 2003/08/07 16:44:33 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/refresh.h,v 1.2.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 991bad246141..374acfab67f2 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/search.c,v 1.9.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * search.c: History and character search functions
diff --git a/lib/libedit/search.h b/lib/libedit/search.h
index 725af7cadacd..2b636751c011 100644
--- a/lib/libedit/search.h
+++ b/lib/libedit/search.h
@@ -31,7 +31,7 @@
  *
  *	@(#)search.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: search.h,v 1.8 2003/10/18 23:27:36 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/search.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c
index a895aeabb158..07baf441c4ef 100644
--- a/lib/libedit/sig.c
+++ b/lib/libedit/sig.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/sig.c,v 1.6.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * sig.c: Signal handling stuff.
diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h
index b1ce14b09096..23cb9ab86338 100644
--- a/lib/libedit/sig.h
+++ b/lib/libedit/sig.h
@@ -31,7 +31,7 @@
  *
  *	@(#)sig.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: sig.h,v 1.5 2003/08/07 16:44:33 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/sig.h,v 1.2.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
index 9b1f04031072..162efae4da08 100644
--- a/lib/libedit/sys.h
+++ b/lib/libedit/sys.h
@@ -31,7 +31,7 @@
  *
  *	@(#)sys.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: sys.h,v 1.9 2004/01/17 17:57:40 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/sys.h,v 1.4.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 6cd0e14e242c..5d134d2848ec 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.16.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * term.c: Editor/termcap-curses interface
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
index d97b46d35789..6e0301d2996b 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/term.h
@@ -31,7 +31,7 @@
  *
  *	@(#)term.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: term.h,v 1.16 2005/03/15 00:10:40 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/term.h,v 1.5.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 8e3100de586b..31f831fffe8e 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/tokenizer.c,v 1.6.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * tokenize.c: Bourne shell like tokenizer
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index e2b99327ea96..b0e8d85ee0a3 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/tty.c,v 1.7.14.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * tty.c: tty interface stuff
diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h
index 3a4e94accf33..3a3a0b86d352 100644
--- a/lib/libedit/tty.h
+++ b/lib/libedit/tty.h
@@ -31,7 +31,7 @@
  *
  *	@(#)tty.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: tty.h,v 1.11 2005/06/01 11:37:52 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/tty.h,v 1.4.14.1 2005/10/09 03:44:01 delphij Exp $
  */
 
 /*
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index 2d611fb307a3..c3c0609a4caa 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/vi.c,v 1.9.12.1 2005/10/09 03:44:01 delphij Exp $");
 
 /*
  * vi.c: Vi mode commands.
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index cac2fccb7fae..1fe4c9174a4a 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libexpat/Makefile,v 1.4.10.1 2005/07/22 17:29:04 kensmith Exp $
 
 EXPAT=		${.CURDIR}/../../contrib/expat
 
diff --git a/lib/libexpat/expat_config.h b/lib/libexpat/expat_config.h
index 036c4d3a5cd5..065b7b899536 100644
--- a/lib/libexpat/expat_config.h
+++ b/lib/libexpat/expat_config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libexpat/expat_config.h,v 1.1 2002/10/02 07:35:35 phk Exp $ */
 
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
 #define BYTEORDER 1234
diff --git a/lib/libexpat/libbsdxml.3 b/lib/libexpat/libbsdxml.3
index 2d5fc3e5e82e..f18c7eac9bc1 100644
--- a/lib/libexpat/libbsdxml.3
+++ b/lib/libexpat/libbsdxml.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libexpat/libbsdxml.3,v 1.3 2002/12/27 12:15:30 schweikh Exp $
 .\"/
 .Dd October 4, 2002
 .Dt LIBBSDXML 3
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 1b69c4953208..be88e233ce39 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.44.2.1 2005/07/22 17:29:05 kensmith Exp $
 
 LIB=		fetch
 CFLAGS+=	-I.
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index ba0d711974af..ad6d4961d1ca 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.50 2005/02/16 12:46:46 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index 62e0846b102d..d75e763d8ae7 100644
--- a/lib/libfetch/common.h
+++ b/lib/libfetch/common.h
@@ -25,7 +25,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/lib/libfetch/common.h,v 1.28 2004/09/21 18:35:20 des Exp $
  */
 
 #ifndef _COMMON_H_INCLUDED
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 27dac66b561d..1b0b8ad7c1c9 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.60 2005/02/13 23:45:47 ru Exp $
 .\"
 .Dd July 1, 1998
 .Dt FETCH 3
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index 403a2dba1e17..d79c239c5730 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.38 2004/09/21 18:35:20 des Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libfetch/fetch.h b/lib/libfetch/fetch.h
index 10d911a4fe3b..e820f967e488 100644
--- a/lib/libfetch/fetch.h
+++ b/lib/libfetch/fetch.h
@@ -25,7 +25,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/lib/libfetch/fetch.h,v 1.26 2004/09/21 18:35:20 des Exp $
  */
 
 #ifndef _FETCH_H_INCLUDED
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index 42ce68d63f9d..237ddc48e272 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.17 2004/09/21 18:35:20 des Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index f59b2f481b03..7d37ce764c54 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.91 2004/09/21 18:35:20 des Exp $");
 
 /*
  * Portions of this code were taken from or based on ftpio.c:
diff --git a/lib/libfetch/ftp.errors b/lib/libfetch/ftp.errors
index 9a4a11ec4b86..9ce0277fbead 100644
--- a/lib/libfetch/ftp.errors
+++ b/lib/libfetch/ftp.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/ftp.errors,v 1.6 2002/10/30 06:06:16 des Exp $
 #
 # This list is taken from RFC 959.
 # It probably needs a going over.
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index bac7b0f75302..6ef3a37a2995 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.76 2005/03/02 19:09:28 kbyanc Exp $");
 
 /*
  * The following copyright applies to the base64 code:
diff --git a/lib/libfetch/http.errors b/lib/libfetch/http.errors
index 1f38574d463a..62e5581a2e23 100644
--- a/lib/libfetch/http.errors
+++ b/lib/libfetch/http.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/http.errors,v 1.5 2001/05/23 18:52:02 des Exp $
 #
 # This list is taken from RFC 2068.
 #
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index 6e69075ba698..3f02f3121eb2 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libform
-# $FreeBSD$
+# $FreeBSD: src/lib/libform/Makefile,v 1.8 2003/06/06 13:46:55 kuriyama Exp $
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index b803db8519b8..69f28e867aaa 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libftpio/Makefile,v 1.13.14.1 2005/07/22 17:29:05 kensmith Exp $
 
 LIB=		ftpio
 SHLIB_MAJOR=	6
diff --git a/lib/libftpio/ftp.errors b/lib/libftpio/ftp.errors
index c03eeacae329..632fcdca24f6 100644
--- a/lib/libftpio/ftp.errors
+++ b/lib/libftpio/ftp.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libftpio/ftp.errors,v 1.5 2000/07/05 19:34:43 ume Exp $
 #
 # This list is taken from RFC 959.
 # It probably needs a going over.
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index 64378c259279..30df72d9d118 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libftpio/ftpio.3,v 1.35 2005/02/13 23:45:47 ru Exp $
 .\"
 .Dd June 17, 1996
 .Dt FTPIO 3
diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c
index f990d4ddac96..902f867991a1 100644
--- a/lib/libftpio/ftpio.c
+++ b/lib/libftpio/ftpio.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libftpio/ftpio.c,v 1.44 2005/02/14 18:40:31 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libftpio/ftpio.h b/lib/libftpio/ftpio.h
index 879abea6607c..5799d6a30e2e 100644
--- a/lib/libftpio/ftpio.h
+++ b/lib/libftpio/ftpio.h
@@ -22,7 +22,7 @@
  * Turned inside out. Now returns xfers as new file ids, not as a special
  * `state' of FTP_t
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libftpio/ftpio.h,v 1.17 2002/03/25 13:49:48 phk Exp $
  */
 
 /* Internal housekeeping data structure for FTP sessions */
diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile
index c64ce5072d5b..a10f06876a89 100644
--- a/lib/libgeom/Makefile
+++ b/lib/libgeom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libgeom/Makefile,v 1.10 2004/03/07 16:07:57 phk Exp $
 
 LIB=	geom
 SHLIBDIR?= /lib
diff --git a/lib/libgeom/geom_ctl.c b/lib/libgeom/geom_ctl.c
index d308849e80a1..7029119079a3 100644
--- a/lib/libgeom/geom_ctl.c
+++ b/lib/libgeom/geom_ctl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.4 2003/06/01 15:05:22 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libgeom/geom_getxml.c b/lib/libgeom/geom_getxml.c
index fbc9cb876c9b..34ff632a1dfd 100644
--- a/lib/libgeom/geom_getxml.c
+++ b/lib/libgeom/geom_getxml.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_getxml.c,v 1.1 2003/02/10 00:11:43 phk Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c
index 14f9b222123c..fc61e3f41848 100644
--- a/lib/libgeom/geom_stats.c
+++ b/lib/libgeom/geom_stats.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_stats.c,v 1.3 2003/03/18 09:53:46 phk Exp $
  */
 
 #include <paths.h>
diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
index 7798f44544af..fc4655f438cf 100644
--- a/lib/libgeom/geom_xml2tree.c
+++ b/lib/libgeom/geom_xml2tree.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_xml2tree.c,v 1.5 2005/05/24 10:10:38 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libgeom/libgeom.3 b/lib/libgeom/libgeom.3
index 0c142ed875d3..835b2b26d91b 100644
--- a/lib/libgeom/libgeom.3
+++ b/lib/libgeom/libgeom.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.6 2004/07/01 18:20:57 ru Exp $
 .\"
 .Dd March 7, 2004
 .Dt LIBGEOM 3
diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h
index 2cdb037b1f25..17b410b6c242 100644
--- a/lib/libgeom/libgeom.h
+++ b/lib/libgeom/libgeom.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.10 2004/03/09 21:14:18 jhb Exp $
  */
 #ifndef _LIBGEOM_H_
 #define _LIBGEOM_H_
diff --git a/lib/libgpib/Makefile b/lib/libgpib/Makefile
index 157ee699b56e..6fc6125f3c6c 100644
--- a/lib/libgpib/Makefile
+++ b/lib/libgpib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libgpib/Makefile,v 1.1.4.1 2005/07/22 17:29:05 kensmith Exp $
 
 LIB =		gpib
 SHLIBDIR ?=	/lib
diff --git a/lib/libgpib/gpib.h b/lib/libgpib/gpib.h
index d3144b527665..7e8a119a89dd 100644
--- a/lib/libgpib/gpib.h
+++ b/lib/libgpib/gpib.h
@@ -25,7 +25,7 @@
  *
  * This file merely redirects to the file in <dev/ieee488/ugpib.h>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgpib/gpib.h,v 1.2 2005/02/12 21:07:09 phk Exp $
  */
 
 #include <dev/ieee488/ugpib.h>
diff --git a/lib/libgpib/ibfoo.c b/lib/libgpib/ibfoo.c
index e88563a6a3cf..1ceb35cd6ad6 100644
--- a/lib/libgpib/ibfoo.c
+++ b/lib/libgpib/ibfoo.c
@@ -25,7 +25,7 @@
  *
  * This file merely redirects to the file in <dev/ieee488/ugpib.h>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgpib/ibfoo.c,v 1.6 2005/02/13 06:21:36 scottl Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libio/Makefile b/lib/libio/Makefile
index 8456e335d5b8..e336c180532a 100644
--- a/lib/libio/Makefile
+++ b/lib/libio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libio/Makefile,v 1.4 2004/12/21 08:47:02 ru Exp $
 
 LIB=		io
 SHLIB_MAJOR=	1
diff --git a/lib/libio/alpha_sethae.c b/lib/libio/alpha_sethae.c
index 206b6ddac4d2..ce6c920fbf19 100644
--- a/lib/libio/alpha_sethae.c
+++ b/lib/libio/alpha_sethae.c
@@ -26,7 +26,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libio/alpha_sethae.c,v 1.6 2004/01/10 18:37:11 nectar Exp $");
 
 #include <sys/types.h>
 #include <machine/sysarch.h>
diff --git a/lib/libio/bwx.c b/lib/libio/bwx.c
index 5b479686f376..764d44cfc1c5 100644
--- a/lib/libio/bwx.c
+++ b/lib/libio/bwx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libio/bwx.c,v 1.6 2001/09/30 21:41:46 dillon Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/lib/libio/io.c b/lib/libio/io.c
index a963349f29e1..91cbdee672dc 100644
--- a/lib/libio/io.c
+++ b/lib/libio/io.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libio/io.c,v 1.4 2001/09/30 21:41:46 dillon Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libio/io.h b/lib/libio/io.h
index 1f4c62034ef3..70b360932550 100644
--- a/lib/libio/io.h
+++ b/lib/libio/io.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libio/io.h,v 1.2 1999/08/28 00:04:44 peter Exp $
  */
 
 struct io_ops {
diff --git a/lib/libio/swiz.c b/lib/libio/swiz.c
index eab2a0380b63..b5c7a49da738 100644
--- a/lib/libio/swiz.c
+++ b/lib/libio/swiz.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libio/swiz.c,v 1.5 2001/09/30 21:41:46 dillon Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 2a60d93e9a55..2b3ecd352a1e 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libipsec/Makefile,v 1.16.2.1 2005/07/22 17:29:05 kensmith Exp $
 
 LIB=	ipsec
 SHLIBDIR?= /lib
diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c
index 3ce525b16937..9ed56a1fe7c0 100644
--- a/lib/libipsec/ipsec_dump_policy.c
+++ b/lib/libipsec/ipsec_dump_policy.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/ipsec_dump_policy.c,v 1.8 2004/02/11 04:34:34 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/ipsec_get_policylen.c b/lib/libipsec/ipsec_get_policylen.c
index 911b2ce46428..cd6d1c42d1af 100644
--- a/lib/libipsec/ipsec_get_policylen.c
+++ b/lib/libipsec/ipsec_get_policylen.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/ipsec_get_policylen.c,v 1.3 2001/09/30 21:43:45 dillon Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3
index 048aa7fe2d35..b28faeff8500 100644
--- a/lib/libipsec/ipsec_set_policy.3
+++ b/lib/libipsec/ipsec_set_policy.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libipsec/ipsec_set_policy.3,v 1.20 2005/02/09 18:03:14 ru Exp $
 .\"
 .Dd May 5, 1998
 .Dt IPSEC_SET_POLICY 3
diff --git a/lib/libipsec/ipsec_strerror.3 b/lib/libipsec/ipsec_strerror.3
index 982d1959ed03..b120cd9a374f 100644
--- a/lib/libipsec/ipsec_strerror.3
+++ b/lib/libipsec/ipsec_strerror.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libipsec/ipsec_strerror.3,v 1.13 2005/02/09 18:03:14 ru Exp $
 .\"
 .Dd May 6, 1998
 .Dt IPSEC_STRERROR 3
diff --git a/lib/libipsec/ipsec_strerror.c b/lib/libipsec/ipsec_strerror.c
index 203b6517edb4..5451d5f4675e 100644
--- a/lib/libipsec/ipsec_strerror.c
+++ b/lib/libipsec/ipsec_strerror.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/ipsec_strerror.c,v 1.4 2001/09/30 21:43:45 dillon Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/ipsec_strerror.h b/lib/libipsec/ipsec_strerror.h
index d9a1f0deffe2..2492f7a14d6b 100644
--- a/lib/libipsec/ipsec_strerror.h
+++ b/lib/libipsec/ipsec_strerror.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/lib/libipsec/ipsec_strerror.h,v 1.4 2002/03/21 23:52:35 obrien Exp $	*/
 /*	$KAME: ipsec_strerror.h,v 1.8 2000/07/30 00:45:12 itojun Exp $	*/
 
 /*
diff --git a/lib/libipsec/libpfkey.h b/lib/libipsec/libpfkey.h
index 07ff582ec827..022961c4c63a 100644
--- a/lib/libipsec/libpfkey.h
+++ b/lib/libipsec/libpfkey.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/lib/libipsec/libpfkey.h,v 1.4 2002/03/22 09:18:36 obrien Exp $	*/
 /*	$KAME: libpfkey.h,v 1.6 2001/03/05 18:22:17 thorpej Exp $	*/
 
 /*
diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c
index ca75df44a17a..628d01e9209a 100644
--- a/lib/libipsec/pfkey.c
+++ b/lib/libipsec/pfkey.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/pfkey.c,v 1.8 2004/02/11 04:34:34 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c
index d8d467642a55..0b23ea3fcc9a 100644
--- a/lib/libipsec/pfkey_dump.c
+++ b/lib/libipsec/pfkey_dump.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.15 2004/02/11 04:34:34 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y
index ae25958852cc..95aab84bb89f 100644
--- a/lib/libipsec/policy_parse.y
+++ b/lib/libipsec/policy_parse.y
@@ -50,7 +50,7 @@
 
 %{
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/policy_parse.y,v 1.4 2003/11/05 09:41:23 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l
index f95756954e10..5c899a62efd0 100644
--- a/lib/libipsec/policy_token.l
+++ b/lib/libipsec/policy_token.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/lib/libipsec/policy_token.l,v 1.8 2004/02/11 04:34:34 bms Exp $	*/
 /*	$KAME: policy_token.l,v 1.13 2003/05/09 05:19:55 sakane Exp $	*/
 
 /*
diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c
index 65c111dd094d..f08e84dada0b 100644
--- a/lib/libipsec/test-policy.c
+++ b/lib/libipsec/test-policy.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/test-policy.c,v 1.7 2003/10/26 12:00:27 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipx/Makefile b/lib/libipx/Makefile
index 66f566a4bd04..2cd9c094afac 100644
--- a/lib/libipx/Makefile
+++ b/lib/libipx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libipx/Makefile,v 1.7 2003/08/18 15:25:38 obrien Exp $
 
 LIB=	ipx
 SHLIBDIR?= /lib
diff --git a/lib/libipx/ipx.3 b/lib/libipx/ipx.3
index d3a295b0efaa..13a94a063553 100644
--- a/lib/libipx/ipx.3
+++ b/lib/libipx/ipx.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libipx/ipx.3,v 1.15 2004/12/29 02:18:24 trhodes Exp $
 .\"
 .Dd June 4, 1993
 .Dt IPX 3
diff --git a/lib/libipx/ipx_addr.c b/lib/libipx/ipx_addr.c
index 99da44042699..b3f9ab28e1c8 100644
--- a/lib/libipx/ipx_addr.c
+++ b/lib/libipx/ipx_addr.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipx/ipx_addr.c,v 1.8 2002/08/25 13:06:32 charnier Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ipx_addr.c";
diff --git a/lib/libipx/ipx_ntoa.c b/lib/libipx/ipx_ntoa.c
index 0864bde8a7c6..c3227e03ff39 100644
--- a/lib/libipx/ipx_ntoa.c
+++ b/lib/libipx/ipx_ntoa.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipx/ipx_ntoa.c,v 1.6 2004/05/24 16:48:53 stefanf Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ipx_ntoa.c";
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index ad4f2f04ed76..651847c96b75 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkiconv/Makefile,v 1.2.8.1 2005/07/22 17:29:05 kensmith Exp $
 
 LIB=		kiconv
 SHLIBDIR?=	/lib
diff --git a/lib/libkiconv/kiconv.3 b/lib/libkiconv/kiconv.3
index affacf1687cb..757d1381bd8e 100644
--- a/lib/libkiconv/kiconv.3
+++ b/lib/libkiconv/kiconv.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkiconv/kiconv.3,v 1.6 2004/07/05 06:59:17 ru Exp $
 .\"
 .Dd July 17, 2003
 .Dt KICONV 3
diff --git a/lib/libkiconv/quirks.c b/lib/libkiconv/quirks.c
index d9a80ee5ec99..287c01eca21e 100644
--- a/lib/libkiconv/quirks.c
+++ b/lib/libkiconv/quirks.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/quirks.c,v 1.1 2003/09/26 20:26:20 fjoe Exp $
  */
 
 /*
diff --git a/lib/libkiconv/quirks.h b/lib/libkiconv/quirks.h
index 682d2cd7fc0c..5a1c20453c91 100644
--- a/lib/libkiconv/quirks.h
+++ b/lib/libkiconv/quirks.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1 2003/09/26 20:26:20 fjoe Exp $
  */
 
 #ifndef _KICONV_QUIRKS_H_
diff --git a/lib/libkiconv/xlat16_iconv.c b/lib/libkiconv/xlat16_iconv.c
index 58d4ec8a0e7b..7792e3d4ebf3 100644
--- a/lib/libkiconv/xlat16_iconv.c
+++ b/lib/libkiconv/xlat16_iconv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/xlat16_iconv.c,v 1.3 2004/03/14 05:14:00 bde Exp $
  */
 
 /*
diff --git a/lib/libkiconv/xlat16_sysctl.c b/lib/libkiconv/xlat16_sysctl.c
index 28420d9d3d6b..3f653c75ebfc 100644
--- a/lib/libkiconv/xlat16_sysctl.c
+++ b/lib/libkiconv/xlat16_sysctl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/xlat16_sysctl.c,v 1.1.10.1 2005/09/08 15:46:38 imura Exp $
  */
 
 /*
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 33081c4226e9..6f46fa8baf42 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libkvm/Makefile,v 1.14 2003/08/18 15:25:38 obrien Exp $
 
 LIB=	kvm
 SHLIBDIR?= /lib
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index 1d3c5eb61016..33f737a90ffa 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.14 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd January 29, 2004
 .Dt KVM 3
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 9e97a7808e6b..487e792c9294 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.27 2005/06/29 22:39:41 peter Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index 0886c778cf6d..35aeff592eef 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkvm/kvm.h,v 1.16 2003/10/13 04:44:55 bde Exp $
  */
 
 #ifndef _KVM_H_
diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c
index 011c397f1490..a9d0d079ccf9 100644
--- a/lib/libkvm/kvm_alpha.c
+++ b/lib/libkvm/kvm_alpha.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_alpha.c,v 1.8 2005/07/02 05:49:29 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/user.h>
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index e73e6a2ce6ba..33a38d427c80 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.18.4.1 2005/10/26 00:07:25 peter Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index 70d8354fd6a9..4796e9a6f21d 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_arm.c,v 1.2 2005/06/29 22:39:41 peter Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index 4a2e20cf3994..d57df635b1b8 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_file.c,v 1.17 2003/07/31 21:44:31 phk Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_geterr.3 b/lib/libkvm/kvm_geterr.3
index 49c6420101b4..e1686b6d1287 100644
--- a/lib/libkvm/kvm_geterr.3
+++ b/lib/libkvm/kvm_geterr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_geterr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_geterr.3,v 1.8 2005/01/20 09:17:06 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETERR 3
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index b13fede010ba..9c9d05a053d7 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getfiles.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getfiles.3,v 1.15 2005/01/20 09:17:06 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt KVM_GETFILES 3
diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3
index 23310bc7ef16..da754ca97072 100644
--- a/lib/libkvm/kvm_getloadavg.3
+++ b/lib/libkvm/kvm_getloadavg.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getloadavg.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getloadavg.3,v 1.10 2001/10/01 16:09:16 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETLOADAVG 3
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index 72d59cd38fb4..2ca68a1ce5e6 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getloadavg.c,v 1.9 2001/11/20 08:26:37 jhb Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index 107f6a8e894b..8d1b66faa0c2 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getprocs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.20 2005/01/20 09:17:06 ru Exp $
 .\"
 .Dd September 27, 2003
 .Dt KVM_GETPROCS 3
diff --git a/lib/libkvm/kvm_getswapinfo.3 b/lib/libkvm/kvm_getswapinfo.3
index edd2068de4d1..1d760b227e93 100644
--- a/lib/libkvm/kvm_getswapinfo.3
+++ b/lib/libkvm/kvm_getswapinfo.3
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getswapinfo.3,v 1.13 2004/07/31 18:49:53 imp Exp $
 .\"
 .Dd January 22, 1999
 .Dt KVM_SWAPINFO 3
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index 9ba7a5c2cba1..9430c1511944 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.26 2004/07/31 18:49:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 258c2f238574..c34dbda184b9 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.17.4.1 2005/10/26 00:07:25 peter Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_ia64.c b/lib/libkvm/kvm_ia64.c
index fbee55180d3d..b124e34eb216 100644
--- a/lib/libkvm/kvm_ia64.c
+++ b/lib/libkvm/kvm_ia64.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.7 2005/06/29 22:39:41 peter Exp $ */
 /*	$NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $	*/
 
 /*
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index c1dd8b7212f3..c71e480eafe4 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_nlist.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_nlist.3,v 1.10 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_NLIST 3
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index f9fa5573c6da..da5172bac818 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_open.3,v 1.17 2005/01/20 09:17:06 ru Exp $
 .\"
 .Dd January 29, 2004
 .Dt KVM_OPEN 3
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
index 24ab7fbdcec3..757bf36df448 100644
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_powerpc.c,v 1.3 2005/06/29 22:39:41 peter Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index b0d696aa01b6..1220c0cd5c31 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm_private.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkvm/kvm_private.h,v 1.9 2005/06/29 22:39:41 peter Exp $
  */
 
 struct __kvm {
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 250cb44f20bd..5cdbba8724dd 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.87 2005/06/24 00:37:04 peter Exp $");
 
 /*
  * Proc traversal interface for kvm.  ps and w are (probably) the exclusive
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
index a2a24850d57a..1e050671232f 100644
--- a/lib/libkvm/kvm_read.3
+++ b/lib/libkvm/kvm_read.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_read.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_read.3,v 1.10 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_READ 3
diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c
index 57b881d986d4..dadd35aa90a3 100644
--- a/lib/libkvm/kvm_sparc.c
+++ b/lib/libkvm/kvm_sparc.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc.c,v 1.6 2005/06/29 22:39:41 peter Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index 6e0cd3728548..b4ecf7faed13 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.7 2005/06/29 22:39:41 peter Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 59f96344ba34..dcd3cd3eefb5 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmagic/Makefile,v 1.6.2.1 2005/07/22 17:29:06 kensmith Exp $
 # Copyright (c) David E. O'Brien, 2000-2004
 
 CONTRDIR=	${.CURDIR}/../../contrib/file
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index 1863903ff588..684251a9c6ce 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libmagic/config.h,v 1.2 2004/12/28 04:35:01 obrien Exp $ */
 
 #include <osreldate.h>
 
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index a98b409cda03..4b1b8f799940 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmd/Makefile,v 1.42 2005/03/09 19:23:04 cperciva Exp $
 
 LIB=	md
 SHLIBDIR?= /lib
diff --git a/lib/libmd/md2.copyright b/lib/libmd/md2.copyright
index acef7bab5be6..545af1c2afd1 100644
--- a/lib/libmd/md2.copyright
+++ b/lib/libmd/md2.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md2.copyright,v 1.5 1999/08/28 00:05:04 peter Exp $
 Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md2.h b/lib/libmd/md2.h
index e449eed2979f..4b1adeffcfd6 100644
--- a/lib/libmd/md2.h
+++ b/lib/libmd/md2.h
@@ -1,5 +1,5 @@
 /* MD2.H - header file for MD2C.C
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md2.h,v 1.9 2001/03/17 10:00:50 phk Exp $
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/md2c.c b/lib/libmd/md2c.c
index c08fe0b8e337..743a379d30b6 100644
--- a/lib/libmd/md2c.c
+++ b/lib/libmd/md2c.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/md2c.c,v 1.10 2003/06/05 13:17:32 markm Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmd/md4.copyright b/lib/libmd/md4.copyright
index e4502073a1ce..0c170052918a 100644
--- a/lib/libmd/md4.copyright
+++ b/lib/libmd/md4.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md4.copyright,v 1.5 1999/08/28 00:05:05 peter Exp $
 Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h
index f727d7ed02c9..0c2eaed54fa4 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -1,5 +1,5 @@
 /* MD4.H - header file for MD4C.C
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md4.h,v 1.10 2001/03/17 10:00:50 phk Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c
index d3725123019e..d8b195943508 100644
--- a/lib/libmd/md4c.c
+++ b/lib/libmd/md4c.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/md4c.c,v 1.9 2003/06/05 13:17:32 markm Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
 
diff --git a/lib/libmd/md5.copyright b/lib/libmd/md5.copyright
index b718bf8b5ebe..f5ecc5bd48fd 100644
--- a/lib/libmd/md5.copyright
+++ b/lib/libmd/md5.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md5.copyright,v 1.5 1999/08/28 00:05:06 peter Exp $
 Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index 45a0972b725c..45933f86e945 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/md5c.c,v 1.16 2003/06/05 13:17:32 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index edfbc8ff256c..99cb3ec8cefd 100644
--- a/lib/libmd/mdX.3
+++ b/lib/libmd/mdX.3
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.29 2005/02/15 09:26:59 ru Exp $
 .\"
 .Dd February 11, 1999
 .Dt MDX 3
diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c
index fd2589aecd4a..73ee6051146e 100644
--- a/lib/libmd/mdXhl.c
+++ b/lib/libmd/mdXhl.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/mdXhl.c,v 1.18 2002/09/08 15:10:04 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libmd/mddriver.c b/lib/libmd/mddriver.c
index c12c5fb5b990..d54eef3a4c2c 100644
--- a/lib/libmd/mddriver.c
+++ b/lib/libmd/mddriver.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/mddriver.c,v 1.7 2001/09/30 21:56:22 dillon Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmd/ripemd.3 b/lib/libmd/ripemd.3
index 6c2f21c79ae3..c16716e62e25 100644
--- a/lib/libmd/ripemd.3
+++ b/lib/libmd/ripemd.3
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------------
 .\"
 .\" 	From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/ripemd.3,v 1.15 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd February 26, 1999
 .Dt RIPEMD 3
diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h
index e64f501db014..ca13e62d8564 100644
--- a/lib/libmd/ripemd.h
+++ b/lib/libmd/ripemd.h
@@ -57,7 +57,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/ripemd.h,v 1.2 2001/03/17 10:00:50 phk Exp $
  */
 
 #ifndef HEADER_RIPEMD_H
diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c
index 2467d71bc2c2..c7d0bc7d8c67 100644
--- a/lib/libmd/rmd160c.c
+++ b/lib/libmd/rmd160c.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/rmd160c.c,v 1.6 2002/03/21 23:38:21 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/rmddriver.c b/lib/libmd/rmddriver.c
index 29084a962b6e..1d81a87d0a94 100644
--- a/lib/libmd/rmddriver.c
+++ b/lib/libmd/rmddriver.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/rmddriver.c,v 1.3 2001/09/30 21:56:22 dillon Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3
index f4e2f192b539..1905533c3296 100644
--- a/lib/libmd/sha.3
+++ b/lib/libmd/sha.3
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------------
 .\"
 .\" 	From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/sha.3,v 1.19 2005/06/16 19:01:06 ru Exp $
 .\"
 .Dd February 25, 1999
 .Dt SHA 3
diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h
index 7e5f2b67f965..7b399e5584bf 100644
--- a/lib/libmd/sha.h
+++ b/lib/libmd/sha.h
@@ -54,7 +54,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/sha.h,v 1.4 2001/03/17 10:00:50 phk Exp $
  */
 
 #ifndef _SHA_H_
diff --git a/lib/libmd/sha0c.c b/lib/libmd/sha0c.c
index 47ea62b212d9..6826e6278eb4 100644
--- a/lib/libmd/sha0c.c
+++ b/lib/libmd/sha0c.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/sha0c.c,v 1.5 2002/03/21 23:38:21 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c
index 97a6ceb77389..7281ebad88a3 100644
--- a/lib/libmd/sha1c.c
+++ b/lib/libmd/sha1c.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/sha1c.c,v 1.4 2002/03/21 23:38:21 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/sha256.3 b/lib/libmd/sha256.3
index c4acc7c4ce5d..cf8fa80d8c94 100644
--- a/lib/libmd/sha256.3
+++ b/lib/libmd/sha256.3
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------------
 .\"
 .\" 	From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/sha256.3,v 1.2.4.1 2005/10/08 21:46:23 pjd Exp $
 .\"
 .Dd March 9, 2005
 .Dt SHA256 3
diff --git a/lib/libmd/sha256.h b/lib/libmd/sha256.h
index de4cd4313c77..3d90b5f07a9e 100644
--- a/lib/libmd/sha256.h
+++ b/lib/libmd/sha256.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/sha256.h,v 1.1 2005/03/09 19:23:04 cperciva Exp $
  */
 
 #ifndef _SHA256_H_
diff --git a/lib/libmd/sha256c.c b/lib/libmd/sha256c.c
index d94e87150146..9814cf9c6f19 100644
--- a/lib/libmd/sha256c.c
+++ b/lib/libmd/sha256c.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/sha256c.c,v 1.1 2005/03/09 19:23:04 cperciva Exp $");
 
 #include <sys/endian.h>
 #include <sys/types.h>
diff --git a/lib/libmd/shadriver.c b/lib/libmd/shadriver.c
index 7f799fb2aaf4..f3e0e3456282 100644
--- a/lib/libmd/shadriver.c
+++ b/lib/libmd/shadriver.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/shadriver.c,v 1.4 2005/03/09 19:23:04 cperciva Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile
index 1d3c43d28731..4bc0b65366c4 100644
--- a/lib/libmemstat/Makefile
+++ b/lib/libmemstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmemstat/Makefile,v 1.3.2.1 2005/07/24 14:49:49 rwatson Exp $
 
 WARNS?=		3
 LIB=		memstat
diff --git a/lib/libmemstat/libmemstat.3 b/lib/libmemstat/libmemstat.3
index a4a2b50e23e4..1772450fde05 100644
--- a/lib/libmemstat/libmemstat.3
+++ b/lib/libmemstat/libmemstat.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmemstat/libmemstat.3,v 1.6.2.2 2005/08/20 21:25:21 rwatson Exp $
 .\"
 .Dd June 27, 2005
 .Os
diff --git a/lib/libmemstat/memstat.c b/lib/libmemstat/memstat.c
index de8ae6599ea1..d78bb5a0844b 100644
--- a/lib/libmemstat/memstat.c
+++ b/lib/libmemstat/memstat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat.c,v 1.5.2.2 2005/08/01 17:14:51 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libmemstat/memstat.h b/lib/libmemstat/memstat.h
index f46640876caf..1f8b83192ae3 100644
--- a/lib/libmemstat/memstat.h
+++ b/lib/libmemstat/memstat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat.h,v 1.7.2.1 2005/07/24 14:49:49 rwatson Exp $
  */
 
 #ifndef _MEMSTAT_H_
diff --git a/lib/libmemstat/memstat_all.c b/lib/libmemstat/memstat_all.c
index e32047cebfb8..c9dfda6db975 100644
--- a/lib/libmemstat/memstat_all.c
+++ b/lib/libmemstat/memstat_all.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_all.c,v 1.1.2.1 2005/07/24 14:49:49 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libmemstat/memstat_internal.h b/lib/libmemstat/memstat_internal.h
index 7123518e283a..b8e3d547ff98 100644
--- a/lib/libmemstat/memstat_internal.h
+++ b/lib/libmemstat/memstat_internal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_internal.h,v 1.5.2.2 2005/08/01 17:14:51 rwatson Exp $
  */
 
 #ifndef _MEMSTAT_INTERNAL_H_
diff --git a/lib/libmemstat/memstat_malloc.c b/lib/libmemstat/memstat_malloc.c
index e94d0054c938..287e44a57fd9 100644
--- a/lib/libmemstat/memstat_malloc.c
+++ b/lib/libmemstat/memstat_malloc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_malloc.c,v 1.4.2.2 2005/08/01 17:14:51 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libmemstat/memstat_uma.c b/lib/libmemstat/memstat_uma.c
index f1fb71059ca2..771342b3c836 100644
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_uma.c,v 1.7.2.3 2005/08/01 17:14:51 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index fd3ddfe71158..66414e7edbd7 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libmenu
-# $FreeBSD$
+# $FreeBSD: src/lib/libmenu/Makefile,v 1.10 2003/06/06 13:46:55 kuriyama Exp $
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index 41db4180d712..17878f9b0175 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmilter/Makefile,v 1.5 2004/12/21 10:49:26 ru Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index 51d395fb362b..a0245f65de86 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmp/Makefile,v 1.9.8.1 2005/07/22 17:29:06 kensmith Exp $
 
 LIB=		mp
 SHLIB_MAJOR=	5
diff --git a/lib/libmp/libmp.3 b/lib/libmp/libmp.3
index 9be21d7b0de4..99352b735ded 100644
--- a/lib/libmp/libmp.3
+++ b/lib/libmp/libmp.3
@@ -28,7 +28,7 @@
 .\" manual page, but it does document what appears to be the "traditional"
 .\" libmp interface.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmp/libmp.3,v 1.5 2003/08/30 05:35:46 seanc Exp $
 .\"
 .\" See above for rationale for this date.
 .Dd September 7, 1989
diff --git a/lib/libmp/mp.h b/lib/libmp/mp.h
index 4c2c94d05fc8..dbe5023484aa 100644
--- a/lib/libmp/mp.h
+++ b/lib/libmp/mp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libmp/mp.h,v 1.2 2003/01/28 23:03:15 markm Exp $ */
 
 #ifndef _MP_H_
 #define _MP_H_
diff --git a/lib/libmp/mpasbn.c b/lib/libmp/mpasbn.c
index 726e2f179dc6..ab078464d1fe 100644
--- a/lib/libmp/mpasbn.c
+++ b/lib/libmp/mpasbn.c
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.3 2003/01/28 23:03:15 markm Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/lib/libncp/CREDITS b/lib/libncp/CREDITS
index 43380553e8f9..0ca5463fb9d6 100644
--- a/lib/libncp/CREDITS
+++ b/lib/libncp/CREDITS
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libncp/CREDITS,v 1.1 1999/10/12 11:56:37 bp Exp $
 
 In the development of NetWare client for FreeBSD next sources was used:
 
diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile
index ab1689c0e3c9..99ff8179e24d 100644
--- a/lib/libncp/Makefile
+++ b/lib/libncp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libncp/Makefile,v 1.5.2.1 2005/07/22 17:29:06 kensmith Exp $
 
 NCPLIB=${.CURDIR}
 
diff --git a/lib/libncp/ipx.c b/lib/libncp/ipx.c
index 9371fddb5590..3757656d5244 100644
--- a/lib/libncp/ipx.c
+++ b/lib/libncp/ipx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ipx.c,v 1.7 2002/03/22 09:18:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/lib/libncp/ipxsap.h b/lib/libncp/ipxsap.h
index 2d8d7f039ec6..9f7f577c4722 100644
--- a/lib/libncp/ipxsap.h
+++ b/lib/libncp/ipxsap.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libncp/ipxsap.h,v 1.1 1999/10/12 11:56:37 bp Exp $
  */
 #ifndef _IPXSAP_H_
 #define _IPXSAP_H_
diff --git a/lib/libncp/ncpl_bind.c b/lib/libncp/ncpl_bind.c
index ab591eb44fc9..651529536e88 100644
--- a/lib/libncp/ncpl_bind.c
+++ b/lib/libncp/ncpl_bind.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_bind.c,v 1.4 2002/02/18 20:35:18 mike Exp $");
 
 #include <sys/types.h>
 #include <arpa/inet.h>
diff --git a/lib/libncp/ncpl_conn.c b/lib/libncp/ncpl_conn.c
index 977752c5c42b..ffb23d912318 100644
--- a/lib/libncp/ncpl_conn.c
+++ b/lib/libncp/ncpl_conn.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_conn.c,v 1.10 2005/01/16 11:22:42 charnier Exp $");
 
 /*
  *
diff --git a/lib/libncp/ncpl_crypt.c b/lib/libncp/ncpl_crypt.c
index bc304c0cb2e2..bfd60f092e1f 100644
--- a/lib/libncp/ncpl_crypt.c
+++ b/lib/libncp/ncpl_crypt.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_crypt.c,v 1.2 2001/09/30 22:01:18 dillon Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libncp/ncpl_file.c b/lib/libncp/ncpl_file.c
index 2ffcc466a6ec..676e24920efa 100644
--- a/lib/libncp/ncpl_file.c
+++ b/lib/libncp/ncpl_file.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_file.c,v 1.5 2002/02/18 20:35:18 mike Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/lib/libncp/ncpl_misc.c b/lib/libncp/ncpl_misc.c
index 16a54c5db15b..7e38c67e8c2d 100644
--- a/lib/libncp/ncpl_misc.c
+++ b/lib/libncp/ncpl_misc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_misc.c,v 1.5 2002/02/18 20:35:18 mike Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libncp/ncpl_msg.c b/lib/libncp/ncpl_msg.c
index 5af2d7287185..5bb54bbeabea 100644
--- a/lib/libncp/ncpl_msg.c
+++ b/lib/libncp/ncpl_msg.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_msg.c,v 1.2 2001/09/30 22:01:19 dillon Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libncp/ncpl_net.c b/lib/libncp/ncpl_net.c
index c161ce1e87bd..2039f18d5b9f 100644
--- a/lib/libncp/ncpl_net.c
+++ b/lib/libncp/ncpl_net.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_net.c,v 1.3 2003/02/28 04:31:29 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libncp/ncpl_nls.c b/lib/libncp/ncpl_nls.c
index 68fae017bff9..38a6b0049228 100644
--- a/lib/libncp/ncpl_nls.c
+++ b/lib/libncp/ncpl_nls.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_nls.c,v 1.5 2004/03/14 05:19:38 bde Exp $");
 
 /*
  * Languages support. Currently is very primitive.
diff --git a/lib/libncp/ncpl_queue.c b/lib/libncp/ncpl_queue.c
index 1f003a151993..d75018e5c20b 100644
--- a/lib/libncp/ncpl_queue.c
+++ b/lib/libncp/ncpl_queue.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_queue.c,v 1.3 2001/09/30 22:01:19 dillon Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libncp/ncpl_rcfile.c b/lib/libncp/ncpl_rcfile.c
index 72395f32b2e2..0314735efbc7 100644
--- a/lib/libncp/ncpl_rcfile.c
+++ b/lib/libncp/ncpl_rcfile.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_rcfile.c,v 1.4 2001/09/30 22:01:19 dillon Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/lib/libncp/ncpl_rpc.c b/lib/libncp/ncpl_rpc.c
index f2240e3b1301..c69e720d1cbc 100644
--- a/lib/libncp/ncpl_rpc.c
+++ b/lib/libncp/ncpl_rpc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_rpc.c,v 1.3 2002/02/18 20:35:18 mike Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libncp/ncpl_subr.c b/lib/libncp/ncpl_subr.c
index 186314386f90..3fd2dac592ac 100644
--- a/lib/libncp/ncpl_subr.c
+++ b/lib/libncp/ncpl_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.11 2004/09/22 16:56:49 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libncp/sap.c b/lib/libncp/sap.c
index a0c7d0cf205b..c0180f98d6ad 100644
--- a/lib/libncp/sap.c
+++ b/lib/libncp/sap.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/sap.c,v 1.4 2002/02/18 20:35:18 mike Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index d372af0fded8..adf35c914f76 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libncurses/Makefile,v 1.78.2.1 2005/07/22 17:29:06 kensmith Exp $
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
diff --git a/lib/libncurses/ncurses_cfg.h b/lib/libncurses/ncurses_cfg.h
index 3fc4c2b1f91c..2d14122b1b34 100644
--- a/lib/libncurses/ncurses_cfg.h
+++ b/lib/libncurses/ncurses_cfg.h
@@ -44,7 +44,7 @@
  *	ftp://dickey.his.com/autoconf/
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libncurses/ncurses_cfg.h,v 1.5 2002/05/21 05:40:28 peter Exp $ */
 
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H
diff --git a/lib/libncurses/pathnames.h b/lib/libncurses/pathnames.h
index 5cac36f3651f..6f25f3291199 100644
--- a/lib/libncurses/pathnames.h
+++ b/lib/libncurses/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libncurses/pathnames.h,v 1.1 1999/08/30 07:57:50 peter Exp $
  */
 
 #define	_PATH_DEF	".termcap /usr/share/misc/termcap"
diff --git a/lib/libncurses/termcap.c b/lib/libncurses/termcap.c
index 24e71d302df5..dc775105046a 100644
--- a/lib/libncurses/termcap.c
+++ b/lib/libncurses/termcap.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncurses/termcap.c,v 1.6 2002/08/12 19:13:22 ru Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)termcap.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 42596e238ed7..d78c7012ef62 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libnetgraph/Makefile,v 1.10.8.1 2005/07/22 17:29:06 kensmith Exp $
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
 
 LIB=		netgraph
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index 73d614daae35..4424482642d0 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libnetgraph/debug.c,v 1.8 2005/04/26 14:25:11 mux Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libnetgraph/internal.h b/lib/libnetgraph/internal.h
index 0c947e5eab6d..82a06db32d7d 100644
--- a/lib/libnetgraph/internal.h
+++ b/lib/libnetgraph/internal.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/internal.h,v 1.4 2003/11/14 08:09:01 harti Exp $
  * $Whistle: internal.h,v 1.5 1999/01/20 00:57:22 archie Exp $
  */
 
diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c
index cca957325ab2..30e09e6cd89b 100644
--- a/lib/libnetgraph/msg.c
+++ b/lib/libnetgraph/msg.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libnetgraph/msg.c,v 1.11 2005/04/26 14:25:11 mux Exp $");
 
 #include <sys/types.h>
 #include <stdarg.h>
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index d2ef8bd8c8fe..87dc5c4ed2f6 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libnetgraph/netgraph.3,v 1.23 2004/07/04 04:03:37 jmallett Exp $
 .\" $Whistle: netgraph.3,v 1.7 1999/01/25 07:14:06 archie Exp $
 .\"
 .Dd January 27, 2004
diff --git a/lib/libnetgraph/netgraph.h b/lib/libnetgraph/netgraph.h
index 4eb15bd8bd89..21038a488a5c 100644
--- a/lib/libnetgraph/netgraph.h
+++ b/lib/libnetgraph/netgraph.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/netgraph.h,v 1.4 2004/01/27 20:25:14 ru Exp $
  * $Whistle: netgraph.h,v 1.7 1999/01/20 00:57:23 archie Exp $
  */
 
diff --git a/lib/libnetgraph/sock.c b/lib/libnetgraph/sock.c
index 395f28b7025a..2ce1704dba67 100644
--- a/lib/libnetgraph/sock.c
+++ b/lib/libnetgraph/sock.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libnetgraph/sock.c,v 1.8 2005/04/26 14:25:11 mux Exp $");
 
 #include <sys/types.h>
 #include <stdarg.h>
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
index d53a61216144..9c2273c23171 100644
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libngatm/Makefile,v 1.5.8.1 2005/07/22 17:29:06 kensmith Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 5b6740ed61e5..0dcff0fd85e3 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libopie
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libopie/Makefile,v 1.20.2.1 2005/07/22 17:29:07 kensmith Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
diff --git a/lib/libopie/config.h b/lib/libopie/config.h
index b6ad39bbbf03..8eb9c5892193 100644
--- a/lib/libopie/config.h
+++ b/lib/libopie/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libopie/config.h,v 1.4 2002/01/03 16:04:57 ache Exp $ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
diff --git a/lib/libopie/opieextra.c b/lib/libopie/opieextra.c
index 6e2b6b88328c..1e7c1620bb04 100644
--- a/lib/libopie/opieextra.c
+++ b/lib/libopie/opieextra.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libopie/opieextra.c,v 1.3 2002/03/22 00:12:20 markm Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 088e8a03b4f5..11d4a84a2695 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/Makefile,v 1.3 2003/03/09 20:06:34 obrien Exp $
 
 # The modules must be built first, because they are built into the
 # static version of libpam.
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index 9fefb468d485..6ab2fa442adb 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/Makefile.inc,v 1.16.2.1 2005/07/22 17:29:07 kensmith Exp $
 
 .ifdef PAM_DEBUG
 DEBUG_FLAGS+=	-DDEBUG
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 6c819409743b..c58166019c4d 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.54 2005/06/17 08:14:42 des Exp $
 
 OPENPAM=	${.CURDIR}/../../../contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
diff --git a/lib/libpam/libpam/pam_debug_log.c b/lib/libpam/libpam/pam_debug_log.c
index c3fe8e3f8467..5523034fe64b 100644
--- a/lib/libpam/libpam/pam_debug_log.c
+++ b/lib/libpam/libpam/pam_debug_log.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/libpam/pam_debug_log.c,v 1.8 2002/04/14 16:44:04 des Exp $");
 
 #include <libgen.h>
 #include <stdarg.h>
diff --git a/lib/libpam/libpam/pam_std_option.c b/lib/libpam/libpam/pam_std_option.c
index a9ddfba51a26..6ff35563eb4c 100644
--- a/lib/libpam/libpam/pam_std_option.c
+++ b/lib/libpam/libpam/pam_std_option.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/libpam/pam_std_option.c,v 1.10 2002/04/14 18:30:03 des Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libpam/libpam/security/pam_mod_misc.h b/lib/libpam/libpam/security/pam_mod_misc.h
index ffc6f92c4052..757698914bbe 100644
--- a/lib/libpam/libpam/security/pam_mod_misc.h
+++ b/lib/libpam/libpam/security/pam_mod_misc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.12 2003/05/31 16:56:35 des Exp $
  */
 
 #ifndef PAM_MOD_MISC_H
diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile
index cacf0115da7a..9247187e9bc2 100644
--- a/lib/libpam/modules/Makefile
+++ b/lib/libpam/modules/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/Makefile,v 1.19 2003/03/09 20:06:34 obrien Exp $
 
 .include "modules.inc"
 
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index d4f2bb3e0545..1a71d7209607 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/Makefile.inc,v 1.18 2004/12/21 09:51:09 ru Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index c721075d3e67..a6054028203f 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.19 2004/12/21 10:16:00 ru Exp $
 
 MODULES		 =
 MODULES		+= pam_chroot
diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile
index 6d0fc0ef7a56..018d7a7e26ac 100644
--- a/lib/libpam/modules/pam_chroot/Makefile
+++ b/lib/libpam/modules/pam_chroot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_chroot/Makefile,v 1.1 2003/03/30 22:58:23 des Exp $
 
 LIB=		pam_chroot
 SRCS=		pam_chroot.c
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.8 b/lib/libpam/modules/pam_chroot/pam_chroot.8
index 1bb48008d781..08cf1c618899 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.8
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_chroot/pam_chroot.8,v 1.4 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd February 10, 2003
 .Dt PAM_CHROOT 8
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.c b/lib/libpam/modules/pam_chroot/pam_chroot.c
index 447e5f78dd10..49f53aca0369 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.c
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_chroot/pam_chroot.c,v 1.3 2003/04/30 00:40:24 des Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile
index 3bf819692747..c01782f79f1a 100644
--- a/lib/libpam/modules/pam_deny/Makefile
+++ b/lib/libpam/modules/pam_deny/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_deny/Makefile,v 1.7 2003/03/09 20:06:34 obrien Exp $
 
 LIB=	pam_deny
 SRCS=	pam_deny.c
diff --git a/lib/libpam/modules/pam_deny/pam_deny.8 b/lib/libpam/modules/pam_deny/pam_deny.8
index d9544be9b09f..4ca5c8f58400 100644
--- a/lib/libpam/modules/pam_deny/pam_deny.8
+++ b/lib/libpam/modules/pam_deny/pam_deny.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_deny/pam_deny.8,v 1.4 2001/08/15 20:05:30 markm Exp $
 .\"
 .Dd July 7, 2001
 .Dt PAM_DENY 8
diff --git a/lib/libpam/modules/pam_deny/pam_deny.c b/lib/libpam/modules/pam_deny/pam_deny.c
index 3d491b158e42..020e065ab474 100644
--- a/lib/libpam/modules/pam_deny/pam_deny.c
+++ b/lib/libpam/modules/pam_deny/pam_deny.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_deny/pam_deny.c,v 1.10 2005/06/10 06:16:13 des Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile
index 6f239460e9b0..5b123d56133b 100644
--- a/lib/libpam/modules/pam_echo/Makefile
+++ b/lib/libpam/modules/pam_echo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_echo/Makefile,v 1.2 2003/03/09 20:06:35 obrien Exp $
 
 LIB=	pam_echo
 SRCS=	pam_echo.c
diff --git a/lib/libpam/modules/pam_echo/pam_echo.8 b/lib/libpam/modules/pam_echo/pam_echo.8
index b162b5b1e4b5..0ba857893c94 100644
--- a/lib/libpam/modules/pam_echo/pam_echo.8
+++ b/lib/libpam/modules/pam_echo/pam_echo.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_echo/pam_echo.8,v 1.4 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd February 6, 2003
 .Dt PAM_ECHO 8
diff --git a/lib/libpam/modules/pam_echo/pam_echo.c b/lib/libpam/modules/pam_echo/pam_echo.c
index ff008597b921..3bebc486d519 100644
--- a/lib/libpam/modules/pam_echo/pam_echo.c
+++ b/lib/libpam/modules/pam_echo/pam_echo.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_echo/pam_echo.c,v 1.4 2003/12/11 13:55:15 des Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile
index 0cf4268a27a8..b197664cc6bd 100644
--- a/lib/libpam/modules/pam_exec/Makefile
+++ b/lib/libpam/modules/pam_exec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_exec/Makefile,v 1.2 2003/03/09 20:06:35 obrien Exp $
 
 LIB=	pam_exec
 SRCS=	pam_exec.c
diff --git a/lib/libpam/modules/pam_exec/pam_exec.8 b/lib/libpam/modules/pam_exec/pam_exec.8
index 311d64c492a9..47f3a96a5f7b 100644
--- a/lib/libpam/modules/pam_exec/pam_exec.8
+++ b/lib/libpam/modules/pam_exec/pam_exec.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_exec/pam_exec.8,v 1.6 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd February 1, 2005
 .Dt PAM_EXEC 8
diff --git a/lib/libpam/modules/pam_exec/pam_exec.c b/lib/libpam/modules/pam_exec/pam_exec.c
index e4a35ee7c4b3..9c6eb0bff960 100644
--- a/lib/libpam/modules/pam_exec/pam_exec.c
+++ b/lib/libpam/modules/pam_exec/pam_exec.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_exec/pam_exec.c,v 1.4.2.1 2005/09/19 20:56:10 cperciva Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile
index 8bca1aab86dd..2219dad72fa8 100644
--- a/lib/libpam/modules/pam_ftpusers/Makefile
+++ b/lib/libpam/modules/pam_ftpusers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_ftpusers/Makefile,v 1.2 2003/03/09 20:06:35 obrien Exp $
 
 LIB=	pam_ftpusers
 SRCS=	pam_ftpusers.c
diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
index 380e3b026c70..69642cce95ae 100644
--- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
+++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8,v 1.2 2004/07/02 23:52:17 ru Exp $
 .\"
 .Dd April 17, 2002
 .Dt PAM_FTPUSERS 8
diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
index 421955ab250e..389b2e0a95ed 100644
--- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
+++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c,v 1.1 2002/05/08 00:30:10 des Exp $");
 
 #include <ctype.h>
 #include <grp.h>
diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile
index 73b072a47795..7607450dda30 100644
--- a/lib/libpam/modules/pam_group/Makefile
+++ b/lib/libpam/modules/pam_group/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_group/Makefile,v 1.1 2003/02/06 14:27:48 des Exp $
 
 LIB=		pam_group
 SRCS=		pam_group.c
diff --git a/lib/libpam/modules/pam_group/pam_group.8 b/lib/libpam/modules/pam_group/pam_group.8
index 832841b4c699..1ee17e87fae5 100644
--- a/lib/libpam/modules/pam_group/pam_group.8
+++ b/lib/libpam/modules/pam_group/pam_group.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_group/pam_group.8,v 1.3 2004/07/02 23:52:17 ru Exp $
 .\"
 .Dd February 6, 2003
 .Dt PAM_GROUP 8
diff --git a/lib/libpam/modules/pam_group/pam_group.c b/lib/libpam/modules/pam_group/pam_group.c
index a9d5fc32df1c..f3168e167f8b 100644
--- a/lib/libpam/modules/pam_group/pam_group.c
+++ b/lib/libpam/modules/pam_group/pam_group.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_group/pam_group.c,v 1.4 2003/12/11 13:55:15 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile
index ccc192e5378a..a174e84e48a9 100644
--- a/lib/libpam/modules/pam_guest/Makefile
+++ b/lib/libpam/modules/pam_guest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_guest/Makefile,v 1.1 2003/05/31 16:52:58 des Exp $
 
 LIB=		pam_guest
 SRCS=		pam_guest.c
diff --git a/lib/libpam/modules/pam_guest/pam_guest.8 b/lib/libpam/modules/pam_guest/pam_guest.8
index 0bd175524f7e..29cf85208392 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.8
+++ b/lib/libpam/modules/pam_guest/pam_guest.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_guest/pam_guest.8,v 1.4 2004/07/05 06:39:03 ru Exp $
 .\"
 .Dd May 26, 2003
 .Dt PAM_GUEST 8
diff --git a/lib/libpam/modules/pam_guest/pam_guest.c b/lib/libpam/modules/pam_guest/pam_guest.c
index 110edcec0ed4..096498a56ec5 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.c
+++ b/lib/libpam/modules/pam_guest/pam_guest.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_guest/pam_guest.c,v 1.1 2003/05/31 16:52:58 des Exp $");
 
 #include <string.h>
 
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile
index a90236c6aca4..9688fe20caca 100644
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.15 2005/07/08 14:53:45 kensmith Exp $
 
 LIB=	pam_krb5
 SRCS=	pam_krb5.c
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.8 b/lib/libpam/modules/pam_krb5/pam_krb5.8
index 3e0db91e009a..f7a455aa8727 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.8
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.8
@@ -1,6 +1,6 @@
 .\"
 .\" $Id: pam_krb5.5,v 1.5 2000/01/05 00:59:56 fcusack Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.8,v 1.6 2001/11/24 23:41:32 dd Exp $
 .Dd January 15, 1999
 .Dt PAM_KRB5 8
 .Os
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c
index 0ed57f93208a..8701fd37285b 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.23 2005/07/07 14:16:38 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile
index 1cb19990c81f..c000e19b5b31 100644
--- a/lib/libpam/modules/pam_ksu/Makefile
+++ b/lib/libpam/modules/pam_ksu/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $
 
 LIB=	pam_ksu
 SRCS=	pam_ksu.c
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.8 b/lib/libpam/modules/pam_ksu/pam_ksu.8
index 614dc9ef78f8..08322b79eb47 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.8
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.8,v 1.3 2002/12/12 08:19:47 ru Exp $
 .\"
 .Dd May 15, 2002
 .Dt PAM_KSU 8
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c
index 80a395a8abd9..2539c4e48d4d 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.c
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.c,v 1.5 2004/02/10 10:13:21 des Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
index f0b96c4d7da7..911be918bda3 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_lastlog/Makefile,v 1.5 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_lastlog
 SRCS=	pam_lastlog.c
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.8 b/lib/libpam/modules/pam_lastlog/pam_lastlog.8
index 9fc7e452ae6b..0e0415f07f48 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.8
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.8,v 1.7 2005/01/21 10:38:42 ru Exp $
 .\"
 .Dd January 24, 2002
 .Dt PAM_LASTLOG 8
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
index 519d4520b812..d892ea3c0190 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.20 2004/01/26 19:28:37 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile
index 60e94f51f02c..d28ea0223128 100644
--- a/lib/libpam/modules/pam_login_access/Makefile
+++ b/lib/libpam/modules/pam_login_access/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.5 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_login_access
 SRCS=	pam_login_access.c login_access.c
diff --git a/lib/libpam/modules/pam_login_access/login.access.5 b/lib/libpam/modules/pam_login_access/login.access.5
index 78be90683ad7..ea2b697e7a96 100644
--- a/lib/libpam/modules/pam_login_access/login.access.5
+++ b/lib/libpam/modules/pam_login_access/login.access.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/login.access.5,v 1.13 2004/07/02 23:52:17 ru Exp $
 .\"
 .\" this is comment
 .Dd April 30, 1994
diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c
index dbc139717dc5..3ec674433b9e 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -14,7 +14,7 @@ static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_login_access/login_access.c,v 1.12 2004/03/05 08:10:18 markm Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.8 b/lib/libpam/modules/pam_login_access/pam_login_access.8
index 6995227487d6..1cb0e1d0980b 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.8
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.8,v 1.5 2004/07/02 23:52:17 ru Exp $
 .\"
 .Dd January 24, 2002
 .Dt PAM_LOGIN_ACCESS 8
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.c b/lib/libpam/modules/pam_login_access/pam_login_access.c
index 945d5eb913a7..9caf1612dd34 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.c
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.c,v 1.11 2004/02/10 10:13:21 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.h b/lib/libpam/modules/pam_login_access/pam_login_access.h
index 38c304958042..95f7dc194248 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.h
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.h,v 1.2 2002/03/14 23:27:57 des Exp $
  */
 
 extern int login_access(const char *, const char *);
diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile
index ba5a7d4aa770..f76b7da2206f 100644
--- a/lib/libpam/modules/pam_nologin/Makefile
+++ b/lib/libpam/modules/pam_nologin/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_nologin/Makefile,v 1.7 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_nologin
 SRCS=	pam_nologin.c
diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.8 b/lib/libpam/modules/pam_nologin/pam_nologin.8
index a2c5990a9c23..cd9be29e944a 100644
--- a/lib/libpam/modules/pam_nologin/pam_nologin.8
+++ b/lib/libpam/modules/pam_nologin/pam_nologin.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.8,v 1.5 2001/08/26 18:05:35 markm Exp $
 .\"
 .Dd July 8, 2001
 .Dt PAM_NOLOGIN 8
diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.c b/lib/libpam/modules/pam_nologin/pam_nologin.c
index f148be6fdecb..9c06cbfecc5d 100644
--- a/lib/libpam/modules/pam_nologin/pam_nologin.c
+++ b/lib/libpam/modules/pam_nologin/pam_nologin.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.c,v 1.10 2002/04/12 22:27:21 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libpam/modules/pam_opie/Makefile b/lib/libpam/modules/pam_opie/Makefile
index fbc12788e9ca..2a0171178d9b 100644
--- a/lib/libpam/modules/pam_opie/Makefile
+++ b/lib/libpam/modules/pam_opie/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_opie/Makefile,v 1.9 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_opie
 SRCS=	pam_opie.c
diff --git a/lib/libpam/modules/pam_opie/pam_opie.8 b/lib/libpam/modules/pam_opie/pam_opie.8
index 968985a6c9f6..759d6738d21e 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.8
+++ b/lib/libpam/modules/pam_opie/pam_opie.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_opie/pam_opie.8,v 1.9 2002/12/27 12:15:31 schweikh Exp $
 .\"
 .Dd July 7, 2001
 .Dt PAM_OPIE 8
diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c
index 737b044e747d..03e3322b847b 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.c
+++ b/lib/libpam/modules/pam_opie/pam_opie.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_opie/pam_opie.c,v 1.25 2003/05/31 17:19:03 des Exp $");
 
 #include <sys/types.h>
 #include <opie.h>
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile b/lib/libpam/modules/pam_opieaccess/Makefile
index 1554a882ba30..4e031138f034 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile
+++ b/lib/libpam/modules/pam_opieaccess/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_opieaccess/Makefile,v 1.4 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_opieaccess
 SRCS=	${LIB}.c
diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
index 07a66a4e84fd..1cb2ea8434ab 100644
--- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
+++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8,v 1.9 2004/07/02 23:52:17 ru Exp $
 .\"
 .Dd January 21, 2002
 .Dt PAM_OPIEACCESS 8
diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
index 035111553d5e..bb015fd82db2 100644
--- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
+++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c,v 1.16 2004/02/10 20:42:33 cperciva Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile
index 905afe1c7eb6..c3add1f1edc5 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile
+++ b/lib/libpam/modules/pam_passwdqc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_passwdqc/Makefile,v 1.6 2003/03/09 20:06:36 obrien Exp $
 
 SRCDIR=	${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
 .PATH: ${SRCDIR}
diff --git a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
index 408f77d2707d..fa17f291aca1 100644
--- a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
+++ b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8,v 1.5 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd April 15, 2002
 .Dt PAM_PASSWDQC 8
diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile
index dbbd5b5d5813..23e194a515d0 100644
--- a/lib/libpam/modules/pam_permit/Makefile
+++ b/lib/libpam/modules/pam_permit/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_permit/Makefile,v 1.7 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_permit
 SRCS=	pam_permit.c
diff --git a/lib/libpam/modules/pam_permit/pam_permit.8 b/lib/libpam/modules/pam_permit/pam_permit.8
index c7d98ab48e16..40f68c64227d 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.8
+++ b/lib/libpam/modules/pam_permit/pam_permit.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_permit/pam_permit.8,v 1.3 2001/07/13 09:09:50 ru Exp $
 .\"
 .Dd July 7, 2001
 .Dt PAM_PERMIT 8
diff --git a/lib/libpam/modules/pam_permit/pam_permit.c b/lib/libpam/modules/pam_permit/pam_permit.c
index fe0a4ed2958b..25a8d693e8eb 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.c
+++ b/lib/libpam/modules/pam_permit/pam_permit.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_permit/pam_permit.c,v 1.8 2002/04/12 22:27:22 des Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
index 88e4357a4b26..1d4165fa58e9 100644
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_radius/Makefile,v 1.13 2004/07/28 05:48:30 kan Exp $
 
 LIB=	pam_radius
 SRCS=	pam_radius.c
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index 25e7312c29a3..5e4defd851be 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.8
+++ b/lib/libpam/modules/pam_radius/pam_radius.8
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.17 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd October 28, 2002
 .Dt PAM_RADIUS 8
diff --git a/lib/libpam/modules/pam_radius/pam_radius.c b/lib/libpam/modules/pam_radius/pam_radius.c
index 511baf329aa3..083a03915756 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.c
+++ b/lib/libpam/modules/pam_radius/pam_radius.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.23 2005/06/13 21:18:52 des Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile
index 866267e63e11..4aa7731cbfeb 100644
--- a/lib/libpam/modules/pam_rhosts/Makefile
+++ b/lib/libpam/modules/pam_rhosts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_rhosts/Makefile,v 1.2 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_rhosts
 SRCS=	pam_rhosts.c
diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.8 b/lib/libpam/modules/pam_rhosts/pam_rhosts.8
index 8adfcc6ed5ae..fa8b80250b9f 100644
--- a/lib/libpam/modules/pam_rhosts/pam_rhosts.8
+++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_rhosts/pam_rhosts.8,v 1.3 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd December 5, 2001
 .Dt PAM_RHOSTS 8
diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.c b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
index 4ba6ade37834..965493f4b164 100644
--- a/lib/libpam/modules/pam_rhosts/pam_rhosts.c
+++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_rhosts/pam_rhosts.c,v 1.3 2003/12/11 13:55:16 des Exp $");
 
 #include <pwd.h>
 #include <stddef.h>
diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile
index 8582daae97c5..12860fef6462 100644
--- a/lib/libpam/modules/pam_rootok/Makefile
+++ b/lib/libpam/modules/pam_rootok/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_rootok/Makefile,v 1.6 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_rootok
 SRCS=	pam_rootok.c
diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.8 b/lib/libpam/modules/pam_rootok/pam_rootok.8
index 4203fbd246b7..ced6cf442ead 100644
--- a/lib/libpam/modules/pam_rootok/pam_rootok.8
+++ b/lib/libpam/modules/pam_rootok/pam_rootok.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_rootok/pam_rootok.8,v 1.4 2001/08/15 20:05:31 markm Exp $
 .\"
 .Dd July 8, 2001
 .Dt PAM_ROOTOK 8
diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.c b/lib/libpam/modules/pam_rootok/pam_rootok.c
index 16fab1f22cc5..1ad149d5daa0 100644
--- a/lib/libpam/modules/pam_rootok/pam_rootok.c
+++ b/lib/libpam/modules/pam_rootok/pam_rootok.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_rootok/pam_rootok.c,v 1.8 2002/04/12 22:27:23 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile
index 8eb3e6e7a6d1..ad0a563337c5 100644
--- a/lib/libpam/modules/pam_securetty/Makefile
+++ b/lib/libpam/modules/pam_securetty/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_securetty/Makefile,v 1.5 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_securetty
 SRCS=	pam_securetty.c
diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.8 b/lib/libpam/modules/pam_securetty/pam_securetty.8
index 5825fb452a7a..66e92a11a6cb 100644
--- a/lib/libpam/modules/pam_securetty/pam_securetty.8
+++ b/lib/libpam/modules/pam_securetty/pam_securetty.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_securetty/pam_securetty.8,v 1.6 2002/03/14 23:27:58 des Exp $
 .\"
 .Dd July 8, 2001
 .Dt PAM_SECURETTY 8
diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.c b/lib/libpam/modules/pam_securetty/pam_securetty.c
index f58274a2ff47..67fd4859204c 100644
--- a/lib/libpam/modules/pam_securetty/pam_securetty.c
+++ b/lib/libpam/modules/pam_securetty/pam_securetty.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_securetty/pam_securetty.c,v 1.13 2004/02/10 10:13:21 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile
index 50718e179846..1aecd82f1808 100644
--- a/lib/libpam/modules/pam_self/Makefile
+++ b/lib/libpam/modules/pam_self/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_self/Makefile,v 1.4 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_self
 SRCS=	pam_self.c
diff --git a/lib/libpam/modules/pam_self/pam_self.8 b/lib/libpam/modules/pam_self/pam_self.8
index d021434770c6..8dd9e14a3a9a 100644
--- a/lib/libpam/modules/pam_self/pam_self.8
+++ b/lib/libpam/modules/pam_self/pam_self.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_self/pam_self.8,v 1.11 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd December 5, 2001
 .Dt PAM_SELF 8
diff --git a/lib/libpam/modules/pam_self/pam_self.c b/lib/libpam/modules/pam_self/pam_self.c
index 63df46c0f984..1ff1e14e1de2 100644
--- a/lib/libpam/modules/pam_self/pam_self.c
+++ b/lib/libpam/modules/pam_self/pam_self.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_self/pam_self.c,v 1.9 2002/04/12 22:27:24 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index c7e4c332d8b4..566383358d9a 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -1,5 +1,5 @@
 # PAM module for SSH
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.20 2005/06/07 09:31:26 des Exp $
 
 SSHSRC=	${.CURDIR}/../../../../crypto/openssh
 
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8
index 07e3176bb66a..2aa98c876898 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.8
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.8,v 1.13.8.1 2005/09/30 14:02:29 des Exp $
 .\"
 .Dd November 26, 2001
 .Dt PAM_SSH 8
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index 11ebfe8d72f9..e16a3839b556 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40.8.1 2005/09/30 14:02:29 des Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile
index 053812ac5178..71573baf09da 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile
+++ b/lib/libpam/modules/pam_tacplus/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_tacplus/Makefile,v 1.8 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_tacplus
 SRCS=	pam_tacplus.c
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.8 b/lib/libpam/modules/pam_tacplus/pam_tacplus.8
index 03faf0cee7de..f1944a0685d5 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.8
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.8
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_tacplus/pam_tacplus.8,v 1.4 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd August 2, 1999
 .Dt PAM_TACPLUS 8
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.c b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
index 7f860c3b370f..c0cdf544f88d 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.c
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_tacplus/pam_tacplus.c,v 1.14 2003/05/31 17:19:03 des Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index fde40feff5f4..a12474066a2e 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.19 2004/11/13 20:40:29 bz Exp $
 
 LIB=	pam_unix
 SRCS=	pam_unix.c
diff --git a/lib/libpam/modules/pam_unix/pam_unix.8 b/lib/libpam/modules/pam_unix/pam_unix.8
index e1ccab6bab80..30524290cb27 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.8
+++ b/lib/libpam/modules/pam_unix/pam_unix.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.11 2005/01/21 10:44:10 ru Exp $
 .\"
 .Dd November 26, 2001
 .Dt PAM_UNIX 8
diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c
index 26084ec0e6f6..83ef914b4a68 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.c
+++ b/lib/libpam/modules/pam_unix/pam_unix.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.51 2005/07/05 18:42:18 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libpanel/Makefile b/lib/libpanel/Makefile
index e715921652ac..ae0e11a2c275 100644
--- a/lib/libpanel/Makefile
+++ b/lib/libpanel/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpanel
-# $FreeBSD$
+# $FreeBSD: src/lib/libpanel/Makefile,v 1.9 2003/06/06 13:46:55 kuriyama Exp $
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index ec4c9fd5ab6c..52067350b016 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpcap
-# $FreeBSD$
+# $FreeBSD: src/lib/libpcap/Makefile,v 1.36 2005/06/03 09:41:26 ume Exp $
 
 LIB=	pcap
 SRCS=	grammar.y tokdefs.h version.h pcap-bpf.c \
diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h
index c88624b8bf8d..2e377568b10d 100644
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libpcap/config.h,v 1.5 2005/05/29 18:12:46 sam Exp $ */
 /* This is an edited copy of the config.h generated by configure. */
 
 /* config.h.  Generated by configure.  */
diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index c2560bdf8042..35829819511b 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpmc/Makefile,v 1.4 2005/06/09 19:45:06 jkoshy Exp $
 
 LIB=	pmc
 
diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c
index 75a33a9f6aa7..a42621ba9fcc 100644
--- a/lib/libpmc/libpmc.c
+++ b/lib/libpmc/libpmc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.8 2005/07/03 16:33:21 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3
index a3925d89c54f..af3cd7028d6c 100644
--- a/lib/libpmc/pmc.3
+++ b/lib/libpmc/pmc.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.5.2.2 2005/07/30 09:12:51 jkoshy Exp $
 .\"
 .Dd June 24, 2005
 .Os
diff --git a/lib/libpmc/pmc.h b/lib/libpmc/pmc.h
index ee3f772551b1..eb1e19d24570 100644
--- a/lib/libpmc/pmc.h
+++ b/lib/libpmc/pmc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpmc/pmc.h,v 1.3 2005/06/09 19:45:06 jkoshy Exp $
  */
 
 #ifndef _PMC_H_
diff --git a/lib/libpmc/pmclog.3 b/lib/libpmc/pmclog.3
index 7cf5f3032e63..ca63bd5033ca 100644
--- a/lib/libpmc/pmclog.3
+++ b/lib/libpmc/pmclog.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpmc/pmclog.3,v 1.2.2.1 2005/07/30 09:11:25 jkoshy Exp $
 .\"
 .Dd June 1, 2005
 .Os
diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c
index e5dd2fc2da16..1b54a19b9741 100644
--- a/lib/libpmc/pmclog.c
+++ b/lib/libpmc/pmclog.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.3 2005/07/09 17:12:30 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/lib/libpmc/pmclog.h b/lib/libpmc/pmclog.h
index bc3c476fe72e..81d2115db2a0 100644
--- a/lib/libpmc/pmclog.h
+++ b/lib/libpmc/pmclog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpmc/pmclog.h,v 1.2 2005/06/30 19:01:26 jkoshy Exp $
  */
 
 #ifndef	_PMCLOG_H_
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index aaa055ff9df6..b93817faa4ba 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.53.2.1 2005/07/22 17:29:07 kensmith Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libpthread/arch/alpha/Makefile.inc b/lib/libpthread/arch/alpha/Makefile.inc
index 7bb3ad93cbff..2bd7bbbd01ab 100644
--- a/lib/libpthread/arch/alpha/Makefile.inc
+++ b/lib/libpthread/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/arch/alpha/Makefile.inc,v 1.2 2003/08/09 05:44:27 deischen Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libpthread/arch/alpha/alpha/context.S b/lib/libpthread/arch/alpha/alpha/context.S
index 6ef42b629c8b..d6c9112760fc 100644
--- a/lib/libpthread/arch/alpha/alpha/context.S
+++ b/lib/libpthread/arch/alpha/alpha/context.S
@@ -52,7 +52,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/alpha/alpha/context.S,v 1.2 2003/10/02 20:51:30 deischen Exp $");
 
 /* #include <machine/frame.h> */
 #define	FRAME_V0		0
diff --git a/lib/libpthread/arch/alpha/alpha/enter_uts.S b/lib/libpthread/arch/alpha/alpha/enter_uts.S
index 6de3bd7dbb88..c498238e0489 100644
--- a/lib/libpthread/arch/alpha/alpha/enter_uts.S
+++ b/lib/libpthread/arch/alpha/alpha/enter_uts.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/alpha/alpha/enter_uts.S,v 1.3 2005/05/31 19:58:23 jhb Exp $");
 
 /*
  * _alpha_enter_uts(struct kse_mailbox *km, kse_func_t uts, void *stack,
diff --git a/lib/libpthread/arch/alpha/alpha/pthread_md.c b/lib/libpthread/arch/alpha/alpha/pthread_md.c
index c8445b177c54..70745558d96c 100644
--- a/lib/libpthread/arch/alpha/alpha/pthread_md.c
+++ b/lib/libpthread/arch/alpha/alpha/pthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/alpha/alpha/pthread_md.c,v 1.2 2004/08/15 16:28:04 dfr Exp $");
 
 #include <stdlib.h>
 #include <strings.h>
diff --git a/lib/libpthread/arch/alpha/include/atomic_ops.h b/lib/libpthread/arch/alpha/include/atomic_ops.h
index 7c3e62bbb50e..f8cfe4fad24e 100644
--- a/lib/libpthread/arch/alpha/include/atomic_ops.h
+++ b/lib/libpthread/arch/alpha/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/alpha/include/atomic_ops.h,v 1.3 2003/09/26 11:59:04 davidxu Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libpthread/arch/alpha/include/pthread_md.h b/lib/libpthread/arch/alpha/include/pthread_md.h
index c7a85f12b31a..8d5c545a5328 100644
--- a/lib/libpthread/arch/alpha/include/pthread_md.h
+++ b/lib/libpthread/arch/alpha/include/pthread_md.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/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.7 2004/08/16 14:07:38 davidxu Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
diff --git a/lib/libpthread/arch/amd64/Makefile.inc b/lib/libpthread/arch/amd64/Makefile.inc
index c8b0362bca85..54a06d540d55 100644
--- a/lib/libpthread/arch/amd64/Makefile.inc
+++ b/lib/libpthread/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/arch/amd64/Makefile.inc,v 1.2 2003/08/05 22:45:59 deischen Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libpthread/arch/amd64/amd64/context.S b/lib/libpthread/arch/amd64/amd64/context.S
index 9e6ed74df710..e75a448b1427 100644
--- a/lib/libpthread/arch/amd64/amd64/context.S
+++ b/lib/libpthread/arch/amd64/amd64/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/context.S,v 1.7 2004/07/31 14:18:26 davidxu Exp $");
 
 /*
  * The following notes ("cheat sheet") was provided by Peter Wemm.
diff --git a/lib/libpthread/arch/amd64/amd64/enter_uts.S b/lib/libpthread/arch/amd64/amd64/enter_uts.S
index fb0df8725785..401243de0b2b 100644
--- a/lib/libpthread/arch/amd64/amd64/enter_uts.S
+++ b/lib/libpthread/arch/amd64/amd64/enter_uts.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.5 2004/07/31 01:53:21 davidxu Exp $");
 
 
 /*
diff --git a/lib/libpthread/arch/amd64/amd64/pthread_md.c b/lib/libpthread/arch/amd64/amd64/pthread_md.c
index 3aceec7c63f5..083f327df9fa 100644
--- a/lib/libpthread/arch/amd64/amd64/pthread_md.c
+++ b/lib/libpthread/arch/amd64/amd64/pthread_md.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/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.4 2004/11/06 03:33:19 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libpthread/arch/amd64/include/atomic_ops.h b/lib/libpthread/arch/amd64/include/atomic_ops.h
index 980eb8e664ca..d784ac09d1ea 100644
--- a/lib/libpthread/arch/amd64/include/atomic_ops.h
+++ b/lib/libpthread/arch/amd64/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/amd64/include/atomic_ops.h,v 1.2 2003/09/03 17:56:25 deischen Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libpthread/arch/amd64/include/pthread_md.h b/lib/libpthread/arch/amd64/include/pthread_md.h
index a7da5dfaf4cf..2372eb5a7035 100644
--- a/lib/libpthread/arch/amd64/include/pthread_md.h
+++ b/lib/libpthread/arch/amd64/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.10 2004/08/25 23:42:40 davidxu Exp $
  */
 /*
  * Machine-dependent thread prototypes/definitions for the thread kernel.
diff --git a/lib/libpthread/arch/arm/Makefile.inc b/lib/libpthread/arch/arm/Makefile.inc
index ced7063106e1..c43745e2db13 100644
--- a/lib/libpthread/arch/arm/Makefile.inc
+++ b/lib/libpthread/arch/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/arch/arm/Makefile.inc,v 1.2 2005/02/26 19:06:49 cognet Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libpthread/arch/arm/arm/context.S b/lib/libpthread/arch/arm/arm/context.S
index c63880458bd4..2e036d7d6fc8 100644
--- a/lib/libpthread/arch/arm/arm/context.S
+++ b/lib/libpthread/arch/arm/arm/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/arm/arm/context.S,v 1.3 2005/02/26 19:06:49 cognet Exp $");
 
 /*
  * int thr_setcontext(mcontext_t *mcp, intptr_t val, intptr_t *loc)
diff --git a/lib/libpthread/arch/arm/arm/pthread_md.c b/lib/libpthread/arch/arm/arm/pthread_md.c
index 72426d467985..19f6941a384c 100644
--- a/lib/libpthread/arch/arm/arm/pthread_md.c
+++ b/lib/libpthread/arch/arm/arm/pthread_md.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/arm/arm/pthread_md.c,v 1.4 2005/02/26 19:06:49 cognet Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libpthread/arch/arm/include/atomic_ops.h b/lib/libpthread/arch/arm/include/atomic_ops.h
index 3a209b3faf17..96cab13460e6 100644
--- a/lib/libpthread/arch/arm/include/atomic_ops.h
+++ b/lib/libpthread/arch/arm/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/arm/include/atomic_ops.h,v 1.3 2005/04/07 22:05:33 cognet Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libpthread/arch/arm/include/pthread_md.h b/lib/libpthread/arch/arm/include/pthread_md.h
index 857fa1b1c8b4..fdaa8bef4b92 100644
--- a/lib/libpthread/arch/arm/include/pthread_md.h
+++ b/lib/libpthread/arch/arm/include/pthread_md.h
@@ -24,7 +24,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/lib/libpthread/arch/arm/include/pthread_md.h,v 1.8 2005/02/26 19:06:49 cognet Exp $
  */
 
 /*
diff --git a/lib/libpthread/arch/i386/Makefile.inc b/lib/libpthread/arch/i386/Makefile.inc
index 73a9a8acde45..3107b574e6ee 100644
--- a/lib/libpthread/arch/i386/Makefile.inc
+++ b/lib/libpthread/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/arch/i386/Makefile.inc,v 1.3 2003/08/05 22:45:59 deischen Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libpthread/arch/i386/i386/pthread_md.c b/lib/libpthread/arch/i386/i386/pthread_md.c
index 5c85fe0fcd14..8cfbd5d100ab 100644
--- a/lib/libpthread/arch/i386/i386/pthread_md.c
+++ b/lib/libpthread/arch/i386/i386/pthread_md.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/pthread_md.c,v 1.7 2005/06/29 23:15:36 peter Exp $");
 
 #include <sys/types.h>
 #include <machine/cpufunc.h>
diff --git a/lib/libpthread/arch/i386/i386/thr_enter_uts.S b/lib/libpthread/arch/i386/i386/thr_enter_uts.S
index bf6df8f5c60b..247341cf22a8 100644
--- a/lib/libpthread/arch/i386/i386/thr_enter_uts.S
+++ b/lib/libpthread/arch/i386/i386/thr_enter_uts.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/thr_enter_uts.S,v 1.6 2003/11/29 14:25:43 davidxu Exp $");
 
 
 /*
diff --git a/lib/libpthread/arch/i386/i386/thr_getcontext.S b/lib/libpthread/arch/i386/i386/thr_getcontext.S
index c3d6a78693af..92a7c59ed7c4 100644
--- a/lib/libpthread/arch/i386/i386/thr_getcontext.S
+++ b/lib/libpthread/arch/i386/i386/thr_getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/thr_getcontext.S,v 1.5 2003/09/22 14:34:02 davidxu Exp $");
 
 /*
  * Where do we define these?
diff --git a/lib/libpthread/arch/i386/include/atomic_ops.h b/lib/libpthread/arch/i386/include/atomic_ops.h
index 7bc3d1b71a05..33f759ee798b 100644
--- a/lib/libpthread/arch/i386/include/atomic_ops.h
+++ b/lib/libpthread/arch/i386/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/i386/include/atomic_ops.h,v 1.3 2003/09/03 17:56:26 deischen Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libpthread/arch/i386/include/pthread_md.h b/lib/libpthread/arch/i386/include/pthread_md.h
index 52afd6a5515d..1193287b1e95 100644
--- a/lib/libpthread/arch/i386/include/pthread_md.h
+++ b/lib/libpthread/arch/i386/include/pthread_md.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.16 2005/06/29 23:15:36 peter Exp $
  */
 /*
  * Machine-dependent thread prototypes/definitions for the thread kernel.
diff --git a/lib/libpthread/arch/ia64/Makefile.inc b/lib/libpthread/arch/ia64/Makefile.inc
index c8b0362bca85..3e4f8151d455 100644
--- a/lib/libpthread/arch/ia64/Makefile.inc
+++ b/lib/libpthread/arch/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.4 2003/08/05 22:46:00 deischen Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libpthread/arch/ia64/ia64/context.S b/lib/libpthread/arch/ia64/ia64/context.S
index 9411293ec7b8..0bb7f36566eb 100644
--- a/lib/libpthread/arch/ia64/ia64/context.S
+++ b/lib/libpthread/arch/ia64/ia64/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/ia64/ia64/context.S,v 1.5 2003/09/19 22:54:05 marcel Exp $");
 
 #include <sys/syscall.h>
 
diff --git a/lib/libpthread/arch/ia64/ia64/enter_uts.S b/lib/libpthread/arch/ia64/ia64/enter_uts.S
index 5df4d939272c..28c6a89b9623 100644
--- a/lib/libpthread/arch/ia64/ia64/enter_uts.S
+++ b/lib/libpthread/arch/ia64/ia64/enter_uts.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/ia64/ia64/enter_uts.S,v 1.1 2003/06/26 05:40:15 marcel Exp $");
 
 /*
  * void _ia64_enter_uts(kse_func_t uts, struct kse_mailbox *km, void *stack,
diff --git a/lib/libpthread/arch/ia64/ia64/pthread_md.c b/lib/libpthread/arch/ia64/ia64/pthread_md.c
index 00e9a40fe5df..dd55f01df839 100644
--- a/lib/libpthread/arch/ia64/ia64/pthread_md.c
+++ b/lib/libpthread/arch/ia64/ia64/pthread_md.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/lib/libpthread/arch/ia64/ia64/pthread_md.c,v 1.3 2004/08/15 16:28:05 dfr Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libpthread/arch/ia64/include/atomic_ops.h b/lib/libpthread/arch/ia64/include/atomic_ops.h
index 483c9050634d..1a3e7dc5ae67 100644
--- a/lib/libpthread/arch/ia64/include/atomic_ops.h
+++ b/lib/libpthread/arch/ia64/include/atomic_ops.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/lib/libpthread/arch/ia64/include/atomic_ops.h,v 1.1 2003/06/23 04:44:43 marcel Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libpthread/arch/ia64/include/pthread_md.h b/lib/libpthread/arch/ia64/include/pthread_md.h
index 1df5046287f2..c3115f505b67 100644
--- a/lib/libpthread/arch/ia64/include/pthread_md.h
+++ b/lib/libpthread/arch/ia64/include/pthread_md.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/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.16 2004/08/16 14:07:38 davidxu Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
diff --git a/lib/libpthread/arch/powerpc/Makefile.inc b/lib/libpthread/arch/powerpc/Makefile.inc
index f4417a6ceb87..60b3ccbf8006 100644
--- a/lib/libpthread/arch/powerpc/Makefile.inc
+++ b/lib/libpthread/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/arch/powerpc/Makefile.inc,v 1.1 2004/07/19 12:19:04 grehan Exp $
 
 # XXX temporary
 CFLAGS+=-DSYSTEM_SCOPE_ONLY
diff --git a/lib/libpthread/arch/powerpc/include/atomic_ops.h b/lib/libpthread/arch/powerpc/include/atomic_ops.h
index 8068e6f030a3..38f297bd2cc9 100644
--- a/lib/libpthread/arch/powerpc/include/atomic_ops.h
+++ b/lib/libpthread/arch/powerpc/include/atomic_ops.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/powerpc/include/atomic_ops.h,v 1.1 2004/07/19 12:19:04 grehan Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libpthread/arch/powerpc/include/pthread_md.h b/lib/libpthread/arch/powerpc/include/pthread_md.h
index 33a58b55af99..808d690cecdc 100644
--- a/lib/libpthread/arch/powerpc/include/pthread_md.h
+++ b/lib/libpthread/arch/powerpc/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/powerpc/include/pthread_md.h,v 1.3 2004/08/16 05:41:38 grehan Exp $
  */
 
 /*
diff --git a/lib/libpthread/arch/powerpc/powerpc/assym.c b/lib/libpthread/arch/powerpc/powerpc/assym.c
index a8479e774585..d8d33ac4c597 100644
--- a/lib/libpthread/arch/powerpc/powerpc/assym.c
+++ b/lib/libpthread/arch/powerpc/powerpc/assym.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/powerpc/powerpc/assym.c,v 1.1 2004/07/19 12:19:04 grehan Exp $
  */
 
 /* Used to generate mcontext_t offsets */
diff --git a/lib/libpthread/arch/powerpc/powerpc/assym.s b/lib/libpthread/arch/powerpc/powerpc/assym.s
index 7017c15153d5..31923fb40d4b 100644
--- a/lib/libpthread/arch/powerpc/powerpc/assym.s
+++ b/lib/libpthread/arch/powerpc/powerpc/assym.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/powerpc/powerpc/assym.s,v 1.1 2004/07/19 12:19:04 grehan Exp $
  */
 
 /*
diff --git a/lib/libpthread/arch/powerpc/powerpc/context.S b/lib/libpthread/arch/powerpc/powerpc/context.S
index 34d175ac6960..1a54577fc484 100644
--- a/lib/libpthread/arch/powerpc/powerpc/context.S
+++ b/lib/libpthread/arch/powerpc/powerpc/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/powerpc/powerpc/context.S,v 1.1 2004/07/19 12:19:04 grehan Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libpthread/arch/powerpc/powerpc/enter_uts.S b/lib/libpthread/arch/powerpc/powerpc/enter_uts.S
index 7cc4d7ff3df4..45a624ad269f 100644
--- a/lib/libpthread/arch/powerpc/powerpc/enter_uts.S
+++ b/lib/libpthread/arch/powerpc/powerpc/enter_uts.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/powerpc/powerpc/enter_uts.S,v 1.1 2004/07/19 12:19:04 grehan Exp $");
 
 /*
  * _ppc32_enter_uts(struct kse_mailbox *km, kse_func_t uts, void *stack,
diff --git a/lib/libpthread/arch/powerpc/powerpc/pthread_md.c b/lib/libpthread/arch/powerpc/powerpc/pthread_md.c
index c8445b177c54..1edcc2e49832 100644
--- a/lib/libpthread/arch/powerpc/powerpc/pthread_md.c
+++ b/lib/libpthread/arch/powerpc/powerpc/pthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c,v 1.2 2004/08/16 05:41:39 grehan Exp $");
 
 #include <stdlib.h>
 #include <strings.h>
diff --git a/lib/libpthread/arch/sparc64/Makefile.inc b/lib/libpthread/arch/sparc64/Makefile.inc
index 07107b4729af..0d3d53e0e9b8 100644
--- a/lib/libpthread/arch/sparc64/Makefile.inc
+++ b/lib/libpthread/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/arch/sparc64/Makefile.inc,v 1.1 2003/10/09 02:32:28 deischen Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libpthread/arch/sparc64/include/atomic_ops.h b/lib/libpthread/arch/sparc64/include/atomic_ops.h
index 4f4d8af28c82..24085da710b3 100644
--- a/lib/libpthread/arch/sparc64/include/atomic_ops.h
+++ b/lib/libpthread/arch/sparc64/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/sparc64/include/atomic_ops.h,v 1.1 2003/10/09 02:32:28 deischen Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libpthread/arch/sparc64/include/pthread_md.h b/lib/libpthread/arch/sparc64/include/pthread_md.h
index fac62c2bf1c4..49e53014f810 100644
--- a/lib/libpthread/arch/sparc64/include/pthread_md.h
+++ b/lib/libpthread/arch/sparc64/include/pthread_md.h
@@ -24,7 +24,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/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.5 2004/08/16 14:07:38 davidxu Exp $
  */
 
 /*
diff --git a/lib/libpthread/arch/sparc64/sparc64/assym.s b/lib/libpthread/arch/sparc64/sparc64/assym.s
index 3e22c9f6e134..3a902ec1fb38 100644
--- a/lib/libpthread/arch/sparc64/sparc64/assym.s
+++ b/lib/libpthread/arch/sparc64/sparc64/assym.s
@@ -2,7 +2,7 @@
  * Offsets into structures used from asm.  Must be kept in sync with
  * appropriate headers.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/arch/sparc64/sparc64/assym.s,v 1.2 2003/10/09 14:48:09 deischen Exp $
  */
 
 #define	UC_MCONTEXT	0x40
diff --git a/lib/libpthread/arch/sparc64/sparc64/pthread_md.c b/lib/libpthread/arch/sparc64/sparc64/pthread_md.c
index d6bf95d00d6d..a163c2abdf0a 100644
--- a/lib/libpthread/arch/sparc64/sparc64/pthread_md.c
+++ b/lib/libpthread/arch/sparc64/sparc64/pthread_md.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/sparc64/sparc64/pthread_md.c,v 1.3 2004/08/15 16:28:05 dfr Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S b/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S
index ca6473ab18ea..c76051a4e953 100644
--- a/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S
+++ b/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S,v 1.3 2003/10/09 20:52:17 deischen Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libpthread/pthread.map b/lib/libpthread/pthread.map
index 2c8f15427bb8..d1a3c2677fed 100644
--- a/lib/libpthread/pthread.map
+++ b/lib/libpthread/pthread.map
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/pthread.map,v 1.14.2.1 2005/10/08 17:58:11 delphij Exp $
 LIBTHREAD_1_0 {
 global:
 	___creat;
diff --git a/lib/libpthread/support/Makefile.inc b/lib/libpthread/support/Makefile.inc
index 956667fdef7d..5c3f1cb7ec0b 100644
--- a/lib/libpthread/support/Makefile.inc
+++ b/lib/libpthread/support/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.8 2005/03/21 23:10:35 davidxu Exp $
 
 .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
diff --git a/lib/libpthread/support/thr_support.c b/lib/libpthread/support/thr_support.c
index 2956e07a5d6b..28028ef6afdb 100644
--- a/lib/libpthread/support/thr_support.c
+++ b/lib/libpthread/support/thr_support.c
@@ -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/lib/libpthread/support/thr_support.c,v 1.4 2005/03/21 23:10:35 davidxu Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc
index fb4a10885695..447e62b1e44b 100644
--- a/lib/libpthread/sys/Makefile.inc
+++ b/lib/libpthread/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/sys/Makefile.inc,v 1.15 2003/06/23 04:28:31 marcel Exp $
 
 .PATH:	 ${.CURDIR}/sys
 
diff --git a/lib/libpthread/sys/lock.c b/lib/libpthread/sys/lock.c
index 2ac8c0c09370..bdb31e4e285f 100644
--- a/lib/libpthread/sys/lock.c
+++ b/lib/libpthread/sys/lock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/sys/lock.c,v 1.9.2.1 2005/08/05 19:43:56 jhb Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libpthread/sys/lock.h b/lib/libpthread/sys/lock.h
index 6102a0b7d60f..feb6bb417d13 100644
--- a/lib/libpthread/sys/lock.h
+++ b/lib/libpthread/sys/lock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/sys/lock.h,v 1.7 2003/11/04 20:01:38 deischen Exp $
  */
 
 #ifndef _LOCK_H_
diff --git a/lib/libpthread/sys/thr_error.c b/lib/libpthread/sys/thr_error.c
index 72e192726b7d..6f3ae6920a3a 100644
--- a/lib/libpthread/sys/thr_error.c
+++ b/lib/libpthread/sys/thr_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/sys/thr_error.c,v 1.8 2004/12/18 18:07:37 deischen Exp $
  */
 #include <pthread.h>
 #include "libc_private.h"
diff --git a/lib/libpthread/test/Makefile b/lib/libpthread/test/Makefile
index 5b5eb3c79a36..32225c6390fe 100644
--- a/lib/libpthread/test/Makefile
+++ b/lib/libpthread/test/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/test/Makefile,v 1.13 2004/02/05 02:55:20 davidxu Exp $
 #
 # Automated test suite for libpthread (pthreads).
 #
diff --git a/lib/libpthread/test/README b/lib/libpthread/test/README
index 8f625a1438e7..fcfe0cf57904 100644
--- a/lib/libpthread/test/README
+++ b/lib/libpthread/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libpthread/test/README,v 1.2 2002/09/16 19:29:34 mini Exp $
 
 This test suite is meant to test general functionality of pthreads, as well as
 provide a simple framework for regression tests.  In general, this test suite
diff --git a/lib/libpthread/test/guard_b.c b/lib/libpthread/test/guard_b.c
index 42bf4edd3bbb..e90a946b4184 100644
--- a/lib/libpthread/test/guard_b.c
+++ b/lib/libpthread/test/guard_b.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/test/guard_b.c,v 1.2 2002/04/22 13:44:24 des Exp $
  *
  * Test thread stack guard functionality.
  */
diff --git a/lib/libpthread/test/guard_s.pl b/lib/libpthread/test/guard_s.pl
index 7802ff3c38d6..f9b92caa7d9f 100755
--- a/lib/libpthread/test/guard_s.pl
+++ b/lib/libpthread/test/guard_s.pl
@@ -27,7 +27,7 @@
 # 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/lib/libpthread/test/guard_s.pl,v 1.1 2001/07/20 04:23:10 jasone Exp $
 #
 # Test thread stack guard functionality.  The C test program needs to be driven
 # by this script because it segfaults when the stack guard is hit.
diff --git a/lib/libpthread/test/hello_b.c b/lib/libpthread/test/hello_b.c
index 2eefa7f48bfe..a0458df1810e 100644
--- a/lib/libpthread/test/hello_b.c
+++ b/lib/libpthread/test/hello_b.c
@@ -2,7 +2,7 @@
  *
  * Back end C programs can be anything compilable.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/test/hello_b.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libpthread/test/hello_d.c b/lib/libpthread/test/hello_d.c
index 6d77526f16c7..7fc80057c1fe 100644
--- a/lib/libpthread/test/hello_d.c
+++ b/lib/libpthread/test/hello_d.c
@@ -2,7 +2,7 @@
  *
  * Simple diff mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/test/hello_d.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libpthread/test/hello_s.c b/lib/libpthread/test/hello_s.c
index 942bf2dae0ae..bbcef450a379 100644
--- a/lib/libpthread/test/hello_s.c
+++ b/lib/libpthread/test/hello_s.c
@@ -2,7 +2,7 @@
  *
  * Simple sequence mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/test/hello_s.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libpthread/test/join_leak_d.c b/lib/libpthread/test/join_leak_d.c
index 6532ca5bfc74..bbd73ca4a13c 100644
--- a/lib/libpthread/test/join_leak_d.c
+++ b/lib/libpthread/test/join_leak_d.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/test/join_leak_d.c,v 1.1 2001/05/20 23:12:13 jasone Exp $
  *
  * Test for leaked joined threads.
  */
diff --git a/lib/libpthread/test/mutex_d.c b/lib/libpthread/test/mutex_d.c
index 801d7791e2dd..babf5d720cc2 100644
--- a/lib/libpthread/test/mutex_d.c
+++ b/lib/libpthread/test/mutex_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/test/mutex_d.c,v 1.4 2003/10/20 04:23:49 deischen Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libpthread/test/propagate_s.pl b/lib/libpthread/test/propagate_s.pl
index 6b8509043d98..5d4d4edcbfab 100755
--- a/lib/libpthread/test/propagate_s.pl
+++ b/lib/libpthread/test/propagate_s.pl
@@ -31,7 +31,7 @@
 #
 # Verify that no cancellation points are propagated inside of libpthread.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/test/propagate_s.pl,v 1.2 2002/09/16 19:29:34 mini Exp $
 #
 
 @CPOINTS = ("aio_suspend", "close", "creat", "fcntl", "fsync", "mq_receive",
diff --git a/lib/libpthread/test/sem_d.c b/lib/libpthread/test/sem_d.c
index b834591852d9..85b9c7378c4f 100644
--- a/lib/libpthread/test/sem_d.c
+++ b/lib/libpthread/test/sem_d.c
@@ -31,7 +31,7 @@
  *
  * sem test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/test/sem_d.c,v 1.2 2001/05/20 23:11:09 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libpthread/test/sigsuspend_d.c b/lib/libpthread/test/sigsuspend_d.c
index aa80a073e4e1..1b3aa4657d18 100644
--- a/lib/libpthread/test/sigsuspend_d.c
+++ b/lib/libpthread/test/sigsuspend_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/test/sigsuspend_d.c,v 1.2 2003/07/17 23:02:29 davidxu Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libpthread/test/sigwait_d.c b/lib/libpthread/test/sigwait_d.c
index f3ccd6b98491..5a4a351aabd7 100644
--- a/lib/libpthread/test/sigwait_d.c
+++ b/lib/libpthread/test/sigwait_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/test/sigwait_d.c,v 1.2 2001/05/20 23:10:30 jasone Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libpthread/test/verify b/lib/libpthread/test/verify
index 2863e5c3fa0c..e8a9ee689779 100755
--- a/lib/libpthread/test/verify
+++ b/lib/libpthread/test/verify
@@ -33,7 +33,7 @@
 #
 # Test harness.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/test/verify,v 1.2 2001/05/20 23:11:54 jasone Exp $
 #
 #############################################################################
 
diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc
index 3ba361e884df..46ca216b1e77 100644
--- a/lib/libpthread/thread/Makefile.inc
+++ b/lib/libpthread/thread/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpthread/thread/Makefile.inc,v 1.49 2004/09/26 06:50:15 deischen Exp $
 
 # thr sources
 .PATH: ${.CURDIR}/thread
diff --git a/lib/libpthread/thread/thr_accept.c b/lib/libpthread/thread/thr_accept.c
index 0131bc8eb97c..4a05d39151f6 100644
--- a/lib/libpthread/thread/thr_accept.c
+++ b/lib/libpthread/thread/thr_accept.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_accept.c,v 1.2 2003/12/09 23:40:27 deischen Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libpthread/thread/thr_aio_suspend.c b/lib/libpthread/thread/thr_aio_suspend.c
index 5b8a6dcaa421..12c08280d787 100644
--- a/lib/libpthread/thread/thr_aio_suspend.c
+++ b/lib/libpthread/thread/thr_aio_suspend.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_aio_suspend.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <aio.h>
diff --git a/lib/libpthread/thread/thr_atfork.c b/lib/libpthread/thread/thr_atfork.c
index 0487a366c1af..f49895916693 100644
--- a/lib/libpthread/thread/thr_atfork.c
+++ b/lib/libpthread/thread/thr_atfork.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_atfork.c,v 1.1 2003/11/05 03:42:10 davidxu Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_attr_destroy.c b/lib/libpthread/thread/thr_attr_destroy.c
index e239a1dc5c41..de1b9a8954e3 100644
--- a/lib/libpthread/thread/thr_attr_destroy.c
+++ b/lib/libpthread/thread/thr_attr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_destroy.c,v 1.7 2002/09/16 08:45:33 mini Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_attr_get_np.c b/lib/libpthread/thread/thr_attr_get_np.c
index e844acbd7a00..67d26a87fbf0 100644
--- a/lib/libpthread/thread/thr_attr_get_np.c
+++ b/lib/libpthread/thread/thr_attr_get_np.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_get_np.c,v 1.4 2003/07/07 04:28:23 davidxu Exp $
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libpthread/thread/thr_attr_getdetachstate.c b/lib/libpthread/thread/thr_attr_getdetachstate.c
index d994548de061..d0376bb4fb22 100644
--- a/lib/libpthread/thread/thr_attr_getdetachstate.c
+++ b/lib/libpthread/thread/thr_attr_getdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getdetachstate.c,v 1.7 2002/09/16 08:45:33 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_getguardsize.c b/lib/libpthread/thread/thr_attr_getguardsize.c
index b32015ad0a15..172bc1c000c1 100644
--- a/lib/libpthread/thread/thr_attr_getguardsize.c
+++ b/lib/libpthread/thread/thr_attr_getguardsize.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_attr_getguardsize.c,v 1.2 2002/09/16 08:45:33 mini Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_attr_getinheritsched.c b/lib/libpthread/thread/thr_attr_getinheritsched.c
index 26ae9e483113..8210c0674575 100644
--- a/lib/libpthread/thread/thr_attr_getinheritsched.c
+++ b/lib/libpthread/thread/thr_attr_getinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getinheritsched.c,v 1.7 2002/09/16 08:45:33 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_getschedparam.c b/lib/libpthread/thread/thr_attr_getschedparam.c
index 79911f4ad4ba..3b6545935ebb 100644
--- a/lib/libpthread/thread/thr_attr_getschedparam.c
+++ b/lib/libpthread/thread/thr_attr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getschedparam.c,v 1.7 2002/09/16 08:45:33 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_getschedpolicy.c b/lib/libpthread/thread/thr_attr_getschedpolicy.c
index 1234b7d06849..56e4913d0aff 100644
--- a/lib/libpthread/thread/thr_attr_getschedpolicy.c
+++ b/lib/libpthread/thread/thr_attr_getschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getschedpolicy.c,v 1.7 2002/09/16 08:45:33 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_getscope.c b/lib/libpthread/thread/thr_attr_getscope.c
index fefe6cf8ee43..92095f61eca4 100644
--- a/lib/libpthread/thread/thr_attr_getscope.c
+++ b/lib/libpthread/thread/thr_attr_getscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getscope.c,v 1.7 2002/09/16 08:45:33 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_getstack.c b/lib/libpthread/thread/thr_attr_getstack.c
index 8c0f87fbe07d..e9710db3da13 100644
--- a/lib/libpthread/thread/thr_attr_getstack.c
+++ b/lib/libpthread/thread/thr_attr_getstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_getstackaddr.c b/lib/libpthread/thread/thr_attr_getstackaddr.c
index d0822489de32..27bf56a66eb1 100644
--- a/lib/libpthread/thread/thr_attr_getstackaddr.c
+++ b/lib/libpthread/thread/thr_attr_getstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getstackaddr.c,v 1.7 2002/09/16 08:45:34 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_getstacksize.c b/lib/libpthread/thread/thr_attr_getstacksize.c
index ec1a9beeeb7e..681ac23344bb 100644
--- a/lib/libpthread/thread/thr_attr_getstacksize.c
+++ b/lib/libpthread/thread/thr_attr_getstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_getstacksize.c,v 1.7 2002/09/16 08:45:34 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_init.c b/lib/libpthread/thread/thr_attr_init.c
index 604a1aa4840b..2fb6d985067e 100644
--- a/lib/libpthread/thread/thr_attr_init.c
+++ b/lib/libpthread/thread/thr_attr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_init.c,v 1.10 2005/02/13 18:38:06 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c b/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c
index d844d6297106..d1f136c59617 100644
--- a/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c
+++ b/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c,v 1.8 2003/09/25 13:53:49 davidxu Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setdetachstate.c b/lib/libpthread/thread/thr_attr_setdetachstate.c
index 4d517f238225..b925247a4e2f 100644
--- a/lib/libpthread/thread/thr_attr_setdetachstate.c
+++ b/lib/libpthread/thread/thr_attr_setdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setdetachstate.c,v 1.7 2002/09/16 08:45:34 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setguardsize.c b/lib/libpthread/thread/thr_attr_setguardsize.c
index d56b2541f6d7..399b7a1cbff2 100644
--- a/lib/libpthread/thread/thr_attr_setguardsize.c
+++ b/lib/libpthread/thread/thr_attr_setguardsize.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_attr_setguardsize.c,v 1.6 2003/09/14 22:39:44 davidxu Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libpthread/thread/thr_attr_setinheritsched.c b/lib/libpthread/thread/thr_attr_setinheritsched.c
index e91b214bff72..5e08c8a0b5e6 100644
--- a/lib/libpthread/thread/thr_attr_setinheritsched.c
+++ b/lib/libpthread/thread/thr_attr_setinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setinheritsched.c,v 1.7 2003/09/14 22:28:13 davidxu Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setschedparam.c b/lib/libpthread/thread/thr_attr_setschedparam.c
index bbb4b1ec37d2..929e5793ca7d 100644
--- a/lib/libpthread/thread/thr_attr_setschedparam.c
+++ b/lib/libpthread/thread/thr_attr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setschedparam.c,v 1.10 2003/04/18 05:04:15 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setschedpolicy.c b/lib/libpthread/thread/thr_attr_setschedpolicy.c
index ddb092157826..e3cc902ec43e 100644
--- a/lib/libpthread/thread/thr_attr_setschedpolicy.c
+++ b/lib/libpthread/thread/thr_attr_setschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setschedpolicy.c,v 1.7 2002/09/16 08:45:34 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setscope.c b/lib/libpthread/thread/thr_attr_setscope.c
index dcf179e290e4..fb6a27e4e124 100644
--- a/lib/libpthread/thread/thr_attr_setscope.c
+++ b/lib/libpthread/thread/thr_attr_setscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setscope.c,v 1.10 2003/09/14 22:32:28 davidxu Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setstack.c b/lib/libpthread/thread/thr_attr_setstack.c
index feeb7132fed1..10f8ad126976 100644
--- a/lib/libpthread/thread/thr_attr_setstack.c
+++ b/lib/libpthread/thread/thr_attr_setstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setstackaddr.c b/lib/libpthread/thread/thr_attr_setstackaddr.c
index 87837f13388d..ada9b4d8a422 100644
--- a/lib/libpthread/thread/thr_attr_setstackaddr.c
+++ b/lib/libpthread/thread/thr_attr_setstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setstackaddr.c,v 1.7 2002/09/16 08:45:34 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_attr_setstacksize.c b/lib/libpthread/thread/thr_attr_setstacksize.c
index e26ab7df948e..2bc2d9b692c6 100644
--- a/lib/libpthread/thread/thr_attr_setstacksize.c
+++ b/lib/libpthread/thread/thr_attr_setstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_attr_setstacksize.c,v 1.8 2002/09/16 08:45:34 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_autoinit.c b/lib/libpthread/thread/thr_autoinit.c
index 95b2a853ca58..c5af0bdcae66 100644
--- a/lib/libpthread/thread/thr_autoinit.c
+++ b/lib/libpthread/thread/thr_autoinit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_autoinit.c,v 1.2 2003/04/18 05:04:15 deischen Exp $
  */
 
 /*
diff --git a/lib/libpthread/thread/thr_barrier.c b/lib/libpthread/thread/thr_barrier.c
index 612acb1c57d8..5028c88d0762 100644
--- a/lib/libpthread/thread/thr_barrier.c
+++ b/lib/libpthread/thread/thr_barrier.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_barrier.c,v 1.1 2003/09/04 14:06:43 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_barrierattr.c b/lib/libpthread/thread/thr_barrierattr.c
index f71c0ddf0551..f7c6790162eb 100644
--- a/lib/libpthread/thread/thr_barrierattr.c
+++ b/lib/libpthread/thread/thr_barrierattr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_barrierattr.c,v 1.1 2003/09/04 14:06:43 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_cancel.c b/lib/libpthread/thread/thr_cancel.c
index a6a32b8f7dc8..f7c8c1b349eb 100644
--- a/lib/libpthread/thread/thr_cancel.c
+++ b/lib/libpthread/thread/thr_cancel.c
@@ -1,6 +1,6 @@
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.32 2004/12/18 18:07:37 deischen Exp $
  */
 #include <sys/errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_clean.c b/lib/libpthread/thread/thr_clean.c
index 1da8a6b592db..924c09e3d1d4 100644
--- a/lib/libpthread/thread/thr_clean.c
+++ b/lib/libpthread/thread/thr_clean.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_clean.c,v 1.9 2004/12/18 18:07:37 deischen Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_close.c b/lib/libpthread/thread/thr_close.c
index 263d4a63aaaa..2a2f5658d3b5 100644
--- a/lib/libpthread/thread/thr_close.c
+++ b/lib/libpthread/thread/thr_close.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_close.c,v 1.17 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_concurrency.c b/lib/libpthread/thread/thr_concurrency.c
index daea56c1d217..d45983a920e6 100644
--- a/lib/libpthread/thread/thr_concurrency.c
+++ b/lib/libpthread/thread/thr_concurrency.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.9 2004/12/18 18:07:37 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c
index cd719d424140..45cb1f4914b7 100644
--- a/lib/libpthread/thread/thr_cond.c
+++ b/lib/libpthread/thread/thr_cond.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.52 2004/12/18 18:07:37 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_condattr_destroy.c b/lib/libpthread/thread/thr_condattr_destroy.c
index e0ade00883ee..37417174a1b6 100644
--- a/lib/libpthread/thread/thr_condattr_destroy.c
+++ b/lib/libpthread/thread/thr_condattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_condattr_destroy.c,v 1.7 2002/09/16 08:45:34 mini Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_condattr_init.c b/lib/libpthread/thread/thr_condattr_init.c
index 7cf4c9eac92b..2b59f155fe33 100644
--- a/lib/libpthread/thread/thr_condattr_init.c
+++ b/lib/libpthread/thread/thr_condattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_condattr_init.c,v 1.8 2003/04/18 05:04:15 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_connect.c b/lib/libpthread/thread/thr_connect.c
index 2d5614b5ef51..74c171229790 100644
--- a/lib/libpthread/thread/thr_connect.c
+++ b/lib/libpthread/thread/thr_connect.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_connect.c,v 1.2 2003/12/09 23:40:27 deischen Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libpthread/thread/thr_creat.c b/lib/libpthread/thread/thr_creat.c
index d2a91bfcdd2a..80e3502c71c2 100644
--- a/lib/libpthread/thread/thr_creat.c
+++ b/lib/libpthread/thread/thr_creat.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_creat.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <fcntl.h>
diff --git a/lib/libpthread/thread/thr_create.c b/lib/libpthread/thread/thr_create.c
index 08b2c47d29bf..cb813b3c9cab 100644
--- a/lib/libpthread/thread/thr_create.c
+++ b/lib/libpthread/thread/thr_create.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.59 2004/12/18 18:07:37 deischen Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_detach.c b/lib/libpthread/thread/thr_detach.c
index 0159e531758c..76778f2518e4 100644
--- a/lib/libpthread/thread/thr_detach.c
+++ b/lib/libpthread/thread/thr_detach.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_detach.c,v 1.23 2003/07/23 02:11:07 deischen Exp $
  */
 #include <sys/types.h>
 #include <machine/atomic.h>
diff --git a/lib/libpthread/thread/thr_equal.c b/lib/libpthread/thread/thr_equal.c
index f8882f5f073b..e2178c26d376 100644
--- a/lib/libpthread/thread/thr_equal.c
+++ b/lib/libpthread/thread/thr_equal.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_equal.c,v 1.6 2002/09/16 08:45:34 mini Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libpthread/thread/thr_execve.c b/lib/libpthread/thread/thr_execve.c
index ab1a9e9852ff..80da0c8022c3 100644
--- a/lib/libpthread/thread/thr_execve.c
+++ b/lib/libpthread/thread/thr_execve.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_execve.c,v 1.3 2004/10/07 14:23:15 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_exit.c b/lib/libpthread/thread/thr_exit.c
index 456b81da2088..71488ac3ffa0 100644
--- a/lib/libpthread/thread/thr_exit.c
+++ b/lib/libpthread/thread/thr_exit.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.39 2004/10/23 23:37:54 davidxu Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libpthread/thread/thr_fcntl.c b/lib/libpthread/thread/thr_fcntl.c
index 947bc1159d64..093f23701a25 100644
--- a/lib/libpthread/thread/thr_fcntl.c
+++ b/lib/libpthread/thread/thr_fcntl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_fcntl.c,v 1.19 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <stdarg.h>
 #include "namespace.h"
diff --git a/lib/libpthread/thread/thr_find_thread.c b/lib/libpthread/thread/thr_find_thread.c
index 5a646406c5f3..d9aa2d723625 100644
--- a/lib/libpthread/thread/thr_find_thread.c
+++ b/lib/libpthread/thread/thr_find_thread.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_find_thread.c,v 1.14 2004/10/23 23:28:36 davidxu Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_fork.c b/lib/libpthread/thread/thr_fork.c
index fdbfd86855f4..c6ad801ad38e 100644
--- a/lib/libpthread/thread/thr_fork.c
+++ b/lib/libpthread/thread/thr_fork.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_fork.c,v 1.35 2004/12/18 18:07:37 deischen Exp $
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libpthread/thread/thr_fsync.c b/lib/libpthread/thread/thr_fsync.c
index 15fe31a51c5a..9452ebc7023e 100644
--- a/lib/libpthread/thread/thr_fsync.c
+++ b/lib/libpthread/thread/thr_fsync.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_fsync.c,v 1.14 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_getprio.c b/lib/libpthread/thread/thr_getprio.c
index fa95ef9540ae..92bec9a36f6c 100644
--- a/lib/libpthread/thread/thr_getprio.c
+++ b/lib/libpthread/thread/thr_getprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_getprio.c,v 1.9 2002/09/16 08:45:34 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_getschedparam.c b/lib/libpthread/thread/thr_getschedparam.c
index ad8486c8fda2..e0ca7808876d 100644
--- a/lib/libpthread/thread/thr_getschedparam.c
+++ b/lib/libpthread/thread/thr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_getschedparam.c,v 1.10 2003/07/07 04:28:23 davidxu Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_info.c b/lib/libpthread/thread/thr_info.c
index 60813819c50c..bd61bcbd4c92 100644
--- a/lib/libpthread/thread/thr_info.c
+++ b/lib/libpthread/thread/thr_info.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_info.c,v 1.27 2003/09/22 00:40:23 davidxu Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_init.c b/lib/libpthread/thread/thr_init.c
index c14362732b03..50287c75dd6d 100644
--- a/lib/libpthread/thread/thr_init.c
+++ b/lib/libpthread/thread/thr_init.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.70 2005/02/18 16:07:05 deischen Exp $
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libpthread/thread/thr_join.c b/lib/libpthread/thread/thr_join.c
index 9f940da0ff74..24481765886d 100644
--- a/lib/libpthread/thread/thr_join.c
+++ b/lib/libpthread/thread/thr_join.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_join.c,v 1.28 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_kern.c b/lib/libpthread/thread/thr_kern.c
index aec254122a50..8adc53894ef7 100644
--- a/lib/libpthread/thread/thr_kern.c
+++ b/lib/libpthread/thread/thr_kern.c
@@ -33,7 +33,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.116 2004/12/18 18:07:37 deischen Exp $");
 
 #include <sys/types.h>
 #include <sys/kse.h>
diff --git a/lib/libpthread/thread/thr_kill.c b/lib/libpthread/thread/thr_kill.c
index 226cb8606c99..e1a7dd189d6b 100644
--- a/lib/libpthread/thread/thr_kill.c
+++ b/lib/libpthread/thread/thr_kill.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_kill.c,v 1.16 2003/06/28 09:55:02 davidxu Exp $
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libpthread/thread/thr_main_np.c b/lib/libpthread/thread/thr_main_np.c
index 0dacd4804c62..66d15f3e30f9 100644
--- a/lib/libpthread/thread/thr_main_np.c
+++ b/lib/libpthread/thread/thr_main_np.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpthread/thread/thr_main_np.c,v 1.5 2003/04/18 05:04:16 deischen Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_mattr_init.c b/lib/libpthread/thread/thr_mattr_init.c
index d5a7a1898aa7..57d03d029ba8 100644
--- a/lib/libpthread/thread/thr_mattr_init.c
+++ b/lib/libpthread/thread/thr_mattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_mattr_init.c,v 1.9 2003/04/18 05:04:16 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_mattr_kind_np.c b/lib/libpthread/thread/thr_mattr_kind_np.c
index f3d30ff075b7..22d4a42351f9 100644
--- a/lib/libpthread/thread/thr_mattr_kind_np.c
+++ b/lib/libpthread/thread/thr_mattr_kind_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_mattr_kind_np.c,v 1.8 2002/09/16 08:45:35 mini Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_msync.c b/lib/libpthread/thread/thr_msync.c
index c2e34335dc4a..b178b2d9ff82 100644
--- a/lib/libpthread/thread/thr_msync.c
+++ b/lib/libpthread/thread/thr_msync.c
@@ -3,7 +3,7 @@
  *
  * $OpenBSD: uthread_msync.c,v 1.2 1999/06/09 07:16:17 d Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_msync.c,v 1.9 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_multi_np.c b/lib/libpthread/thread/thr_multi_np.c
index bd42365621a6..32f657104f70 100644
--- a/lib/libpthread/thread/thr_multi_np.c
+++ b/lib/libpthread/thread/thr_multi_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_multi_np.c,v 1.7 2002/05/24 04:32:28 deischen Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c
index b502c15af818..9e260dce540f 100644
--- a/lib/libpthread/thread/thr_mutex.c
+++ b/lib/libpthread/thread/thr_mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.47 2004/12/18 18:07:37 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_mutex_prioceiling.c b/lib/libpthread/thread/thr_mutex_prioceiling.c
index c65270a62abe..473400355fdb 100644
--- a/lib/libpthread/thread/thr_mutex_prioceiling.c
+++ b/lib/libpthread/thread/thr_mutex_prioceiling.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_mutex_prioceiling.c,v 1.8 2003/07/07 04:28:23 davidxu Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_mutex_protocol.c b/lib/libpthread/thread/thr_mutex_protocol.c
index 9f0f262667d8..cc5f2970740b 100644
--- a/lib/libpthread/thread/thr_mutex_protocol.c
+++ b/lib/libpthread/thread/thr_mutex_protocol.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_mutex_protocol.c,v 1.7 2003/04/18 05:04:16 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_mutexattr_destroy.c b/lib/libpthread/thread/thr_mutexattr_destroy.c
index b9852b57a63c..13e279fc79be 100644
--- a/lib/libpthread/thread/thr_mutexattr_destroy.c
+++ b/lib/libpthread/thread/thr_mutexattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_mutexattr_destroy.c,v 1.8 2002/09/16 08:45:35 mini Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_nanosleep.c b/lib/libpthread/thread/thr_nanosleep.c
index e8baa844a1d0..8d9c52b5449f 100644
--- a/lib/libpthread/thread/thr_nanosleep.c
+++ b/lib/libpthread/thread/thr_nanosleep.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_nanosleep.c,v 1.24 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_once.c b/lib/libpthread/thread/thr_once.c
index 40344bdc28ed..0f55f50e1b89 100644
--- a/lib/libpthread/thread/thr_once.c
+++ b/lib/libpthread/thread/thr_once.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_once.c,v 1.10 2004/12/18 18:07:37 deischen Exp $
  */
 #include "namespace.h"
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_open.c b/lib/libpthread/thread/thr_open.c
index 8ac625d8a30f..dc25cd44ca92 100644
--- a/lib/libpthread/thread/thr_open.c
+++ b/lib/libpthread/thread/thr_open.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_open.c,v 1.16 2003/12/09 02:20:56 davidxu Exp $
  *
  */
 #include <stdarg.h>
diff --git a/lib/libpthread/thread/thr_pause.c b/lib/libpthread/thread/thr_pause.c
index 391b5a0b55bb..2d975446f42d 100644
--- a/lib/libpthread/thread/thr_pause.c
+++ b/lib/libpthread/thread/thr_pause.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_pause.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libpthread/thread/thr_poll.c b/lib/libpthread/thread/thr_poll.c
index 1b165989b4f3..f9b9c0353a2d 100644
--- a/lib/libpthread/thread/thr_poll.c
+++ b/lib/libpthread/thread/thr_poll.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_poll.c,v 1.16 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_printf.c b/lib/libpthread/thread/thr_printf.c
index 2a4b12bf971c..d6ef52cd88b2 100644
--- a/lib/libpthread/thread/thr_printf.c
+++ b/lib/libpthread/thread/thr_printf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_printf.c,v 1.4 2004/02/10 20:42:33 cperciva Exp $");
 
 #include <stdarg.h>
 #include <string.h>
diff --git a/lib/libpthread/thread/thr_priority_queue.c b/lib/libpthread/thread/thr_priority_queue.c
index f750a0178961..ade4bbf273db 100644
--- a/lib/libpthread/thread/thr_priority_queue.c
+++ b/lib/libpthread/thread/thr_priority_queue.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_priority_queue.c,v 1.16 2004/08/03 02:22:25 davidxu Exp $
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h
index e2055bc1da64..4ee3f2ee1a69 100644
--- a/lib/libpthread/thread/thr_private.h
+++ b/lib/libpthread/thread/thr_private.h
@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.123 2005/06/22 22:35:49 davidxu Exp $
  */
 
 #ifndef _THR_PRIVATE_H
diff --git a/lib/libpthread/thread/thr_pselect.c b/lib/libpthread/thread/thr_pselect.c
index ce7a530dc4f4..5c20d8f3bd0c 100644
--- a/lib/libpthread/thread/thr_pselect.c
+++ b/lib/libpthread/thread/thr_pselect.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_pselect.c,v 1.5 2003/12/09 02:20:56 davidxu Exp $");
 
 #include <sys/select.h>
 #include <sys/time.h>
diff --git a/lib/libpthread/thread/thr_pspinlock.c b/lib/libpthread/thread/thr_pspinlock.c
index b58d7120d4ea..4b43be443ce4 100644
--- a/lib/libpthread/thread/thr_pspinlock.c
+++ b/lib/libpthread/thread/thr_pspinlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_pspinlock.c,v 1.2 2003/11/04 19:56:12 deischen Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_raise.c b/lib/libpthread/thread/thr_raise.c
index 0554fa411745..c2b04c08ecf8 100644
--- a/lib/libpthread/thread/thr_raise.c
+++ b/lib/libpthread/thread/thr_raise.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_raise.c,v 1.1 2003/07/19 05:25:49 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_read.c b/lib/libpthread/thread/thr_read.c
index c0391c55411a..f656ad305b36 100644
--- a/lib/libpthread/thread/thr_read.c
+++ b/lib/libpthread/thread/thr_read.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_read.c,v 1.18 2003/12/09 02:20:56 davidxu Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_readv.c b/lib/libpthread/thread/thr_readv.c
index eb0e54aa0454..7fcbc0fe1007 100644
--- a/lib/libpthread/thread/thr_readv.c
+++ b/lib/libpthread/thread/thr_readv.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_readv.c,v 1.19 2003/12/09 02:20:56 davidxu Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_resume_np.c b/lib/libpthread/thread/thr_resume_np.c
index ba9b91169d43..663263cd9d3b 100644
--- a/lib/libpthread/thread/thr_resume_np.c
+++ b/lib/libpthread/thread/thr_resume_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_resume_np.c,v 1.18 2003/07/23 02:11:07 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_rtld.c b/lib/libpthread/thread/thr_rtld.c
index 9528593fbde4..cd2b1c9a3182 100644
--- a/lib/libpthread/thread/thr_rtld.c
+++ b/lib/libpthread/thread/thr_rtld.c
@@ -25,7 +25,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/lib/libpthread/thread/thr_rtld.c,v 1.5 2003/11/05 18:19:24 deischen Exp $
  */
 #include <sys/cdefs.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_rwlock.c b/lib/libpthread/thread/thr_rwlock.c
index ca8a0815d2e0..d4e33846534b 100644
--- a/lib/libpthread/thread/thr_rwlock.c
+++ b/lib/libpthread/thread/thr_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_rwlock.c,v 1.14 2004/01/08 15:37:09 deischen Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_rwlockattr.c b/lib/libpthread/thread/thr_rwlockattr.c
index 8c0697bd671c..aac5ac233680 100644
--- a/lib/libpthread/thread/thr_rwlockattr.c
+++ b/lib/libpthread/thread/thr_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_rwlockattr.c,v 1.8 2002/09/16 08:45:35 mini Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_select.c b/lib/libpthread/thread/thr_select.c
index 792ff09eb189..21ca26771812 100644
--- a/lib/libpthread/thread/thr_select.c
+++ b/lib/libpthread/thread/thr_select.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_select.c,v 1.26 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_self.c b/lib/libpthread/thread/thr_self.c
index 0c702a66e5d2..4e85a138c0fb 100644
--- a/lib/libpthread/thread/thr_self.c
+++ b/lib/libpthread/thread/thr_self.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_self.c,v 1.7 2003/04/18 05:04:16 deischen Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libpthread/thread/thr_sem.c b/lib/libpthread/thread/thr_sem.c
index 027960e0c859..1e60278931fa 100644
--- a/lib/libpthread/thread/thr_sem.c
+++ b/lib/libpthread/thread/thr_sem.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_sem.c,v 1.16 2004/12/18 18:07:37 deischen Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libpthread/thread/thr_seterrno.c b/lib/libpthread/thread/thr_seterrno.c
index 245d43f19095..536233d26923 100644
--- a/lib/libpthread/thread/thr_seterrno.c
+++ b/lib/libpthread/thread/thr_seterrno.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_seterrno.c,v 1.7 2003/04/18 05:04:16 deischen Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libpthread/thread/thr_setprio.c b/lib/libpthread/thread/thr_setprio.c
index c5a950600a13..ab93c5931699 100644
--- a/lib/libpthread/thread/thr_setprio.c
+++ b/lib/libpthread/thread/thr_setprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_setprio.c,v 1.10 2002/09/16 08:45:36 mini Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libpthread/thread/thr_setschedparam.c b/lib/libpthread/thread/thr_setschedparam.c
index 63cd0730a955..9ae2cccd2f99 100644
--- a/lib/libpthread/thread/thr_setschedparam.c
+++ b/lib/libpthread/thread/thr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_setschedparam.c,v 1.13 2003/04/21 04:02:56 deischen Exp $
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libpthread/thread/thr_sig.c b/lib/libpthread/thread/thr_sig.c
index ec6ebd51eadd..9bdab174c65e 100644
--- a/lib/libpthread/thread/thr_sig.c
+++ b/lib/libpthread/thread/thr_sig.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.83 2004/12/18 18:07:37 deischen Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_sigaction.c b/lib/libpthread/thread/thr_sigaction.c
index 694f37e37f95..0be34ebb6981 100644
--- a/lib/libpthread/thread/thr_sigaction.c
+++ b/lib/libpthread/thread/thr_sigaction.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigaction.c,v 1.22 2003/09/25 06:23:40 davidxu Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_sigaltstack.c b/lib/libpthread/thread/thr_sigaltstack.c
index 3153ebd378df..a473501c15fe 100644
--- a/lib/libpthread/thread/thr_sigaltstack.c
+++ b/lib/libpthread/thread/thr_sigaltstack.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_sigaltstack.c,v 1.2 2004/01/02 00:38:42 davidxu Exp $");
 
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libpthread/thread/thr_sigmask.c b/lib/libpthread/thread/thr_sigmask.c
index 70463a5a051f..b350409854e0 100644
--- a/lib/libpthread/thread/thr_sigmask.c
+++ b/lib/libpthread/thread/thr_sigmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigmask.c,v 1.19 2003/09/18 12:19:28 davidxu Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_sigpending.c b/lib/libpthread/thread/thr_sigpending.c
index 7a0a76dcb8c3..c2f882872e0d 100644
--- a/lib/libpthread/thread/thr_sigpending.c
+++ b/lib/libpthread/thread/thr_sigpending.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigpending.c,v 1.16 2003/08/18 03:58:29 davidxu Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_sigprocmask.c b/lib/libpthread/thread/thr_sigprocmask.c
index d87df58e60c0..c944eefd765b 100644
--- a/lib/libpthread/thread/thr_sigprocmask.c
+++ b/lib/libpthread/thread/thr_sigprocmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigprocmask.c,v 1.17 2003/08/18 03:58:29 davidxu Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_sigsuspend.c b/lib/libpthread/thread/thr_sigsuspend.c
index b8e14e354fea..2eddc9f73b4f 100644
--- a/lib/libpthread/thread/thr_sigsuspend.c
+++ b/lib/libpthread/thread/thr_sigsuspend.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigsuspend.c,v 1.26 2004/12/19 23:23:43 deischen Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_sigwait.c b/lib/libpthread/thread/thr_sigwait.c
index 6f60653ea461..8480f543529d 100644
--- a/lib/libpthread/thread/thr_sigwait.c
+++ b/lib/libpthread/thread/thr_sigwait.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigwait.c,v 1.35 2004/03/17 02:12:19 davidxu Exp $
  */
 #include <signal.h>
 #include <sys/param.h>
diff --git a/lib/libpthread/thread/thr_single_np.c b/lib/libpthread/thread/thr_single_np.c
index 1ee5e7918bd9..6f6250ac8e8f 100644
--- a/lib/libpthread/thread/thr_single_np.c
+++ b/lib/libpthread/thread/thr_single_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_single_np.c,v 1.6 2002/05/24 04:32:28 deischen Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libpthread/thread/thr_sleep.c b/lib/libpthread/thread/thr_sleep.c
index 682c76403213..bdcedeb27d33 100644
--- a/lib/libpthread/thread/thr_sleep.c
+++ b/lib/libpthread/thread/thr_sleep.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_sleep.c,v 1.8.8.1 2005/10/08 17:57:49 delphij Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libpthread/thread/thr_spec.c b/lib/libpthread/thread/thr_spec.c
index 6c2b6367c651..b18eb9db1f87 100644
--- a/lib/libpthread/thread/thr_spec.c
+++ b/lib/libpthread/thread/thr_spec.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_spec.c,v 1.22 2004/07/13 22:49:58 davidxu Exp $
  */
 #include <signal.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_spinlock.c b/lib/libpthread/thread/thr_spinlock.c
index 2b2b2512c96e..85fb2ff7abaa 100644
--- a/lib/libpthread/thread/thr_spinlock.c
+++ b/lib/libpthread/thread/thr_spinlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.22 2004/12/18 18:07:37 deischen Exp $
  *
  */
 
diff --git a/lib/libpthread/thread/thr_stack.c b/lib/libpthread/thread/thr_stack.c
index f634055c0e56..4705afd70e84 100644
--- a/lib/libpthread/thread/thr_stack.c
+++ b/lib/libpthread/thread/thr_stack.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_stack.c,v 1.10 2005/02/13 18:38:06 deischen Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/lib/libpthread/thread/thr_suspend_np.c b/lib/libpthread/thread/thr_suspend_np.c
index 4813de1ad6e5..06c33d395f36 100644
--- a/lib/libpthread/thread/thr_suspend_np.c
+++ b/lib/libpthread/thread/thr_suspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_suspend_np.c,v 1.19 2003/05/04 16:17:01 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_switch_np.c b/lib/libpthread/thread/thr_switch_np.c
index b70ce7008f29..7173182fea28 100644
--- a/lib/libpthread/thread/thr_switch_np.c
+++ b/lib/libpthread/thread/thr_switch_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_switch_np.c,v 1.7 2003/04/18 05:04:16 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_symbols.c b/lib/libpthread/thread/thr_symbols.c
index 5091a9517c66..d118c967975e 100644
--- a/lib/libpthread/thread/thr_symbols.c
+++ b/lib/libpthread/thread/thr_symbols.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_symbols.c,v 1.1 2004/08/16 03:25:07 davidxu Exp $
  */
 
 #include <stddef.h>
diff --git a/lib/libpthread/thread/thr_system.c b/lib/libpthread/thread/thr_system.c
index 57c219977714..e20f1845453e 100644
--- a/lib/libpthread/thread/thr_system.c
+++ b/lib/libpthread/thread/thr_system.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_system.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_tcdrain.c b/lib/libpthread/thread/thr_tcdrain.c
index d0d701b0f360..e16ec4607a97 100644
--- a/lib/libpthread/thread/thr_tcdrain.c
+++ b/lib/libpthread/thread/thr_tcdrain.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_tcdrain.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <termios.h>
diff --git a/lib/libpthread/thread/thr_vfork.c b/lib/libpthread/thread/thr_vfork.c
index dbefc6521802..874bf8f2618e 100644
--- a/lib/libpthread/thread/thr_vfork.c
+++ b/lib/libpthread/thread/thr_vfork.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_vfork.c,v 1.3 2001/04/10 04:19:20 deischen Exp $
  */
 #include <unistd.h>
 
diff --git a/lib/libpthread/thread/thr_wait.c b/lib/libpthread/thread/thr_wait.c
index 689f6833dce7..8f1bc4a1edd8 100644
--- a/lib/libpthread/thread/thr_wait.c
+++ b/lib/libpthread/thread/thr_wait.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_wait.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_wait4.c b/lib/libpthread/thread/thr_wait4.c
index 12a10670dcfd..450b2eb1112b 100644
--- a/lib/libpthread/thread/thr_wait4.c
+++ b/lib/libpthread/thread/thr_wait4.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_wait4.c,v 1.19 2003/12/09 02:20:56 davidxu Exp $
  */
 #include <sys/types.h>
 
diff --git a/lib/libpthread/thread/thr_waitpid.c b/lib/libpthread/thread/thr_waitpid.c
index 4edef3bfdb81..0379ffda5229 100644
--- a/lib/libpthread/thread/thr_waitpid.c
+++ b/lib/libpthread/thread/thr_waitpid.c
@@ -26,7 +26,7 @@
  * 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/lib/libpthread/thread/thr_waitpid.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_write.c b/lib/libpthread/thread/thr_write.c
index 39d221c363d0..e09667f158d3 100644
--- a/lib/libpthread/thread/thr_write.c
+++ b/lib/libpthread/thread/thr_write.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_write.c,v 1.24 2003/12/09 02:20:56 davidxu Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_writev.c b/lib/libpthread/thread/thr_writev.c
index 81499d708f39..0541cf49d7d6 100644
--- a/lib/libpthread/thread/thr_writev.c
+++ b/lib/libpthread/thread/thr_writev.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_writev.c,v 1.24 2003/12/09 02:20:56 davidxu Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_yield.c b/lib/libpthread/thread/thr_yield.c
index 5c24113c2767..f75e72e13e9c 100644
--- a/lib/libpthread/thread/thr_yield.c
+++ b/lib/libpthread/thread/thr_yield.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpthread/thread/thr_yield.c,v 1.15 2003/08/18 03:58:29 davidxu Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index 98d7b345bf34..a00b2741fa32 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libradius/Makefile,v 1.11.2.1 2005/07/22 17:29:07 kensmith Exp $
 
 LIB=		radius
 SRCS=		radlib.c
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index 095d6e9a58aa..4cd2edd24f33 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libradius/libradius.3,v 1.17 2004/04/27 15:00:29 ru Exp $
 .\"
 .Dd April 27, 2004
 .Dt LIBRADIUS 3
diff --git a/lib/libradius/radius.conf.5 b/lib/libradius/radius.conf.5
index 6fa5cd78a587..b4d326e9bf24 100644
--- a/lib/libradius/radius.conf.5
+++ b/lib/libradius/radius.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/lib/libradius/radius.conf.5,v 1.8 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd October 30, 1999
 .Dt RADIUS.CONF 5
diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c
index 6060885f0ad3..9661e520aa5b 100644
--- a/lib/libradius/radlib.c
+++ b/lib/libradius/radlib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libradius/radlib.c,v 1.12 2004/06/14 20:55:30 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libradius/radlib.h b/lib/libradius/radlib.h
index 2c42c3a9f40e..e6cacc250b79 100644
--- a/lib/libradius/radlib.h
+++ b/lib/libradius/radlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libradius/radlib.h,v 1.7 2004/04/27 15:00:29 ru Exp $
  */
 
 #ifndef _RADLIB_H_
diff --git a/lib/libradius/radlib_private.h b/lib/libradius/radlib_private.h
index d323cbd5fcc9..07269a657ffa 100644
--- a/lib/libradius/radlib_private.h
+++ b/lib/libradius/radlib_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libradius/radlib_private.h,v 1.6 2004/04/27 15:00:29 ru Exp $
  */
 
 #ifndef RADLIB_PRIVATE_H
diff --git a/lib/libradius/radlib_vs.h b/lib/libradius/radlib_vs.h
index 8b3a75e79d6a..c9ab743396fe 100644
--- a/lib/libradius/radlib_vs.h
+++ b/lib/libradius/radlib_vs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libradius/radlib_vs.h,v 1.3 2004/04/27 15:00:29 ru Exp $
  */
 
 #ifndef _RADLIB_VS_H_
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 04282a4c6aab..c59b5331ba27 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile    5.10 (Berkeley) 6/24/90
-# $FreeBSD$
+# $FreeBSD: src/lib/librpcsvc/Makefile,v 1.20 2005/06/04 10:48:21 ru Exp $
 
 .PATH: ${.CURDIR}/../../include/rpcsvc
 
diff --git a/lib/librpcsvc/rnusers.c b/lib/librpcsvc/rnusers.c
index 49cab076e476..1e35a3cfb732 100644
--- a/lib/librpcsvc/rnusers.c
+++ b/lib/librpcsvc/rnusers.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/rnusers.c,v 1.3 2003/10/26 03:43:35 peter Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rnusers.c	1.2 91/03/11 TIRPC 1.0; from 1.7 89/03/24 SMI";
diff --git a/lib/librpcsvc/rstat.c b/lib/librpcsvc/rstat.c
index 1c19c4e841d4..7df89a64c1fe 100644
--- a/lib/librpcsvc/rstat.c
+++ b/lib/librpcsvc/rstat.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/rstat.c,v 1.4 2003/10/26 03:43:35 peter Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rstat.c	1.2 91/03/11 TIRPC 1.0; from 1.6 89/03/24 SMI";
diff --git a/lib/librpcsvc/rwall.c b/lib/librpcsvc/rwall.c
index dd7b590d9506..84831c3e2744 100644
--- a/lib/librpcsvc/rwall.c
+++ b/lib/librpcsvc/rwall.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/rwall.c,v 1.3 2003/10/26 03:43:35 peter Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rwall.c	1.2 91/03/11 TIRPC 1.0; from  1.3 89/03/24 SMI";
diff --git a/lib/librpcsvc/secretkey.c b/lib/librpcsvc/secretkey.c
index f45544546bb6..db40259796f6 100644
--- a/lib/librpcsvc/secretkey.c
+++ b/lib/librpcsvc/secretkey.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/secretkey.c,v 1.3 2002/03/21 23:53:40 obrien Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)secretkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c
index ed6cbefcc14e..c73ff918e425 100644
--- a/lib/librpcsvc/xcrypt.c
+++ b/lib/librpcsvc/xcrypt.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/xcrypt.c,v 1.5 2005/05/31 21:19:14 stefanf Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index e7c59145fa2e..00a4fac517c8 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/yp_passwd.c,v 1.7 2003/10/26 03:43:35 peter Exp $");
 
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index 1d2848d4ea61..45374d4b04db 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/yp_update.c,v 1.7 2003/10/26 03:43:35 peter Exp $");
 
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile
index b166befc287e..2f4b14bbead9 100644
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsbuf/Makefile,v 1.5 2003/08/18 15:25:39 obrien Exp $
 
 LIB=	sbuf
 SHLIBDIR?= /lib
diff --git a/lib/libsdp/Makefile b/lib/libsdp/Makefile
index bf71fe3e9a93..60e2a83516ee 100644
--- a/lib/libsdp/Makefile
+++ b/lib/libsdp/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/09/07 20:34:19 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libsdp/Makefile,v 1.3.8.1 2005/07/22 17:29:07 kensmith Exp $
 
 LIB=		sdp
 MAN=		sdp.3
diff --git a/lib/libsdp/sdp-int.h b/lib/libsdp/sdp-int.h
index d8a064d1e382..1b7daca31a71 100644
--- a/lib/libsdp/sdp-int.h
+++ b/lib/libsdp/sdp-int.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp-int.h,v 1.1 2003/09/01 23:01:07 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/sdp-int.h,v 1.2 2004/01/09 18:19:12 emax Exp $
  */
 
 #ifndef _SDP_INT_H_
diff --git a/lib/libsdp/sdp.3 b/lib/libsdp/sdp.3
index c51b6f9e2e60..4e4330453cb3 100644
--- a/lib/libsdp/sdp.3
+++ b/lib/libsdp/sdp.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sdp.3,v 1.1 2003/09/07 20:34:19 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libsdp/sdp.3,v 1.10 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd May 27, 2005
 .Dt SDP 3
diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h
index 2b06b2c18e9c..579569b26a73 100644
--- a/lib/libsdp/sdp.h
+++ b/lib/libsdp/sdp.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp.h,v 1.3 2003/09/05 00:33:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/sdp.h,v 1.5 2005/05/27 19:11:33 emax Exp $
  */
 
 #ifndef _SDP_H_
diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c
index 54ac3a40f6ba..c7556603dc79 100644
--- a/lib/libsdp/search.c
+++ b/lib/libsdp/search.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: search.c,v 1.2 2003/09/04 22:12:13 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/search.c,v 1.7 2004/12/09 18:57:12 emax Exp $
  */
 
 #include <sys/uio.h>
diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c
index 2667966c7822..bd245926b7d9 100644
--- a/lib/libsdp/service.c
+++ b/lib/libsdp/service.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: service.c,v 1.1 2004/01/13 19:32:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/service.c,v 1.1 2004/01/20 20:48:25 emax Exp $
  */
 
 #include <sys/uio.h>
diff --git a/lib/libsdp/session.c b/lib/libsdp/session.c
index a31f3278dc0f..6f95366bca04 100644
--- a/lib/libsdp/session.c
+++ b/lib/libsdp/session.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: session.c,v 1.2 2003/09/04 22:12:13 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/session.c,v 1.3 2004/01/09 22:44:28 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/lib/libsdp/util.c b/lib/libsdp/util.c
index 7c7330db2860..27f031a8cfce 100644
--- a/lib/libsdp/util.c
+++ b/lib/libsdp/util.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: util.c,v 1.5 2003/09/08 02:29:35 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/util.c,v 1.5 2005/05/27 19:11:33 emax Exp $
  */
 
 #include <netinet/in.h>
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 12a73d7e6d42..cef173fdde4a 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsm/Makefile,v 1.9 2005/06/07 04:18:25 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsm
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index 371b0454973f..1bc8c33658ca 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmb/Makefile,v 1.7.2.1 2005/07/22 17:29:07 kensmith Exp $
 
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile
index b796deb5acd7..df2f09d92900 100644
--- a/lib/libsmdb/Makefile
+++ b/lib/libsmdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmdb/Makefile,v 1.7 2004/10/24 15:32:33 ru Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmdb
diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile
index 2e835fd76fdd..662e0504d85d 100644
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmutil/Makefile,v 1.7 2004/10/24 15:32:33 ru Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmutil
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 69e104be9572..e6d540eb7321 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libstand/Makefile,v 1.54 2005/06/03 06:55:22 obrien Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
diff --git a/lib/libstand/__main.c b/lib/libstand/__main.c
index 1c7e67703e0d..a592b4f9ead7 100644
--- a/lib/libstand/__main.c
+++ b/lib/libstand/__main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/__main.c,v 1.2 2001/09/30 22:27:59 dillon Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libstand/alpha/_setjmp.S b/lib/libstand/alpha/_setjmp.S
index 15879785a188..8c8af826ca41 100644
--- a/lib/libstand/alpha/_setjmp.S
+++ b/lib/libstand/alpha/_setjmp.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: _setjmp.S,v 1.2 1996/10/17 03:08:03 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libstand/alpha/_setjmp.S,v 1.3 2000/05/12 21:48:54 peter Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
diff --git a/lib/libstand/arm/_setjmp.S b/lib/libstand/arm/_setjmp.S
index 631213f217e1..592446c56772 100644
--- a/lib/libstand/arm/_setjmp.S
+++ b/lib/libstand/arm/_setjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/arm/_setjmp.S,v 1.1 2004/05/14 12:24:51 cognet Exp $");
 
 #define SOFTFLOAT /* XXX */
 /*
diff --git a/lib/libstand/arp.c b/lib/libstand/arp.c
index 59f0ce5536d5..d6c25c4ade2a 100644
--- a/lib/libstand/arp.c
+++ b/lib/libstand/arp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/arp.c,v 1.3 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/assert.c b/lib/libstand/assert.c
index b42435824ae8..76209c50d648 100644
--- a/lib/libstand/assert.c
+++ b/lib/libstand/assert.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/assert.c,v 1.7 2001/10/29 07:07:25 mike Exp $");
 
 #include <assert.h>
 
diff --git a/lib/libstand/bcd.c b/lib/libstand/bcd.c
index 7bd67c91620a..337e1b3f9dfc 100644
--- a/lib/libstand/bcd.c
+++ b/lib/libstand/bcd.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bcd.c,v 1.3 2001/09/30 22:28:00 dillon Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libstand/bootp.c b/lib/libstand/bootp.c
index 0a6d31034b11..4e84bb2cbf81 100644
--- a/lib/libstand/bootp.c
+++ b/lib/libstand/bootp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bootp.c,v 1.5 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/lib/libstand/bootp.h b/lib/libstand/bootp.h
index ed9101f3ea89..c11daf1be881 100644
--- a/lib/libstand/bootp.h
+++ b/lib/libstand/bootp.h
@@ -19,7 +19,7 @@
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/bootp.h,v 1.2 2000/08/11 08:36:12 ps Exp $
  */
 
 
diff --git a/lib/libstand/bootparam.c b/lib/libstand/bootparam.c
index e4d2f1022c92..730f4098e865 100644
--- a/lib/libstand/bootparam.c
+++ b/lib/libstand/bootparam.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bootparam.c,v 1.2 2001/09/30 22:28:00 dillon Exp $");
 
 /*
  * RPC/bootparams
diff --git a/lib/libstand/bswap.c b/lib/libstand/bswap.c
index a9bd323b7f62..69ebf897fcee 100644
--- a/lib/libstand/bswap.c
+++ b/lib/libstand/bswap.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bswap.c,v 1.2 2001/09/30 22:28:00 dillon Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = "$NetBSD: bswap32.c,v 1.1 1997/10/09 15:42:33 bouyer Exp $";
diff --git a/lib/libstand/bzipfs.c b/lib/libstand/bzipfs.c
index d4d3adf89bf3..d81ea1a88612 100644
--- a/lib/libstand/bzipfs.c
+++ b/lib/libstand/bzipfs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bzipfs.c,v 1.7 2005/05/17 16:22:54 obrien Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c
index 1c43e7564b60..a49c56bd1479 100644
--- a/lib/libstand/cd9660.c
+++ b/lib/libstand/cd9660.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/cd9660.c,v 1.11 2001/11/06 22:31:10 jhb Exp $");
 
 /*
  * Stand-alone ISO9660 file reading package.
diff --git a/lib/libstand/close.c b/lib/libstand/close.c
index 8ad628b87608..74d9f7d39b4a 100644
--- a/lib/libstand/close.c
+++ b/lib/libstand/close.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/close.c,v 1.3 2001/09/30 22:28:00 dillon Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/closeall.c b/lib/libstand/closeall.c
index 2f7be72e9a94..2989233f5dd6 100644
--- a/lib/libstand/closeall.c
+++ b/lib/libstand/closeall.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/closeall.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/dev.c b/lib/libstand/dev.c
index 12d7130cca7b..b374d559beec 100644
--- a/lib/libstand/dev.c
+++ b/lib/libstand/dev.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/dev.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/lib/libstand/dosfs.c b/lib/libstand/dosfs.c
index 161d33008376..bf1a01b57efb 100644
--- a/lib/libstand/dosfs.c
+++ b/lib/libstand/dosfs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/dosfs.c,v 1.8 2004/10/03 15:58:20 stefanf Exp $");
 
 /*
  * Readonly filesystem for Microsoft FAT12/FAT16/FAT32 filesystems,
diff --git a/lib/libstand/environment.c b/lib/libstand/environment.c
index 1a3cfc7e5fef..b03f80feb412 100644
--- a/lib/libstand/environment.c
+++ b/lib/libstand/environment.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/environment.c,v 1.6 2003/10/26 04:04:12 peter Exp $");
 
 /*
  * Manage an environment-like space in which string variables may be stored.
diff --git a/lib/libstand/ether.c b/lib/libstand/ether.c
index 1fc5ff2ed525..5e7e04ef7143 100644
--- a/lib/libstand/ether.c
+++ b/lib/libstand/ether.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ether.c,v 1.4 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/ext2fs.c b/lib/libstand/ext2fs.c
index 1bd78e20acb1..4f23c62cc795 100644
--- a/lib/libstand/ext2fs.c
+++ b/lib/libstand/ext2fs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ext2fs.c,v 1.6 2004/10/03 15:58:20 stefanf Exp $");
 
 /*-
  * Copyright (c) 1993
diff --git a/lib/libstand/fstat.c b/lib/libstand/fstat.c
index 7d953604e5d5..67083519a717 100644
--- a/lib/libstand/fstat.c
+++ b/lib/libstand/fstat.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/fstat.c,v 1.4 2004/01/21 20:12:23 jhb Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/getopt.c b/lib/libstand/getopt.c
index 9af05e096632..388f3c600f20 100644
--- a/lib/libstand/getopt.c
+++ b/lib/libstand/getopt.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/getopt.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
diff --git a/lib/libstand/gets.c b/lib/libstand/gets.c
index cb0e7557c160..89f3152c57a9 100644
--- a/lib/libstand/gets.c
+++ b/lib/libstand/gets.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/gets.c,v 1.4 2002/03/21 23:38:48 obrien Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/globals.c b/lib/libstand/globals.c
index 03108232fff0..6e88b5ef93a8 100644
--- a/lib/libstand/globals.c
+++ b/lib/libstand/globals.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/globals.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/lib/libstand/gzipfs.c b/lib/libstand/gzipfs.c
index 0d7c59b263ac..b8d6a2f5517b 100644
--- a/lib/libstand/gzipfs.c
+++ b/lib/libstand/gzipfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/gzipfs.c,v 1.13 2004/01/21 20:12:23 jhb Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/i386/_setjmp.S b/lib/libstand/i386/_setjmp.S
index 6fc8ac1c9d67..28503f5661d3 100644
--- a/lib/libstand/i386/_setjmp.S
+++ b/lib/libstand/i386/_setjmp.S
@@ -36,7 +36,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libstand/i386/_setjmp.S,v 1.5 2001/10/25 01:30:54 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libstand/if_ether.h b/lib/libstand/if_ether.h
index 392ef7a3bf3b..eb58f7260b1a 100644
--- a/lib/libstand/if_ether.h
+++ b/lib/libstand/if_ether.h
@@ -34,7 +34,7 @@
  *
  *	@(#)if_ether.h	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/if_ether.h,v 1.3 2000/05/26 02:00:31 jake Exp $
  */
 
 /*
diff --git a/lib/libstand/in_cksum.c b/lib/libstand/in_cksum.c
index e253fad31916..41d3ed5638c5 100644
--- a/lib/libstand/in_cksum.c
+++ b/lib/libstand/in_cksum.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/in_cksum.c,v 1.4 2002/06/29 09:00:47 peter Exp $");
 
 #include <sys/types.h>
 #include <machine/endian.h>
diff --git a/lib/libstand/inet_ntoa.c b/lib/libstand/inet_ntoa.c
index 3bfe09eb883b..a03afd98d5bf 100644
--- a/lib/libstand/inet_ntoa.c
+++ b/lib/libstand/inet_ntoa.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/inet_ntoa.c,v 1.4 2001/09/30 22:28:01 dillon Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libstand/ioctl.c b/lib/libstand/ioctl.c
index debd9e4ef8b3..b98545493430 100644
--- a/lib/libstand/ioctl.c
+++ b/lib/libstand/ioctl.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ioctl.c,v 1.3 2002/03/21 23:38:48 obrien Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 816006a95be6..ec6c4723ccf8 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libstand/libstand.3,v 1.33 2005/01/20 09:17:06 ru Exp $
 .\"
 .Dd August 6, 2004
 .Dt LIBSTAND 3
diff --git a/lib/libstand/lseek.c b/lib/libstand/lseek.c
index 6880ef9297c5..f6eba7f9958c 100644
--- a/lib/libstand/lseek.c
+++ b/lib/libstand/lseek.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/lseek.c,v 1.4 2001/09/30 22:28:01 dillon Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/net.c b/lib/libstand/net.c
index 77cf8915fd3b..0fa4c311f070 100644
--- a/lib/libstand/net.c
+++ b/lib/libstand/net.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/net.c,v 1.6 2005/05/31 20:01:58 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/net.h b/lib/libstand/net.h
index dcd574fb1225..0dc48b353cc1 100644
--- a/lib/libstand/net.h
+++ b/lib/libstand/net.h
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/net.h,v 1.4 2000/11/10 06:06:55 benno Exp $
  */
 
 #ifndef _KERNEL	/* XXX - see <netinet/in.h> */
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index c260690c503c..1e04b4bef1ea 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/netif.c,v 1.5 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libstand/netif.h b/lib/libstand/netif.h
index dac285107a73..3c7fdd7d3811 100644
--- a/lib/libstand/netif.h
+++ b/lib/libstand/netif.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: netif.h,v 1.4 1995/09/14 23:45:30 pk Exp $	*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libstand/netif.h,v 1.2 2000/08/03 09:08:29 jhb Exp $ */
 
 #ifndef __SYS_LIBNETBOOT_NETIF_H
 #define __SYS_LIBNETBOOT_NETIF_H
diff --git a/lib/libstand/nfs.c b/lib/libstand/nfs.c
index 1c439a899ab7..b62880c00b74 100644
--- a/lib/libstand/nfs.c
+++ b/lib/libstand/nfs.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libstand/nfsv2.h b/lib/libstand/nfsv2.h
index 02c3070e222c..5203a519e441 100644
--- a/lib/libstand/nfsv2.h
+++ b/lib/libstand/nfsv2.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libstand/nfsv2.h,v 1.3 2000/05/06 04:50:09 ps Exp $ */
 /*	$NetBSD: nfsv2.h,v 1.2 1996/02/26 23:05:23 gwr Exp $	*/
 
 /*
diff --git a/lib/libstand/nullfs.c b/lib/libstand/nullfs.c
index fea4c7a52c95..47eb423e750e 100644
--- a/lib/libstand/nullfs.c
+++ b/lib/libstand/nullfs.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/nullfs.c,v 1.6 2004/01/21 20:12:23 jhb Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/open.c b/lib/libstand/open.c
index 64721e51d4f1..fb37778bde4c 100644
--- a/lib/libstand/open.c
+++ b/lib/libstand/open.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/open.c,v 1.6 2001/09/30 22:28:01 dillon Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/pager.c b/lib/libstand/pager.c
index a966b0bd7992..fa601d46a209 100644
--- a/lib/libstand/pager.c
+++ b/lib/libstand/pager.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/pager.c,v 1.6 2001/09/30 22:28:01 dillon Exp $");
 
 #include "stand.h"
 #include <string.h>
diff --git a/lib/libstand/powerpc/_setjmp.S b/lib/libstand/powerpc/_setjmp.S
index 5a30810b54ff..8aac8d84b572 100644
--- a/lib/libstand/powerpc/_setjmp.S
+++ b/lib/libstand/powerpc/_setjmp.S
@@ -4,7 +4,7 @@
 
 #if (defined(LIBC_SCCS) || defined(LIBC_RCS)) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libstand/powerpc/_setjmp.S,v 1.3 2000/11/10 06:10:28 benno Exp $"
 #endif
 
 /*
diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c
index e877a537418c..fbd9103e126d 100644
--- a/lib/libstand/printf.c
+++ b/lib/libstand/printf.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/printf.c,v 1.8 2003/04/06 05:25:48 peter Exp $");
 
 /*
  * Standaloneified version of the FreeBSD kernel printf family.
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index 584a0b1e67b0..0eb0c716fe9c 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/qdivrem.c,v 1.5 2002/05/13 13:31:20 phk Exp $");
 
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
diff --git a/lib/libstand/quad.h b/lib/libstand/quad.h
index 86c377279837..6a1069660220 100644
--- a/lib/libstand/quad.h
+++ b/lib/libstand/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/quad.h,v 1.3 2002/03/21 23:53:20 obrien Exp $
  */
 
 /*
diff --git a/lib/libstand/random.c b/lib/libstand/random.c
index 441c4ae6d6ac..365bc5bb01e0 100644
--- a/lib/libstand/random.c
+++ b/lib/libstand/random.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/random.c,v 1.5 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libstand/rarp.c b/lib/libstand/rarp.c
index eed1ed0594d6..669d07e9445d 100644
--- a/lib/libstand/rarp.c
+++ b/lib/libstand/rarp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/rarp.c,v 1.3 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/read.c b/lib/libstand/read.c
index 09e24e1f6f87..0d4340f6624c 100644
--- a/lib/libstand/read.c
+++ b/lib/libstand/read.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/read.c,v 1.5 2004/10/03 15:58:20 stefanf Exp $");
 
 #include <sys/param.h>
 #include "stand.h"
diff --git a/lib/libstand/readdir.c b/lib/libstand/readdir.c
index e49d93d15ed6..e2fb1b0b8298 100644
--- a/lib/libstand/readdir.c
+++ b/lib/libstand/readdir.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/readdir.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include <sys/param.h>
 #include "stand.h"
diff --git a/lib/libstand/rpc.c b/lib/libstand/rpc.c
index bddb49d51781..7ebc244c3681 100644
--- a/lib/libstand/rpc.c
+++ b/lib/libstand/rpc.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/rpc.c,v 1.3 2002/03/21 23:38:48 obrien Exp $");
 
 /*
  * RPC functions used by NFS and bootparams.
diff --git a/lib/libstand/sbrk.c b/lib/libstand/sbrk.c
index 93d94e482451..65438abbd1b0 100644
--- a/lib/libstand/sbrk.c
+++ b/lib/libstand/sbrk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/sbrk.c,v 1.5 2004/10/03 15:58:20 stefanf Exp $");
 
 /*
  * Minimal sbrk() emulation required for malloc support.
diff --git a/lib/libstand/sparc64/_setjmp.S b/lib/libstand/sparc64/_setjmp.S
index a66188164c1b..84b0a63f0dd2 100644
--- a/lib/libstand/sparc64/_setjmp.S
+++ b/lib/libstand/sparc64/_setjmp.S
@@ -46,7 +46,7 @@
 #endif /* LIBC_SCCS and not lint */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/sparc64/_setjmp.S,v 1.2 2002/07/07 18:04:45 jake Exp $");
 
 #define	_JB_FP		0x0
 #define	_JB_PC		0x8
diff --git a/lib/libstand/splitfs.c b/lib/libstand/splitfs.c
index af28704bc465..f8c54b36fed2 100644
--- a/lib/libstand/splitfs.c
+++ b/lib/libstand/splitfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/splitfs.c,v 1.8 2005/05/20 12:55:38 charnier Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 2279bc783bc6..e6032a58b2af 100644
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/stand.h,v 1.41 2005/05/17 17:46:29 obrien Exp $
  * From	$NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $	
  */
 
diff --git a/lib/libstand/stat.c b/lib/libstand/stat.c
index 8593281c57cd..b8287c0f96af 100644
--- a/lib/libstand/stat.c
+++ b/lib/libstand/stat.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/stat.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/strcasecmp.c b/lib/libstand/strcasecmp.c
index 9eb8350938c3..622d436a446f 100644
--- a/lib/libstand/strcasecmp.c
+++ b/lib/libstand/strcasecmp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strcasecmp.c,v 1.3 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/cdefs.h>
 #include <string.h>
diff --git a/lib/libstand/strdup.c b/lib/libstand/strdup.c
index 2204d33e052f..1043c60e50b3 100644
--- a/lib/libstand/strdup.c
+++ b/lib/libstand/strdup.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strdup.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libstand/strerror.c b/lib/libstand/strerror.c
index 7c7f579cc2f5..675ebc887c60 100644
--- a/lib/libstand/strerror.c
+++ b/lib/libstand/strerror.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strerror.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/strtol.c b/lib/libstand/strtol.c
index 4844a1a0972f..ab5a18cbb609 100644
--- a/lib/libstand/strtol.c
+++ b/lib/libstand/strtol.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strtol.c,v 1.3 2002/03/21 23:38:48 obrien Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libstand/tftp.c b/lib/libstand/tftp.c
index 0cbfa520a4ff..9620399d837b 100644
--- a/lib/libstand/tftp.c
+++ b/lib/libstand/tftp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.12 2004/10/03 15:58:20 stefanf Exp $");
 
 /*
  * Simple TFTP implementation for libsa.
diff --git a/lib/libstand/twiddle.c b/lib/libstand/twiddle.c
index 46bd8958e29d..303750d2ae02 100644
--- a/lib/libstand/twiddle.c
+++ b/lib/libstand/twiddle.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/twiddle.c,v 1.3 2001/09/30 22:28:01 dillon Exp $");
 
 #include <sys/types.h>
 #include "stand.h"
diff --git a/lib/libstand/udp.c b/lib/libstand/udp.c
index 5f4a5dfd2e58..9b619fdbe6a9 100644
--- a/lib/libstand/udp.c
+++ b/lib/libstand/udp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.5 2005/05/31 20:01:58 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/ufs.c b/lib/libstand/ufs.c
index 169991fb9fb2..a1c1102bce25 100644
--- a/lib/libstand/ufs.c
+++ b/lib/libstand/ufs.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ufs.c,v 1.15 2004/09/04 14:54:01 iedowse Exp $");
 
 /*
  *	Stand-alone file reading package.
diff --git a/lib/libstand/write.c b/lib/libstand/write.c
index 8f0fa9712ad4..30f676acb87b 100644
--- a/lib/libstand/write.c
+++ b/lib/libstand/write.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/write.c,v 1.6 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/param.h>
 #include "stand.h"
diff --git a/lib/libstand/zalloc.c b/lib/libstand/zalloc.c
index aa8ccd03c0fa..3fd75a7ea92f 100644
--- a/lib/libstand/zalloc.c
+++ b/lib/libstand/zalloc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/zalloc.c,v 1.7 2002/12/19 23:23:20 dillon Exp $");
 
 /*
  * LIB/MEMORY/ZALLOC.C	- self contained low-overhead memory pool/allocation 
diff --git a/lib/libstand/zalloc_defs.h b/lib/libstand/zalloc_defs.h
index 2544f59a6349..31d95a15381d 100644
--- a/lib/libstand/zalloc_defs.h
+++ b/lib/libstand/zalloc_defs.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_defs.h,v 1.15 2005/05/31 20:01:18 jhb Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c
index 3161fc37dcba..cfb8f6c5e63a 100644
--- a/lib/libstand/zalloc_malloc.c
+++ b/lib/libstand/zalloc_malloc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/zalloc_malloc.c,v 1.9 2004/02/25 00:52:14 grehan Exp $");
 
 /*
  * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk
diff --git a/lib/libstand/zalloc_mem.h b/lib/libstand/zalloc_mem.h
index c872da17da73..2dbd1a978664 100644
--- a/lib/libstand/zalloc_mem.h
+++ b/lib/libstand/zalloc_mem.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_mem.h,v 1.3 1999/08/28 00:05:35 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_protos.h b/lib/libstand/zalloc_protos.h
index c90bd5a3cd35..2466f1fea551 100644
--- a/lib/libstand/zalloc_protos.h
+++ b/lib/libstand/zalloc_protos.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_protos.h,v 1.3 1999/08/28 00:05:35 peter Exp $
  */
 
 Library void *znalloc(struct MemPool *mpool, iaddr_t bytes);
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index f39f27143cb1..d4b1d1e9cb24 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libtacplus/Makefile,v 1.6.8.1 2005/07/22 17:29:08 kensmith Exp $
 
 LIB=		tacplus
 SRCS=		taclib.c
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index 94c96943a460..f2b9b1213523 100644
--- a/lib/libtacplus/libtacplus.3
+++ b/lib/libtacplus/libtacplus.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libtacplus/libtacplus.3,v 1.13 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd September 2, 1998
 .Dt LIBTACPLUS 3
diff --git a/lib/libtacplus/taclib.c b/lib/libtacplus/taclib.c
index 6ac3c72501c6..ee717443a0c9 100644
--- a/lib/libtacplus/taclib.c
+++ b/lib/libtacplus/taclib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libtacplus/taclib.c,v 1.6 2005/02/14 17:42:56 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libtacplus/taclib.h b/lib/libtacplus/taclib.h
index 2ef36b9efd50..53d9c10a4902 100644
--- a/lib/libtacplus/taclib.h
+++ b/lib/libtacplus/taclib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libtacplus/taclib.h,v 1.2 2002/09/25 23:18:51 pst Exp $
  */
 
 #ifndef _TACLIB_H_
diff --git a/lib/libtacplus/taclib_private.h b/lib/libtacplus/taclib_private.h
index bbc1990c9269..a261941d48e3 100644
--- a/lib/libtacplus/taclib_private.h
+++ b/lib/libtacplus/taclib_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libtacplus/taclib_private.h,v 1.2 2002/09/25 23:18:51 pst Exp $
  */
 
 #ifndef TACLIB_PRIVATE_H
diff --git a/lib/libtacplus/tacplus.conf.5 b/lib/libtacplus/tacplus.conf.5
index e68982d3d627..aad579d89632 100644
--- a/lib/libtacplus/tacplus.conf.5
+++ b/lib/libtacplus/tacplus.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/lib/libtacplus/tacplus.conf.5,v 1.7 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd July 29, 1998
 .Dt TACPLUS.CONF 5
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 38f73a420af9..5d07d6da08f5 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libtelnet/Makefile,v 1.22 2004/12/21 10:16:00 ru Exp $
 
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/libtelnet
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 57dd9790eaf7..8ebd221c37df 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/Makefile,v 1.13.2.1 2005/07/22 17:29:08 kensmith Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libthr/arch/alpha/Makefile.inc b/lib/libthr/arch/alpha/Makefile.inc
index 508d2b49a1e5..bf0cd37b4853 100644
--- a/lib/libthr/arch/alpha/Makefile.inc
+++ b/lib/libthr/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/alpha/Makefile.inc,v 1.2 2005/04/02 01:19:56 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/alpha/alpha/pthread_md.c b/lib/libthr/arch/alpha/alpha/pthread_md.c
index 1a82341e92a4..3460e9e46a34 100644
--- a/lib/libthr/arch/alpha/alpha/pthread_md.c
+++ b/lib/libthr/arch/alpha/alpha/pthread_md.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/lib/libthr/arch/alpha/alpha/pthread_md.c,v 1.1 2005/04/02 01:19:56 davidxu Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/arch/alpha/include/pthread_md.h b/lib/libthr/arch/alpha/include/pthread_md.h
index 003cba009d10..52086e590f16 100644
--- a/lib/libthr/arch/alpha/include/pthread_md.h
+++ b/lib/libthr/arch/alpha/include/pthread_md.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/lib/libthr/arch/alpha/include/pthread_md.h,v 1.1 2005/04/02 01:19:56 davidxu Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
diff --git a/lib/libthr/arch/amd64/Makefile.inc b/lib/libthr/arch/amd64/Makefile.inc
index 6e6d577bce15..ad627cdf8826 100644
--- a/lib/libthr/arch/amd64/Makefile.inc
+++ b/lib/libthr/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.2 2005/04/02 01:19:57 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/amd64/amd64/pthread_md.c b/lib/libthr/arch/amd64/amd64/pthread_md.c
index d2477df82506..c2b12fa2d0a3 100644
--- a/lib/libthr/arch/amd64/amd64/pthread_md.c
+++ b/lib/libthr/arch/amd64/amd64/pthread_md.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/lib/libthr/arch/amd64/amd64/pthread_md.c,v 1.1 2005/04/02 01:19:57 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/amd64/include/pthread_md.h b/lib/libthr/arch/amd64/include/pthread_md.h
index 4500f6b51e2f..0f5919e22ee4 100644
--- a/lib/libthr/arch/amd64/include/pthread_md.h
+++ b/lib/libthr/arch/amd64/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.1 2005/04/02 01:19:57 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/arm/Makefile.inc b/lib/libthr/arch/arm/Makefile.inc
index 508d2b49a1e5..c0751f95c6b0 100644
--- a/lib/libthr/arch/arm/Makefile.inc
+++ b/lib/libthr/arch/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/arm/Makefile.inc,v 1.2 2005/04/07 22:06:05 cognet Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/arm/arm/pthread_md.c b/lib/libthr/arch/arm/arm/pthread_md.c
index 69cf57ed519c..61bd990c8499 100644
--- a/lib/libthr/arch/arm/arm/pthread_md.c
+++ b/lib/libthr/arch/arm/arm/pthread_md.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/arm/arm/pthread_md.c,v 1.1 2005/04/02 01:19:57 davidxu Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/arch/arm/include/pthread_md.h b/lib/libthr/arch/arm/include/pthread_md.h
index d9deff942dc4..9ea89ec7c2f2 100644
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.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/lib/libthr/arch/arm/include/pthread_md.h,v 1.2 2005/04/07 22:06:05 cognet Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/i386/Makefile.inc b/lib/libthr/arch/i386/Makefile.inc
index 508d2b49a1e5..6b52b47b3340 100644
--- a/lib/libthr/arch/i386/Makefile.inc
+++ b/lib/libthr/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.2 2005/04/02 01:19:58 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/i386/i386/pthread_md.c b/lib/libthr/arch/i386/i386/pthread_md.c
index e99e189b7054..b08f3987c166 100644
--- a/lib/libthr/arch/i386/i386/pthread_md.c
+++ b/lib/libthr/arch/i386/i386/pthread_md.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/i386/i386/pthread_md.c,v 1.5 2005/04/23 03:34:43 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/i386/include/pthread_md.h b/lib/libthr/arch/i386/include/pthread_md.h
index 95edfa6cc916..6d2afeb031a4 100644
--- a/lib/libthr/arch/i386/include/pthread_md.h
+++ b/lib/libthr/arch/i386/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.4 2005/04/27 01:29:03 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/ia64/Makefile.inc b/lib/libthr/arch/ia64/Makefile.inc
index c07c0975d5ca..ca831e8e94ee 100644
--- a/lib/libthr/arch/ia64/Makefile.inc
+++ b/lib/libthr/arch/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.2 2005/04/02 01:19:58 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/ia64/ia64/pthread_md.c b/lib/libthr/arch/ia64/ia64/pthread_md.c
index a6f7defc1056..314878b87b88 100644
--- a/lib/libthr/arch/ia64/ia64/pthread_md.c
+++ b/lib/libthr/arch/ia64/ia64/pthread_md.c
@@ -24,7 +24,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/lib/libthr/arch/ia64/ia64/pthread_md.c,v 1.1 2005/04/02 01:19:58 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/ia64/include/pthread_md.h b/lib/libthr/arch/ia64/include/pthread_md.h
index aee5dd2b1c4c..019285581d60 100644
--- a/lib/libthr/arch/ia64/include/pthread_md.h
+++ b/lib/libthr/arch/ia64/include/pthread_md.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/lib/libthr/arch/ia64/include/pthread_md.h,v 1.1 2005/04/02 01:19:58 davidxu Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
diff --git a/lib/libthr/arch/powerpc/Makefile.inc b/lib/libthr/arch/powerpc/Makefile.inc
index 508d2b49a1e5..f145b8ebe8d1 100644
--- a/lib/libthr/arch/powerpc/Makefile.inc
+++ b/lib/libthr/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/powerpc/Makefile.inc,v 1.2 2005/04/02 01:19:59 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/powerpc/include/pthread_md.h b/lib/libthr/arch/powerpc/include/pthread_md.h
index 008c4cd702a1..3e2256a09fda 100644
--- a/lib/libthr/arch/powerpc/include/pthread_md.h
+++ b/lib/libthr/arch/powerpc/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/powerpc/include/pthread_md.h,v 1.1 2005/04/02 01:19:59 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/powerpc/powerpc/pthread_md.c b/lib/libthr/arch/powerpc/powerpc/pthread_md.c
index aa02a8dbfa81..0f1d1fc6b0a5 100644
--- a/lib/libthr/arch/powerpc/powerpc/pthread_md.c
+++ b/lib/libthr/arch/powerpc/powerpc/pthread_md.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/lib/libthr/arch/powerpc/powerpc/pthread_md.c,v 1.1 2005/04/02 01:19:59 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/sparc64/Makefile.inc b/lib/libthr/arch/sparc64/Makefile.inc
index 508d2b49a1e5..8f6246545c7e 100644
--- a/lib/libthr/arch/sparc64/Makefile.inc
+++ b/lib/libthr/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/sparc64/Makefile.inc,v 1.3 2005/04/02 01:19:59 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/sparc64/include/pthread_md.h b/lib/libthr/arch/sparc64/include/pthread_md.h
index 054c2be83ce7..5fd9d59519da 100644
--- a/lib/libthr/arch/sparc64/include/pthread_md.h
+++ b/lib/libthr/arch/sparc64/include/pthread_md.h
@@ -24,7 +24,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/lib/libthr/arch/sparc64/include/pthread_md.h,v 1.1 2005/04/02 01:19:59 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/sparc64/sparc64/pthread_md.c b/lib/libthr/arch/sparc64/sparc64/pthread_md.c
index 3f8e10560df1..ea589deca92f 100644
--- a/lib/libthr/arch/sparc64/sparc64/pthread_md.c
+++ b/lib/libthr/arch/sparc64/sparc64/pthread_md.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/sparc64/sparc64/pthread_md.c,v 1.1 2005/04/02 01:19:59 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3
index 356edd903006..eade9c4b2faf 100644
--- a/lib/libthr/libthr.3
+++ b/lib/libthr/libthr.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libthr/libthr.3,v 1.3 2005/06/16 19:01:07 ru Exp $
 .\"
 .Dd June 11, 2005
 .Os
diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map
index 3cb7a38d8099..cb91e3c24dd2 100644
--- a/lib/libthr/pthread.map
+++ b/lib/libthr/pthread.map
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/pthread.map,v 1.3.2.1 2005/10/08 17:58:11 delphij Exp $
 LIBPTHREAD_1_0 {
 global:
 	___creat;
diff --git a/lib/libthr/support/Makefile.inc b/lib/libthr/support/Makefile.inc
index bcf4393a2f59..ac631f8e4a2f 100644
--- a/lib/libthr/support/Makefile.inc
+++ b/lib/libthr/support/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/support/Makefile.inc,v 1.1 2005/04/23 02:48:58 davidxu Exp $
 
 .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
diff --git a/lib/libthr/sys/Makefile.inc b/lib/libthr/sys/Makefile.inc
index 70c6dda60b74..b8aad558dfb3 100644
--- a/lib/libthr/sys/Makefile.inc
+++ b/lib/libthr/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/sys/Makefile.inc,v 1.3 2005/04/02 01:20:00 davidxu Exp $
 
 .PATH:	 ${.CURDIR}/sys
 
diff --git a/lib/libthr/sys/thr_error.c b/lib/libthr/sys/thr_error.c
index 902c054900c2..5bd4ec25e339 100644
--- a/lib/libthr/sys/thr_error.c
+++ b/lib/libthr/sys/thr_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/sys/thr_error.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/Makefile.inc b/lib/libthr/thread/Makefile.inc
index 595d99457b22..a5bf21503ca1 100644
--- a/lib/libthr/thread/Makefile.inc
+++ b/lib/libthr/thread/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.10 2005/04/12 03:00:28 davidxu Exp $
 
 # thr sources
 .PATH: ${.CURDIR}/thread
diff --git a/lib/libthr/thread/thr_atfork.c b/lib/libthr/thread/thr_atfork.c
index 370623a2c83a..6bc01c259bbc 100644
--- a/lib/libthr/thread/thr_atfork.c
+++ b/lib/libthr/thread/thr_atfork.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_atfork.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c
index 9e6554846092..eb22be1e953a 100644
--- a/lib/libthr/thread/thr_attr.c
+++ b/lib/libthr/thread/thr_attr.c
@@ -93,7 +93,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.3 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_autoinit.c b/lib/libthr/thread/thr_autoinit.c
index c425569c226e..2179033c59ab 100644
--- a/lib/libthr/thread/thr_autoinit.c
+++ b/lib/libthr/thread/thr_autoinit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_autoinit.c,v 1.2 2003/05/23 09:48:20 mtm Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_barrier.c b/lib/libthr/thread/thr_barrier.c
index 113fce0cde83..ee118d2cb6a7 100644
--- a/lib/libthr/thread/thr_barrier.c
+++ b/lib/libthr/thread/thr_barrier.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_barrier.c,v 1.4 2005/04/04 23:43:53 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_barrierattr.c b/lib/libthr/thread/thr_barrierattr.c
index 6785937ce271..b974f823194c 100644
--- a/lib/libthr/thread/thr_barrierattr.c
+++ b/lib/libthr/thread/thr_barrierattr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_barrierattr.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index 5a3960ee1484..d15f0154e10c 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.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/lib/libthr/thread/thr_cancel.c,v 1.11 2005/04/02 01:20:00 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_clean.c b/lib/libthr/thread/thr_clean.c
index 33fec2ec8fea..5998966de5de 100644
--- a/lib/libthr/thread/thr_clean.c
+++ b/lib/libthr/thread/thr_clean.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_clean.c,v 1.3 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <signal.h>
diff --git a/lib/libthr/thread/thr_concurrency.c b/lib/libthr/thread/thr_concurrency.c
index 7f019fe6d550..950a056919d8 100644
--- a/lib/libthr/thread/thr_concurrency.c
+++ b/lib/libthr/thread/thr_concurrency.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_concurrency.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c
index cd50c4db0a65..afeb7fb96bef 100644
--- a/lib/libthr/thread/thr_cond.c
+++ b/lib/libthr/thread/thr_cond.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/lib/libthr/thread/thr_cond.c,v 1.16 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_condattr.c b/lib/libthr/thread/thr_condattr.c
index 46b9ec01af44..f77edb9792e2 100644
--- a/lib/libthr/thread/thr_condattr.c
+++ b/lib/libthr/thread/thr_condattr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_condattr.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index e21805dbc457..04c5c8c3d251 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_create.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.22.4.1 2005/10/11 23:24:25 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_detach.c b/lib/libthr/thread/thr_detach.c
index 9ff5f8465ade..8eab1e7fb2a7 100644
--- a/lib/libthr/thread/thr_detach.c
+++ b/lib/libthr/thread/thr_detach.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.9 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_equal.c b/lib/libthr/thread/thr_equal.c
index f8882f5f073b..df56a214e24f 100644
--- a/lib/libthr/thread/thr_equal.c
+++ b/lib/libthr/thread/thr_equal.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_equal.c,v 1.1 2003/04/01 03:46:28 jeff Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libthr/thread/thr_event.c b/lib/libthr/thread/thr_event.c
index 6a64cf9af6cc..1204f78d02f7 100644
--- a/lib/libthr/thread/thr_event.c
+++ b/lib/libthr/thread/thr_event.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_event.c,v 1.1 2005/04/12 03:08:11 davidxu Exp $
  */
 
 #include "thr_private.h"
diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c
index 4f4eff6c5158..8686d444b6b0 100644
--- a/lib/libthr/thread/thr_exit.c
+++ b/lib/libthr/thread/thr_exit.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.18 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c
index 8b311cb81e61..bcf34b2fd48f 100644
--- a/lib/libthr/thread/thr_fork.c
+++ b/lib/libthr/thread/thr_fork.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_fork.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_getprio.c b/lib/libthr/thread/thr_getprio.c
index fa95ef9540ae..dc4a66660990 100644
--- a/lib/libthr/thread/thr_getprio.c
+++ b/lib/libthr/thread/thr_getprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_getprio.c,v 1.1 2003/04/01 03:46:28 jeff Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_getschedparam.c b/lib/libthr/thread/thr_getschedparam.c
index 907174c37dd9..6891e613734e 100644
--- a/lib/libthr/thread/thr_getschedparam.c
+++ b/lib/libthr/thread/thr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_getschedparam.c,v 1.3 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_info.c b/lib/libthr/thread/thr_info.c
index 7142f031f94c..4d42883994b6 100644
--- a/lib/libthr/thread/thr_info.c
+++ b/lib/libthr/thread/thr_info.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_info.c,v 1.4 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index a53259015f11..de413a124239 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.23 2005/04/12 03:13:49 davidxu Exp $
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c
index c44b2617f3a4..4da16182e6fc 100644
--- a/lib/libthr/thread/thr_join.c
+++ b/lib/libthr/thread/thr_join.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.16 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_kern.c b/lib/libthr/thread/thr_kern.c
index 4c451f1cfc20..4f291f29d879 100644
--- a/lib/libthr/thread/thr_kern.c
+++ b/lib/libthr/thread/thr_kern.c
@@ -24,7 +24,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/lib/libthr/thread/thr_kern.c,v 1.19 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_kill.c b/lib/libthr/thread/thr_kill.c
index 38ec80f27613..34884f0d4795 100644
--- a/lib/libthr/thread/thr_kill.c
+++ b/lib/libthr/thread/thr_kill.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_kill.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_list.c b/lib/libthr/thread/thr_list.c
index a0d5aaa1427d..203ec0cacdcf 100644
--- a/lib/libthr/thread/thr_list.c
+++ b/lib/libthr/thread/thr_list.c
@@ -24,7 +24,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/lib/libthr/thread/thr_list.c,v 1.4 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_main_np.c b/lib/libthr/thread/thr_main_np.c
index 6b4626efe287..f66263a6bf5c 100644
--- a/lib/libthr/thread/thr_main_np.c
+++ b/lib/libthr/thread/thr_main_np.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_main_np.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_multi_np.c b/lib/libthr/thread/thr_multi_np.c
index bd42365621a6..7473fa504646 100644
--- a/lib/libthr/thread/thr_multi_np.c
+++ b/lib/libthr/thread/thr_multi_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_multi_np.c,v 1.1 2003/04/01 03:46:29 jeff Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index 2126080dff35..8b9008202c01 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.33 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/thread/thr_mutex_prioceiling.c b/lib/libthr/thread/thr_mutex_prioceiling.c
index edea12402b24..444ea0a6ec46 100644
--- a/lib/libthr/thread/thr_mutex_prioceiling.c
+++ b/lib/libthr/thread/thr_mutex_prioceiling.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex_prioceiling.c,v 1.4 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <string.h>
diff --git a/lib/libthr/thread/thr_mutex_protocol.c b/lib/libthr/thread/thr_mutex_protocol.c
index 526cbe08a050..3b2b77a0803e 100644
--- a/lib/libthr/thread/thr_mutex_protocol.c
+++ b/lib/libthr/thread/thr_mutex_protocol.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex_protocol.c,v 1.3 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <string.h>
diff --git a/lib/libthr/thread/thr_mutexattr.c b/lib/libthr/thread/thr_mutexattr.c
index 180afd347a32..598dc6e39ca2 100644
--- a/lib/libthr/thread/thr_mutexattr.c
+++ b/lib/libthr/thread/thr_mutexattr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c
index 8716e758c502..47c90661c271 100644
--- a/lib/libthr/thread/thr_once.c
+++ b/lib/libthr/thread/thr_once.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_printf.c b/lib/libthr/thread/thr_printf.c
index 7d32ae717eb7..3cfa4f8db5ff 100644
--- a/lib/libthr/thread/thr_printf.c
+++ b/lib/libthr/thread/thr_printf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.5 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <stdarg.h>
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 65e258d57b09..ace3b2f833d3 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.47 2005/06/22 22:38:56 davidxu Exp $
  */
 
 #ifndef _THR_PRIVATE_H
diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c
index 9343fdc3b78e..940788827a10 100644
--- a/lib/libthr/thread/thr_pspinlock.c
+++ b/lib/libthr/thread/thr_pspinlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_resume_np.c b/lib/libthr/thread/thr_resume_np.c
index 8fe6de94b727..586e6df35aec 100644
--- a/lib/libthr/thread/thr_resume_np.c
+++ b/lib/libthr/thread/thr_resume_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_resume_np.c,v 1.8 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index 6881ef8da2b7..fb99d228bb59 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.8 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_rwlockattr.c b/lib/libthr/thread/thr_rwlockattr.c
index 8c0697bd671c..031cfaa6806e 100644
--- a/lib/libthr/thread/thr_rwlockattr.c
+++ b/lib/libthr/thread/thr_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_rwlockattr.c,v 1.1 2003/04/01 03:46:29 jeff Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_self.c b/lib/libthr/thread/thr_self.c
index baaf44cb60e9..e4f033654c64 100644
--- a/lib/libthr/thread/thr_self.c
+++ b/lib/libthr/thread/thr_self.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_self.c,v 1.3 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c
index bd952ef28e9b..27b9bef47f1e 100644
--- a/lib/libthr/thread/thr_sem.c
+++ b/lib/libthr/thread/thr_sem.c
@@ -27,7 +27,7 @@
  * 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/lib/libthr/thread/thr_sem.c,v 1.5 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_seterrno.c b/lib/libthr/thread/thr_seterrno.c
index f48179998fa0..c52e6433a9bc 100644
--- a/lib/libthr/thread/thr_seterrno.c
+++ b/lib/libthr/thread/thr_seterrno.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_seterrno.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_setprio.c b/lib/libthr/thread/thr_setprio.c
index c5a950600a13..b9a28ffc5435 100644
--- a/lib/libthr/thread/thr_setprio.c
+++ b/lib/libthr/thread/thr_setprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_setprio.c,v 1.1 2003/04/01 03:46:29 jeff Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libthr/thread/thr_setschedparam.c b/lib/libthr/thread/thr_setschedparam.c
index 4f0a60d3ef5e..db3e6116d63a 100644
--- a/lib/libthr/thread/thr_setschedparam.c
+++ b/lib/libthr/thread/thr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_setschedparam.c,v 1.9 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index 1410059b6d19..b98408636be8 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.13 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libthr/thread/thr_sigmask.c b/lib/libthr/thread/thr_sigmask.c
index 2024cc0ac6fa..89179e1a966e 100644
--- a/lib/libthr/thread/thr_sigmask.c
+++ b/lib/libthr/thread/thr_sigmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_sigmask.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_single_np.c b/lib/libthr/thread/thr_single_np.c
index c8e5a9432233..da3101163b2d 100644
--- a/lib/libthr/thread/thr_single_np.c
+++ b/lib/libthr/thread/thr_single_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_single_np.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_spec.c b/lib/libthr/thread/thr_spec.c
index c5464b527e54..e4ac8aba20dd 100644
--- a/lib/libthr/thread/thr_spec.c
+++ b/lib/libthr/thread/thr_spec.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.3 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <signal.h>
diff --git a/lib/libthr/thread/thr_spinlock.c b/lib/libthr/thread/thr_spinlock.c
index 7d5cd847cae0..4fd4d77945a3 100644
--- a/lib/libthr/thread/thr_spinlock.c
+++ b/lib/libthr/thread/thr_spinlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_spinlock.c,v 1.11 2005/04/02 01:20:00 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c
index 3c5503f2f79f..7839ce57123b 100644
--- a/lib/libthr/thread/thr_stack.c
+++ b/lib/libthr/thread/thr_stack.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.6 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_suspend_np.c b/lib/libthr/thread/thr_suspend_np.c
index fd929ad9b00d..89a2d0ba740b 100644
--- a/lib/libthr/thread/thr_suspend_np.c
+++ b/lib/libthr/thread/thr_suspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_suspend_np.c,v 1.3 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c
index 98497b7c7669..26c5d90c9a21 100644
--- a/lib/libthr/thread/thr_switch_np.c
+++ b/lib/libthr/thread/thr_switch_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_switch_np.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_symbols.c b/lib/libthr/thread/thr_symbols.c
index c35f2c717fe8..fd91b003c431 100644
--- a/lib/libthr/thread/thr_symbols.c
+++ b/lib/libthr/thread/thr_symbols.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_symbols.c,v 1.2 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #include <stddef.h>
diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c
index 89cc836a5b3b..fe1264e540f0 100644
--- a/lib/libthr/thread/thr_syscalls.c
+++ b/lib/libthr/thread/thr_syscalls.c
@@ -28,7 +28,7 @@
  * 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/lib/libthr/thread/thr_syscalls.c,v 1.9.2.1 2005/10/08 17:57:28 delphij Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_umtx.c b/lib/libthr/thread/thr_umtx.c
index ba73de8632ae..56b97799e7db 100644
--- a/lib/libthr/thread/thr_umtx.c
+++ b/lib/libthr/thread/thr_umtx.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/lib/libthr/thread/thr_umtx.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_umtx.h b/lib/libthr/thread/thr_umtx.h
index 8d2718dc47f5..c5b71bd3ff0f 100644
--- a/lib/libthr/thread/thr_umtx.h
+++ b/lib/libthr/thread/thr_umtx.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_umtx.h,v 1.1.2.1 2005/08/05 19:43:57 jhb Exp $
  */
 
 #ifndef _THR_FBSD_UMTX_H_
diff --git a/lib/libthr/thread/thr_yield.c b/lib/libthr/thread/thr_yield.c
index 2c9682090423..d587d4f9f6d9 100644
--- a/lib/libthr/thread/thr_yield.c
+++ b/lib/libthr/thread/thr_yield.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_yield.c,v 1.1 2003/04/01 03:46:29 jeff Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libthread_db/Makefile b/lib/libthread_db/Makefile
index 53f5500adc2b..2879739c99eb 100644
--- a/lib/libthread_db/Makefile
+++ b/lib/libthread_db/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthread_db/Makefile,v 1.5.8.1 2005/07/22 17:29:08 kensmith Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 
diff --git a/lib/libthread_db/arch/alpha/libc_r_md.c b/lib/libthread_db/arch/alpha/libc_r_md.c
index 227440c860f0..0b08e2b29a06 100644
--- a/lib/libthread_db/arch/alpha/libc_r_md.c
+++ b/lib/libthread_db/arch/alpha/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/alpha/libc_r_md.c,v 1.2 2004/07/19 16:54:52 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/alpha/libpthread_md.c b/lib/libthread_db/arch/alpha/libpthread_md.c
index 7553ed117eae..4daec818cc76 100644
--- a/lib/libthread_db/arch/alpha/libpthread_md.c
+++ b/lib/libthread_db/arch/alpha/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/alpha/libpthread_md.c,v 1.3 2004/07/18 19:29:38 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <ucontext.h>
diff --git a/lib/libthread_db/arch/amd64/libc_r_md.c b/lib/libthread_db/arch/amd64/libc_r_md.c
index 6c53953235be..a902b4695dbb 100644
--- a/lib/libthread_db/arch/amd64/libc_r_md.c
+++ b/lib/libthread_db/arch/amd64/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/amd64/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 8fca1fdf1acc..7102fe06585b 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/amd64/libpthread_md.c,v 1.3 2004/08/01 02:08:39 davidxu Exp $");
 
 #include <sys/procfs.h>
 #include <ucontext.h>
diff --git a/lib/libthread_db/arch/i386/libc_r_md.c b/lib/libthread_db/arch/i386/libc_r_md.c
index de27b682a804..546a2b9aa97f 100644
--- a/lib/libthread_db/arch/i386/libc_r_md.c
+++ b/lib/libthread_db/arch/i386/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/i386/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/i386/libpthread_md.c b/lib/libthread_db/arch/i386/libpthread_md.c
index dc14e6080872..53613c11ee5b 100644
--- a/lib/libthread_db/arch/i386/libpthread_md.c
+++ b/lib/libthread_db/arch/i386/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/i386/libpthread_md.c,v 1.2 2005/05/31 09:43:04 dfr Exp $");
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/lib/libthread_db/arch/ia64/libc_r_md.c b/lib/libthread_db/arch/ia64/libc_r_md.c
index 6c53953235be..530ee55a11e6 100644
--- a/lib/libthread_db/arch/ia64/libc_r_md.c
+++ b/lib/libthread_db/arch/ia64/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/ia64/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/ia64/libpthread_md.c b/lib/libthread_db/arch/ia64/libpthread_md.c
index 7553ed117eae..374f7d54a0a5 100644
--- a/lib/libthread_db/arch/ia64/libpthread_md.c
+++ b/lib/libthread_db/arch/ia64/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/ia64/libpthread_md.c,v 1.3 2004/07/18 19:29:38 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <ucontext.h>
diff --git a/lib/libthread_db/arch/sparc64/libc_r_md.c b/lib/libthread_db/arch/sparc64/libc_r_md.c
index 6c53953235be..3c15470bb6d6 100644
--- a/lib/libthread_db/arch/sparc64/libc_r_md.c
+++ b/lib/libthread_db/arch/sparc64/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/sparc64/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/sparc64/libpthread_md.c b/lib/libthread_db/arch/sparc64/libpthread_md.c
index 7553ed117eae..f683e063f673 100644
--- a/lib/libthread_db/arch/sparc64/libpthread_md.c
+++ b/lib/libthread_db/arch/sparc64/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/sparc64/libpthread_md.c,v 1.3 2004/07/18 19:29:38 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <ucontext.h>
diff --git a/lib/libthread_db/libc_r_db.c b/lib/libthread_db/libc_r_db.c
index 10f7df1b0d7f..d09c6411c48c 100644
--- a/lib/libthread_db/libc_r_db.c
+++ b/lib/libthread_db/libc_r_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.3 2005/05/31 09:43:03 dfr Exp $");
 
 #include <machine/setjmp.h>
 #include <proc_service.h>
diff --git a/lib/libthread_db/libpthread_db.c b/lib/libthread_db/libpthread_db.c
index ea7f81c6ebc8..934c8a6ddd55 100644
--- a/lib/libthread_db/libpthread_db.c
+++ b/lib/libthread_db/libpthread_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.10 2005/05/31 09:43:03 dfr Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libthread_db/libpthread_db.h b/lib/libthread_db/libpthread_db.h
index 5347d01dc979..14e694cc65a2 100644
--- a/lib/libthread_db/libpthread_db.h
+++ b/lib/libthread_db/libpthread_db.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthread_db/libpthread_db.h,v 1.3 2005/05/31 09:43:03 dfr Exp $
  */
 
 #ifndef _LIBPTHREAD_DB_H_
diff --git a/lib/libthread_db/libthr_db.c b/lib/libthread_db/libthr_db.c
index 8986939cf6ed..a8690724c2e4 100644
--- a/lib/libthread_db/libthr_db.c
+++ b/lib/libthread_db/libthr_db.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.9 2005/05/31 09:43:03 dfr Exp $");
 
 #include <proc_service.h>
 #include <stddef.h>
diff --git a/lib/libthread_db/thread_db.c b/lib/libthread_db/thread_db.c
index 45400bf7c00d..5a549991b7b2 100644
--- a/lib/libthread_db/thread_db.c
+++ b/lib/libthread_db/thread_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.3 2005/05/31 09:43:03 dfr Exp $");
 
 #include <proc_service.h>
 #include <stddef.h>
diff --git a/lib/libthread_db/thread_db.h b/lib/libthread_db/thread_db.h
index a05274e38254..b46f9844f9a3 100644
--- a/lib/libthread_db/thread_db.h
+++ b/lib/libthread_db/thread_db.h
@@ -24,7 +24,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/lib/libthread_db/thread_db.h,v 1.6 2005/05/31 09:43:03 dfr Exp $
  */
 
 #ifndef _THREAD_DB_H_
diff --git a/lib/libthread_db/thread_db_int.h b/lib/libthread_db/thread_db_int.h
index 2e5ecba71c8d..0c4cb02ff5b6 100644
--- a/lib/libthread_db/thread_db_int.h
+++ b/lib/libthread_db/thread_db_int.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthread_db/thread_db_int.h,v 1.3 2005/05/31 09:43:03 dfr Exp $
  */
 
 #ifndef _THREAD_DB_INT_H_
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index fc72c0c7db22..9d3fa6205428 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libufs/Makefile,v 1.10 2003/08/18 15:25:39 obrien Exp $
 
 LIB=	ufs
 SHLIBDIR?= /lib
diff --git a/lib/libufs/block.c b/lib/libufs/block.c
index c4ff30482707..d1bb85294483 100644
--- a/lib/libufs/block.c
+++ b/lib/libufs/block.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/block.c,v 1.10 2003/10/07 07:12:22 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/bread.3 b/lib/libufs/bread.3
index 80aa921f91e6..4df1361424eb 100644
--- a/lib/libufs/bread.3
+++ b/lib/libufs/bread.3
@@ -7,7 +7,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/bread.3,v 1.6 2004/07/05 06:53:34 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt BREAD 3
diff --git a/lib/libufs/cgread.3 b/lib/libufs/cgread.3
index f98da40714b6..a9881c11ccc2 100644
--- a/lib/libufs/cgread.3
+++ b/lib/libufs/cgread.3
@@ -7,7 +7,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/cgread.3,v 1.6 2004/07/05 06:53:34 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt CGREAD 3
diff --git a/lib/libufs/cgroup.c b/lib/libufs/cgroup.c
index d615b18dd32b..2118beb5aad5 100644
--- a/lib/libufs/cgroup.c
+++ b/lib/libufs/cgroup.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.3 2003/06/09 09:32:29 jmallett Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/getino.3 b/lib/libufs/getino.3
index 881d9e72be30..7e90a330ad62 100644
--- a/lib/libufs/getino.3
+++ b/lib/libufs/getino.3
@@ -7,7 +7,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/getino.3,v 1.5 2004/07/05 06:53:34 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt GETINO 3
diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c
index d8bef61f8917..9307f30e1b1c 100644
--- a/lib/libufs/inode.c
+++ b/lib/libufs/inode.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/inode.c,v 1.6 2003/06/19 22:12:54 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/libufs.3 b/lib/libufs/libufs.3
index ecdfb275f67a..22f235882356 100644
--- a/lib/libufs/libufs.3
+++ b/lib/libufs/libufs.3
@@ -5,7 +5,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/libufs.3,v 1.8 2004/07/05 06:53:34 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt LIBUFS 3
diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h
index 57062f9baa45..102477da699d 100644
--- a/lib/libufs/libufs.h
+++ b/lib/libufs/libufs.h
@@ -24,7 +24,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libufs/libufs.h,v 1.11 2003/06/09 09:47:38 jmallett Exp $
  */
 
 #ifndef	__LIBUFS_H__
diff --git a/lib/libufs/sblock.c b/lib/libufs/sblock.c
index c9125f28ad34..a9186faf3cd8 100644
--- a/lib/libufs/sblock.c
+++ b/lib/libufs/sblock.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/sblock.c,v 1.10 2003/06/09 09:32:29 jmallett Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/sbread.3 b/lib/libufs/sbread.3
index e59365a80b27..497032136f10 100644
--- a/lib/libufs/sbread.3
+++ b/lib/libufs/sbread.3
@@ -7,7 +7,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/sbread.3,v 1.5 2004/07/05 06:53:34 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt SBREAD 3
diff --git a/lib/libufs/type.c b/lib/libufs/type.c
index c88da96baa7c..da6fea036f79 100644
--- a/lib/libufs/type.c
+++ b/lib/libufs/type.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/type.c,v 1.15 2003/06/09 09:47:38 jmallett Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/ufs_disk_close.3 b/lib/libufs/ufs_disk_close.3
index a659116a4f54..427408c82058 100644
--- a/lib/libufs/ufs_disk_close.3
+++ b/lib/libufs/ufs_disk_close.3
@@ -9,7 +9,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/ufs_disk_close.3,v 1.6 2005/01/21 10:27:09 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt UFS_DISK_CLOSE 3
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index bdcb5ca11d59..cf5e8865ed2a 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libugidfw/Makefile,v 1.6.2.1 2005/07/22 17:29:08 kensmith Exp $
 
 LIB=		ugidfw
 SHLIB_MAJOR=	2
diff --git a/lib/libugidfw/bsde_get_rule.3 b/lib/libugidfw/bsde_get_rule.3
index a3b6691eaa9a..fa4fb0e5bc4e 100644
--- a/lib/libugidfw/bsde_get_rule.3
+++ b/lib/libugidfw/bsde_get_rule.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule.3,v 1.5 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd February 24, 2004
 .Os
diff --git a/lib/libugidfw/bsde_get_rule_count.3 b/lib/libugidfw/bsde_get_rule_count.3
index bf441e150d9c..15b988459327 100644
--- a/lib/libugidfw/bsde_get_rule_count.3
+++ b/lib/libugidfw/bsde_get_rule_count.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule_count.3,v 1.3 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 7, 2003
 .Os
diff --git a/lib/libugidfw/bsde_parse_rule.3 b/lib/libugidfw/bsde_parse_rule.3
index d510cab26a2e..3c69ad5dbef2 100644
--- a/lib/libugidfw/bsde_parse_rule.3
+++ b/lib/libugidfw/bsde_parse_rule.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_parse_rule.3,v 1.3 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 7, 2003
 .Os
diff --git a/lib/libugidfw/bsde_rule_to_string.3 b/lib/libugidfw/bsde_rule_to_string.3
index 44144069a524..567d598ed9db 100644
--- a/lib/libugidfw/bsde_rule_to_string.3
+++ b/lib/libugidfw/bsde_rule_to_string.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_rule_to_string.3,v 1.3 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 7, 2003
 .Os
diff --git a/lib/libugidfw/libugidfw.3 b/lib/libugidfw/libugidfw.3
index 7e8c75193a6f..c9fc86ada737 100644
--- a/lib/libugidfw/libugidfw.3
+++ b/lib/libugidfw/libugidfw.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.7 2005/04/16 11:32:46 rwatson Exp $
 .\"
 .Dd February 25, 2004
 .Os
diff --git a/lib/libugidfw/ugidfw.c b/lib/libugidfw/ugidfw.c
index 1f46e50e2e48..253b347de748 100644
--- a/lib/libugidfw/ugidfw.c
+++ b/lib/libugidfw/ugidfw.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.10 2005/04/23 02:20:35 trhodes Exp $
  */
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libugidfw/ugidfw.h b/lib/libugidfw/ugidfw.h
index 7637ca5a5346..a662056f814a 100644
--- a/lib/libugidfw/ugidfw.h
+++ b/lib/libugidfw/ugidfw.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libugidfw/ugidfw.h,v 1.4 2004/02/25 03:24:39 rwatson Exp $
  */
 
 #ifndef _UGIDFW_H
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index 4c6ad06daec8..b05d6ad23e56 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libusbhid/Makefile,v 1.9.2.1 2005/07/22 17:29:08 kensmith Exp $
 
 LIB=	usbhid
 MAN=	usbhid.3
diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c
index d278ddb8d875..450536228469 100644
--- a/lib/libusbhid/data.c
+++ b/lib/libusbhid/data.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6 2003/04/09 01:52:48 mdodd Exp $");
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c
index 4afdb61ce19b..8c7d2ceb7c7f 100644
--- a/lib/libusbhid/descr.c
+++ b/lib/libusbhid/descr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c
index 3abc036644ba..e4ed230b5a4e 100644
--- a/lib/libusbhid/parse.c
+++ b/lib/libusbhid/parse.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.10 2004/02/11 21:09:13 emax Exp $");
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c
index 280ef69aae8c..b1030e5572f4 100644
--- a/lib/libusbhid/usage.c
+++ b/lib/libusbhid/usage.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/usage.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $");
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index 241c4dc8fc93..7c0e12247c83 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libusbhid/usbhid.3,v 1.17 2005/01/20 09:17:06 ru Exp $
 .\"
 .Dd December 29, 2001
 .Dt USBHID 3
diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h
index af3228f17c42..42e0b994861f 100644
--- a/lib/libusbhid/usbhid.h
+++ b/lib/libusbhid/usbhid.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.11 2004/06/03 15:04:24 des Exp $
  *
  */
 
diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h
index 7ed04e5edea1..83c7b8d75466 100644
--- a/lib/libusbhid/usbvar.h
+++ b/lib/libusbhid/usbvar.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libusbhid/usbvar.h,v 1.2 2002/03/27 16:07:18 joe Exp $
  *
  */
 
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 0cab08abba6d..a41e9e86dcb3 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libutil/Makefile,v 1.56.8.1 2005/07/22 17:29:09 kensmith Exp $
 
 LIB=	util
 SHLIB_MAJOR= 5
diff --git a/lib/libutil/_secure_path.3 b/lib/libutil/_secure_path.3
index fe23d12b2b9f..7efb511279c0 100644
--- a/lib/libutil/_secure_path.3
+++ b/lib/libutil/_secure_path.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/_secure_path.3,v 1.13 2005/01/20 09:17:07 ru Exp $
 .\"
 .Dd May 2, 1997
 .Os
diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c
index 363378b0d649..1fb1bed3eaff 100644
--- a/lib/libutil/_secure_path.c
+++ b/lib/libutil/_secure_path.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/_secure_path.c,v 1.9 2004/12/18 12:31:12 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index 3a1bb4dd4dbf..241f1f101bd6 100644
--- a/lib/libutil/auth.3
+++ b/lib/libutil/auth.3
@@ -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/lib/libutil/auth.3,v 1.10 2005/01/20 09:17:07 ru Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index 748c3ad84bd7..2028a17f66f1 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/auth.c,v 1.6 2003/06/14 18:42:37 markm Exp $");
 
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/lib/libutil/auth.conf.5 b/lib/libutil/auth.conf.5
index be10eb85fdf0..a64868c2c268 100644
--- a/lib/libutil/auth.conf.5
+++ b/lib/libutil/auth.conf.5
@@ -11,7 +11,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/auth.conf.5,v 1.8 2005/01/21 12:07:46 ru Exp $
 .\"
 .Dd October 7, 1998
 .Dt AUTH.CONF 5
diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3
index cd78437e3eb4..482d0a9a3a50 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/libutil/fparseln.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/fparseln.3,v 1.11 2005/01/11 20:50:50 ru Exp $
 .\"
 .\" Copyright (c) 1997 Christos Zoulas.  All rights reserved.
 .\"
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 0624f0e4ea31..36e9eb7a433b 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/fparseln.c,v 1.6 2003/10/18 10:04:16 markm Exp $");
 
 #include <sys/types.h>
 #include <assert.h>
diff --git a/lib/libutil/humanize_number.3 b/lib/libutil/humanize_number.3
index 650c936cdd89..aa712a7f7f09 100644
--- a/lib/libutil/humanize_number.3
+++ b/lib/libutil/humanize_number.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.8 2005/04/10 12:15:25 delphij Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index 21d5e3962c45..f7055a6c549a 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2 2004/09/25 14:11:34 pjd Exp $");
 
 #include <sys/types.h>
 #include <assert.h>
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index 3042d0fddb3a..78b979bca660 100644
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/libutil.h,v 1.40 2004/05/24 22:19:27 pjd Exp $
  */
 
 #ifndef _LIBUTIL_H_
diff --git a/lib/libutil/login.3 b/lib/libutil/login.3
index d88f719485d2..70ff01a251f5 100644
--- a/lib/libutil/login.3
+++ b/lib/libutil/login.3
@@ -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/lib/libutil/login.3,v 1.10 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index c2a0b16635fd..3a20f45a8665 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -33,7 +33,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login.c,v 1.11 2003/10/18 10:04:16 markm Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index b71ef9986d69..e20986b9f435 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.56 2005/02/27 22:24:24 trhodes Exp $
 .\"
 .Dd August 6, 2004
 .Dt LOGIN.CONF 5
diff --git a/lib/libutil/login_auth.3 b/lib/libutil/login_auth.3
index 3750bd69182b..d388f254a00b 100644
--- a/lib/libutil/login_auth.3
+++ b/lib/libutil/login_auth.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_auth.3,v 1.14 2001/10/01 16:09:18 ru Exp $
 .\"
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login_auth.c b/lib/libutil/login_auth.c
index ce9a2e47c316..a4bd8ad119ba 100644
--- a/lib/libutil/login_auth.c
+++ b/lib/libutil/login_auth.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_auth.c,v 1.14 2003/06/14 18:42:37 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 960f6dea044d..808f77e55327 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_cap.3,v 1.34 2004/12/29 02:18:24 trhodes Exp $
 .\"
 .Dd December 27, 1996
 .Os
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 6d965e307c34..3140b5972d3e 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.33 2005/04/22 23:11:57 trhodes Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
index a7cb4c67e8f0..7860c99317b4 100644
--- a/lib/libutil/login_cap.h
+++ b/lib/libutil/login_cap.h
@@ -22,7 +22,7 @@
  * Low-level routines relating to the user capabilities database
  *
  *	Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_cap.h,v 1.9 2003/10/18 10:04:16 markm Exp $
  */
 
 #ifndef _LOGIN_CAP_H_
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index c698bdb66724..7a43ecf1a57c 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.17 2004/05/11 11:10:09 dds Exp $
 .\"
 .Dd December 28, 1996
 .Os
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 30716056fc89..d899fcac3b58 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_class.c,v 1.24 2003/10/29 10:55:56 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index c65fc9b8328a..acfb89b278e4 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_crypt.c,v 1.5 2002/04/08 11:04:56 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libutil/login_ok.3 b/lib/libutil/login_ok.3
index 8a6f291c97c1..c072507345a5 100644
--- a/lib/libutil/login_ok.3
+++ b/lib/libutil/login_ok.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.14 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 2, 1997
 .Os
diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c
index 19c884f2057b..3b6276dcd03d 100644
--- a/lib/libutil/login_ok.c
+++ b/lib/libutil/login_ok.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_ok.c,v 1.11 2003/10/18 10:04:16 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libutil/login_times.3 b/lib/libutil/login_times.3
index e1f57cea173c..4e1b411d7b2c 100644
--- a/lib/libutil/login_times.3
+++ b/lib/libutil/login_times.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_times.3,v 1.15 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 2, 1997
 .Os
diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c
index 10e88dd5a5f3..e3700165c945 100644
--- a/lib/libutil/login_times.c
+++ b/lib/libutil/login_times.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_times.c,v 1.9 2003/06/14 18:42:37 markm Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libutil/login_tty.3 b/lib/libutil/login_tty.3
index 6303d685e034..a35d6dfeb972 100644
--- a/lib/libutil/login_tty.3
+++ b/lib/libutil/login_tty.3
@@ -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/lib/libutil/login_tty.3,v 1.10 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index 985a6ea58cb7..92a0dc23da3a 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_tty.c,v 1.9 2003/10/18 10:04:16 markm Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/logout.3 b/lib/libutil/logout.3
index 426fe087040a..819acf608815 100644
--- a/lib/libutil/logout.3
+++ b/lib/libutil/logout.3
@@ -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/lib/libutil/logout.3,v 1.12 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index 292f8980dc1c..93a6decb2b4e 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/logout.c,v 1.11 2003/10/18 10:04:16 markm Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/logwtmp.3 b/lib/libutil/logwtmp.3
index 16903fbde79b..a0d00319ff0b 100644
--- a/lib/libutil/logwtmp.3
+++ b/lib/libutil/logwtmp.3
@@ -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/lib/libutil/logwtmp.3,v 1.11 2001/10/11 11:02:50 yar Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index 42f3599f9fef..0df8c4852459 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/logwtmp.c,v 1.20 2005/05/13 16:31:09 ume Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index 61eb15399098..79c787d56687 100644
--- a/lib/libutil/property.3
+++ b/lib/libutil/property.3
@@ -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/lib/libutil/property.3,v 1.18 2005/01/20 09:17:07 ru Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index f2c3917e9296..3e46e18b3346 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/property.c,v 1.13 2003/06/14 18:42:37 markm Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libutil/pty.3 b/lib/libutil/pty.3
index 35f0b828ce2f..70c811ec004d 100644
--- a/lib/libutil/pty.3
+++ b/lib/libutil/pty.3
@@ -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/lib/libutil/pty.3,v 1.13 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index b230edb113af..73c634d66e8c 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.15 2003/10/18 10:04:16 markm Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index 90c9d72f4f93..b06d7256af0e 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -43,7 +43,7 @@
 static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libutil/pw_util.c,v 1.35 2004/05/18 15:53:58 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/lib/libutil/realhostname.3 b/lib/libutil/realhostname.3
index fd64d4c6966e..3148e272f487 100644
--- a/lib/libutil/realhostname.3
+++ b/lib/libutil/realhostname.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/realhostname.3,v 1.10 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd April 6, 1999
 .Os
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 6a1b82f34631..3fffcdb6e1c5 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/realhostname.c,v 1.18 2005/05/13 16:31:09 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index 9f7f0dfb0224..d1bf06333090 100644
--- a/lib/libutil/realhostname_sa.3
+++ b/lib/libutil/realhostname_sa.3
@@ -49,7 +49,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/realhostname_sa.3,v 1.11 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd January 11, 2000
 .Os
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index ec78a3503609..4f9828c3828b 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/stub.c,v 1.3 2003/10/18 10:04:16 markm Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3
index f01e884e7870..c3708124dd6f 100644
--- a/lib/libutil/trimdomain.3
+++ b/lib/libutil/trimdomain.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/trimdomain.3,v 1.8 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd April 7, 1999
 .Os
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index a7ce8c4eaea3..848b56f4de98 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/trimdomain.c,v 1.5 2003/10/18 10:04:16 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index 5f75c7f94e99..7ed6bcbe83d6 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -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/lib/libutil/uucplock.3,v 1.19 2005/02/13 22:25:14 ru Exp $
 .\" "
 .Dd March 30, 1997
 .Os
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 71ea25e1e215..dfd9be67d121 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/uucplock.c,v 1.16 2003/10/18 10:04:16 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index 6f88eeb0beda..462892fbebac 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libvgl/Makefile,v 1.10.14.1 2005/07/22 17:29:09 kensmith Exp $
 LIB=	vgl
 SHLIB_MAJOR= 4
 CFLAGS+=-Wall -I${.CURDIR}
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index ec99d26c7126..1fe72d1863f9 100644
--- a/lib/libvgl/bitmap.c
+++ b/lib/libvgl/bitmap.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/bitmap.c,v 1.9 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c
index 5c437ad45334..7002d80783eb 100644
--- a/lib/libvgl/keyboard.c
+++ b/lib/libvgl/keyboard.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/keyboard.c,v 1.7 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c
index 8506a1bc8729..f3fc92ec4677 100644
--- a/lib/libvgl/main.c
+++ b/lib/libvgl/main.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/main.c,v 1.15 2004/06/08 12:24:47 stefanf Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c
index 4f9dc6210530..c7d8cbe90a78 100644
--- a/lib/libvgl/mouse.c
+++ b/lib/libvgl/mouse.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/mouse.c,v 1.6 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index b7d789a57a7c..273b3cde2f7a 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/simple.c,v 1.8 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <signal.h>
 #include <sys/fbio.h>
diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c
index 757702f12655..30fce56b690d 100644
--- a/lib/libvgl/text.c
+++ b/lib/libvgl/text.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/text.c,v 1.8 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <stdio.h>
 #include <sys/fbio.h>
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 06d05a5ae16f..9d3beadb7aae 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -24,7 +24,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/lib/libvgl/vgl.3,v 1.30 2005/02/13 23:45:48 ru Exp $
 .Dd November 7, 1999
 .Dt VGL 3
 .Os
diff --git a/lib/libvgl/vgl.h b/lib/libvgl/vgl.h
index 1b843829d72b..24a5c387c6c6 100644
--- a/lib/libvgl/vgl.h
+++ b/lib/libvgl/vgl.h
@@ -25,7 +25,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/lib/libvgl/vgl.h,v 1.8 2002/06/02 20:05:39 schweikh Exp $
  */
 
 #ifndef _VGL_H_
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 1f3ccd0cbd3b..21f8dc0a2812 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.16.2.1 2005/07/22 17:29:09 kensmith Exp $
 #
 
 LIB=	wrap
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 8a3f6b4271be..2118fdcf299e 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/liby/Makefile,v 1.12 2004/12/21 09:33:47 ru Exp $
 
 LIB=		y
 SHLIB_MAJOR=	2
diff --git a/lib/liby/main.c b/lib/liby/main.c
index c2955c407369..7878e855fba4 100644
--- a/lib/liby/main.c
+++ b/lib/liby/main.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/liby/main.c,v 1.4 2004/05/24 09:50:57 stefanf Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
index c2159c8a9444..378ba13b266c 100644
--- a/lib/liby/yyerror.c
+++ b/lib/liby/yyerror.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/liby/yyerror.c,v 1.3 2001/09/30 22:36:18 dillon Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)yyerror.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index de237de07534..41b176172a55 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libypclnt/Makefile,v 1.12.8.1 2005/07/22 17:29:09 kensmith Exp $
 
 LIB=	ypclnt
 SHLIB_MAJOR= 2
diff --git a/lib/libypclnt/ypclnt.h b/lib/libypclnt/ypclnt.h
index 476981c15d15..48537e619364 100644
--- a/lib/libypclnt/ypclnt.h
+++ b/lib/libypclnt/ypclnt.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt.h,v 1.2 2002/05/08 00:48:39 des Exp $
  */
 
 #ifndef _YPCLNT_H_INCLUDED
diff --git a/lib/libypclnt/ypclnt_connect.c b/lib/libypclnt/ypclnt_connect.c
index 5670fa442587..f2a3399c4121 100644
--- a/lib/libypclnt/ypclnt_connect.c
+++ b/lib/libypclnt/ypclnt_connect.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_connect.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libypclnt/ypclnt_error.c b/lib/libypclnt/ypclnt_error.c
index a7d986f19dd9..40075b5dcbdd 100644
--- a/lib/libypclnt/ypclnt_error.c
+++ b/lib/libypclnt/ypclnt_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_error.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include <stdarg.h>
diff --git a/lib/libypclnt/ypclnt_free.c b/lib/libypclnt/ypclnt_free.c
index f5e78a42054e..975083b8a109 100644
--- a/lib/libypclnt/ypclnt_free.c
+++ b/lib/libypclnt/ypclnt_free.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_free.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libypclnt/ypclnt_get.c b/lib/libypclnt/ypclnt_get.c
index 8a709719959e..e242a13d4ec3 100644
--- a/lib/libypclnt/ypclnt_get.c
+++ b/lib/libypclnt/ypclnt_get.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_get.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include "ypclnt.h"
diff --git a/lib/libypclnt/ypclnt_new.c b/lib/libypclnt/ypclnt_new.c
index 650cfdd62f7e..a6cb21f10e62 100644
--- a/lib/libypclnt/ypclnt_new.c
+++ b/lib/libypclnt/ypclnt_new.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_new.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libypclnt/ypclnt_passwd.c b/lib/libypclnt/ypclnt_passwd.c
index 648379430aba..d12e97e468fc 100644
--- a/lib/libypclnt/ypclnt_passwd.c
+++ b/lib/libypclnt/ypclnt_passwd.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_passwd.c,v 1.6 2003/06/15 10:36:53 mbr Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade
index 4ee4eebedb63..436a8369cb95 100644
--- a/lib/libz/FREEBSD-upgrade
+++ b/lib/libz/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libz/FREEBSD-upgrade,v 1.1 2005/05/11 03:50:50 kientzle Exp $
 
 ZLib 1.2.2
 
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 63383b4d97b6..2897f0cdfb71 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libz/Makefile,v 1.17 2005/06/03 15:25:13 imp Exp $
 #
 
 LIB=		z
diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index 5424de0baf4e..cd34e24cc104 100644
--- a/lib/libz/gzio.c
+++ b/lib/libz/gzio.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/gzio.c,v 1.11 2005/04/24 22:04:34 kientzle Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c
index 979fd9f24c83..ed95c1c6faf9 100644
--- a/lib/libz/minigzip.c
+++ b/lib/libz/minigzip.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.14 2004/06/30 23:54:46 tjr Exp $");
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h
index 66e929d209bf..b609160ff817 100644
--- a/lib/libz/zconf.h
+++ b/lib/libz/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/zconf.h,v 1.9 2005/04/24 22:04:34 kientzle Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/lib/libz/zopen.c b/lib/libz/zopen.c
index 025899f0dc05..0e77ddb21efa 100644
--- a/lib/libz/zopen.c
+++ b/lib/libz/zopen.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/zopen.c,v 1.2 2001/09/30 22:39:00 dillon Exp $");
 
 #include <stdio.h>
 #include <zlib.h>
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index b6452c6cd579..ad6eca9201ae 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -1,5 +1,5 @@
 #  @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/Makefile,v 1.71.2.1 2005/07/22 17:29:09 kensmith Exp $
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
diff --git a/lib/msun/alpha/Makefile.inc b/lib/msun/alpha/Makefile.inc
index b5c855809f36..f75ace93687f 100644
--- a/lib/msun/alpha/Makefile.inc
+++ b/lib/msun/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/alpha/Makefile.inc,v 1.2 2005/03/07 04:53:35 das Exp $
 
 ARCH_SRCS = s_copysign.S s_copysignf.S
 LDBL_PREC = 53
diff --git a/lib/msun/alpha/fenv.c b/lib/msun/alpha/fenv.c
index 5f0182c696f0..e8ab204c4399 100644
--- a/lib/msun/alpha/fenv.c
+++ b/lib/msun/alpha/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/alpha/fenv.c,v 1.2 2005/03/16 19:03:44 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/alpha/fenv.h b/lib/msun/alpha/fenv.h
index b940a60eec34..dc7bcb78f2eb 100644
--- a/lib/msun/alpha/fenv.h
+++ b/lib/msun/alpha/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/alpha/fenv.h,v 1.3 2005/03/16 19:03:44 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/alpha/s_copysign.S b/lib/msun/alpha/s_copysign.S
index 2a724e228c48..12381bb0370e 100644
--- a/lib/msun/alpha/s_copysign.S
+++ b/lib/msun/alpha/s_copysign.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/msun/alpha/s_copysign.S,v 1.2 1999/08/28 00:06:07 peter Exp $ */
 /*	From: NetBSD: s_copysign.S,v 1.3 1997/07/30 23:58:38 jtc Exp	*/
 
 /*-
diff --git a/lib/msun/alpha/s_copysignf.S b/lib/msun/alpha/s_copysignf.S
index d8a42a464c4c..2e5eda113473 100644
--- a/lib/msun/alpha/s_copysignf.S
+++ b/lib/msun/alpha/s_copysignf.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/msun/alpha/s_copysignf.S,v 1.2 1999/08/28 00:06:08 peter Exp $ */
 /*	From: NetBSD: s_copysignf.S,v 1.3 1997/07/30 23:58:41 jtc Exp */
 
 /*-
diff --git a/lib/msun/amd64/Makefile.inc b/lib/msun/amd64/Makefile.inc
index 1914ce8f5803..43da77545cc5 100644
--- a/lib/msun/amd64/Makefile.inc
+++ b/lib/msun/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/amd64/Makefile.inc,v 1.4 2005/04/16 21:12:55 das Exp $
 
 ARCH_SRCS = e_sqrt.S e_sqrtf.S s_llrint.S s_llrintf.S s_lrint.S s_lrintf.S \
 	    s_remquo.S s_remquof.S s_scalbn.S s_scalbnf.S s_scalbnl.S
diff --git a/lib/msun/amd64/e_sqrt.S b/lib/msun/amd64/e_sqrt.S
index f4b4f62b5ce0..0429cceb3656 100644
--- a/lib/msun/amd64/e_sqrt.S
+++ b/lib/msun/amd64/e_sqrt.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrt.S,v 1.2 2005/02/04 14:08:32 das Exp $")
 	
 ENTRY(sqrt)
 	sqrtsd	%xmm0, %xmm0
diff --git a/lib/msun/amd64/e_sqrtf.S b/lib/msun/amd64/e_sqrtf.S
index 25f4dfc5bf84..471fa668026f 100644
--- a/lib/msun/amd64/e_sqrtf.S
+++ b/lib/msun/amd64/e_sqrtf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrtf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 ENTRY(sqrtf)
 	sqrtss	%xmm0, %xmm0
diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c
index 95c82dee6e39..2b4367874df7 100644
--- a/lib/msun/amd64/fenv.c
+++ b/lib/msun/amd64/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/amd64/fenv.c,v 1.3 2005/03/16 19:03:45 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/amd64/fenv.h b/lib/msun/amd64/fenv.h
index cb213c271c5f..c4f94322ce22 100644
--- a/lib/msun/amd64/fenv.h
+++ b/lib/msun/amd64/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/amd64/fenv.h,v 1.5 2005/03/16 22:34:14 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/amd64/s_llrint.S b/lib/msun/amd64/s_llrint.S
index ab098465cd57..b81c73a452d3 100644
--- a/lib/msun/amd64/s_llrint.S
+++ b/lib/msun/amd64/s_llrint.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_llrint.S,v 1.1 2005/01/15 03:32:28 das Exp $")
 	
 /* sizeof(long) == sizeof(long long) */
 #define	fn	llrint
diff --git a/lib/msun/amd64/s_llrintf.S b/lib/msun/amd64/s_llrintf.S
index e810e40b640d..d62cfcbc410d 100644
--- a/lib/msun/amd64/s_llrintf.S
+++ b/lib/msun/amd64/s_llrintf.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_llrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 /* sizeof(long) == sizeof(long long) */
 #define	fn	llrintf
diff --git a/lib/msun/amd64/s_lrint.S b/lib/msun/amd64/s_lrint.S
index 9059a38f84de..161b7319b693 100644
--- a/lib/msun/amd64/s_lrint.S
+++ b/lib/msun/amd64/s_lrint.S
@@ -27,7 +27,7 @@
 #include <machine/asm.h>
 
 #ifndef fn
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrint.S,v 1.1 2005/01/15 03:32:28 das Exp $")
 #define	fn	lrint
 #endif
 
diff --git a/lib/msun/amd64/s_lrintf.S b/lib/msun/amd64/s_lrintf.S
index cc27d208ae4a..506e834d5794 100644
--- a/lib/msun/amd64/s_lrintf.S
+++ b/lib/msun/amd64/s_lrintf.S
@@ -27,7 +27,7 @@
 #include <machine/asm.h>
 
 #ifndef fn
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 #define	fn	lrintf
 #endif
 
diff --git a/lib/msun/amd64/s_remquo.S b/lib/msun/amd64/s_remquo.S
index eb113d718e86..19f3b532538b 100644
--- a/lib/msun/amd64/s_remquo.S
+++ b/lib/msun/amd64/s_remquo.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquo.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquo)
 	movsd	%xmm0,-8(%rsp)
diff --git a/lib/msun/amd64/s_remquof.S b/lib/msun/amd64/s_remquof.S
index 0833f5b984b5..02b604fa43e0 100644
--- a/lib/msun/amd64/s_remquof.S
+++ b/lib/msun/amd64/s_remquof.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquof.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquof)
 	movss	%xmm0,-4(%rsp)
diff --git a/lib/msun/amd64/s_scalbn.S b/lib/msun/amd64/s_scalbn.S
index c9ac808b9b03..6942e1892321 100644
--- a/lib/msun/amd64/s_scalbn.S
+++ b/lib/msun/amd64/s_scalbn.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbn.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(scalbn)
 	movsd	%xmm0,-8(%rsp)
diff --git a/lib/msun/amd64/s_scalbnf.S b/lib/msun/amd64/s_scalbnf.S
index d1bcb9f183a9..b81e873e2213 100644
--- a/lib/msun/amd64/s_scalbnf.S
+++ b/lib/msun/amd64/s_scalbnf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(scalbnf)
 	movss	%xmm0,-8(%rsp)
diff --git a/lib/msun/amd64/s_scalbnl.S b/lib/msun/amd64/s_scalbnl.S
index 8dfa810757af..57629a4ffe5f 100644
--- a/lib/msun/amd64/s_scalbnl.S
+++ b/lib/msun/amd64/s_scalbnl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnl)
diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc
index 812ce1aa034f..6559cc3f0909 100644
--- a/lib/msun/arm/Makefile.inc
+++ b/lib/msun/arm/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/arm/Makefile.inc,v 1.1 2005/03/07 04:53:35 das Exp $
 
 LDBL_PREC = 53
diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c
index a6781e0e715e..469f198c3a48 100644
--- a/lib/msun/arm/fenv.c
+++ b/lib/msun/arm/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/arm/fenv.c,v 1.1 2004/06/06 10:03:59 das Exp $
  */
 
 #include <fenv.h>
diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h
index d540ae2d5dbb..e7a88604bc59 100644
--- a/lib/msun/arm/fenv.h
+++ b/lib/msun/arm/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/arm/fenv.h,v 1.5 2005/03/16 19:03:45 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c
index 98d2247ae091..e0a5b73676d8 100644
--- a/lib/msun/bsdsrc/b_exp.c
+++ b/lib/msun/bsdsrc/b_exp.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_exp.c,v 1.7 2004/12/16 20:40:37 das Exp $");
 
 
 /* EXP(X)
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index 95d366de6de5..068842872dd3 100644
--- a/lib/msun/bsdsrc/b_log.c
+++ b/lib/msun/bsdsrc/b_log.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)log.c	8.2 (Berkeley) 11/30/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_log.c,v 1.7 2004/12/16 20:40:37 das Exp $");
 
 #include <math.h>
 #include <errno.h>
diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c
index babf3261de89..97e25208fea4 100644
--- a/lib/msun/bsdsrc/b_tgamma.c
+++ b/lib/msun/bsdsrc/b_tgamma.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)gamma.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_tgamma.c,v 1.6 2004/12/16 20:40:37 das Exp $");
 
 /*
  * This code by P. McIlroy, Oct 1992;
diff --git a/lib/msun/bsdsrc/mathimpl.h b/lib/msun/bsdsrc/mathimpl.h
index 275b6247f3ee..20ef0a3477fe 100644
--- a/lib/msun/bsdsrc/mathimpl.h
+++ b/lib/msun/bsdsrc/mathimpl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mathimpl.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/bsdsrc/mathimpl.h,v 1.5 2004/12/16 20:40:49 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/i387/Makefile.inc b/lib/msun/i387/Makefile.inc
index bae4c620a154..d83a56bc364c 100644
--- a/lib/msun/i387/Makefile.inc
+++ b/lib/msun/i387/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/i387/Makefile.inc,v 1.7 2005/04/16 21:12:55 das Exp $
 
 ARCH_SRCS = e_exp.S e_fmod.S e_log.S e_log10.S \
 	    e_remainder.S e_scalb.S e_sqrt.S s_ceil.S s_copysign.S \
diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S
index d21958c0b4a6..5ed9a64c7594 100644
--- a/lib/msun/i387/e_exp.S
+++ b/lib/msun/i387/e_exp.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_exp.S,v 1.10 2005/02/04 14:08:32 das Exp $")
 
 /* e^x = 2^(x * log2(e)) */
 ENTRY(exp)
diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S
index 71c4c3062ee5..233476f4f00b 100644
--- a/lib/msun/i387/e_fmod.S
+++ b/lib/msun/i387/e_fmod.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_fmod.S,v 1.8 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(fmod)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S
index 0d06940a670b..caaac87076cd 100644
--- a/lib/msun/i387/e_log.S
+++ b/lib/msun/i387/e_log.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_log.S,v 1.7 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(log)
 	fldln2
diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S
index edc13ffb8bd2..7695ef6cc1b6 100644
--- a/lib/msun/i387/e_log10.S
+++ b/lib/msun/i387/e_log10.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_log10.S,v 1.7 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(log10)
 	fldlg2
diff --git a/lib/msun/i387/e_log10f.S b/lib/msun/i387/e_log10f.S
index 44410bc2b8ec..2dd670827b95 100644
--- a/lib/msun/i387/e_log10f.S
+++ b/lib/msun/i387/e_log10f.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_log10f.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_log10f.S,v 1.1 1996/07/03 16:50:22 jtc Exp $") */
 
 ENTRY(log10f)
diff --git a/lib/msun/i387/e_logf.S b/lib/msun/i387/e_logf.S
index e66c844e20ef..9f3bd00d5255 100644
--- a/lib/msun/i387/e_logf.S
+++ b/lib/msun/i387/e_logf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_logf.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_logf.S,v 1.2 1996/07/06 00:15:45 jtc Exp $") */
 
 ENTRY(logf)
diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S
index ff2f1426ec14..5f0d67955653 100644
--- a/lib/msun/i387/e_remainder.S
+++ b/lib/msun/i387/e_remainder.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_remainder.S,v 1.8 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(remainder)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_remainderf.S b/lib/msun/i387/e_remainderf.S
index 4093c8a289b5..6d1ca794431e 100644
--- a/lib/msun/i387/e_remainderf.S
+++ b/lib/msun/i387/e_remainderf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_remainderf.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_remainderf.S,v 1.2 1995/05/08 23:49:47 jtc Exp $") */
 
 ENTRY(remainderf)
diff --git a/lib/msun/i387/e_scalb.S b/lib/msun/i387/e_scalb.S
index 1aa510fece5d..dd8657f617c5 100644
--- a/lib/msun/i387/e_scalb.S
+++ b/lib/msun/i387/e_scalb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_scalb.S,v 1.8 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(scalb)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_scalbf.S b/lib/msun/i387/e_scalbf.S
index d937dd50dcb2..9de0d706a7f9 100644
--- a/lib/msun/i387/e_scalbf.S
+++ b/lib/msun/i387/e_scalbf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_scalbf.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_scalbf.S,v 1.1 1996/07/03 16:50:24 jtc Exp $") */
 
 ENTRY(scalbf)
diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S
index 554beb706eb1..b7e9621e802f 100644
--- a/lib/msun/i387/e_sqrt.S
+++ b/lib/msun/i387/e_sqrt.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_sqrt.S,v 1.7 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(sqrt)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/e_sqrtf.S b/lib/msun/i387/e_sqrtf.S
index 9d78725030cd..86c56a9d55e7 100644
--- a/lib/msun/i387/e_sqrtf.S
+++ b/lib/msun/i387/e_sqrtf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_sqrtf.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_sqrtf.S,v 1.2 1995/05/08 23:50:14 jtc Exp $") */
 
 ENTRY(sqrtf)
diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c
index 567d69901306..830e38f8d8e8 100644
--- a/lib/msun/i387/fenv.c
+++ b/lib/msun/i387/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/i387/fenv.c,v 1.2 2005/03/17 22:21:46 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/i387/fenv.h b/lib/msun/i387/fenv.h
index d62dcf8374c1..b124366acb6b 100644
--- a/lib/msun/i387/fenv.h
+++ b/lib/msun/i387/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/i387/fenv.h,v 1.4 2005/03/17 22:21:46 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S
index e805d8524bb9..8e73b38fe3ae 100644
--- a/lib/msun/i387/s_ceil.S
+++ b/lib/msun/i387/s_ceil.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_ceil.S,v 1.7 1999/08/28 00:06:11 peter Exp $")
 
 ENTRY(ceil)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_ceilf.S b/lib/msun/i387/s_ceilf.S
index 473d30951d2b..152ca7bdef31 100644
--- a/lib/msun/i387/s_ceilf.S
+++ b/lib/msun/i387/s_ceilf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceilf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $");
 /* RCSID("$NetBSD: s_ceilf.S,v 1.3 1995/05/08 23:52:44 jtc Exp $") */
 
 ENTRY(ceilf)
diff --git a/lib/msun/i387/s_ceill.S b/lib/msun/i387/s_ceill.S
index ae64abfecaf8..b6c3c41be374 100644
--- a/lib/msun/i387/s_ceill.S
+++ b/lib/msun/i387/s_ceill.S
@@ -4,7 +4,7 @@
  */
 	
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceill.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(ceill)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_copysign.S b/lib/msun/i387/s_copysign.S
index ec28b452bfa7..6ecc7703a927 100644
--- a/lib/msun/i387/s_copysign.S
+++ b/lib/msun/i387/s_copysign.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_copysign.S,v 1.6 1999/08/28 00:06:11 peter Exp $")
 
 ENTRY(copysign)
 	movl	16(%esp),%edx
diff --git a/lib/msun/i387/s_copysignf.S b/lib/msun/i387/s_copysignf.S
index e78ad24b71d3..c3fc898d5afd 100644
--- a/lib/msun/i387/s_copysignf.S
+++ b/lib/msun/i387/s_copysignf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_copysignf.S,v 1.3 1995/05/08 23:53:25 jtc Exp $") */
 
 ENTRY(copysignf)
diff --git a/lib/msun/i387/s_copysignl.S b/lib/msun/i387/s_copysignl.S
index 7878591d387e..4c3a374e02e2 100644
--- a/lib/msun/i387/s_copysignl.S
+++ b/lib/msun/i387/s_copysignl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(copysignl)
 	movl	24(%esp),%edx
diff --git a/lib/msun/i387/s_cos.S b/lib/msun/i387/s_cos.S
index a73ba0621229..c38cb7b207d3 100644
--- a/lib/msun/i387/s_cos.S
+++ b/lib/msun/i387/s_cos.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_cos.S,v 1.6 1999/08/28 00:06:12 peter Exp $")
 
 ENTRY(cos)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_finite.S b/lib/msun/i387/s_finite.S
index b27b7d1149df..4835b0e06e69 100644
--- a/lib/msun/i387/s_finite.S
+++ b/lib/msun/i387/s_finite.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_finite.S,v 1.7 1999/08/28 00:06:12 peter Exp $")
 
 ENTRY(finite)
 	movl	8(%esp),%eax
diff --git a/lib/msun/i387/s_floor.S b/lib/msun/i387/s_floor.S
index 66c1d9f9d0f5..722f83d6cdb4 100644
--- a/lib/msun/i387/s_floor.S
+++ b/lib/msun/i387/s_floor.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_floor.S,v 1.7 1999/08/28 00:06:12 peter Exp $")
 
 ENTRY(floor)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_floorf.S b/lib/msun/i387/s_floorf.S
index f1000fef7659..5d39acd1ccd3 100644
--- a/lib/msun/i387/s_floorf.S
+++ b/lib/msun/i387/s_floorf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $");
 /* RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $") */
 
 ENTRY(floorf)
diff --git a/lib/msun/i387/s_floorl.S b/lib/msun/i387/s_floorl.S
index a0bb048e4a7d..3cde33552f1e 100644
--- a/lib/msun/i387/s_floorl.S
+++ b/lib/msun/i387/s_floorl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(floorl)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_llrint.S b/lib/msun/i387/s_llrint.S
index 1b8a63826679..b266e5ca07f9 100644
--- a/lib/msun/i387/s_llrint.S
+++ b/lib/msun/i387/s_llrint.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrint.S,v 1.1 2005/01/11 23:10:53 das Exp $"); 
 	
 ENTRY(llrint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_llrintf.S b/lib/msun/i387/s_llrintf.S
index 4f398b6dd1b8..e1edb090ff68 100644
--- a/lib/msun/i387/s_llrintf.S
+++ b/lib/msun/i387/s_llrintf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 ENTRY(llrintf)
 	flds	4(%esp)
diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S
index 9e09f840c40c..d3f8d9d933ec 100644
--- a/lib/msun/i387/s_logb.S
+++ b/lib/msun/i387/s_logb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_logb.S,v 1.7 2000/06/06 12:12:36 bde Exp $")
 
 ENTRY(logb)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_logbf.S b/lib/msun/i387/s_logbf.S
index 4cfa02b86f7d..26bc484e43ea 100644
--- a/lib/msun/i387/s_logbf.S
+++ b/lib/msun/i387/s_logbf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_logbf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_logbf.S,v 1.3 1995/05/09 00:15:12 jtc Exp $") */
 
 ENTRY(logbf)
diff --git a/lib/msun/i387/s_lrint.S b/lib/msun/i387/s_lrint.S
index 82269c884d53..022783cbf2ce 100644
--- a/lib/msun/i387/s_lrint.S
+++ b/lib/msun/i387/s_lrint.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrint.S,v 1.1 2005/01/11 23:10:53 das Exp $"); 
 	
 ENTRY(lrint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_lrintf.S b/lib/msun/i387/s_lrintf.S
index b9915fa5d071..ac126f0fdcbf 100644
--- a/lib/msun/i387/s_lrintf.S
+++ b/lib/msun/i387/s_lrintf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 ENTRY(lrintf)
 	flds	4(%esp)
diff --git a/lib/msun/i387/s_remquo.S b/lib/msun/i387/s_remquo.S
index fd8af5ef8b3c..f75283929c8f 100644
--- a/lib/msun/i387/s_remquo.S
+++ b/lib/msun/i387/s_remquo.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquo.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquo)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/s_remquof.S b/lib/msun/i387/s_remquof.S
index 70a43f4b4b39..40d24b898c01 100644
--- a/lib/msun/i387/s_remquof.S
+++ b/lib/msun/i387/s_remquof.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquof.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquof)
 	flds	8(%esp)
diff --git a/lib/msun/i387/s_rint.S b/lib/msun/i387/s_rint.S
index 79da080d7110..ccda3142ac1b 100644
--- a/lib/msun/i387/s_rint.S
+++ b/lib/msun/i387/s_rint.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_rint.S,v 1.6 1999/08/28 00:06:13 peter Exp $")
 
 ENTRY(rint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_rintf.S b/lib/msun/i387/s_rintf.S
index 646dcb516cee..ad45267cd4cb 100644
--- a/lib/msun/i387/s_rintf.S
+++ b/lib/msun/i387/s_rintf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_rintf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_rintf.S,v 1.3 1995/05/09 00:17:22 jtc Exp $") */
 
 ENTRY(rintf)
diff --git a/lib/msun/i387/s_scalbn.S b/lib/msun/i387/s_scalbn.S
index c00e1fb137e0..4600603aa01d 100644
--- a/lib/msun/i387/s_scalbn.S
+++ b/lib/msun/i387/s_scalbn.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_scalbn.S,v 1.7 1999/08/28 00:06:13 peter Exp $")
 
 ENTRY(scalbn)
 	fildl	12(%esp)
diff --git a/lib/msun/i387/s_scalbnf.S b/lib/msun/i387/s_scalbnf.S
index 3c84749b6c42..3e1ac41a9361 100644
--- a/lib/msun/i387/s_scalbnf.S
+++ b/lib/msun/i387/s_scalbnf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnf.S,v 1.2 2005/03/07 04:52:43 das Exp $");
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnf)
diff --git a/lib/msun/i387/s_scalbnl.S b/lib/msun/i387/s_scalbnl.S
index c166326b6d16..512ab615cb5e 100644
--- a/lib/msun/i387/s_scalbnl.S
+++ b/lib/msun/i387/s_scalbnl.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnl.S,v 1.1 2005/03/07 04:52:57 das Exp $");
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnl)
diff --git a/lib/msun/i387/s_significand.S b/lib/msun/i387/s_significand.S
index 13f1f3e76282..eddbc8262d27 100644
--- a/lib/msun/i387/s_significand.S
+++ b/lib/msun/i387/s_significand.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_significand.S,v 1.7 2000/06/06 12:12:36 bde Exp $")
 
 ENTRY(significand)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_significandf.S b/lib/msun/i387/s_significandf.S
index 99299814353b..6096ef007552 100644
--- a/lib/msun/i387/s_significandf.S
+++ b/lib/msun/i387/s_significandf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_significandf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_significandf.S,v 1.3 1995/05/09 00:24:07 jtc Exp $") */
 
 ENTRY(significandf)
diff --git a/lib/msun/i387/s_sin.S b/lib/msun/i387/s_sin.S
index d152352abf2f..c3d65fd7f0c1 100644
--- a/lib/msun/i387/s_sin.S
+++ b/lib/msun/i387/s_sin.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_sin.S,v 1.6 1999/08/28 00:06:14 peter Exp $")
 
 ENTRY(sin)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_tan.S b/lib/msun/i387/s_tan.S
index d0cbc0aabd97..925e11a1188a 100644
--- a/lib/msun/i387/s_tan.S
+++ b/lib/msun/i387/s_tan.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_tan.S,v 1.6 1999/08/28 00:06:14 peter Exp $")
 
 ENTRY(tan)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_trunc.S b/lib/msun/i387/s_trunc.S
index 91926d7373c4..1d78e1ca5dd5 100644
--- a/lib/msun/i387/s_trunc.S
+++ b/lib/msun/i387/s_trunc.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_trunc.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(trunc)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_truncf.S b/lib/msun/i387/s_truncf.S
index 000136738dfc..8afaf3ebc769 100644
--- a/lib/msun/i387/s_truncf.S
+++ b/lib/msun/i387/s_truncf.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $")
 
 ENTRY(truncf)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_truncl.S b/lib/msun/i387/s_truncl.S
index b20b06ebcfc4..cd5df1cf1bf4 100644
--- a/lib/msun/i387/s_truncl.S
+++ b/lib/msun/i387/s_truncl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(truncl)
 	pushl	%ebp
diff --git a/lib/msun/ia64/Makefile.inc b/lib/msun/ia64/Makefile.inc
index 0743e663badc..fdf2267a1757 100644
--- a/lib/msun/ia64/Makefile.inc
+++ b/lib/msun/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/ia64/Makefile.inc,v 1.2 2005/03/07 04:54:02 das Exp $
 
 ARCH_SRCS = s_fma.S s_fmaf.S s_fmal.S
 LDBL_PREC = 64
diff --git a/lib/msun/ia64/fenv.c b/lib/msun/ia64/fenv.c
index 95a580998e57..182d37e47daa 100644
--- a/lib/msun/ia64/fenv.c
+++ b/lib/msun/ia64/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/ia64/fenv.c,v 1.2 2004/06/11 02:35:30 das Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/msun/ia64/fenv.h b/lib/msun/ia64/fenv.h
index 6f0240f7b226..8c6b65b5e2b3 100644
--- a/lib/msun/ia64/fenv.h
+++ b/lib/msun/ia64/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/ia64/fenv.h,v 1.4 2005/03/16 19:03:45 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/ia64/s_fma.S b/lib/msun/ia64/s_fma.S
index 3e693592fce8..2da6c17be0f0 100644
--- a/lib/msun/ia64/s_fma.S
+++ b/lib/msun/ia64/s_fma.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fma.S,v 1.1 2005/01/22 09:53:18 das Exp $")
 
 ENTRY(fma, 3)
 {
diff --git a/lib/msun/ia64/s_fmaf.S b/lib/msun/ia64/s_fmaf.S
index 1e122bb525eb..320051baa971 100644
--- a/lib/msun/ia64/s_fmaf.S
+++ b/lib/msun/ia64/s_fmaf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fmaf.S,v 1.1 2005/01/22 09:53:18 das Exp $")
 
 ENTRY(fmaf, 3)
 {
diff --git a/lib/msun/ia64/s_fmal.S b/lib/msun/ia64/s_fmal.S
index c24a1dee62a0..7b8c4079c478 100644
--- a/lib/msun/ia64/s_fmal.S
+++ b/lib/msun/ia64/s_fmal.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fmal.S,v 1.1 2005/03/07 04:53:11 das Exp $")
 
 ENTRY(fmal, 3)
 {
diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3
index a08230a890fe..9f03d602bb06 100644
--- a/lib/msun/man/acos.3
+++ b/lib/msun/man/acos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acos.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/acos.3,v 1.13 2005/01/14 23:28:28 das Exp $
 .\"
 .Dd January 14, 2005
 .Dt ACOS 3
diff --git a/lib/msun/man/acosh.3 b/lib/msun/man/acosh.3
index b1339013889d..62534ab4ac9d 100644
--- a/lib/msun/man/acosh.3
+++ b/lib/msun/man/acosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acosh.3	5.2 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/acosh.3,v 1.11 2005/01/14 23:28:28 das Exp $
 .\"
 .Dd January 14, 2005
 .Dt ACOSH 3
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index e33623d74db3..1018990d895f 100644
--- a/lib/msun/man/asin.3
+++ b/lib/msun/man/asin.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asin.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/asin.3,v 1.15 2005/01/14 23:28:28 das Exp $
 .\"
 .Dd January 14, 2005
 .Dt ASIN 3
diff --git a/lib/msun/man/asinh.3 b/lib/msun/man/asinh.3
index 636bbe08cc56..6a0d9a088d76 100644
--- a/lib/msun/man/asinh.3
+++ b/lib/msun/man/asinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asinh.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/asinh.3,v 1.10 2001/10/13 12:23:22 bde Exp $
 .\"
 .Dd May 6, 1991
 .Dt ASINH 3
diff --git a/lib/msun/man/atan.3 b/lib/msun/man/atan.3
index b6417c639be6..c4cefed7f468 100644
--- a/lib/msun/man/atan.3
+++ b/lib/msun/man/atan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atan.3,v 1.10 2001/10/13 12:23:22 bde Exp $
 .\"
 .Dd May 2, 1991
 .Dt ATAN 3
diff --git a/lib/msun/man/atan2.3 b/lib/msun/man/atan2.3
index 684124b5043b..421e17de0e97 100644
--- a/lib/msun/man/atan2.3
+++ b/lib/msun/man/atan2.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan2.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atan2.3,v 1.14 2005/01/28 21:13:34 ru Exp $
 .\"
 .Dd January 14, 2005
 .Dt ATAN2 3
diff --git a/lib/msun/man/atanh.3 b/lib/msun/man/atanh.3
index abd0c7d91293..3dcc01aafb40 100644
--- a/lib/msun/man/atanh.3
+++ b/lib/msun/man/atanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atanh.3	5.2 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atanh.3,v 1.13 2005/01/28 21:14:16 ru Exp $
 .\"
 .Dd January 14, 2005
 .Dt ATANH 3
diff --git a/lib/msun/man/ceil.3 b/lib/msun/man/ceil.3
index 3f825c911dd8..557903ebe61b 100644
--- a/lib/msun/man/ceil.3
+++ b/lib/msun/man/ceil.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ceil.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ceil.3,v 1.15 2005/01/13 20:33:42 stefanf Exp $
 .\"
 .Dd January 13, 2005
 .Dt CEIL 3
diff --git a/lib/msun/man/cimag.3 b/lib/msun/man/cimag.3
index 10a3b2cb405e..069e8480d024 100644
--- a/lib/msun/man/cimag.3
+++ b/lib/msun/man/cimag.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cimag.3,v 1.2 2005/01/13 10:43:01 ru Exp $
 .\"
 .Dd August 7, 2004
 .Dt CIMAG 3
diff --git a/lib/msun/man/copysign.3 b/lib/msun/man/copysign.3
index 83fc126e6e5c..c3ce3dca88ad 100644
--- a/lib/msun/man/copysign.3
+++ b/lib/msun/man/copysign.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/copysign.3,v 1.1 2005/01/27 05:46:16 das Exp $
 .\"
 .Dd January 26, 2005
 .Dt COPYSIGN 3
diff --git a/lib/msun/man/cos.3 b/lib/msun/man/cos.3
index 38d8ccfc36b9..8e0bd91777fe 100644
--- a/lib/msun/man/cos.3
+++ b/lib/msun/man/cos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cos.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cos.3,v 1.11 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd May 2, 1991
 .Dt COS 3
diff --git a/lib/msun/man/cosh.3 b/lib/msun/man/cosh.3
index 74744d4e335a..947c33e6beb4 100644
--- a/lib/msun/man/cosh.3
+++ b/lib/msun/man/cosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cosh.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cosh.3,v 1.12 2005/01/14 23:28:28 das Exp $
 .\"
 .Dd January 14, 2005
 .Dt COSH 3
diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index 0ebb6a721ae6..824787f21c48 100644
--- a/lib/msun/man/erf.3
+++ b/lib/msun/man/erf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)erf.3	6.4 (Berkeley) 4/20/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/erf.3,v 1.11 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd April 20, 1991
 .Dt ERF 3
diff --git a/lib/msun/man/exp.3 b/lib/msun/man/exp.3
index 0fb5878f0f0f..f6aed8f13aa0 100644
--- a/lib/msun/man/exp.3
+++ b/lib/msun/man/exp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)exp.3	6.12 (Berkeley) 7/31/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/exp.3,v 1.22 2005/04/05 02:57:28 das Exp $
 .\"
 .Dd April 5, 2005
 .Dt EXP 3
diff --git a/lib/msun/man/fabs.3 b/lib/msun/man/fabs.3
index 9d9348477719..56b3a2307c05 100644
--- a/lib/msun/man/fabs.3
+++ b/lib/msun/man/fabs.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fabs.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fabs.3,v 1.11 2004/07/01 18:20:57 ru Exp $
 .\"
 .Dd October 25, 2003
 .Dt FABS 3
diff --git a/lib/msun/man/fdim.3 b/lib/msun/man/fdim.3
index 2de2e320ab4f..ca4e5ec0799c 100644
--- a/lib/msun/man/fdim.3
+++ b/lib/msun/man/fdim.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fdim.3,v 1.1 2004/06/30 07:04:01 das Exp $
 .\"
 .Dd June 29, 2004
 .Dt FDIM 3
diff --git a/lib/msun/man/feclearexcept.3 b/lib/msun/man/feclearexcept.3
index 217642c858e7..073de67b83fd 100644
--- a/lib/msun/man/feclearexcept.3
+++ b/lib/msun/man/feclearexcept.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/feclearexcept.3,v 1.3 2005/01/14 09:12:05 ru Exp $
 .\"
 .Dd May 8, 2004
 .Dt FECLEAREXCEPT 3
diff --git a/lib/msun/man/feenableexcept.3 b/lib/msun/man/feenableexcept.3
index 40bb892ebce7..0b790e7a3287 100644
--- a/lib/msun/man/feenableexcept.3
+++ b/lib/msun/man/feenableexcept.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/feenableexcept.3,v 1.1 2005/03/16 19:04:28 das Exp $
 .\"
 .Dd March 16, 2005
 .Dt FEENABLEEXCEPT 3
diff --git a/lib/msun/man/fegetenv.3 b/lib/msun/man/fegetenv.3
index c99663ed1a4b..2e386adad461 100644
--- a/lib/msun/man/fegetenv.3
+++ b/lib/msun/man/fegetenv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fegetenv.3,v 1.1 2004/06/06 10:06:26 das Exp $
 .\"
 .Dd May 8, 2004
 .Dt FEGETENV 3
diff --git a/lib/msun/man/fegetround.3 b/lib/msun/man/fegetround.3
index c6cd417dc9ad..938415880465 100644
--- a/lib/msun/man/fegetround.3
+++ b/lib/msun/man/fegetround.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fegetround.3,v 1.2 2005/01/14 09:12:05 ru Exp $
 .\"
 .Dd May 8, 2004
 .Dt FEGETROUND 3
diff --git a/lib/msun/man/fenv.3 b/lib/msun/man/fenv.3
index 3450153b13d4..33ad54137de4 100644
--- a/lib/msun/man/fenv.3
+++ b/lib/msun/man/fenv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fenv.3,v 1.5 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd March 16, 2005
 .Dt FENV 3
diff --git a/lib/msun/man/floor.3 b/lib/msun/man/floor.3
index ed46689cf43c..1f02daf3f345 100644
--- a/lib/msun/man/floor.3
+++ b/lib/msun/man/floor.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)floor.3	6.5 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/floor.3,v 1.17 2005/01/13 09:35:47 ru Exp $
 .\"
 .Dd January 13, 2005
 .Dt FLOOR 3
diff --git a/lib/msun/man/fma.3 b/lib/msun/man/fma.3
index d4cb32cb93a1..3398f559af03 100644
--- a/lib/msun/man/fma.3
+++ b/lib/msun/man/fma.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fma.3,v 1.2 2005/03/07 04:59:43 das Exp $
 .\"
 .Dd January 22, 2005
 .Dt FMA 3
diff --git a/lib/msun/man/fmax.3 b/lib/msun/man/fmax.3
index 71cb7d932f36..03249a3f4d7e 100644
--- a/lib/msun/man/fmax.3
+++ b/lib/msun/man/fmax.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fmax.3,v 1.2 2005/01/14 09:12:05 ru Exp $
 .\"
 .Dd June 29, 2004
 .Dt FMAX 3
diff --git a/lib/msun/man/fmod.3 b/lib/msun/man/fmod.3
index c585408faee0..c0d4ed8df84d 100644
--- a/lib/msun/man/fmod.3
+++ b/lib/msun/man/fmod.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fmod.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fmod.3,v 1.8 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd May 2, 1991
 .Dt FMOD 3
diff --git a/lib/msun/man/hypot.3 b/lib/msun/man/hypot.3
index 4843e4418373..a92a2a6726ea 100644
--- a/lib/msun/man/hypot.3
+++ b/lib/msun/man/hypot.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hypot.3	6.7 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/hypot.3,v 1.13 2005/01/14 23:28:28 das Exp $
 .\"
 .Dd January 14, 2005
 .Dt HYPOT 3
diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3
index 4d93d6361e29..3b7087d5a078 100644
--- a/lib/msun/man/ieee.3
+++ b/lib/msun/man/ieee.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.22 2005/06/16 21:55:45 ru Exp $
 .\"
 .Dd January 26, 2005
 .Dt IEEE 3
diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3
index 986fd08b9ae8..4bbb3659f1f8 100644
--- a/lib/msun/man/ieee_test.3
+++ b/lib/msun/man/ieee_test.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ieee_test.3,v 1.11 2004/06/12 04:40:47 das Exp $
 .\"
 .Dd March 10, 1994
 .Dt IEEE_TEST 3
diff --git a/lib/msun/man/ilogb.3 b/lib/msun/man/ilogb.3
index 401e86df7256..80b9c81b5502 100644
--- a/lib/msun/man/ilogb.3
+++ b/lib/msun/man/ilogb.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ilogb.3,v 1.1 2005/01/27 05:46:16 das Exp $
 .\"
 .Dd January 26, 2005
 .Dt ILOGB 3
diff --git a/lib/msun/man/j0.3 b/lib/msun/man/j0.3
index 2d8081084cdd..76cd51c8b841 100644
--- a/lib/msun/man/j0.3
+++ b/lib/msun/man/j0.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)j0.3	6.7 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/j0.3,v 1.13 2005/01/14 23:28:28 das Exp $
 .\"
 .Dd January 14, 2005
 .Dt J0 3
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index f7812c9f8f1a..0064a48c2a19 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/lgamma.3,v 1.22 2005/01/16 16:46:14 ru Exp $
 .\"
 .Dd January 14, 2005
 .Dt LGAMMA 3
diff --git a/lib/msun/man/lrint.3 b/lib/msun/man/lrint.3
index bae9c454563b..d7de09331c34 100644
--- a/lib/msun/man/lrint.3
+++ b/lib/msun/man/lrint.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/lrint.3,v 1.2 2005/01/13 10:43:01 ru Exp $
 .\"
 .Dd January 11, 2005
 .Dt LRINT 3
diff --git a/lib/msun/man/lround.3 b/lib/msun/man/lround.3
index a98229dbb3b4..d3e53c22f196 100644
--- a/lib/msun/man/lround.3
+++ b/lib/msun/man/lround.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/lround.3,v 1.4 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd April 7, 2005
 .Dt LROUND 3
diff --git a/lib/msun/man/math.3 b/lib/msun/man/math.3
index a0d1fdef3589..d8287fa7d5a3 100644
--- a/lib/msun/man/math.3
+++ b/lib/msun/man/math.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)math.3	6.10 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/math.3,v 1.25 2005/06/16 21:56:03 ru Exp $
 .\"
 .Dd April 5, 2005
 .Dt MATH 3
diff --git a/lib/msun/man/nextafter.3 b/lib/msun/man/nextafter.3
index e958b5a9f665..1c94fb77766e 100644
--- a/lib/msun/man/nextafter.3
+++ b/lib/msun/man/nextafter.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/nextafter.3,v 1.2 2005/03/07 05:00:29 das Exp $
 .\"
 .Dd May 4, 2005
 .Dt NEXTAFTER 3
diff --git a/lib/msun/man/remainder.3 b/lib/msun/man/remainder.3
index 10ac4dedcf9e..bc49b3afc4c5 100644
--- a/lib/msun/man/remainder.3
+++ b/lib/msun/man/remainder.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/remainder.3,v 1.2 2005/03/25 04:40:44 das Exp $
 .\"
 .Dd March 24, 2005
 .Dt REMAINDER 3
diff --git a/lib/msun/man/rint.3 b/lib/msun/man/rint.3
index bd1a7d321d1d..ee55feaf2238 100644
--- a/lib/msun/man/rint.3
+++ b/lib/msun/man/rint.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rint.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/rint.3,v 1.11 2005/01/11 23:12:17 das Exp $
 .\"
 .Dd July 5, 2004
 .Dt RINT 3
diff --git a/lib/msun/man/round.3 b/lib/msun/man/round.3
index 24b3970c8245..b077d77338b3 100644
--- a/lib/msun/man/round.3
+++ b/lib/msun/man/round.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/round.3,v 1.6 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd April 7, 2005
 .Dt ROUND 3
diff --git a/lib/msun/man/scalbn.3 b/lib/msun/man/scalbn.3
index 0007132acd6f..faada7afb346 100644
--- a/lib/msun/man/scalbn.3
+++ b/lib/msun/man/scalbn.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/scalbn.3,v 1.2 2005/03/07 05:00:44 das Exp $
 .\"
 .Dd March 4, 2005
 .Dt SCALBN 3
diff --git a/lib/msun/man/signbit.3 b/lib/msun/man/signbit.3
index dd0a39fcee15..b74967120292 100644
--- a/lib/msun/man/signbit.3
+++ b/lib/msun/man/signbit.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/signbit.3,v 1.1 2004/07/19 08:16:10 das Exp $
 .\"
 .Dd July 18, 2004
 .Dt SIGNBIT 3
diff --git a/lib/msun/man/sin.3 b/lib/msun/man/sin.3
index f3e2db1205a1..3a408a784ed8 100644
--- a/lib/msun/man/sin.3
+++ b/lib/msun/man/sin.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sin.3	6.7 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sin.3,v 1.9 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd April 19, 1991
 .Dt SIN 3
diff --git a/lib/msun/man/sinh.3 b/lib/msun/man/sinh.3
index f7e69955c011..8347862a2fa0 100644
--- a/lib/msun/man/sinh.3
+++ b/lib/msun/man/sinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sinh.3	6.6 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sinh.3,v 1.12 2005/01/14 23:28:28 das Exp $
 .Dd January 14, 2005
 .Dt SINH 3
 .Os
diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3
index 99399008f0b5..22f8b7b685fa 100644
--- a/lib/msun/man/sqrt.3
+++ b/lib/msun/man/sqrt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sqrt.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sqrt.3,v 1.12 2005/01/14 23:28:28 das Exp $
 .\"
 .Dd May 6, 1991
 .Dt SQRT 3
diff --git a/lib/msun/man/tan.3 b/lib/msun/man/tan.3
index fee9fb286c84..5995a3b5bbf5 100644
--- a/lib/msun/man/tan.3
+++ b/lib/msun/man/tan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tan.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/tan.3,v 1.9 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd May 2, 1991
 .Dt TAN 3
diff --git a/lib/msun/man/tanh.3 b/lib/msun/man/tanh.3
index 39315e2c3990..391bc15829ec 100644
--- a/lib/msun/man/tanh.3
+++ b/lib/msun/man/tanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tanh.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/tanh.3,v 1.10 2001/10/13 12:23:23 bde Exp $
 .\"
 .Dd May 2, 1991
 .Dt TANH 3
diff --git a/lib/msun/man/trunc.3 b/lib/msun/man/trunc.3
index 7d9e82882ae6..cb6c26f5462c 100644
--- a/lib/msun/man/trunc.3
+++ b/lib/msun/man/trunc.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/trunc.3,v 1.3 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd April 16, 2005
 .Dt TRUNC 3
diff --git a/lib/msun/powerpc/Makefile.inc b/lib/msun/powerpc/Makefile.inc
index 812ce1aa034f..7eb3700abe49 100644
--- a/lib/msun/powerpc/Makefile.inc
+++ b/lib/msun/powerpc/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/powerpc/Makefile.inc,v 1.1 2005/03/07 04:53:36 das Exp $
 
 LDBL_PREC = 53
diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c
index 04bbeafc5892..a8fa87a9cc21 100644
--- a/lib/msun/powerpc/fenv.c
+++ b/lib/msun/powerpc/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/powerpc/fenv.c,v 1.1 2004/06/06 10:05:10 das Exp $
  */
 
 #include <fenv.h>
diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h
index 3010472e14f3..3fd238975f4f 100644
--- a/lib/msun/powerpc/fenv.h
+++ b/lib/msun/powerpc/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.3 2005/03/16 19:03:45 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/sparc64/Makefile.inc b/lib/msun/sparc64/Makefile.inc
index 199be4146aa2..e883fa98f92e 100644
--- a/lib/msun/sparc64/Makefile.inc
+++ b/lib/msun/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/sparc64/Makefile.inc,v 1.2 2005/03/07 04:53:36 das Exp $
 
 ARCH_SRCS= e_sqrt.S e_sqrtf.S
 LDBL_PREC= 113
diff --git a/lib/msun/sparc64/e_sqrt.S b/lib/msun/sparc64/e_sqrt.S
index 8c90c164b042..95f79a6d1416 100644
--- a/lib/msun/sparc64/e_sqrt.S
+++ b/lib/msun/sparc64/e_sqrt.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/sparc64/e_sqrt.S,v 1.1 2005/02/21 18:27:57 das Exp $")
 
 ENTRY(sqrt)
 	retl
diff --git a/lib/msun/sparc64/e_sqrtf.S b/lib/msun/sparc64/e_sqrtf.S
index bf63f33d1d00..e1f7cf6f27c9 100644
--- a/lib/msun/sparc64/e_sqrtf.S
+++ b/lib/msun/sparc64/e_sqrtf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/sparc64/e_sqrtf.S,v 1.1 2005/02/21 18:27:57 das Exp $")
 
 ENTRY(sqrtf)
 	retl
diff --git a/lib/msun/sparc64/fenv.c b/lib/msun/sparc64/fenv.c
index 6e8220f7ec0b..79a0f64de72a 100644
--- a/lib/msun/sparc64/fenv.c
+++ b/lib/msun/sparc64/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/sparc64/fenv.c,v 1.1 2004/06/06 10:05:57 das Exp $
  */
 
 #include <fenv.h>
diff --git a/lib/msun/sparc64/fenv.h b/lib/msun/sparc64/fenv.h
index 82732991349b..684c4a27d6dd 100644
--- a/lib/msun/sparc64/fenv.h
+++ b/lib/msun/sparc64/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/sparc64/fenv.h,v 1.3 2005/03/16 19:03:46 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index b021a1e5ac36..8ba672a7d07b 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acos.c,v 1.10 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_acos(x)
diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c
index 0688edf1c3b9..a11f48ee6f66 100644
--- a/lib/msun/src/e_acosf.c
+++ b/lib/msun/src/e_acosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c
index 25e11c3bede9..ccb1521f0b49 100644
--- a/lib/msun/src/e_acosh.c
+++ b/lib/msun/src/e_acosh.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosh.c,v 1.8 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_acosh(x)
diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c
index 5138d7252176..52579140bc44 100644
--- a/lib/msun/src/e_acoshf.c
+++ b/lib/msun/src/e_acoshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c
index 044c1be95aac..1ba702626562 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asin.c,v 1.11 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_asin(x)
diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c
index 178289a4d5ec..5f7a8947c141 100644
--- a/lib/msun/src/e_asinf.c
+++ b/lib/msun/src/e_asinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.8 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c
index a05a84029898..073f81b4c9c6 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.10 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_atan2(y,x)
diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c
index af011318d649..466d5d40b1da 100644
--- a/lib/msun/src/e_atan2f.c
+++ b/lib/msun/src/e_atan2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.7 2004/06/02 17:09:05 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c
index 9a896699031f..604875c24caa 100644
--- a/lib/msun/src/e_atanh.c
+++ b/lib/msun/src/e_atanh.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanh.c,v 1.7 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_atanh(x)
diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c
index c7cf3e00840c..64ebd3d698da 100644
--- a/lib/msun/src/e_atanhf.c
+++ b/lib/msun/src/e_atanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c
index f8a2b9b32bb4..40a943a21b43 100644
--- a/lib/msun/src/e_cosh.c
+++ b/lib/msun/src/e_cosh.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_cosh.c,v 1.8 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_cosh(x)
diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c
index d2368a65a727..8f4616e4bd16 100644
--- a/lib/msun/src/e_coshf.c
+++ b/lib/msun/src/e_coshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c
index 60b8b2a14811..e261895edbaa 100644
--- a/lib/msun/src/e_exp.c
+++ b/lib/msun/src/e_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_exp.c,v 1.10 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_exp(x)
diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c
index 5858d2c50675..2bafc75ddbac 100644
--- a/lib/msun/src/e_expf.c
+++ b/lib/msun/src/e_expf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_expf.c,v 1.9 2005/02/24 06:32:13 das Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index b731ce15c56e..3b3c169959f6 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmod.c,v 1.9 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* 
diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c
index e3865c4d44d5..8b487ac68cbf 100644
--- a/lib/msun/src/e_fmodf.c
+++ b/lib/msun/src/e_fmodf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmodf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c
index e3ebd7cefed4..f52ff17a79f4 100644
--- a/lib/msun/src/e_gamma.c
+++ b/lib/msun/src/e_gamma.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma.c,v 1.7 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_gamma(x)
diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c
index 48b981a89548..be8339d76be1 100644
--- a/lib/msun/src/e_gamma_r.c
+++ b/lib/msun/src/e_gamma_r.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma_r.c,v 1.7 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_gamma_r(x, signgamp)
diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c
index da31d9fd8818..b5c2ec12320a 100644
--- a/lib/msun/src/e_gammaf.c
+++ b/lib/msun/src/e_gammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /* __ieee754_gammaf(x)
diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c
index c14870d239ac..d4300c3bd9c2 100644
--- a/lib/msun/src/e_gammaf_r.c
+++ b/lib/msun/src/e_gammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf_r.c,v 1.7 2002/05/28 18:15:03 alfred Exp $";
 #endif
 
 /* __ieee754_gammaf_r(x, signgamp)
diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c
index e2f82acf7f7c..11385f518241 100644
--- a/lib/msun/src/e_hypot.c
+++ b/lib/msun/src/e_hypot.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.9 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_hypot(x,y)
diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c
index 0624a39606ea..354075ade84e 100644
--- a/lib/msun/src/e_hypotf.c
+++ b/lib/msun/src/e_hypotf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.9 2002/05/28 18:15:03 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c
index 493f0efa3214..d99bf11578c7 100644
--- a/lib/msun/src/e_j0.c
+++ b/lib/msun/src/e_j0.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0.c,v 1.8 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_j0(x), __ieee754_y0(x)
diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c
index 6d9858207cf6..b872406bbf37 100644
--- a/lib/msun/src/e_j0f.c
+++ b/lib/msun/src/e_j0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.7 2002/05/28 18:15:03 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c
index a01b812a23d0..4dbf222bda6e 100644
--- a/lib/msun/src/e_j1.c
+++ b/lib/msun/src/e_j1.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_j1(x), __ieee754_y1(x)
diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c
index 6ccc0697f10a..539399e4f2db 100644
--- a/lib/msun/src/e_j1f.c
+++ b/lib/msun/src/e_j1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c
index ca26230b02e0..413b22da6c8d 100644
--- a/lib/msun/src/e_jn.c
+++ b/lib/msun/src/e_jn.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jn.c,v 1.9 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c
index 17a7008616ea..029dba65b77d 100644
--- a/lib/msun/src/e_jnf.c
+++ b/lib/msun/src/e_jnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c
index 39d3f852718b..87ad41a1b086 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_lgamma(x)
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index 91989d552bfd..68dbfd0af077 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma_r.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_lgamma_r(x, signgamp)
diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c
index 4fcf943a04ba..b1f48d579ea2 100644
--- a/lib/msun/src/e_lgammaf.c
+++ b/lib/msun/src/e_lgammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* __ieee754_lgammaf(x)
diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c
index 1c12eec42735..f946b6b2af16 100644
--- a/lib/msun/src/e_lgammaf_r.c
+++ b/lib/msun/src/e_lgammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c
index eee7cf957e89..2dbf0575bd55 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log.c,v 1.10 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_log(x)
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index 871a44a3753e..e84c0c75e0b9 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10.c,v 1.11 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_log10(x)
diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c
index beb2271bbd8b..347308874ad7 100644
--- a/lib/msun/src/e_log10f.c
+++ b/lib/msun/src/e_log10f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_logf.c b/lib/msun/src/e_logf.c
index 4e7142b18d29..ef80aa201447 100644
--- a/lib/msun/src/e_logf.c
+++ b/lib/msun/src/e_logf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_logf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c
index 95d0855e8519..d21313253454 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_pow.c,v 1.11 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_pow(x,y) return x**y
diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c
index 09fb59cdf419..41f08ddbb682 100644
--- a/lib/msun/src/e_powf.c
+++ b/lib/msun/src/e_powf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_powf.c,v 1.12 2004/06/01 19:33:30 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c
index 5b4a08dec293..121ba292e0ed 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_rem_pio2(x,y)
diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c
index eef45b070ee6..11c8d16b126e 100644
--- a/lib/msun/src/e_rem_pio2f.c
+++ b/lib/msun/src/e_rem_pio2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.7 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 /* __ieee754_rem_pio2f(x,y)
diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c
index 1cea6c1b6db2..46932a282cea 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.10 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_remainder(x,p)
diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c
index 7841bdceb682..4045088d11f8 100644
--- a/lib/msun/src/e_remainderf.c
+++ b/lib/msun/src/e_remainderf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c
index f7d46d0816a0..b81666e3a19a 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.12 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c
index e0e7c02753bc..508d4eab2f35 100644
--- a/lib/msun/src/e_scalbf.c
+++ b/lib/msun/src/e_scalbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.9 2004/07/09 10:01:10 das Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c
index 09b0597a2ae6..7584b27b219f 100644
--- a/lib/msun/src/e_sinh.c
+++ b/lib/msun/src/e_sinh.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinh.c,v 1.9 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_sinh(x)
diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c
index 7e022b08356f..05455961d861 100644
--- a/lib/msun/src/e_sinhf.c
+++ b/lib/msun/src/e_sinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c
index 3b3b2a7f19b0..d75cb10ac715 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrt.c,v 1.10 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_sqrt(x)
diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c
index 7eba4d07f92c..edc9ef2c5470 100644
--- a/lib/msun/src/e_sqrtf.c
+++ b/lib/msun/src/e_sqrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c
index ad78f8ee9cfc..2d06047587c7 100644
--- a/lib/msun/src/k_cos.c
+++ b/lib/msun/src/k_cos.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cos.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index fb021ed21a1a..bd81f73c822f 100644
--- a/lib/msun/src/k_cosf.c
+++ b/lib/msun/src/k_cosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c
index 61f7dce26129..7116f315cabc 100644
--- a/lib/msun/src/k_rem_pio2.c
+++ b/lib/msun/src/k_rem_pio2.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.7 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_rem_pio2f.c b/lib/msun/src/k_rem_pio2f.c
index e1e9e35eb3d4..1bf7681f3234 100644
--- a/lib/msun/src/k_rem_pio2f.c
+++ b/lib/msun/src/k_rem_pio2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.7 2005/04/05 23:27:47 das Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c
index 55e2bdce1954..aa3cd5f7739e 100644
--- a/lib/msun/src/k_sin.c
+++ b/lib/msun/src/k_sin.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sin.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __kernel_sin( x, y, iy)
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index 10a3290d2741..8dc0c4e3bdab 100644
--- a/lib/msun/src/k_sinf.c
+++ b/lib/msun/src/k_sinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c
index 16b2dd00b2df..da450d10575d 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -12,7 +12,7 @@
 
 /* INDENT OFF */
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tan.c,v 1.10 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __kernel_tan( x, y, k )
diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c
index 41c522c8df1e..6412853d9c53 100644
--- a/lib/msun/src/k_tanf.c
+++ b/lib/msun/src/k_tanf.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.8 2004/06/02 04:39:44 das Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index ba918a36ede6..dd570281619d 100644
--- a/lib/msun/src/math.h
+++ b/lib/msun/src/math.h
@@ -11,7 +11,7 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.61 2005/04/16 21:12:47 das Exp $
  */
 
 #ifndef _MATH_H_
diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h
index 1fc6a93d40f0..6c5a4895dbbe 100644
--- a/lib/msun/src/math_private.h
+++ b/lib/msun/src/math_private.h
@@ -11,7 +11,7 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/math_private.h,v 1.17 2005/02/04 20:05:39 das Exp $
  */
 
 #ifndef _MATH_PRIVATE_H_
diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c
index 95a539dc6049..079007f6ae8d 100644
--- a/lib/msun/src/s_asinh.c
+++ b/lib/msun/src/s_asinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinh.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* asinh(x)
diff --git a/lib/msun/src/s_asinhf.c b/lib/msun/src/s_asinhf.c
index 6dcfc5b03844..73dc7981477a 100644
--- a/lib/msun/src/s_asinhf.c
+++ b/lib/msun/src/s_asinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c
index 5ef6700c58db..23d7aa833104 100644
--- a/lib/msun/src/s_atan.c
+++ b/lib/msun/src/s_atan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atan.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* atan(x)
diff --git a/lib/msun/src/s_atanf.c b/lib/msun/src/s_atanf.c
index d4a500f53b6d..f90b35dcdc06 100644
--- a/lib/msun/src/s_atanf.c
+++ b/lib/msun/src/s_atanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrt.c b/lib/msun/src/s_cbrt.c
index 4d70825786eb..6fbd92763f6a 100644
--- a/lib/msun/src/s_cbrt.c
+++ b/lib/msun/src/s_cbrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrtf.c b/lib/msun/src/s_cbrtf.c
index 4ed43511d9ac..03ef35901bb4 100644
--- a/lib/msun/src/s_cbrtf.c
+++ b/lib/msun/src/s_cbrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c
index 210b7ee61ddf..e5440e296528 100644
--- a/lib/msun/src/s_ceil.c
+++ b/lib/msun/src/s_ceil.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_ceilf.c b/lib/msun/src/s_ceilf.c
index 96a0f4879f94..5c465b36c163 100644
--- a/lib/msun/src/s_ceilf.c
+++ b/lib/msun/src/s_ceilf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ceill.c b/lib/msun/src/s_ceill.c
index 1de973b0f62d..7e8817c11aa1 100644
--- a/lib/msun/src/s_ceill.c
+++ b/lib/msun/src/s_ceill.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_cimag.c b/lib/msun/src/s_cimag.c
index 03ddf79cc0f1..e4be0b30f619 100644
--- a/lib/msun/src/s_cimag.c
+++ b/lib/msun/src/s_cimag.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_cimag.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_cimagf.c b/lib/msun/src/s_cimagf.c
index 6f943d8b4df2..1e0f53fd7b1f 100644
--- a/lib/msun/src/s_cimagf.c
+++ b/lib/msun/src/s_cimagf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_cimagf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_cimagl.c b/lib/msun/src/s_cimagl.c
index 7f531d0fc29e..a87677eff876 100644
--- a/lib/msun/src/s_cimagl.c
+++ b/lib/msun/src/s_cimagl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_cimagl.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_conj.c b/lib/msun/src/s_conj.c
index 1d0011bea130..d47a15d9868f 100644
--- a/lib/msun/src/s_conj.c
+++ b/lib/msun/src/s_conj.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_conj.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_conjf.c b/lib/msun/src/s_conjf.c
index ea951b9a9012..24e0398f739a 100644
--- a/lib/msun/src/s_conjf.c
+++ b/lib/msun/src/s_conjf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_conjf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_conjl.c b/lib/msun/src/s_conjl.c
index e6cb2efa4f37..13d80c241102 100644
--- a/lib/msun/src/s_conjl.c
+++ b/lib/msun/src/s_conjl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_conjl.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c
index 7b0fc386954f..f37be0d2c5b2 100644
--- a/lib/msun/src/s_copysign.c
+++ b/lib/msun/src/s_copysign.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysign.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_copysignf.c b/lib/msun/src/s_copysignf.c
index df5304f80530..79c44800c4c9 100644
--- a/lib/msun/src/s_copysignf.c
+++ b/lib/msun/src/s_copysignf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysignf.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_copysignl.c b/lib/msun/src/s_copysignl.c
index 8d39f841db20..5c5bd3914a86 100644
--- a/lib/msun/src/s_copysignl.c
+++ b/lib/msun/src/s_copysignl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_copysignl.c,v 1.1 2004/05/07 18:56:31 stefanf Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c
index b49b28aa05e3..17064908bc98 100644
--- a/lib/msun/src/s_cos.c
+++ b/lib/msun/src/s_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cos.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* cos(x)
diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c
index 18e02990442d..0d638ac13333 100644
--- a/lib/msun/src/s_cosf.c
+++ b/lib/msun/src/s_cosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_creal.c b/lib/msun/src/s_creal.c
index 3295ff281b03..ad14cdf66809 100644
--- a/lib/msun/src/s_creal.c
+++ b/lib/msun/src/s_creal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_creal.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_crealf.c b/lib/msun/src/s_crealf.c
index 5819b86b790f..a5c1562938f5 100644
--- a/lib/msun/src/s_crealf.c
+++ b/lib/msun/src/s_crealf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_crealf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_creall.c b/lib/msun/src/s_creall.c
index e4946f9fd088..1531d166f81f 100644
--- a/lib/msun/src/s_creall.c
+++ b/lib/msun/src/s_creall.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_creall.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c
index 8461425ac8c9..f33a2a55d0e8 100644
--- a/lib/msun/src/s_erf.c
+++ b/lib/msun/src/s_erf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* double erf(double x)
diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c
index 6bb24cfd94d8..24e053c2bd75 100644
--- a/lib/msun/src/s_erff.c
+++ b/lib/msun/src/s_erff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_exp2.c b/lib/msun/src/s_exp2.c
index 8dce338a3df1..ddf70f1dde81 100644
--- a/lib/msun/src/s_exp2.c
+++ b/lib/msun/src/s_exp2.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.1 2005/04/05 02:57:15 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_exp2f.c b/lib/msun/src/s_exp2f.c
index 1bc026a3f0eb..d251059516d1 100644
--- a/lib/msun/src/s_exp2f.c
+++ b/lib/msun/src/s_exp2f.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.1 2005/04/05 02:57:15 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_expm1.c b/lib/msun/src/s_expm1.c
index 1bf4aa62f754..57aa3f20cf3b 100644
--- a/lib/msun/src/s_expm1.c
+++ b/lib/msun/src/s_expm1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* expm1(x)
diff --git a/lib/msun/src/s_expm1f.c b/lib/msun/src/s_expm1f.c
index f8191b2d64ba..a670a72c56c3 100644
--- a/lib/msun/src/s_expm1f.c
+++ b/lib/msun/src/s_expm1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_fabs.c b/lib/msun/src/s_fabs.c
index 15529e58576f..0dfa9405eb8c 100644
--- a/lib/msun/src/s_fabs.c
+++ b/lib/msun/src/s_fabs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabs.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fabsf.c b/lib/msun/src/s_fabsf.c
index 6b7d0a16dd27..2200705c6a99 100644
--- a/lib/msun/src/s_fabsf.c
+++ b/lib/msun/src/s_fabsf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabsf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fabsl.c b/lib/msun/src/s_fabsl.c
index f150dddb842c..200a9a527532 100644
--- a/lib/msun/src/s_fabsl.c
+++ b/lib/msun/src/s_fabsl.c
@@ -25,7 +25,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/lib/msun/src/s_fabsl.c,v 1.2 2003/10/25 19:53:28 des Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_fdim.c b/lib/msun/src/s_fdim.c
index 2f347fda6fe0..6ec10dfe66cd 100644
--- a/lib/msun/src/s_fdim.c
+++ b/lib/msun/src/s_fdim.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fdim.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c
index 8e7c1752f56e..704d1d8ccf33 100644
--- a/lib/msun/src/s_finite.c
+++ b/lib/msun/src/s_finite.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finite.c,v 1.8 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_finitef.c b/lib/msun/src/s_finitef.c
index a8ccb92b427c..b43063968e91 100644
--- a/lib/msun/src/s_finitef.c
+++ b/lib/msun/src/s_finitef.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finitef.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c
index 16fc7f620012..acc32146b198 100644
--- a/lib/msun/src/s_floor.c
+++ b/lib/msun/src/s_floor.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floor.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floorf.c b/lib/msun/src/s_floorf.c
index d4bb6c5a0ef0..70a71f3de431 100644
--- a/lib/msun/src/s_floorf.c
+++ b/lib/msun/src/s_floorf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floorl.c b/lib/msun/src/s_floorl.c
index 9dd13b6cb1cc..2ef0acc9f015 100644
--- a/lib/msun/src/s_floorl.c
+++ b/lib/msun/src/s_floorl.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c
index c6d27bdf6032..6ed5698e3955 100644
--- a/lib/msun/src/s_fma.c
+++ b/lib/msun/src/s_fma.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fma.c,v 1.4 2005/03/18 02:27:59 das Exp $");
 
 #include <fenv.h>
 #include <float.h>
diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c
index 1b483b740679..0e90180d0d76 100644
--- a/lib/msun/src/s_fmaf.c
+++ b/lib/msun/src/s_fmaf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.1 2005/01/22 09:53:18 das Exp $");
 
 /*
  * Fused multiply-add: Compute x * y + z with a single rounding error.
diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c
index 160477864c18..c823c3ae4809 100644
--- a/lib/msun/src/s_fmal.c
+++ b/lib/msun/src/s_fmal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
 
 #include <fenv.h>
 #include <float.h>
diff --git a/lib/msun/src/s_fmax.c b/lib/msun/src/s_fmax.c
index b51b8655eb8f..6e619febaba7 100644
--- a/lib/msun/src/s_fmax.c
+++ b/lib/msun/src/s_fmax.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmax.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fmaxf.c b/lib/msun/src/s_fmaxf.c
index 423da54517e8..a97eeb520a35 100644
--- a/lib/msun/src/s_fmaxf.c
+++ b/lib/msun/src/s_fmaxf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fmaxl.c b/lib/msun/src/s_fmaxl.c
index 0ac48a976cc4..5ed4ee034bf8 100644
--- a/lib/msun/src/s_fmaxl.c
+++ b/lib/msun/src/s_fmaxl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fmin.c b/lib/msun/src/s_fmin.c
index 3500c84a1c84..76c1c12e7552 100644
--- a/lib/msun/src/s_fmin.c
+++ b/lib/msun/src/s_fmin.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmin.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fminf.c b/lib/msun/src/s_fminf.c
index 76a5c76a997d..bd1d24157503 100644
--- a/lib/msun/src/s_fminf.c
+++ b/lib/msun/src/s_fminf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fminf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fminl.c b/lib/msun/src/s_fminl.c
index f9d3ebb05852..63395df29719 100644
--- a/lib/msun/src/s_fminl.c
+++ b/lib/msun/src/s_fminl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fminl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_frexp.c b/lib/msun/src/s_frexp.c
index 1b5b9bd682b5..d89e135f0990 100644
--- a/lib/msun/src/s_frexp.c
+++ b/lib/msun/src/s_frexp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexp.c,v 1.10 2005/03/07 21:27:37 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c
index 1952836ffa03..89d464b4d57c 100644
--- a/lib/msun/src/s_frexpf.c
+++ b/lib/msun/src/s_frexpf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_frexpl.c b/lib/msun/src/s_frexpl.c
index d34f55d9f4f8..20b316706f1a 100644
--- a/lib/msun/src/s_frexpl.c
+++ b/lib/msun/src/s_frexpl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_frexpl.c,v 1.1 2005/03/07 04:54:51 das Exp $
  */
 
 #include <float.h>
diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c
index 69077af33496..bd4a44b08528 100644
--- a/lib/msun/src/s_ilogb.c
+++ b/lib/msun/src/s_ilogb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogb.c,v 1.9 2004/10/09 17:14:28 stefanf Exp $";
 #endif
 
 /* ilogb(double x)
diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c
index ff588139a5c9..3c9c4deefaec 100644
--- a/lib/msun/src/s_ilogbf.c
+++ b/lib/msun/src/s_ilogbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.7 2004/10/09 17:14:28 stefanf Exp $";
 #endif
 
 #include <limits.h>
diff --git a/lib/msun/src/s_ilogbl.c b/lib/msun/src/s_ilogbl.c
index a6a4708562db..406ad56dbcf8 100644
--- a/lib/msun/src/s_ilogbl.c
+++ b/lib/msun/src/s_ilogbl.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogbl.c,v 1.1 2004/10/11 18:13:52 stefanf Exp $";
 #endif
 
 #include <float.h>
diff --git a/lib/msun/src/s_isfinite.c b/lib/msun/src/s_isfinite.c
index c9d1bd7a1347..394505d2a997 100644
--- a/lib/msun/src/s_isfinite.c
+++ b/lib/msun/src/s_isfinite.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_isfinite.c,v 1.1 2004/07/09 03:32:39 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c
index 5de99ad0ff3b..4715715aec0b 100644
--- a/lib/msun/src/s_isnan.c
+++ b/lib/msun/src/s_isnan.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_isnan.c,v 1.8 2004/08/05 01:46:11 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_isnormal.c b/lib/msun/src/s_isnormal.c
index 49f2a74346b3..1345dbafda14 100644
--- a/lib/msun/src/s_isnormal.c
+++ b/lib/msun/src/s_isnormal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_isnormal.c,v 1.1 2004/07/09 03:32:39 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_llrint.c b/lib/msun/src/s_llrint.c
index 7c959ec950ae..fba9784f8dad 100644
--- a/lib/msun/src/s_llrint.c
+++ b/lib/msun/src/s_llrint.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llrint.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		double
 #define	roundit		rint
diff --git a/lib/msun/src/s_llrintf.c b/lib/msun/src/s_llrintf.c
index 7ec6015238d3..49fe58d81092 100644
--- a/lib/msun/src/s_llrintf.c
+++ b/lib/msun/src/s_llrintf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llrintf.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		float
 #define	roundit		rintf
diff --git a/lib/msun/src/s_llround.c b/lib/msun/src/s_llround.c
index 827dfc1f6367..36451cae5d2e 100644
--- a/lib/msun/src/s_llround.c
+++ b/lib/msun/src/s_llround.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llround.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		double
 #define	roundit		round
diff --git a/lib/msun/src/s_llroundf.c b/lib/msun/src/s_llroundf.c
index c037a18d5708..3799ef0ecd9f 100644
--- a/lib/msun/src/s_llroundf.c
+++ b/lib/msun/src/s_llroundf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		float
 #define	roundit		roundf
diff --git a/lib/msun/src/s_llroundl.c b/lib/msun/src/s_llroundl.c
index 02c44eb4bdec..f0e0294fa354 100644
--- a/lib/msun/src/s_llroundl.c
+++ b/lib/msun/src/s_llroundl.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundl.c,v 1.1 2005/04/08 01:24:08 das Exp $");
 
 #define type		long double
 #define	roundit		roundl
diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c
index 4ce4c3aa86a1..31b5c4768f1d 100644
--- a/lib/msun/src/s_log1p.c
+++ b/lib/msun/src/s_log1p.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* double log1p(double x)
diff --git a/lib/msun/src/s_log1pf.c b/lib/msun/src/s_log1pf.c
index c2f01c71e5ef..4da4e43a8a49 100644
--- a/lib/msun/src/s_log1pf.c
+++ b/lib/msun/src/s_log1pf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c
index 5c6ea6cb1788..141f9e876be9 100644
--- a/lib/msun/src/s_logb.c
+++ b/lib/msun/src/s_logb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logb.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_logbf.c b/lib/msun/src/s_logbf.c
index e673d965ed60..10325a5aa568 100644
--- a/lib/msun/src/s_logbf.c
+++ b/lib/msun/src/s_logbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_lrint.c b/lib/msun/src/s_lrint.c
index 27ff5ffbbb9b..81eabaaa9a96 100644
--- a/lib/msun/src/s_lrint.c
+++ b/lib/msun/src/s_lrint.c
@@ -29,7 +29,7 @@
 #include <math.h>
 
 #ifndef type
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lrint.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 #define type		double
 #define	roundit		rint
 #define dtype		long
diff --git a/lib/msun/src/s_lrintf.c b/lib/msun/src/s_lrintf.c
index a757ded233a3..546a099feffa 100644
--- a/lib/msun/src/s_lrintf.c
+++ b/lib/msun/src/s_lrintf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lrintf.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		float
 #define	roundit		rintf
diff --git a/lib/msun/src/s_lround.c b/lib/msun/src/s_lround.c
index 3cff4898ab4f..bf193616c1d9 100644
--- a/lib/msun/src/s_lround.c
+++ b/lib/msun/src/s_lround.c
@@ -30,7 +30,7 @@
 #include <math.h>
 
 #ifndef type
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lround.c,v 1.2 2005/04/08 00:52:16 das Exp $");
 #define type		double
 #define	roundit		round
 #define dtype		long
diff --git a/lib/msun/src/s_lroundf.c b/lib/msun/src/s_lroundf.c
index e24fe7f81902..c78a561af1ff 100644
--- a/lib/msun/src/s_lroundf.c
+++ b/lib/msun/src/s_lroundf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		float
 #define	roundit		roundf
diff --git a/lib/msun/src/s_lroundl.c b/lib/msun/src/s_lroundl.c
index e410827e2622..6947ebf9dc06 100644
--- a/lib/msun/src/s_lroundl.c
+++ b/lib/msun/src/s_lroundl.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundl.c,v 1.1 2005/04/08 01:24:08 das Exp $");
 
 #define type		long double
 #define	roundit		roundl
diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c
index 8cfe56884a01..683fbdaa28e7 100644
--- a/lib/msun/src/s_modf.c
+++ b/lib/msun/src/s_modf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_modff.c b/lib/msun/src/s_modff.c
index 69b64e901cf9..6c75ffd063c6 100644
--- a/lib/msun/src/s_modff.c
+++ b/lib/msun/src/s_modff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_nearbyint.c b/lib/msun/src/s_nearbyint.c
index a075d2f48d63..0fd36aa1dc1b 100644
--- a/lib/msun/src/s_nearbyint.c
+++ b/lib/msun/src/s_nearbyint.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_nearbyint.c,v 1.1 2004/07/06 04:46:08 das Exp $");
 
 #include <fenv.h>
 #include <math.h>
diff --git a/lib/msun/src/s_nextafter.c b/lib/msun/src/s_nextafter.c
index 674e9c10dea5..3ed0361cff10 100644
--- a/lib/msun/src/s_nextafter.c
+++ b/lib/msun/src/s_nextafter.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafter.c,v 1.11 2005/03/07 21:27:37 das Exp $";
 #endif
 
 /* IEEE functions
diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c
index b8a112527749..ebeac4a2cd9b 100644
--- a/lib/msun/src/s_nextafterf.c
+++ b/lib/msun/src/s_nextafterf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.10 2005/03/07 04:55:58 das Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_nextafterl.c b/lib/msun/src/s_nextafterl.c
index a74dd79a9090..eacfd339bd6c 100644
--- a/lib/msun/src/s_nextafterl.c
+++ b/lib/msun/src/s_nextafterl.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafterl.c,v 1.1 2005/03/07 04:56:46 das Exp $";
 #endif
 
 /* IEEE functions
diff --git a/lib/msun/src/s_nexttoward.c b/lib/msun/src/s_nexttoward.c
index a493c83ff317..55da4ad5a04e 100644
--- a/lib/msun/src/s_nexttoward.c
+++ b/lib/msun/src/s_nexttoward.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nexttoward.c,v 1.1 2005/03/07 04:56:46 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_nexttowardf.c b/lib/msun/src/s_nexttowardf.c
index 38005aec2e36..54156e68e306 100644
--- a/lib/msun/src/s_nexttowardf.c
+++ b/lib/msun/src/s_nexttowardf.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nexttowardf.c,v 1.1 2005/03/07 04:57:38 das Exp $";
 #endif
 
 #include <float.h>
diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c
index 8756c2a3d0bb..e38595c4c074 100644
--- a/lib/msun/src/s_remquo.c
+++ b/lib/msun/src/s_remquo.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_remquo.c,v 1.1 2005/03/25 04:40:44 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c
index 3141642116a2..0fa74c8db1f9 100644
--- a/lib/msun/src/s_remquof.c
+++ b/lib/msun/src/s_remquof.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_remquof.c,v 1.1 2005/03/25 04:40:44 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index 9a2b42e96e99..232e419186c3 100644
--- a/lib/msun/src/s_rint.c
+++ b/lib/msun/src/s_rint.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rint.c,v 1.11 2005/03/07 20:28:26 stefanf Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c
index 429eac7213f6..7b44a0e8530d 100644
--- a/lib/msun/src/s_rintf.c
+++ b/lib/msun/src/s_rintf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.9 2004/06/09 21:24:52 das Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/msun/src/s_round.c b/lib/msun/src/s_round.c
index 34b26f08c048..9b0c77051078 100644
--- a/lib/msun/src/s_round.c
+++ b/lib/msun/src/s_round.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_round.c,v 1.3 2005/01/13 15:43:41 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index a7a3da93bc69..8c7a3eb552a1 100644
--- a/lib/msun/src/s_roundf.c
+++ b/lib/msun/src/s_roundf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_roundf.c,v 1.3 2005/01/13 15:43:41 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_roundl.c b/lib/msun/src/s_roundl.c
index 0cb688bf2745..66e707abf4d7 100644
--- a/lib/msun/src/s_roundl.c
+++ b/lib/msun/src/s_roundl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_roundl.c,v 1.1 2005/04/08 01:24:08 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_scalbln.c b/lib/msun/src/s_scalbln.c
index d609d4e8b3d4..81846b0634cc 100644
--- a/lib/msun/src/s_scalbln.c
+++ b/lib/msun/src/s_scalbln.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_scalbln.c,v 1.2 2005/03/07 04:57:50 das Exp $");
 
 #include <limits.h>
 #include <math.h>
diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c
index e7efaabbf559..ed5b5710d049 100644
--- a/lib/msun/src/s_scalbn.c
+++ b/lib/msun/src/s_scalbn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbn.c,v 1.11 2005/03/07 21:27:37 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_scalbnf.c b/lib/msun/src/s_scalbnf.c
index 7666c74ab22c..46c7baf6e38a 100644
--- a/lib/msun/src/s_scalbnf.c
+++ b/lib/msun/src/s_scalbnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnf.c,v 1.8 2005/03/07 04:52:43 das Exp $";
 #endif
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/src/s_scalbnl.c b/lib/msun/src/s_scalbnl.c
index fc89f8d8ac5d..c645d0071bd5 100644
--- a/lib/msun/src/s_scalbnl.c
+++ b/lib/msun/src/s_scalbnl.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnl.c,v 1.1 2005/03/07 04:52:58 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_signbit.c b/lib/msun/src/s_signbit.c
index 01eb3ab8b2e6..ffc08f3d0dd7 100644
--- a/lib/msun/src/s_signbit.c
+++ b/lib/msun/src/s_signbit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_signbit.c,v 1.1 2004/07/19 08:16:10 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c
index a91bcde3c2d2..08bb303edc9f 100644
--- a/lib/msun/src/s_significand.c
+++ b/lib/msun/src/s_significand.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significand.c,v 1.9 2003/07/23 04:53:47 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_significandf.c b/lib/msun/src/s_significandf.c
index c11a08956e09..b3e341dd5f02 100644
--- a/lib/msun/src/s_significandf.c
+++ b/lib/msun/src/s_significandf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c
index 4d3b9d50cb9a..220cdc5815c8 100644
--- a/lib/msun/src/s_sin.c
+++ b/lib/msun/src/s_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sin.c,v 1.9 2003/07/23 04:53:47 peter Exp $";
 #endif
 
 /* sin(x)
diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c
index 8ea9e559a56d..958560dbd106 100644
--- a/lib/msun/src/s_sinf.c
+++ b/lib/msun/src/s_sinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c
index 5094d3091ea3..bd070a632d20 100644
--- a/lib/msun/src/s_tan.c
+++ b/lib/msun/src/s_tan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tan.c,v 1.9 2003/07/23 04:53:47 peter Exp $";
 #endif
 
 /* tan(x)
diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c
index c81caaf8f8c5..041be2e03fae 100644
--- a/lib/msun/src/s_tanf.c
+++ b/lib/msun/src/s_tanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tanh.c b/lib/msun/src/s_tanh.c
index e3bbf47e27dd..4729145261d1 100644
--- a/lib/msun/src/s_tanh.c
+++ b/lib/msun/src/s_tanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* Tanh(x)
diff --git a/lib/msun/src/s_tanhf.c b/lib/msun/src/s_tanhf.c
index 74cb2db7f5a4..c32bb2f9fe60 100644
--- a/lib/msun/src/s_tanhf.c
+++ b/lib/msun/src/s_tanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_trunc.c b/lib/msun/src/s_trunc.c
index cce9e1592ef8..d8c76a782178 100644
--- a/lib/msun/src/s_trunc.c
+++ b/lib/msun/src/s_trunc.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp $");
 
 /*
  * trunc(x)
diff --git a/lib/msun/src/s_truncf.c b/lib/msun/src/s_truncf.c
index 384eaee55006..efec266531b7 100644
--- a/lib/msun/src/s_truncf.c
+++ b/lib/msun/src/s_truncf.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_truncf.c,v 1.1 2004/06/20 09:25:43 das Exp $");
 
 /*
  * truncf(x)
diff --git a/lib/msun/src/s_truncl.c b/lib/msun/src/s_truncl.c
index c475b904dccf..39926a516f54 100644
--- a/lib/msun/src/s_truncl.c
+++ b/lib/msun/src/s_truncl.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_cabs.c b/lib/msun/src/w_cabs.c
index a33a41faabdc..577e5e0bc935 100644
--- a/lib/msun/src/w_cabs.c
+++ b/lib/msun/src/w_cabs.c
@@ -7,7 +7,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.4 2001/06/13 15:16:30 ru Exp $";
 #endif /* not lint */
 
 #include <complex.h>
diff --git a/lib/msun/src/w_cabsf.c b/lib/msun/src/w_cabsf.c
index e7bfe220a9a5..fac152f9ad31 100644
--- a/lib/msun/src/w_cabsf.c
+++ b/lib/msun/src/w_cabsf.c
@@ -7,7 +7,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/msun/src/w_cabsf.c,v 1.3 2001/06/13 15:16:30 ru Exp $";
 #endif /* not lint */
 
 #include <complex.h>
diff --git a/lib/msun/src/w_dremf.c b/lib/msun/src/w_dremf.c
index 4bfcff27f702..e83ac0e0b0d6 100644
--- a/lib/msun/src/w_dremf.c
+++ b/lib/msun/src/w_dremf.c
@@ -4,7 +4,7 @@
  * Written by J.T. Conklin, <jtc@wimsey.com>
  * Placed into the Public Domain, 1994.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/msun/src/w_dremf.c,v 1.3 2004/07/28 05:53:18 kan Exp $ */
 
 #include "math.h"
 #include "math_private.h"
diff --git a/libexec/Makefile b/libexec/Makefile
index 30a8db11f503..8c21d4d9f213 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/Makefile,v 1.75 2005/06/10 20:52:35 nectar Exp $
 
 SUBDIR=	atrun \
 	bootpd \
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 05deedc6127f..4c164445fa37 100644
--- a/libexec/Makefile.inc
+++ b/libexec/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/Makefile.inc,v 1.4 2002/02/04 02:33:49 kris Exp $
 
 BINDIR?=	/usr/libexec
 WFORMAT?=	1
diff --git a/libexec/atrun/LEGAL b/libexec/atrun/LEGAL
index af8be572d5cd..4b1b49dd3a26 100644
--- a/libexec/atrun/LEGAL
+++ b/libexec/atrun/LEGAL
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/atrun/LEGAL,v 1.5 1999/08/28 00:09:11 peter Exp $
 
 -----BEGIN PGP SIGNED MESSAGE-----
 
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index aacbf2e407a6..7e453d80ad65 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.12 2002/02/04 02:33:49 kris Exp $
 
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index 1cb5e7ed5771..2183ceeaba59 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/atrun/atrun.c,v 1.18 2004/07/11 17:37:32 stefanf Exp $";
 #endif /* not lint */
 
 /* System Headers */
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index a8ce57cc0dfd..581f976f331d 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/atrun/atrun.man,v 1.12 2004/07/02 19:07:31 ru Exp $
 .Dd April 12, 1995
 .Dt ATRUN 8
 .Os
diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
index 6cffe5a4cfec..c4ecce647e8c 100644
--- a/libexec/atrun/gloadavg.c
+++ b/libexec/atrun/gloadavg.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/atrun/gloadavg.c,v 1.5 1999/08/28 00:09:12 peter Exp $";
 #endif /* not lint */
 
 #ifndef __FreeBSD__
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index 48890ce54b59..3ead6ca6843b 100644
--- a/libexec/atrun/gloadavg.h
+++ b/libexec/atrun/gloadavg.h
@@ -25,5 +25,5 @@
 
 double gloadavg(void);
 #if 0
-static char atrun_h_rcsid[] = "$FreeBSD$";
+static char atrun_h_rcsid[] = "$FreeBSD: src/libexec/atrun/gloadavg.h,v 1.4 1999/08/28 00:09:12 peter Exp $";
 #endif
diff --git a/libexec/bootpd/Announce b/libexec/bootpd/Announce
index 60838d5e978e..2befcc8bd77d 100644
--- a/libexec/bootpd/Announce
+++ b/libexec/bootpd/Announce
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Announce,v 1.5 1999/08/28 00:09:13 peter Exp $
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/Changes b/libexec/bootpd/Changes
index d797ea1fa9e5..668fdcdd44ec 100644
--- a/libexec/bootpd/Changes
+++ b/libexec/bootpd/Changes
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Changes,v 1.5 1999/08/28 00:09:13 peter Exp $
 
 Changes, most recent first
 Date, <email> Real Name
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index 830577a57def..d0eb2594f873 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile,v 1.9 2001/03/26 14:22:02 ru Exp $
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS
diff --git a/libexec/bootpd/Makefile.UNIX b/libexec/bootpd/Makefile.UNIX
index 5b2c186bcb4b..09936d202318 100644
--- a/libexec/bootpd/Makefile.UNIX
+++ b/libexec/bootpd/Makefile.UNIX
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile.UNIX,v 1.5 1999/08/28 00:09:14 peter Exp $
 #
 # Makefile for the BOOTP programs:
 #   bootpd	- BOOTP server daemon
diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc
index 829da300445d..52b80b3f59c6 100644
--- a/libexec/bootpd/Makefile.inc
+++ b/libexec/bootpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile.inc,v 1.4 1999/08/28 00:09:14 peter Exp $
 
 BINDIR?=	/usr/libexec
diff --git a/libexec/bootpd/Problems b/libexec/bootpd/Problems
index c7f9951946b3..277d8ad15b44 100644
--- a/libexec/bootpd/Problems
+++ b/libexec/bootpd/Problems
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Problems,v 1.5 1999/08/28 00:09:15 peter Exp $
 
 Common problems and ways to work around them:
 
diff --git a/libexec/bootpd/README b/libexec/bootpd/README
index a88cca5b6450..26a6f9943112 100644
--- a/libexec/bootpd/README
+++ b/libexec/bootpd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/README,v 1.5 1999/08/28 00:09:15 peter Exp $
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/bootp.h b/libexec/bootpd/bootp.h
index c3a3909287ba..9b2f3d242ead 100644
--- a/libexec/bootpd/bootp.h
+++ b/libexec/bootpd/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/bootp.h,v 1.6 2001/09/25 21:02:10 iedowse Exp $
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index b3818589017a..694d7465249a 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/bootpd.8,v 1.20 2004/07/02 21:28:48 ru Exp $
 .\"
 .Dd February 10, 2004
 .Dt BOOTPD 8
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index 239b26780a7c..029478510e4a 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -38,7 +38,7 @@ SOFTWARE.
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/bootpd.c,v 1.23 2005/02/14 17:42:56 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/libexec/bootpd/bootpd.h b/libexec/bootpd/bootpd.h
index 86c1b3da8b64..ee25199cbbe4 100644
--- a/libexec/bootpd/bootpd.h
+++ b/libexec/bootpd/bootpd.h
@@ -24,7 +24,7 @@ SOFTWARE.
 /*
  * bootpd.h -- common header file for all the modules of the bootpd program.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/bootpd.h,v 1.2 1999/11/12 10:11:48 marcel Exp $
  */
 
 #include "bptypes.h"
diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile
index 93a982c2d384..4d5bd6307f99 100644
--- a/libexec/bootpd/bootpgw/Makefile
+++ b/libexec/bootpd/bootpgw/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/bootpgw/Makefile,v 1.6 2004/12/21 08:47:03 ru Exp $
 
 PROG=	bootpgw
 NO_MAN=
diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c
index f180fd66713f..e729a70cfb74 100644
--- a/libexec/bootpd/bootpgw/bootpgw.c
+++ b/libexec/bootpd/bootpgw/bootpgw.c
@@ -31,7 +31,7 @@ SOFTWARE.
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/bootpgw/bootpgw.c,v 1.6 2003/02/05 13:45:25 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index c10d26b75217..b1dbb03f8467 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/bootptab.5,v 1.11 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd October 31, 1991
 .Dt BOOTPTAB 5
diff --git a/libexec/bootpd/bootptab.mcs b/libexec/bootpd/bootptab.mcs
index 9bce37e07f29..1efbdd3e3fe8 100644
--- a/libexec/bootpd/bootptab.mcs
+++ b/libexec/bootpd/bootptab.mcs
@@ -2,7 +2,7 @@
 # Last update: gwr, Sun Dec 12 19:00:00 EDT 1993
 # Blank lines and lines beginning with '#' are ignored.
 #
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/bootptab.mcs,v 1.5 1999/08/28 00:09:17 peter Exp $
 #
 # Legend:	(see bootptab.5)
 #	first field -- hostname (not indented)
diff --git a/libexec/bootpd/bptypes.h b/libexec/bootpd/bptypes.h
index e27cc832c5fe..933f34df9750 100644
--- a/libexec/bootpd/bptypes.h
+++ b/libexec/bootpd/bptypes.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/libexec/bootpd/bptypes.h,v 1.2 1999/11/12 10:11:48 marcel Exp $
  */
 
 #ifndef	BPTYPES_H
diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c
index 3b2bd973cbf1..22ea7a63282a 100644
--- a/libexec/bootpd/dovend.c
+++ b/libexec/bootpd/dovend.c
@@ -1,7 +1,7 @@
 /*
  * dovend.c : Inserts all but the first few vendor options.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/dovend.c,v 1.8 2002/05/28 18:36:43 alfred Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/dovend.h b/libexec/bootpd/dovend.h
index ef3b62de7126..c1342ff793e0 100644
--- a/libexec/bootpd/dovend.h
+++ b/libexec/bootpd/dovend.h
@@ -1,5 +1,5 @@
 /* dovend.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/dovend.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 extern int dovend_rfc1497(struct host *hp, u_char *buf, int len);
 extern int insert_ip(int, struct in_addr_list *, u_char **, int *);
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 43e94ec4cef2..c739c0a58369 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -1,7 +1,7 @@
 /*
  * dumptab.c - handles dumping the database
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/dumptab.c,v 1.9 2002/05/28 18:36:43 alfred Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index e4dc1b66b9e2..a0f94bbdc217 100644
--- a/libexec/bootpd/getether.c
+++ b/libexec/bootpd/getether.c
@@ -7,7 +7,7 @@
  * If you figure out how to do this on another system,
  * please let me know.  <gwr@mc.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/getether.c,v 1.14 2002/12/30 21:18:03 schweikh Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.h b/libexec/bootpd/getether.h
index 026df158b50c..143574739585 100644
--- a/libexec/bootpd/getether.h
+++ b/libexec/bootpd/getether.h
@@ -1,4 +1,4 @@
 /* getether.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/getether.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 extern int getether(char *ifname, char *eaptr);
diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c
index 64e5edadb679..6e368c15eb41 100644
--- a/libexec/bootpd/getif.c
+++ b/libexec/bootpd/getif.c
@@ -1,7 +1,7 @@
 /*
  * getif.c : get an interface structure
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/getif.c,v 1.8 2004/07/29 18:05:20 kan Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getif.h b/libexec/bootpd/getif.h
index a2c86cfba04b..9b02003a5faa 100644
--- a/libexec/bootpd/getif.h
+++ b/libexec/bootpd/getif.h
@@ -1,4 +1,4 @@
 /* getif.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/getif.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 extern struct ifreq *getif(int, struct in_addr *);
diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c
index 146e87e69356..a8d7f41e96ab 100644
--- a/libexec/bootpd/hash.c
+++ b/libexec/bootpd/hash.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/hash.c,v 1.7 2002/05/28 18:36:43 alfred Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/hash.h b/libexec/bootpd/hash.h
index 22cdc04332c2..fa89957c72a5 100644
--- a/libexec/bootpd/hash.h
+++ b/libexec/bootpd/hash.h
@@ -25,7 +25,7 @@ SOFTWARE.
 
 /*
  * Generalized hash table ADT
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hash.h,v 1.3 2002/05/28 18:36:43 alfred Exp $
  *
  * Provides multiple, dynamically-allocated, variable-sized hash tables on
  * various data and keys.
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
index de264cc83a5f..104c07456636 100644
--- a/libexec/bootpd/hwaddr.c
+++ b/libexec/bootpd/hwaddr.c
@@ -2,7 +2,7 @@
  * hwaddr.c - routines that deal with hardware addresses.
  * (i.e. Ethernet)
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hwaddr.c,v 1.9 2002/10/13 11:27:36 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hwaddr.h b/libexec/bootpd/hwaddr.h
index bd68857648a1..233e2d15982e 100644
--- a/libexec/bootpd/hwaddr.h
+++ b/libexec/bootpd/hwaddr.h
@@ -1,7 +1,7 @@
 /* 
  * hwaddr.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hwaddr.h,v 1.7 2002/05/28 18:36:43 alfred Exp $
  */
 
 #ifndef	HWADDR_H
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index 54b3f62242f7..b3ef9d23cf89 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,7 +1,7 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/lookup.c,v 1.7 1999/08/28 00:09:19 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/lookup.h b/libexec/bootpd/lookup.h
index 4940f054696a..43d12895108b 100644
--- a/libexec/bootpd/lookup.h
+++ b/libexec/bootpd/lookup.h
@@ -1,5 +1,5 @@
 /* lookup.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/lookup.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 #include "bptypes.h"	/* for int32, u_int32 */
 
diff --git a/libexec/bootpd/patchlevel.h b/libexec/bootpd/patchlevel.h
index fc79f18b4068..df5b94b00f6c 100644
--- a/libexec/bootpd/patchlevel.h
+++ b/libexec/bootpd/patchlevel.h
@@ -1,7 +1,7 @@
 /* 
  * patchlevel.h 
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/patchlevel.h,v 1.5 1999/08/28 00:09:19 peter Exp $
  */
 
 #define VERSION 	"2.4"
diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c
index ab583d485db4..9cb1a2fa0672 100644
--- a/libexec/bootpd/readfile.c
+++ b/libexec/bootpd/readfile.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/readfile.c,v 1.11 2002/08/25 13:07:51 charnier Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/readfile.h b/libexec/bootpd/readfile.h
index be9cada23779..e24c2be86d79 100644
--- a/libexec/bootpd/readfile.h
+++ b/libexec/bootpd/readfile.h
@@ -1,5 +1,5 @@
 /* readfile.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/readfile.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 #include "bptypes.h"
 #include "hash.h"
diff --git a/libexec/bootpd/report.c b/libexec/bootpd/report.c
index 290e19e74063..38aabc89a730 100644
--- a/libexec/bootpd/report.c
+++ b/libexec/bootpd/report.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/report.c,v 1.5 2002/05/28 18:31:41 alfred Exp $ */
 
 /*
  * report() - calls syslog
diff --git a/libexec/bootpd/report.h b/libexec/bootpd/report.h
index 55cec5c76845..15964fbca268 100644
--- a/libexec/bootpd/report.h
+++ b/libexec/bootpd/report.h
@@ -1,5 +1,5 @@
 /* report.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/report.h,v 1.5 2002/05/28 18:36:43 alfred Exp $ */
 
 extern void report_init(int nolog);
 extern void report(int, const char *, ...) __printflike(2, 3);
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 45845699bfe0..f51d46ef6550 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/rtmsg.c,v 1.12 2003/02/05 13:45:25 charnier Exp $");
 
 #include <sys/param.h>
 /*
diff --git a/libexec/bootpd/tools/Makefile b/libexec/bootpd/tools/Makefile
index e905bffa7696..49ce256edafd 100644
--- a/libexec/bootpd/tools/Makefile
+++ b/libexec/bootpd/tools/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/Makefile,v 1.4 1999/08/28 00:09:23 peter Exp $
 
 SUBDIR=	bootpef bootptest
 
diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc
index 4d7876162d28..81a9bd902c36 100644
--- a/libexec/bootpd/tools/Makefile.inc
+++ b/libexec/bootpd/tools/Makefile.inc
@@ -1,4 +1,4 @@
 # Makefile.inc
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/Makefile.inc,v 1.6 2001/03/26 14:22:03 ru Exp $
 
 BINDIR=		/usr/sbin
diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile
index 9436561d4a66..a3b6ae88a5c4 100644
--- a/libexec/bootpd/tools/bootpef/Makefile
+++ b/libexec/bootpd/tools/bootpef/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/bootpef/Makefile,v 1.6 2001/03/26 14:22:03 ru Exp $
 
 PROG=	bootpef
 MAN=	bootpef.8
diff --git a/libexec/bootpd/tools/bootpef/bootpef.8 b/libexec/bootpd/tools/bootpef/bootpef.8
index 841b01cd4ff6..16f47777c99b 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.8
+++ b/libexec/bootpd/tools/bootpef/bootpef.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/tools/bootpef/bootpef.8,v 1.4 2002/07/06 19:18:38 charnier Exp $
 .\"
 .\" bootpef.8
 .Dd December 4, 1993
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
index 04089c87b560..2d662e7f95d7 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.c
+++ b/libexec/bootpd/tools/bootpef/bootpef.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/tools/bootpef/bootpef.c,v 1.7 2002/05/28 18:39:52 alfred Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index fae5127eebb3..82e680778fd1 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/bootptest/Makefile,v 1.8 2001/03/26 14:22:03 ru Exp $
 
 PROG=	bootptest
 MAN=	bootptest.8
diff --git a/libexec/bootpd/tools/bootptest/bootptest.8 b/libexec/bootpd/tools/bootptest/bootptest.8
index 888ff227f124..242803d094d8 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.8
+++ b/libexec/bootpd/tools/bootptest/bootptest.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.8,v 1.5 2005/01/18 09:29:39 ru Exp $
 .\"
 .\" bootptest.8
 .Dd June 10, 1993
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index 04909878f33f..5e04af20fc72 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.c,v 1.8 2003/02/05 13:45:25 charnier Exp $");
 
 char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
 
diff --git a/libexec/bootpd/tools/bootptest/bootptest.h b/libexec/bootpd/tools/bootptest/bootptest.h
index a1891fe52556..88fcfbf79f98 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.h
+++ b/libexec/bootpd/tools/bootptest/bootptest.h
@@ -1,5 +1,5 @@
 /* bootptest.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.h,v 1.2 2002/05/28 18:39:53 alfred Exp $ */
 /*
  * Hacks for sharing print-bootp.c between tcpdump and bootptest.
  */
diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c
index 9ea450e10d90..a1e0cd658764 100644
--- a/libexec/bootpd/tools/bootptest/print-bootp.c
+++ b/libexec/bootpd/tools/bootptest/print-bootp.c
@@ -23,7 +23,7 @@
  * This file was copied from tcpdump-2.1.1 and modified.
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/tools/bootptest/print-bootp.c,v 1.7 2001/09/29 11:37:13 iedowse Exp $
  */
 
 #include <stdio.h>
diff --git a/libexec/bootpd/trygetea.c b/libexec/bootpd/trygetea.c
index 0ae63a3a2fba..54b8b0c87ba1 100644
--- a/libexec/bootpd/trygetea.c
+++ b/libexec/bootpd/trygetea.c
@@ -1,7 +1,7 @@
 /*
  * trygetea.c - test program for getether.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trygetea.c,v 1.5 1999/08/28 00:09:19 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trygetif.c b/libexec/bootpd/trygetif.c
index 0e2cca195b23..1c4f28e9cea3 100644
--- a/libexec/bootpd/trygetif.c
+++ b/libexec/bootpd/trygetif.c
@@ -1,7 +1,7 @@
 /*
  * trygetif.c - test program for getif.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trygetif.c,v 1.5 1999/08/28 00:09:20 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trylook.c b/libexec/bootpd/trylook.c
index 9484d04b6da3..e6705a62076a 100644
--- a/libexec/bootpd/trylook.c
+++ b/libexec/bootpd/trylook.c
@@ -1,7 +1,7 @@
 /*
  * trylook.c - test program for lookup.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trylook.c,v 1.5 1999/08/28 00:09:20 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/tzone.c b/libexec/bootpd/tzone.c
index 354fb54ed373..f671cdb06365 100644
--- a/libexec/bootpd/tzone.c
+++ b/libexec/bootpd/tzone.c
@@ -3,7 +3,7 @@
  *
  * This is shared by bootpd and bootpef
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/tzone.c,v 1.2 2000/11/10 12:19:53 dirk Exp $
  */
 
 #ifdef	SVR4
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index c501cccb8551..9da389aa1133 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/comsat/Makefile,v 1.8 2001/03/26 14:22:03 ru Exp $
 
 PROG=	comsat
 MAN=	comsat.8
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8
index 50b6b113b1d9..f72dd76421d9 100644
--- a/libexec/comsat/comsat.8
+++ b/libexec/comsat/comsat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)comsat.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/comsat/comsat.8,v 1.14 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index ed14b1a2d2bc..688631030651 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)comsat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/comsat/comsat.c,v 1.17 2005/02/14 17:42:56 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index ae92564cda96..c6091db6115e 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/fingerd/Makefile,v 1.11 2004/03/29 09:29:51 pjd Exp $
 
 PROG=	fingerd
 DPADD=	${LIBUTIL}
diff --git a/libexec/fingerd/fingerd.8 b/libexec/fingerd/fingerd.8
index 232771ad0013..932d42fa8357 100644
--- a/libexec/fingerd/fingerd.8
+++ b/libexec/fingerd/fingerd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fingerd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/fingerd/fingerd.8,v 1.14 2005/01/18 09:29:39 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FINGERD 8
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 0979c64a504b..ec54df688d60 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fingerd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/fingerd/fingerd.c,v 1.25 2005/02/14 17:42:57 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftp-proxy/Makefile b/libexec/ftp-proxy/Makefile
index e2290011d148..9a4080f6f5df 100644
--- a/libexec/ftp-proxy/Makefile
+++ b/libexec/ftp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/ftp-proxy/Makefile,v 1.2 2005/05/18 12:19:50 keramida Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/ftp-proxy
 
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index c4275e43939b..40904ed36732 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-# $FreeBSD$
+# $FreeBSD: src/libexec/ftpd/Makefile,v 1.55 2004/12/21 12:49:23 ru Exp $
 
 PROG=	ftpd
 MAN=	ftpd.8 ftpchroot.5
diff --git a/libexec/ftpd/config.h b/libexec/ftpd/config.h
index 8e10bbb270dc..5c42a5cbdf3a 100644
--- a/libexec/ftpd/config.h
+++ b/libexec/ftpd/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/ftpd/config.h,v 1.1 2001/07/19 17:45:14 obrien Exp $ */
 
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 7c1cc8edd1db..b0dab9370428 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/4/94
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ftpd/extern.h,v 1.19 2002/02/04 01:23:44 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/ftpchroot.5 b/libexec/ftpd/ftpchroot.5
index 216ed3da4e27..575774291150 100644
--- a/libexec/ftpd/ftpchroot.5
+++ b/libexec/ftpd/ftpchroot.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ftpd/ftpchroot.5,v 1.3 2003/06/01 19:52:36 ru Exp $
 .\"
 .Dd January 26, 2003
 .Dt FTPCHROOT 5
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index d40e354aa33d..d2f1ad8538db 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.64 2004/11/18 13:46:29 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index aed7d5d57a58..212dcb9d5341 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.69 2005/01/18 09:29:39 ru Exp $
 .\"
 .Dd January 27, 2000
 .Dt FTPD 8
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 1334757e7b5b..bc14c19fb314 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.206 2005/02/16 11:35:51 yar Exp $");
 
 /*
  * FTP server.
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 29bea5cef0d0..e0589b7da739 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/logwtmp.c,v 1.13 2004/11/18 13:46:29 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index a8837a90c446..24b74645baa8 100644
--- a/libexec/ftpd/pathnames.h
+++ b/libexec/ftpd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ftpd/pathnames.h,v 1.11 1999/08/28 00:09:31 peter Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 3c187b94daf9..9edcefb67e4a 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/popen.c,v 1.26 2004/11/18 13:46:29 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index 697e81ae0bb4..c7e84226d601 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/getty/Makefile,v 1.11 2002/02/04 02:33:50 kris Exp $
 
 PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index bc5a963c8a35..4fa3084f5635 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/chat.c,v 1.11 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 04f3287c9bb9..76fdf44b8a22 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/extern.h,v 1.9 2005/04/06 17:42:24 stefanf Exp $
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 4ab5501b3f9a..bc55f6f0acb5 100644
--- a/libexec/getty/getty.8
+++ b/libexec/getty/getty.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)getty.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/getty.8,v 1.16 2005/01/18 09:29:39 ru Exp $
 .\" "
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 7b475b191781..e9e41553555e 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/gettytab.5,v 1.41 2005/01/18 09:29:39 ru Exp $
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index e8b4143af645..3addfe357e0f 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)gettytab.h	8.2 (Berkeley) 3/30/94
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/gettytab.h,v 1.14 2003/06/10 18:30:41 yar Exp $
  */
 
 /*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index b832bb29fa8b..9c8a4a6d2dab 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: init.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/init.c,v 1.16 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index ad53411b57fb..dea5a5d88510 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: main.c	8.1 (Berkeley) 6/20/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/main.c,v 1.47 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 035e8b6c14b3..2c64fd1e4f01 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/pathnames.h,v 1.7 1999/08/28 00:09:36 peter Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 4938d7386dbf..624e9edfb1ee 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: subr.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/subr.c,v 1.19 2004/06/25 10:11:28 phk Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index d1aaff6be5bb..db093c75f682 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ttys.5	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.18 2005/06/14 08:40:10 ru Exp $
 .\" "
 .Dd May 27, 2005
 .Dt TTYS 5
diff --git a/libexec/lukemftpd/Makefile b/libexec/lukemftpd/Makefile
index 532f85c55c5f..eca81f0d0e5f 100644
--- a/libexec/lukemftpd/Makefile
+++ b/libexec/lukemftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-# $FreeBSD$
+# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.16 2004/12/21 12:49:23 ru Exp $
 
 LUKEMFTPD=	${.CURDIR}/../../contrib/lukemftpd
 .PATH: ${LUKEMFTPD}/src ${LUKEMFTPD}/libnetbsd
diff --git a/libexec/lukemftpd/config.h b/libexec/lukemftpd/config.h
index 0d4566a924c0..03b6d4452a08 100644
--- a/libexec/lukemftpd/config.h
+++ b/libexec/lukemftpd/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/config.h,v 1.4 2004/08/21 03:36:47 obrien Exp $ */
 
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/libexec/lukemftpd/nbsd2fbsd.h b/libexec/lukemftpd/nbsd2fbsd.h
index d060af6cd5b6..9802aec6cc83 100644
--- a/libexec/lukemftpd/nbsd2fbsd.h
+++ b/libexec/lukemftpd/nbsd2fbsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/nbsd2fbsd.h,v 1.4 2003/09/11 03:28:21 obrien Exp $ */
 
 /* XXX: Depend on our system headers protecting against multiple includes. */
 #include <paths.h>
diff --git a/libexec/lukemftpd/pamize.h b/libexec/lukemftpd/pamize.h
index 345f4bbd7e02..a526d3eade56 100644
--- a/libexec/lukemftpd/pamize.h
+++ b/libexec/lukemftpd/pamize.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/pamize.h,v 1.1 2003/02/02 21:06:10 obrien Exp $ */
 
 
 #ifdef USE_PAM
diff --git a/libexec/lukemftpd/util.h b/libexec/lukemftpd/util.h
index 91ce241953ea..32eacdd9c045 100644
--- a/libexec/lukemftpd/util.h
+++ b/libexec/lukemftpd/util.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/util.h,v 1.1 2003/01/06 03:03:53 obrien Exp $ */
 
 #include <libutil.h>
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index 57837d11166b..807d2bbf6637 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/mail.local/Makefile,v 1.21 2005/06/10 06:12:51 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/mail.local
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index d09f8127dc21..10fe87876b7e 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/makekey/Makefile,v 1.14 2004/02/05 22:44:23 ru Exp $
 
 PROG=	makekey
 MAN=	makekey.8
diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8
index 7f7f054d012b..5afba778e57f 100644
--- a/libexec/makekey/makekey.8
+++ b/libexec/makekey/makekey.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)makekey.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/makekey/makekey.8,v 1.15 2004/05/16 22:11:56 ru Exp $
 .\"
 .Dd October 8, 2003
 .Dt MAKEKEY 8
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index 2b541bf87b63..eb3cfb09fa19 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)makekey.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/makekey/makekey.c,v 1.9 2002/02/06 16:51:09 imp Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile
index 6941b8fde414..db0756b9fec4 100644
--- a/libexec/mknetid/Makefile
+++ b/libexec/mknetid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/mknetid/Makefile,v 1.7 2001/08/21 15:39:15 ru Exp $
 
 PROG=	mknetid
 SRCS=	mknetid.c hash.c parse_group.c
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index b4a39cbc12ec..16ec6443cdee 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/hash.c,v 1.7 2002/12/30 21:18:03 schweikh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 7918ae2e95f0..5821e4fd4634 100644
--- a/libexec/mknetid/hash.h
+++ b/libexec/mknetid/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/mknetid/hash.h,v 1.6 2002/02/17 19:09:20 imp Exp $
  */
 
 /* Groupid entry hung off a member_entry node. */
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index e70dc0038d9f..0b3ff67e47bf 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/mknetid/mknetid.8,v 1.16 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 66868664c3c5..a62fa57603c0 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/mknetid.c,v 1.13 2002/11/12 14:15:59 maxim Exp $";
 #endif /* not lint */
 
 #define LINSIZ 1024
diff --git a/libexec/mknetid/netid.5 b/libexec/mknetid/netid.5
index 011d8f507ec9..782256e1cba5 100644
--- a/libexec/mknetid/netid.5
+++ b/libexec/mknetid/netid.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/mknetid/netid.5,v 1.4 2005/01/18 09:29:40 ru Exp $
 .\"
 .Dd January 13, 1996
 .Dt NETID 5
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index b34ee11fcb39..0749a39330a7 100644
--- a/libexec/mknetid/parse_group.c
+++ b/libexec/mknetid/parse_group.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)getgrent.c	8.2 (Berkeley) 3/21/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/parse_group.c,v 1.7 2002/02/17 19:09:20 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile
index 0f0c78eda4f1..85eaaf3a35fe 100644
--- a/libexec/pppoed/Makefile
+++ b/libexec/pppoed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/pppoed/Makefile,v 1.5 2005/01/28 16:08:05 ru Exp $
 
 PROG=	pppoed
 DPADD=	${LIBNETGRAPH}
diff --git a/libexec/pppoed/pppoed.8 b/libexec/pppoed/pppoed.8
index 2f783535b767..63706a38468f 100644
--- a/libexec/pppoed/pppoed.8
+++ b/libexec/pppoed/pppoed.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/pppoed/pppoed.8,v 1.18 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd November 8, 1999
 .Dt PPPOED 8
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index 8dfebb70ff27..1a60fa485a55 100644
--- a/libexec/pppoed/pppoed.c
+++ b/libexec/pppoed/pppoed.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/pppoed/pppoed.c,v 1.24 2005/02/09 20:36:12 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/pt_chown/Makefile b/libexec/pt_chown/Makefile
index d4f31bbfd688..2eebc9d7efe0 100644
--- a/libexec/pt_chown/Makefile
+++ b/libexec/pt_chown/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/pt_chown/Makefile,v 1.4 2005/01/28 16:08:05 ru Exp $
 
 PROG=	pt_chown
 BINOWN=	root
diff --git a/libexec/pt_chown/pt_chown.c b/libexec/pt_chown/pt_chown.c
index d89ffeaba87e..3deaac684caa 100644
--- a/libexec/pt_chown/pt_chown.c
+++ b/libexec/pt_chown/pt_chown.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/pt_chown/pt_chown.c,v 1.1 2003/01/02 20:44:41 jmallett Exp $");
 #endif /* not lint */
 
 #include <sys/stat.h>
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index 3a4099e4a8be..bdafffe2ed0f 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rbootd/Makefile,v 1.12 2002/02/04 02:33:50 kris Exp $
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index ddd9cfbc2ae6..71a488cb9867 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)bpf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/bpf.c,v 1.11 2002/02/07 23:57:00 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c
index 74ff341095f9..66e43ea90b80 100644
--- a/libexec/rbootd/conf.c
+++ b/libexec/rbootd/conf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)conf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/conf.c,v 1.5 1999/08/28 00:09:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/defs.h b/libexec/rbootd/defs.h
index ff640c1629b5..4532cd935bf7 100644
--- a/libexec/rbootd/defs.h
+++ b/libexec/rbootd/defs.h
@@ -43,7 +43,7 @@
  * From: Utah Hdr: defs.h 3.1 92/07/06
  * Author: Jeff Forys, University of Utah CSS
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rbootd/defs.h,v 1.4 2002/02/07 23:57:00 imp Exp $
  */
 
 #include "rmp.h"
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 2eb33e0a370e..8ee8a4674919 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)parseconf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/parseconf.c,v 1.11 2002/02/07 23:57:00 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index c00186f48fac..f57de0e0a3cc 100644
--- a/libexec/rbootd/rbootd.8
+++ b/libexec/rbootd/rbootd.8
@@ -38,7 +38,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)rbootd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rbootd/rbootd.8,v 1.14 2004/07/02 21:28:48 ru Exp $
 .\"
 .\" Utah Hdr: rbootd.man 3.1 92/07/06
 .\" Author: Jeff Forys, University of Utah CSS
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index 942c7cb7133c..8b2752e59e65 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -55,7 +55,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rbootd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/rbootd.c,v 1.14 2004/08/21 07:23:41 maxim Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 78c2488f9a84..5b8e0e0f26cc 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)rmpproto.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/rmpproto.c,v 1.9 2004/05/24 11:59:16 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c
index 138bc4cc0078..24f7246e9f12 100644
--- a/libexec/rbootd/utils.c
+++ b/libexec/rbootd/utils.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)utils.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/utils.c,v 1.8 2004/05/24 11:59:16 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile
index 708837141347..2e6ca8281db3 100644
--- a/libexec/revnetgroup/Makefile
+++ b/libexec/revnetgroup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/revnetgroup/Makefile,v 1.6 2001/03/26 14:22:06 ru Exp $
 
 PROG=	revnetgroup
 SRCS=	revnetgroup.c hash.c parse_netgroup.c
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 118008023551..4e2ab98f83ca 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/hash.c,v 1.7 2002/02/07 23:57:01 imp Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index 2485901ed68e..6e8a0eb31367 100644
--- a/libexec/revnetgroup/hash.h
+++ b/libexec/revnetgroup/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/revnetgroup/hash.h,v 1.7 2002/02/07 23:57:01 imp Exp $
  */
 
 /* Groupname entry hung off a member_entry node. */
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index 67e1b14788d8..30dd32805729 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/parse_netgroup.c,v 1.9 2002/04/01 21:13:15 mike Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index 84cf9f91b007..de953565ebb8 100644
--- a/libexec/revnetgroup/revnetgroup.8
+++ b/libexec/revnetgroup/revnetgroup.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/revnetgroup/revnetgroup.8,v 1.14 2005/02/09 20:36:12 ru Exp $
 .\"
 .Dd October 24, 1995
 .Dt REVNETGROUP 8
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 505c482b3be8..f86337759ebd 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/revnetgroup.c,v 1.13 2005/02/09 20:36:12 ru Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index f71ce1b570db..329be2add538 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rlogind/Makefile,v 1.20 2005/01/28 16:08:05 ru Exp $
 
 PROG=	rlogind
 MAN=	rlogind.8
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index d861da538394..c994f27fe2a0 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rlogind.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rlogind/rlogind.8,v 1.24 2005/02/09 20:23:36 ru Exp $
 .\"
 .Dd February 9, 2005
 .Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index c4db3c7ae6bf..09cc72a58a87 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -50,7 +50,7 @@ static const char sccsid[] = "@(#)rlogind.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rlogind/rlogind.c,v 1.44 2005/05/13 16:31:09 ume Exp $");
 
 /*
  * remote login server:
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 331f6ab6e2b6..3b88cc86aee8 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rquotad/Makefile,v 1.6 2001/03/26 14:22:07 ru Exp $
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index 4e14da0b034c..cc1a5bb04590 100644
--- a/libexec/rpc.rquotad/rpc.rquotad.8
+++ b/libexec/rpc.rquotad/rpc.rquotad.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/libexec/rpc.rquotad/rpc.rquotad.8,v 1.12 2005/01/18 09:29:40 ru Exp $
 .\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index 6ca4c7461245..840b39251351 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.9 2005/02/14 17:42:57 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index be8981430171..5b092206f4f5 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rstatd/Makefile,v 1.8 2004/02/04 10:20:43 ru Exp $
 
 PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c
diff --git a/libexec/rpc.rstatd/rpc.rstatd.8 b/libexec/rpc.rstatd/rpc.rstatd.8
index ebaa766efd88..024b78f94bf8 100644
--- a/libexec/rpc.rstatd/rpc.rstatd.8
+++ b/libexec/rpc.rstatd/rpc.rstatd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rstatd/rpc.rstatd.8,v 1.8 2002/07/06 19:19:23 charnier Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RSTATD 8
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index c8f2b97b6bf8..69452a4ee701 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -33,7 +33,7 @@ static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro
 static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.25 2003/06/02 02:34:36 obrien Exp $";
 #endif
 
 /*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 362cdc486683..c61fed103201 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rstatd/rstatd.c,v 1.11 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index af43bd3e7cf3..d272a997e7ca 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rusersd/Makefile,v 1.8 2001/03/26 14:22:07 ru Exp $
 
 PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
diff --git a/libexec/rpc.rusersd/rpc.rusersd.8 b/libexec/rpc.rusersd/rpc.rusersd.8
index 6efd47de9ede..0e557e519add 100644
--- a/libexec/rpc.rusersd/rpc.rusersd.8
+++ b/libexec/rpc.rusersd/rpc.rusersd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rusersd/rpc.rusersd.8,v 1.9 2002/07/06 19:19:25 charnier Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RUSERSD 8
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 8bd96924b29a..e2bec5934acb 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rusersd/rusers_proc.c,v 1.13 2003/06/02 02:35:18 obrien Exp $";
 #endif /* not lint */
 
 #ifdef DEBUG
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 1835e8e27aeb..def910906617 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rusersd/rusersd.c,v 1.11 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 83182e904b3e..7c708d9f98cb 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rwalld/Makefile,v 1.7 2004/02/04 11:59:07 ru Exp $
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8
index d5e1472732a6..841910b9b4d4 100644
--- a/libexec/rpc.rwalld/rpc.rwalld.8
+++ b/libexec/rpc.rwalld/rpc.rwalld.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rwalld/rpc.rwalld.8,v 1.9 2004/07/02 21:28:49 ru Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RWALLD 8
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index 6bfe53770560..198c35c64650 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rwalld/rwalld.c,v 1.13 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 1dd582de0082..e9d531f60d79 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.sprayd/Makefile,v 1.6 2001/03/26 14:22:08 ru Exp $
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8
index 8840043e5ed2..d0f2cc2a11de 100644
--- a/libexec/rpc.sprayd/rpc.sprayd.8
+++ b/libexec/rpc.sprayd/rpc.sprayd.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/libexec/rpc.sprayd/rpc.sprayd.8,v 1.9 2002/07/06 19:19:30 charnier Exp $
 .\"
 .Dd June 22, 1994
 .Dt RPC.SPRAYD 8
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 9c7cee1e105b..0e597f74059e 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.sprayd/sprayd.c,v 1.9 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 155314ad611f..6e33a93532a9 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rshd/Makefile,v 1.25 2005/01/28 16:08:05 ru Exp $
 
 PROG=	rshd
 MAN=	rshd.8
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index bc77108b5223..2d8e359364d3 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rshd/rshd.8,v 1.36 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index ec1725147546..037ba143b0e6 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)rshd.c	8.2 (Berkeley) 4/6/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rshd/rshd.c,v 1.51 2005/05/11 02:41:39 jmallett Exp $");
 
 /*
  * remote shell server:
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 39ec792a72c9..bbee7eb2394b 100644
--- a/libexec/rtld-aout/shlib.c
+++ b/libexec/rtld-aout/shlib.c
@@ -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/libexec/rtld-aout/shlib.c,v 1.26 2005/01/14 12:22:57 delphij Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.h b/libexec/rtld-aout/shlib.h
index 4b6d753e573e..e889a7ef4c5e 100644
--- a/libexec/rtld-aout/shlib.h
+++ b/libexec/rtld-aout/shlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.8 2005/01/14 12:22:57 delphij Exp $
  */
 
 /*
diff --git a/libexec/rtld-aout/support.c b/libexec/rtld-aout/support.c
index 71a84ffa1299..7442575f7cd3 100644
--- a/libexec/rtld-aout/support.c
+++ b/libexec/rtld-aout/support.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.7 2005/01/11 16:40:29 trhodes Exp $
  */
 #include <sys/types.h>
 #include <string.h>
diff --git a/libexec/rtld-aout/support.h b/libexec/rtld-aout/support.h
index da0340783f27..dac35f3738d9 100644
--- a/libexec/rtld-aout/support.h
+++ b/libexec/rtld-aout/support.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.6 2005/01/11 16:40:29 trhodes Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 31794951a593..f89d15705a4e 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.36 2004/11/14 22:18:31 ru Exp $
 
 PROG?=		ld-elf.so.1
 SRCS=		rtld_start.S \
diff --git a/libexec/rtld-elf/alpha/Makefile.inc b/libexec/rtld-elf/alpha/Makefile.inc
index 0f34febdf49d..4ebc4586ebe0 100644
--- a/libexec/rtld-elf/alpha/Makefile.inc
+++ b/libexec/rtld-elf/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/alpha/Makefile.inc,v 1.2 2002/02/18 02:24:09 peter Exp $
 
 CFLAGS+=	-mno-fp-regs
 LDFLAGS+=	-Wl,--script,${.CURDIR}/alpha/ld.so.script
diff --git a/libexec/rtld-elf/alpha/ld.so.script b/libexec/rtld-elf/alpha/ld.so.script
index 2b5d535d1adc..b90f23bfcf21 100644
--- a/libexec/rtld-elf/alpha/ld.so.script
+++ b/libexec/rtld-elf/alpha/ld.so.script
@@ -1,5 +1,5 @@
 /*	$NetBSD: ld.so.script,v 1.2 2001/12/13 20:31:31 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/rtld-elf/alpha/ld.so.script,v 1.2 2002/10/12 02:30:53 obrien Exp $ */
 
 OUTPUT_FORMAT("elf64-alpha-freebsd", "elf64-alpha-freebsd",
 	      "elf64-alpha-freebsd")
diff --git a/libexec/rtld-elf/alpha/reloc.c b/libexec/rtld-elf/alpha/reloc.c
index 74aaf9cfa8ac..5e974c75ab22 100644
--- a/libexec/rtld-elf/alpha/reloc.c
+++ b/libexec/rtld-elf/alpha/reloc.c
@@ -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/libexec/rtld-elf/alpha/reloc.c,v 1.20 2005/06/02 05:34:08 marcel Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/alpha/rtld_machdep.h b/libexec/rtld-elf/alpha/rtld_machdep.h
index 397139e35ba0..f83aae1f3823 100644
--- a/libexec/rtld-elf/alpha/rtld_machdep.h
+++ b/libexec/rtld-elf/alpha/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/alpha/rtld_machdep.h,v 1.10 2004/08/03 08:50:59 dfr Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/alpha/rtld_start.S b/libexec/rtld-elf/alpha/rtld_start.S
index 8ab7605a5817..6ea22139b1e5 100644
--- a/libexec/rtld-elf/alpha/rtld_start.S
+++ b/libexec/rtld-elf/alpha/rtld_start.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/libexec/rtld-elf/alpha/rtld_start.S,v 1.6 2003/05/29 22:58:24 kan Exp $	*/
 /*	From: NetBSD: rtld_start.S,v 1.1 1996/12/16 20:38:09 cgd Exp 	*/
 
 /*
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
index 985b4818500d..67d6b3d49fb9 100644
--- a/libexec/rtld-elf/amd64/reloc.c
+++ b/libexec/rtld-elf/amd64/reloc.c
@@ -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/libexec/rtld-elf/amd64/reloc.c,v 1.15 2004/08/03 08:50:59 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h
index 57bd0de1251f..fc54dd8c290a 100644
--- a/libexec/rtld-elf/amd64/rtld_machdep.h
+++ b/libexec/rtld-elf/amd64/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_machdep.h,v 1.12 2004/08/03 08:50:59 dfr Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/amd64/rtld_start.S b/libexec/rtld-elf/amd64/rtld_start.S
index 4cdad22b0557..10c1553d49f8 100644
--- a/libexec/rtld-elf/amd64/rtld_start.S
+++ b/libexec/rtld-elf/amd64/rtld_start.S
@@ -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/libexec/rtld-elf/amd64/rtld_start.S,v 1.5 2004/03/21 01:43:39 peter Exp $
  */
 
 	.text
diff --git a/libexec/rtld-elf/arm/Makefile.inc b/libexec/rtld-elf/arm/Makefile.inc
index e8c0da7a1d7e..4bb1113adbfc 100644
--- a/libexec/rtld-elf/arm/Makefile.inc
+++ b/libexec/rtld-elf/arm/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/arm/Makefile.inc,v 1.3 2004/06/17 17:53:16 cognet Exp $
diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c
index ff9d195c9002..f58621b02849 100644
--- a/libexec/rtld-elf/arm/reloc.c
+++ b/libexec/rtld-elf/arm/reloc.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rtld-elf/arm/reloc.c,v 1.3 2004/09/28 14:43:12 cognet Exp $");
 #include <sys/param.h>
 #include <sys/mman.h>
 
diff --git a/libexec/rtld-elf/arm/rtld_machdep.h b/libexec/rtld-elf/arm/rtld_machdep.h
index dd046a9d5ae8..0cc35d3e5d27 100644
--- a/libexec/rtld-elf/arm/rtld_machdep.h
+++ b/libexec/rtld-elf/arm/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/arm/rtld_machdep.h,v 1.5 2005/04/07 22:04:49 cognet Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/arm/rtld_start.S b/libexec/rtld-elf/arm/rtld_start.S
index da22c57317ea..ae10c1253632 100644
--- a/libexec/rtld-elf/arm/rtld_start.S
+++ b/libexec/rtld-elf/arm/rtld_start.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rtld-elf/arm/rtld_start.S,v 1.3 2004/09/28 14:41:15 cognet Exp $");
 
 	.text
 	.align	0
diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c
index 3b7611c6e63d..3a83b66360f9 100644
--- a/libexec/rtld-elf/debug.c
+++ b/libexec/rtld-elf/debug.c
@@ -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/libexec/rtld-elf/debug.c,v 1.4 2003/06/19 16:09:18 mdodd Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h
index 3708df62cbe7..68faa0aed243 100644
--- a/libexec/rtld-elf/debug.h
+++ b/libexec/rtld-elf/debug.h
@@ -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/libexec/rtld-elf/debug.h,v 1.6 2004/03/21 01:21:26 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index db2fcf2cf441..169bf96d3ee9 100644
--- a/libexec/rtld-elf/i386/reloc.c
+++ b/libexec/rtld-elf/i386/reloc.c
@@ -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/libexec/rtld-elf/i386/reloc.c,v 1.18 2005/06/29 23:15:36 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h
index e104f868b5a4..3bc939e09ed3 100644
--- a/libexec/rtld-elf/i386/rtld_machdep.h
+++ b/libexec/rtld-elf/i386/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.10 2004/08/03 08:50:59 dfr Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/i386/rtld_start.S b/libexec/rtld-elf/i386/rtld_start.S
index 9a6e2d5e5292..65d900db5d90 100644
--- a/libexec/rtld-elf/i386/rtld_start.S
+++ b/libexec/rtld-elf/i386/rtld_start.S
@@ -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/libexec/rtld-elf/i386/rtld_start.S,v 1.4 2005/05/19 07:32:42 dfr Exp $
  */
 
 	.text
diff --git a/libexec/rtld-elf/ia64/Makefile.inc b/libexec/rtld-elf/ia64/Makefile.inc
index 3ea0ac3391f6..70def0d1bf0e 100644
--- a/libexec/rtld-elf/ia64/Makefile.inc
+++ b/libexec/rtld-elf/ia64/Makefile.inc
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/ia64/Makefile.inc,v 1.1 2001/10/15 18:48:42 dfr Exp $
 LDFLAGS+=	-Wl,--export-dynamic
diff --git a/libexec/rtld-elf/ia64/reloc.c b/libexec/rtld-elf/ia64/reloc.c
index d71829371457..e18aa2e139cc 100644
--- a/libexec/rtld-elf/ia64/reloc.c
+++ b/libexec/rtld-elf/ia64/reloc.c
@@ -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/libexec/rtld-elf/ia64/reloc.c,v 1.15 2004/08/03 08:50:59 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/ia64/rtld_machdep.h b/libexec/rtld-elf/ia64/rtld_machdep.h
index 21c3a8fd7a49..c2209e2092cc 100644
--- a/libexec/rtld-elf/ia64/rtld_machdep.h
+++ b/libexec/rtld-elf/ia64/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/ia64/rtld_machdep.h,v 1.5 2004/08/03 08:50:59 dfr Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/ia64/rtld_start.S b/libexec/rtld-elf/ia64/rtld_start.S
index 158520713e50..b3c9df6aaa4b 100644
--- a/libexec/rtld-elf/ia64/rtld_start.S
+++ b/libexec/rtld-elf/ia64/rtld_start.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/libexec/rtld-elf/ia64/rtld_start.S,v 1.3 2003/05/29 22:58:25 kan Exp $	*/
 /*	From: NetBSD: rtld_start.S,v 1.1 1996/12/16 20:38:09 cgd Exp 	*/
 
 /*
diff --git a/libexec/rtld-elf/libmap.c b/libexec/rtld-elf/libmap.c
index cb72f03f3176..b78fe4cee6bb 100644
--- a/libexec/rtld-elf/libmap.c
+++ b/libexec/rtld-elf/libmap.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.14 2005/02/04 02:46:41 mdodd Exp $
  */
 
 #include <stdio.h>
diff --git a/libexec/rtld-elf/libmap.h b/libexec/rtld-elf/libmap.h
index 53b2ba1ec0bf..6b0991d5e88a 100644
--- a/libexec/rtld-elf/libmap.h
+++ b/libexec/rtld-elf/libmap.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/libmap.h,v 1.4 2005/02/04 02:46:41 mdodd Exp $
  */
 
 int	lm_init (char *);
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 2fe69a78b22e..c8fa19ed21c0 100644
--- a/libexec/rtld-elf/malloc.c
+++ b/libexec/rtld-elf/malloc.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)malloc.c	5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/libexec/rtld-elf/malloc.c,v 1.10 2003/08/22 02:22:59 imp Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index 2b1ef24c70aa..8d5f24a75628 100644
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -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/libexec/rtld-elf/map_object.c,v 1.16 2005/02/27 12:55:40 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/powerpc/Makefile.inc b/libexec/rtld-elf/powerpc/Makefile.inc
index e8c0da7a1d7e..4c1638b6c12d 100644
--- a/libexec/rtld-elf/powerpc/Makefile.inc
+++ b/libexec/rtld-elf/powerpc/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/powerpc/Makefile.inc,v 1.1 2002/12/04 07:32:20 grehan Exp $
diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c
index b65e026a24af..d363e5f99588 100644
--- a/libexec/rtld-elf/powerpc/reloc.c
+++ b/libexec/rtld-elf/powerpc/reloc.c
@@ -26,7 +26,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/libexec/rtld-elf/powerpc/reloc.c,v 1.5 2004/11/02 09:47:01 ssouhlal Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/powerpc/rtld_machdep.h b/libexec/rtld-elf/powerpc/rtld_machdep.h
index 38e105dd2832..1acc19f6a370 100644
--- a/libexec/rtld-elf/powerpc/rtld_machdep.h
+++ b/libexec/rtld-elf/powerpc/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/powerpc/rtld_machdep.h,v 1.4 2004/11/02 09:47:01 ssouhlal Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/powerpc/rtld_start.S b/libexec/rtld-elf/powerpc/rtld_start.S
index 86f76e6d282a..cde441b2a863 100644
--- a/libexec/rtld-elf/powerpc/rtld_start.S
+++ b/libexec/rtld-elf/powerpc/rtld_start.S
@@ -26,7 +26,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/libexec/rtld-elf/powerpc/rtld_start.S,v 1.2 2003/05/29 22:58:26 kan Exp $
  */
 
 #include <machine/asm.h>
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index 2ac900234437..4c035427ee54 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.1
@@ -26,7 +26,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/libexec/rtld-elf/rtld.1,v 1.40 2005/06/14 08:41:11 ru Exp $
 .\"
 .Dd May 31, 2003
 .Dt RTLD 1
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 1db0227310d2..f04cac4681a8 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.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/libexec/rtld-elf/rtld.c,v 1.106 2005/03/30 08:28:26 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index bee36aff1e70..db6554fd6357 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -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/libexec/rtld-elf/rtld.h,v 1.35 2005/02/27 12:55:40 dfr Exp $
  */
 
 #ifndef RTLD_H /* { */
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c
index 7bffc94913e9..9a9fa0500d63 100644
--- a/libexec/rtld-elf/rtld_lock.c
+++ b/libexec/rtld-elf/rtld_lock.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/libexec/rtld-elf/sparc64/lockdflt.c,v 1.3 2002/10/09
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/rtld_lock.c,v 1.3 2004/11/16 20:45:51 jhb Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h
index cca4f18ed14f..906e47218cd9 100644
--- a/libexec/rtld-elf/rtld_lock.h
+++ b/libexec/rtld-elf/rtld_lock.h
@@ -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/libexec/rtld-elf/rtld_lock.h,v 1.2 2003/06/19 02:39:37 mdodd Exp $
  */
 
 #ifndef _RTLD_LOCK_H_
diff --git a/libexec/rtld-elf/rtld_tls.h b/libexec/rtld-elf/rtld_tls.h
index b85db59afb18..4e179343ee3a 100644
--- a/libexec/rtld-elf/rtld_tls.h
+++ b/libexec/rtld-elf/rtld_tls.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/libexec/rtld-elf/rtld_tls.h,v 1.1 2004/08/03 08:50:58 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/sparc64/Makefile.inc b/libexec/rtld-elf/sparc64/Makefile.inc
index e8c0da7a1d7e..fec0efc48c57 100644
--- a/libexec/rtld-elf/sparc64/Makefile.inc
+++ b/libexec/rtld-elf/sparc64/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/sparc64/Makefile.inc,v 1.1 2002/03/13 02:40:39 jake Exp $
diff --git a/libexec/rtld-elf/sparc64/reloc.c b/libexec/rtld-elf/sparc64/reloc.c
index acc6701bcbe0..427bf26c755a 100644
--- a/libexec/rtld-elf/sparc64/reloc.c
+++ b/libexec/rtld-elf/sparc64/reloc.c
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/sparc64/reloc.c,v 1.10 2005/06/04 20:49:15 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/sparc64/rtld_machdep.h b/libexec/rtld-elf/sparc64/rtld_machdep.h
index db2ce256c6cb..9c445cdd3438 100644
--- a/libexec/rtld-elf/sparc64/rtld_machdep.h
+++ b/libexec/rtld-elf/sparc64/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_machdep.h,v 1.7 2004/08/03 08:51:00 dfr Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/sparc64/rtld_start.S b/libexec/rtld-elf/sparc64/rtld_start.S
index 58bdd1bbc944..4834e0524266 100644
--- a/libexec/rtld-elf/sparc64/rtld_start.S
+++ b/libexec/rtld-elf/sparc64/rtld_start.S
@@ -37,7 +37,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_start.S,v 1.6 2004/06/18 02:01:37 tmm Exp $
  */
 
 #include <machine/asm.h>
diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c
index 7ee4c570c6b8..785e16294074 100644
--- a/libexec/rtld-elf/xmalloc.c
+++ b/libexec/rtld-elf/xmalloc.c
@@ -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/libexec/rtld-elf/xmalloc.c,v 1.3 2003/06/19 05:28:26 mdodd Exp $
  */
 
 #include <err.h>
diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile
index 3e27c48315c4..94ea2b58ae31 100644
--- a/libexec/save-entropy/Makefile
+++ b/libexec/save-entropy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/save-entropy/Makefile,v 1.4 2004/12/21 08:46:52 ru Exp $
 
 SCRIPTS=	save-entropy.sh
 NO_OBJ=
diff --git a/libexec/save-entropy/save-entropy.sh b/libexec/save-entropy/save-entropy.sh
index 96f1a819be59..b87871c7f0f6 100755
--- a/libexec/save-entropy/save-entropy.sh
+++ b/libexec/save-entropy/save-entropy.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/libexec/save-entropy/save-entropy.sh,v 1.3 2005/04/11 02:07:33 dougb Exp $
 
 # This script is called by cron to store bits of randomness which are
 # then used to seed /dev/random on boot.
diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile
index 6fd2801f780d..07c3e60f5103 100644
--- a/libexec/smrsh/Makefile
+++ b/libexec/smrsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/2/95
-# $FreeBSD$
+# $FreeBSD: src/libexec/smrsh/Makefile,v 1.10 2005/06/10 06:12:51 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/smrsh
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index aa6df1bb9b67..6c629ed8f406 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/talkd/Makefile,v 1.9 2002/02/04 02:33:51 kris Exp $
 
 PROG=	ntalkd
 SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index ca64541d80ed..841822b605c0 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)announce.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/announce.c,v 1.16 2003/04/03 05:13:27 jmallett Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/talkd/extern.h b/libexec/talkd/extern.h
index cb231a95d134..3b7323643768 100644
--- a/libexec/talkd/extern.h
+++ b/libexec/talkd/extern.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/talkd/extern.h,v 1.3 2003/04/03 05:13:27 jmallett Exp $
  */
 
 int	announce(CTL_MSG *, const char *);
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 6c39d8da72cc..9fe04759e10c 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/print.c,v 1.12 2003/04/03 05:13:27 jmallett Exp $";
 #endif /* not lint */
 
 /* debug print routines */
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index d77f8a168bf4..0d324f947e7a 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)process.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/process.c,v 1.11 2005/05/06 15:28:54 delphij Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 001e7d41db7a..31aa498037aa 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/table.c,v 1.9 2003/04/03 05:13:27 jmallett Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/talkd.8 b/libexec/talkd/talkd.8
index b1944b7b5600..c2ab04c4ffcb 100644
--- a/libexec/talkd/talkd.8
+++ b/libexec/talkd/talkd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talkd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/talkd/talkd.8,v 1.7 2003/09/08 19:57:18 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt TALKD 8
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index e81cec6eb74d..8712cb888322 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talkd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/talkd.c,v 1.17 2004/06/14 22:44:13 bms Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile
index e9ae81a3d191..b15193f5da5f 100644
--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/tcpd/Makefile,v 1.4 2004/12/21 10:49:26 ru Exp $
 
 PROG=	tcpd
 MAN=	tcpd.8
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 68b2be674e89..cd09ed8ee510 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/telnetd/Makefile,v 1.26 2005/06/10 06:12:51 des Exp $
 
 # Do not define -DKLUDGELINEMODE, as it does not interact well with many
 # telnet implementations.
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index 75b16ae7f76e..b16fde59dee8 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/tftpd/Makefile,v 1.9 2001/03/26 14:22:11 ru Exp $
 
 PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index 63e1e75d51a8..f65ddc64696c 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tftpd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.18 2004/07/07 19:57:14 ru Exp $
 .\"
 .Dd September 14, 2000
 .Dt TFTPD 8
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 7958bbb793a1..d4990be32ee1 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tftpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.37 2005/05/31 17:22:53 maxim Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index 72978eb17d94..0e525dd5becc 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/ypxfr/Makefile,v 1.11 2002/02/04 02:33:51 kris Exp $
 
 PROG=	ypxfr
 SRCS=	yp_dblookup.c yp_dbwrite.c yp_error.c \
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index 488f9e4ad446..57d7c5a9d795 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/yp_dbwrite.c,v 1.11 2003/05/04 00:59:13 obrien Exp $");
 
 #include <db.h>
 #include <errno.h>
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 0d24b0de48b7..0118d91ef3d3 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ypxfr/ypxfr.8,v 1.19 2005/02/13 22:25:15 ru Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index f843b645b6dd..7e04fcfe346e 100644
--- a/libexec/ypxfr/ypxfr_extern.h
+++ b/libexec/ypxfr/ypxfr_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ypxfr/ypxfr_extern.h,v 1.11 2002/04/06 19:08:02 des Exp $
  */
 #include <sys/types.h>
 #include <limits.h>
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 452b18667ad3..9b9e18a921f7 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfr_getmap.c,v 1.12 2003/05/04 00:59:13 obrien Exp $");
 
 #include <stdio.h>
 #include <time.h>
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index f6b478a89d3c..ccd6be512f33 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfr_main.c,v 1.20 2004/10/17 19:33:32 stefanf Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index 726abec8022d..fd2334093341 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfr_misc.c,v 1.17 2004/10/17 19:33:32 stefanf Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index b1424ac552fc..71bcee88744f 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfrd_getmap.c,v 1.11 2003/10/26 04:32:53 peter Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/release/Makefile b/release/Makefile
index 69dbd1ca4168..79542b767e96 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/Makefile,v 1.887.2.2.2.1 2005/10/16 14:07:44 hrs Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
diff --git a/release/Makefile.inc.docports b/release/Makefile.inc.docports
index 5ff6eec153e9..9c586e49829e 100644
--- a/release/Makefile.inc.docports
+++ b/release/Makefile.inc.docports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/Makefile.inc.docports,v 1.26 2004/09/01 14:36:48 ru Exp $
 #
 # List of (dependent) ports that are minimally required to be
 # checked out from CVS in order to get ${DOCPORTS} built and
diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf
index c5c68cb090be..60b20d8e2403 100644
--- a/release/alpha/boot_crunch.conf
+++ b/release/alpha/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/alpha/boot_crunch.conf,v 1.55 2004/10/01 07:54:36 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/alpha/mkisoimages.sh b/release/alpha/mkisoimages.sh
index 9762931f441c..e73b6931f545 100644
--- a/release/alpha/mkisoimages.sh
+++ b/release/alpha/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.11 2005/01/30 21:10:51 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index c5c68cb090be..1270496e5f86 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.59 2004/10/01 07:54:36 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index a538d5b8764b..7e82479c8ec1 100644
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.11 2005/01/30 21:10:51 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/doc/Makefile b/release/doc/Makefile
index 51076c21309a..2d0f5f9a1e5f 100644
--- a/release/doc/Makefile
+++ b/release/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/Makefile,v 1.7 2004/08/06 08:41:22 simon Exp $
 #
 # The user can override the default language to build and install
 # with the RELNOTES_LANG variable.
diff --git a/release/doc/README b/release/doc/README
index 8a8165ae0862..df06f6fefd78 100644
--- a/release/doc/README
+++ b/release/doc/README
@@ -1,7 +1,7 @@
 -*- text -*-
 RELNOTESng README
 Bruce A. Mah <bmah@freebsd.org>
-$FreeBSD$
+$FreeBSD: src/release/doc/README,v 1.10 2002/03/06 07:59:18 bmah Exp $
 
 This is the top-level directory for RELNOTESng, a re-write of
 FreeBSD's *.TXT documentation files.  They have been converted to
diff --git a/release/doc/de_DE.ISO8859-1/Makefile b/release/doc/de_DE.ISO8859-1/Makefile
index a5288af45d95..7ce017cbe919 100644
--- a/release/doc/de_DE.ISO8859-1/Makefile
+++ b/release/doc/de_DE.ISO8859-1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/Makefile,v 1.2 2002/11/02 03:07:46 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/Makefile,v 1.4 2002/10/28 18:37:19 ue Exp $
 # basiert auf: 1.3
 
diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/Makefile b/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
index 8019ccac94dd..8b8fec80472d 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Documentation
 # The FreeBSD German Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/Makefile,v 1.1 2002/11/02 03:07:46 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/Makefile,v 1.1 2002/10/28 18:37:20 ue Exp $
 # basiert auf: 1.3
 
diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml b/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
index 49d3af042562..f4063dde7b24 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
@@ -1,7 +1,7 @@
 <!--
   The FreeBSD Documentation Project
   The FreeBSD German Documentation Project
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.11 2003/05/27 16:11:08 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.24 2003/05/25 12:44:41 mheinen Exp $
   basiert auf: 1.15
 -->
@@ -39,7 +39,7 @@
       <corpauthor>The &os; Release Engineering Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.11 2003/05/27 16:11:08 alex Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/de_DE.ISO8859-1/errata/Makefile b/release/doc/de_DE.ISO8859-1/errata/Makefile
index de5344dfeec1..ddc5925baee0 100644
--- a/release/doc/de_DE.ISO8859-1/errata/Makefile
+++ b/release/doc/de_DE.ISO8859-1/errata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/errata/Makefile,v 1.1 2002/03/12 18:35:39 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/Makefile,v 1.4 2002/03/10 18:26:34 ue Exp $
 # $Id: Makefile,v 1.5 2002/03/10 16:39:26 ue Exp $
 # basiert auf: 1.5
diff --git a/release/doc/de_DE.ISO8859-1/errata/article.sgml b/release/doc/de_DE.ISO8859-1/errata/article.sgml
index f7a8d284d128..ec4c09a8deaf 100644
--- a/release/doc/de_DE.ISO8859-1/errata/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/errata/article.sgml
@@ -41,7 +41,7 @@
       <corpauthor>Das &os; Projekt</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/errata/article.sgml,v 1.12 2004/08/22 09:53:23 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/Makefile b/release/doc/de_DE.ISO8859-1/hardware/Makefile
index db8c7f9024aa..462e18611703 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/Makefile,v 1.3 2002/11/09 21:27:37 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/Makefile,v 1.4 2002/11/09 18:00:42 ue Exp $
 # basiert auf: 1.5
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc b/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc
index 6a72b8968270..3456835c8d1a 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc
+++ b/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc,v 1.1 2002/03/12 18:35:39 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/Makefile.inc,v 1.2 2002/03/10 18:41:33 ue Exp $
 # $Id: Makefile.inc,v 1.5 2002/03/10 15:37:14 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile b/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
index 7b97c3801700..f452d199f0db 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile,v 1.1 2002/03/12 18:35:40 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/Makefile,v 1.3 2002/03/10 18:41:33 ue Exp $
 # $Id: Makefile,v 1.6 2002/03/10 15:37:14 ue Exp $
 # basiert auf: 1.6
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
index c09494b4f657..01141689a7b6 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml,v 1.3 2002/10/12 19:00:27 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/article.sgml,v 1.5 2002/10/12 18:02:21 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
index 30ceb44a084f..fd139779fbf4 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.15 2003/05/27 16:11:08 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.35 2003/05/24 19:11:43 ue Exp $
   basiert auf: 1.60
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
index 94a9d0fc8f5f..fdf9ee6bfae3 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml,v 1.2 2003/01/09 12:11:20 ue Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/artheader.sgml,v 1.4 2003/01/09 12:14:47 ue Exp $
 	basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
index 020bffc69d2a..48dd5985e789 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
@@ -34,7 +34,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml,v 1.20 2003/05/27 16:11:08 alex Exp $</pubdate>
   </sect1info>
 
   <title>Unterst&uuml;tzte Ger&auml;te</title>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent b/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
index 7a8048bd2379..5e1f5f92114b 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*- -->
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent,v 1.2 2002/10/12 19:00:28 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/hw.ent,v 1.4 2002/07/08 18:42:56 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
index 1ff4a5a9a12c..2ed784251624 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml,v 1.3 2003/05/27 16:11:08 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/intro.sgml,v 1.6 2003/05/24 21:35:15 ue Exp $
   basiert auf: 1.6
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile b/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
index e8ec75f3dbce..1b1f26c0263e 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile,v 1.1 2002/03/12 18:35:41 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/Makefile,v 1.2 2002/03/10 18:41:36 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:15 ue Exp $
 # basiert auf: 1.5
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
index fdbf5d31d3b8..ed1b08d903bc 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml,v 1.4 2002/12/07 22:32:30 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/article.sgml,v 1.5 2002/12/07 21:09:09 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
index 5c5273b1244a..6122d3f0ef5b 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.5 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.13 2003/05/24 21:49:22 ue Exp $
   basiert auf: 1.11
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile b/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
index 5531a50226cd..2ee93fc151a5 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile,v 1.1 2002/03/12 18:35:43 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/Makefile,v 1.2 2002/03/10 18:41:37 ue Exp $
 # $Id: Makefile,v 1.2 2002/03/10 15:37:16 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
index 01c6ef708f53..e19ae4313ed5 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml,v 1.5 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/article.sgml,v 1.6 2003/05/24 21:52:46 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
index 9119a2a330fb..05870d3d52ea 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.3 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.5 2003/05/24 22:16:24 ue Exp $
   basiert auf: 1.7
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile b/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
index 7b3a0a86844c..708b2a92d082 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile,v 1.1 2002/10/12 19:00:29 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/Makefile,v 1.1 2002/07/08 18:41:44 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
index 5911d341237e..f492c3cd1ca1 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml,v 1.1 2002/10/12 19:00:29 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/article.sgml,v 1.2 2002/10/12 18:02:22 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
index 9dbc7047f4ea..bcbe081ec7ce 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.3 2003/01/14 07:12:30 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.3 2003/01/13 20:30:49 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
index 2ae7bfd36d18..0b0e7ce2d32c 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile,v 1.2 2003/01/11 09:56:30 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/Makefile,v 1.3 2003/01/09 12:47:37 ue Exp $
 # basiert auf: 1.3
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
index 7e3b0ebc3d56..dfded69a2996 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml,v 1.4 2003/01/11 09:56:30 ue Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/article.sgml,v 1.7 2003/01/09 12:46:28 ue Exp $
 	basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index 9563a4fc146c..a9cc35370132 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -6,7 +6,7 @@
 
 <sect1 id="support-dev">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.2 2003/01/14 07:12:30 ue Exp $</pubdate>
   </sect1info>
 
   <title>Unterst&uuml;tzte Ger&auml;te</title>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
index 4b6b351adf47..71d4b3dfa6ce 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.8 2003/05/27 16:11:09 alex Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.10 2003/02/08 07:43:14 ue Exp $
 	basiert auf: 1.11
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/Makefile b/release/doc/de_DE.ISO8859-1/installation/Makefile
index 6f461f7c52de..5ee90372b806 100644
--- a/release/doc/de_DE.ISO8859-1/installation/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/Makefile,v 1.5 2002/11/09 21:27:37 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/Makefile,v 1.6 2002/11/09 18:09:45 ue Exp $
 # basiert auf: 1.5
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/Makefile.inc b/release/doc/de_DE.ISO8859-1/installation/Makefile.inc
index 91a7fde2db20..1eb30c64716a 100644
--- a/release/doc/de_DE.ISO8859-1/installation/Makefile.inc
+++ b/release/doc/de_DE.ISO8859-1/installation/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/Makefile.inc,v 1.1 2002/03/12 18:35:45 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/Makefile.inc,v 1.2 2002/03/10 18:41:39 ue Exp $
 # $Id: Makefile.inc,v 1.4 2002/03/10 15:37:17 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
index f0092048aecb..9b5212260d74 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile,v 1.1 2002/03/12 18:35:46 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/Makefile,v 1.2 2002/03/10 18:41:40 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:17 ue Exp $
 # basiert auf: 1.4
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
index 16ca34e610fb..0c44675a045e 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml,v 1.3 2002/10/12 19:00:29 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/article.sgml,v 1.4 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml b/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
index 8dd1c0244116..62a3d616811f 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml,v 1.1 2002/03/12 18:35:47 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/abstract.sgml,v 1.3 2002/03/12 17:24:25 ue Exp $
   $Id: abstract.sgml,v 1.2 2002/03/10 15:37:17 ue Exp $
   basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml b/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
index 58396b8006e4..123b9f4c62a3 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml,v 1.2 2003/01/09 12:11:20 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/artheader.sgml,v 1.3 2003/01/09 12:17:18 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.ent b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
index 5ce38e015a2e..55cb6efe2540 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.ent
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
@@ -1,7 +1,7 @@
 <!-- -*- sgml -*- -->
 
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/install.ent,v 1.1 2002/03/12 18:35:47 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.ent,v 1.2 2002/03/10 18:41:41 ue Exp $
   $Id: install.ent,v 1.3 2002/03/10 15:37:17 ue Exp $
   basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.sgml b/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
index 2138d5d1261d..862b4bd2c401 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
@@ -1,6 +1,6 @@
 <!--
 
-$FreeBSD$
+$FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/install.sgml,v 1.11 2003/05/27 16:11:09 alex Exp $
 $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.sgml,v 1.18 2003/05/24 19:11:45 ue Exp $
 basiert auf: 1.20
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml b/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
index 99fc17fef5fe..6bb0ab0520f9 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml,v 1.3 2002/11/10 01:24:35 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/layout.sgml,v 1.5 2002/11/09 23:07:18 ue Exp $
   basiert auf: 1.6
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml b/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
index 0e7c726b9518..bc5f9e0072e6 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml,v 1.9 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/trouble.sgml,v 1.13 2003/05/24 19:11:45 ue Exp $
   basiert auf: 1.12
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
index 54539debfca2..640961ae2ee8 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml,v 1.6 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/upgrade.sgml,v 1.10 2003/05/24 19:11:45 ue Exp $
   basiert auf: 1.11
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
index c3eb92c6cf46..174c3c373ab2 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/i386/Makefile,v 1.1 2002/03/12 18:35:51 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/Makefile,v 1.2 2002/03/10 18:41:43 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:18 ue Exp $
 # basiert auf: 1.4
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
index 5e5f42f9316b..bfa65ffda1b9 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml,v 1.4 2002/12/07 22:32:31 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/article.sgml,v 1.5 2002/12/07 21:09:56 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
index b0e2b5080750..d20c898f5889 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile,v 1.1 2002/11/09 21:27:38 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/Makefile,v 1.1 2002/11/09 20:07:25 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
index bcf65ce7d0b1..7450db27b3e8 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml,v 1.1 2002/11/09 21:27:38 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/article.sgml,v 1.1 2002/11/09 20:07:25 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
index 0e431f0899c9..481a796c3339 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile,v 1.1 2002/10/12 19:00:30 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/Makefile,v 1.1 2002/07/08 18:41:45 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
index 916e1027e603..19cc5545fcfb 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml,v 1.1 2002/10/12 19:00:30 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/article.sgml,v 1.2 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
index 958e6aa03046..6dd1f530c837 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile,v 1.1 2002/03/14 18:32:27 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/Makefile,v 1.1 2002/03/14 18:23:47 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
index 473392e8002b..da1ca31dfe7c 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml,v 1.3 2002/11/16 12:14:21 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/article.sgml,v 1.3 2002/11/16 12:10:42 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
index 91b240b453cc..720600d2635a 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml,v 1.8 2003/01/14 07:12:31 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/install.sgml,v 1.10 2003/01/13 20:30:51 ue Exp $
   basiert auf: 1.14
   This file contains sparc64-specific installation instructions.
diff --git a/release/doc/de_DE.ISO8859-1/readme/Makefile b/release/doc/de_DE.ISO8859-1/readme/Makefile
index f65809eec366..5a7e36c155fb 100644
--- a/release/doc/de_DE.ISO8859-1/readme/Makefile
+++ b/release/doc/de_DE.ISO8859-1/readme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/readme/Makefile,v 1.1 2002/03/12 18:35:51 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/readme/Makefile,v 1.2 2002/03/10 18:41:44 ue Exp $
 # $Id: Makefile,v 1.5 2002/03/10 15:37:18 ue Exp $
 # basiert auf: 1.7
diff --git a/release/doc/de_DE.ISO8859-1/readme/article.sgml b/release/doc/de_DE.ISO8859-1/readme/article.sgml
index a64f50f4efa2..0307d372d36b 100644
--- a/release/doc/de_DE.ISO8859-1/readme/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/readme/article.sgml
@@ -24,7 +24,7 @@
 
     <corpauthor>Das &os; Projekt</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/readme/article.sgml,v 1.12 2004/08/22 09:53:23 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/Makefile
index 968f906eb271..49396cc9efc1 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/Makefile,v 1.3 2002/11/09 21:27:38 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/Makefile,v 1.4 2002/11/09 20:58:39 ue Exp $
 # basiert auf: 1.5
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc b/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc
index fbea3e1ebc79..21c40ea75e26 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc
+++ b/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc,v 1.1 2002/03/12 18:35:52 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/Makefile.inc,v 1.2 2002/03/10 18:41:45 ue Exp $
 # $Id: Makefile.inc,v 1.3 2002/03/10 15:37:19 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
index 4d7265652497..e4c6cd110bb6 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile,v 1.1 2002/03/12 18:35:52 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/Makefile,v 1.2 2002/03/10 18:41:45 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:19 ue Exp $
 # basiert auf: 1.6
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
index ca3bf375d81d..887e88cec450 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml,v 1.3 2002/10/12 19:00:32 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/article.sgml,v 1.4 2002/10/12 18:02:24 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml b/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
index 9476d6a5fde5..73605a077f6f 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
@@ -7,7 +7,7 @@
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.31 2003/05/27 16:11:09 alex Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
index e7dc5f5c4653..8597f29d2454 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
@@ -1,7 +1,7 @@
 <!-- -*- sgml -*- -->
 
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent,v 1.2 2002/10/12 19:00:33 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/common/relnotes.ent,v 1.3 2002/07/08 18:52:50 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
index 30d6a145ca33..9a2541b9221d 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile,v 1.1 2002/03/12 18:35:53 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/Makefile,v 1.2 2002/03/10 18:41:47 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:20 ue Exp $
 # basiert auf: 1.6
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
index 2420f67f01fc..de92eb88af86 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml,v 1.4 2002/12/07 22:32:31 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/article.sgml,v 1.6 2002/12/07 22:11:35 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
index e106b467ed96..584bf71639f4 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile,v 1.1 2002/11/09 21:27:38 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/Makefile,v 1.1 2002/11/09 20:58:39 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
index 769af0af2714..be66bfe5eeb4 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml,v 1.2 2002/11/14 22:24:08 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/article.sgml,v 1.2 2002/11/10 10:47:53 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
index 33f8a62dbfe0..cd9c619957c8 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile,v 1.1 2002/10/12 19:00:33 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/Makefile,v 1.1 2002/07/08 18:41:46 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
index 49edccc09357..6d3a1509e95f 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml,v 1.1 2002/10/12 19:00:33 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/article.sgml,v 1.2 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
index 85ec1603c610..908f20e20238 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile,v 1.1 2002/03/12 18:35:53 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/Makefile,v 1.1 2002/03/10 18:38:07 ue Exp $
 # $Id: Makefile,v 1.1 2002/03/10 16:05:35 ue Exp $
 # basiert auf: 1.1
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
index 4b121e13b148..0d981dc62c6d 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml,v 1.3 2002/10/12 19:00:33 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/article.sgml,v 1.4 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.3
   -->
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/catalog b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
index 8530d26a582b..9e648b293fbc 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/catalog
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/de_DE.ISO8859-1/share/sgml/catalog,v 1.2 2002/10/12 19:00:34 ue Exp $ --
   -- $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/catalog,v 1.6 2002/10/12 18:02:25 ue Exp $ --
   -- basiert auf: 1.1 --
 
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
index 79f4a8753bb2..1926d96f7044 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.7 2003/05/27 16:11:10 alex Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.9 2003/05/24 22:43:52 ue Exp $
 	basiert auf: 1.7
 -->
diff --git a/release/doc/en_US.ISO8859-1/Makefile b/release/doc/en_US.ISO8859-1/Makefile
index 7911dbfe2ef7..21db5e4fc719 100644
--- a/release/doc/en_US.ISO8859-1/Makefile
+++ b/release/doc/en_US.ISO8859-1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.7 2005/03/09 18:32:28 hrs Exp $
 
 RELN_ROOT?= ${.CURDIR}/..
 
diff --git a/release/doc/en_US.ISO8859-1/errata/Makefile b/release/doc/en_US.ISO8859-1/errata/Makefile
index c8ac2093f88a..ec989cf774fe 100644
--- a/release/doc/en_US.ISO8859-1/errata/Makefile
+++ b/release/doc/en_US.ISO8859-1/errata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/Makefile,v 1.5 2001/09/03 14:39:31 dd Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/en_US.ISO8859-1/errata/article.sgml b/release/doc/en_US.ISO8859-1/errata/article.sgml
index d209e9b8a5ab..72fa1a8f86d2 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.sgml
+++ b/release/doc/en_US.ISO8859-1/errata/article.sgml
@@ -27,7 +27,7 @@
     The &os; Project
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.2.1 2005/10/02 20:11:34 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/en_US.ISO8859-1/hardware/Makefile b/release/doc/en_US.ISO8859-1/hardware/Makefile
index 0e6b4dc6eb76..07e7de907b2d 100644
--- a/release/doc/en_US.ISO8859-1/hardware/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.6 2003/06/27 03:50:35 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/Makefile.inc b/release/doc/en_US.ISO8859-1/hardware/Makefile.inc
index 37ebd11d4fce..39a07261c536 100644
--- a/release/doc/en_US.ISO8859-1/hardware/Makefile.inc
+++ b/release/doc/en_US.ISO8859-1/hardware/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile.inc,v 1.3 2004/08/03 22:12:44 simon Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/hardware/${.CURDIR:T}
diff --git a/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile b/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile
index 505825cfb817..d99bd4e93e04 100644
--- a/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile,v 1.7 2004/08/03 22:12:44 simon Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml b/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml
index d8c3e793899e..0d6e5d810b59 100644
--- a/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml,v 1.6 2004/08/08 14:59:25 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml b/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml
index 81ea19b234f8..42e46ff790a6 100644
--- a/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.77 2005/06/15 19:41:24 wilko Exp $ -->
 
 <sect1 id="support-proc">
   <sect1info>
diff --git a/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile b/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile
index 976e97a26eda..27c346dd80e9 100644
--- a/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile,v 1.2 2004/08/03 22:12:44 simon Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml b/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml
index 712367b5c509..ef5e50460b58 100644
--- a/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml,v 1.3 2004/08/08 14:59:25 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml b/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
index 9c5d538ffe6b..5eedd43587bb 100644
--- a/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml,v 1.5.2.1 2005/09/28 16:51:27 brueffer Exp $
 -->
 <sect1 id="proc">
   <title>Supported Processors and Motherboards</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml b/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml
index 85f4eda8bebb..290d1db1b816 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml,v 1.7 2005/04/19 09:43:52 hrs Exp $ -->
 
 <articleinfo>
   <title>&os;/&arch; &release.current; Hardware Notes</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index 1f2c235b5fe3..98b269069b6e 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.282.2.3 2005/09/24 10:46:38 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/hw.ent b/release/doc/en_US.ISO8859-1/hardware/common/hw.ent
index c43b06b45fa8..22ff88f4fee8 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/hw.ent
+++ b/release/doc/en_US.ISO8859-1/hardware/common/hw.ent
@@ -1,5 +1,5 @@
 <!-- -*- sgml -*- -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent,v 1.5 2003/06/27 03:50:35 bmah Exp $ -->
 
 <!-- Text constants which probably don't need to be changed.-->
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml b/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
index 639857a97435..5008619d6312 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml,v 1.7 2004/09/05 14:53:34 hrs Exp $ -->
 
 <sect1 id="intro">
   <title>Introduction</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/i386/Makefile b/release/doc/en_US.ISO8859-1/hardware/i386/Makefile
index ab08a81a928c..10d603f409c7 100644
--- a/release/doc/en_US.ISO8859-1/hardware/i386/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/i386/Makefile,v 1.6 2004/08/03 22:12:44 simon Exp $
 RELN_ROOT?= ${.CURDIR}/../../..
 
 DOC?= article
diff --git a/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml b/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml
index 1d9eb5d08ccd..318d86579ecf 100644
--- a/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml,v 1.6 2004/08/08 14:59:25 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml b/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml
index d528640dda84..d352f55c66b5 100644
--- a/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.14 2004/11/17 23:03:17 jhb Exp $
 -->
 <sect1 id="proc">
   <title>Supported Processors and Motherboards</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile b/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile
index 8896eccc6483..2de5bd1334f4 100644
--- a/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml b/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml
index 1f1e7d0a3881..5e12270de65b 100644
--- a/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml,v 1.5 2004/08/08 14:59:25 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml b/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml
index 597a5f7931a7..e21e95a3e005 100644
--- a/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.9 2004/07/07 13:11:59 den Exp $
 -->
 <sect1 id="proc-ia64">
   <title>Supported Processors and Motherboards</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile b/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile
index a4b5bc48e759..8b9bb15944bb 100644
--- a/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile,v 1.2 2004/08/03 22:12:45 simon Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml b/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml
index d312c4ce13b4..eea47dcd16ac 100644
--- a/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml,v 1.3 2004/08/08 14:59:25 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml b/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml
index 7a731512f730..71e0728d9302 100644
--- a/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.5 2004/11/17 23:03:17 jhb Exp $
 -->
 <sect1 id="support-sys">
   <title>Supported Systems</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile b/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile
index 4414433400da..a7da72a582d9 100644
--- a/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile,v 1.4 2004/08/03 22:12:45 simon Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml
index fb5513439049..e2f4e352b213 100644
--- a/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml,v 1.5 2004/08/08 14:59:25 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index c3530d014836..41a454cb6c67 100644
--- a/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -1,6 +1,6 @@
 <sect1 id="support-dev">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.5 2005/03/09 18:41:42 hrs Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml b/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
index 96927c0c1d71..caf5f8513d80 100644
--- a/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.12 2004/08/31 19:00:20 hrs Exp $
 -->
 <sect1 id="support-sys">
   <title>Supported Systems</title>
diff --git a/release/doc/en_US.ISO8859-1/installation/Makefile b/release/doc/en_US.ISO8859-1/installation/Makefile
index 0e6b4dc6eb76..fbbd7bb6bd1e 100644
--- a/release/doc/en_US.ISO8859-1/installation/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.6 2003/06/27 03:50:36 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/en_US.ISO8859-1/installation/Makefile.inc b/release/doc/en_US.ISO8859-1/installation/Makefile.inc
index 535d4a41bdd9..cdd7fb83ed7f 100644
--- a/release/doc/en_US.ISO8859-1/installation/Makefile.inc
+++ b/release/doc/en_US.ISO8859-1/installation/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile.inc,v 1.2 2001/09/03 14:39:31 dd Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/installation/${.CURDIR:T}
diff --git a/release/doc/en_US.ISO8859-1/installation/alpha/Makefile b/release/doc/en_US.ISO8859-1/installation/alpha/Makefile
index 36f855e86d97..7ae3774f1cd8 100644
--- a/release/doc/en_US.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/alpha/Makefile,v 1.4 2001/08/27 03:37:54 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml b/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
index f6c2a8bd78b2..1f5a7e4e262a 100644
--- a/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml,v 1.4 2004/08/08 14:59:25 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/installation/amd64/Makefile b/release/doc/en_US.ISO8859-1/installation/amd64/Makefile
index 36f855e86d97..9779fe441731 100644
--- a/release/doc/en_US.ISO8859-1/installation/amd64/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/amd64/Makefile,v 1.1 2003/06/27 03:50:36 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml b/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml
index 7e71f15e4b3c..939f5f57d7f3 100644
--- a/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml,v 1.2 2004/08/08 14:59:26 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml b/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
index 527d9ea80f8e..918df17bc1e9 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml,v 1.2 2001/10/24 16:01:40 bmah Exp $ -->
 
 <abstract>
   <para>This article gives some brief instructions on installing
diff --git a/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml b/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml
index 518230c21bbb..4a8449e0ec66 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml,v 1.7 2005/04/19 09:43:53 hrs Exp $ -->
 
 <articleinfo>
   <title>&os;/&arch; &release.current; Installation Instructions</title>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/install.ent b/release/doc/en_US.ISO8859-1/installation/common/install.ent
index 3e6060d08e44..99b74787a363 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/install.ent
+++ b/release/doc/en_US.ISO8859-1/installation/common/install.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*- -->
 
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.ent,v 1.2 2001/08/27 03:37:55 bmah Exp $ -->
 
 <!-- Text constants which probably don't need to be changed.-->
 
diff --git a/release/doc/en_US.ISO8859-1/installation/common/install.sgml b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
index e6b6b5596653..0ed3232cd1f2 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
@@ -1,6 +1,6 @@
 <!--
 
-$FreeBSD$
+$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v 1.32 2005/06/24 09:07:04 hrs Exp $
 
 install.sgml
 
diff --git a/release/doc/en_US.ISO8859-1/installation/common/layout.sgml b/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
index f08a5ee69f4f..7ac05156d8b6 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml,v 1.10 2005/04/02 19:41:41 bmah Exp $
 
 	This section contains the contents of the old LAYOUT.TXT file.
 -->
diff --git a/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml b/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
index ea1f8db742cc..0ecbd30ed74b 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml,v 1.19 2005/06/16 22:22:05 brueffer Exp $
 
 	This file contains the comments of the old TROUBLE.TXT file.
 -->
diff --git a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
index b721a9c688a5..d1d713426569 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml,v 1.13 2004/09/05 14:53:34 hrs Exp $
 
 	This section contains the contents of the old UPGRADE.TXT
 	file.
diff --git a/release/doc/en_US.ISO8859-1/installation/i386/Makefile b/release/doc/en_US.ISO8859-1/installation/i386/Makefile
index 36f855e86d97..c63db5b6b4ee 100644
--- a/release/doc/en_US.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/i386/Makefile,v 1.4 2001/08/27 03:37:56 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/installation/i386/article.sgml b/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
index c113a8c43021..2fbfc7f71fa2 100644
--- a/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/i386/article.sgml,v 1.5 2004/08/08 14:59:26 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/installation/ia64/Makefile b/release/doc/en_US.ISO8859-1/installation/ia64/Makefile
index 36f855e86d97..a8337bc67258 100644
--- a/release/doc/en_US.ISO8859-1/installation/ia64/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/ia64/Makefile,v 1.1 2002/11/08 18:01:31 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml b/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml
index 0a0e54c518bc..223d2b7ec175 100644
--- a/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml,v 1.2 2004/08/08 14:59:26 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/installation/pc98/Makefile b/release/doc/en_US.ISO8859-1/installation/pc98/Makefile
index 36f855e86d97..f1d41d8b645d 100644
--- a/release/doc/en_US.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/pc98/Makefile,v 1.1 2002/05/31 18:00:38 nyan Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml b/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml
index 84ff87ea5d21..137a9f9ce6f2 100644
--- a/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml,v 1.2 2004/08/08 14:59:26 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/installation/sparc64/Makefile b/release/doc/en_US.ISO8859-1/installation/sparc64/Makefile
index 706d2971a6e4..d4540481e974 100644
--- a/release/doc/en_US.ISO8859-1/installation/sparc64/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/sparc64/Makefile,v 1.1 2002/03/05 23:22:08 tmm Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml b/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml
index 16c058277b75..df4f6420c325 100644
--- a/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml,v 1.5 2004/08/08 14:59:26 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml b/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
index 8fcb543ff3bf..407abde5d559 100644
--- a/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
@@ -1,6 +1,6 @@
 <!--
 
-$FreeBSD$
+$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml,v 1.15 2004/09/05 14:53:34 hrs Exp $
 
 This file contains sparc64-specific installation instructions.
 
diff --git a/release/doc/en_US.ISO8859-1/readme/Makefile b/release/doc/en_US.ISO8859-1/readme/Makefile
index 05486df04aa9..f76bd7c788f2 100644
--- a/release/doc/en_US.ISO8859-1/readme/Makefile
+++ b/release/doc/en_US.ISO8859-1/readme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/Makefile,v 1.7 2001/09/03 14:39:32 dd Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/en_US.ISO8859-1/readme/article.sgml b/release/doc/en_US.ISO8859-1/readme/article.sgml
index afda15fcab65..2e5c1175e670 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.sgml
+++ b/release/doc/en_US.ISO8859-1/readme/article.sgml
@@ -12,7 +12,7 @@
 
     <corpauthor>The &os; Project</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.37 2005/04/19 09:43:53 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/Makefile b/release/doc/en_US.ISO8859-1/relnotes/Makefile
index 0e6b4dc6eb76..de1d12a90df9 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.6 2003/06/27 03:50:36 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc b/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc
index 45c320c81117..641f4aa71968 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc
+++ b/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc,v 1.2 2001/09/03 14:39:32 dd Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/relnotes/${.CURDIR:T}
diff --git a/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile b/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile
index f548b33ede17..08e0212a68fc 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile,v 1.6 2001/10/27 02:41:29 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
index 961662fa9718..6be59650c589 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml,v 1.6 2004/08/08 14:59:27 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile b/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile
index f548b33ede17..9144fd88a28b 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile,v 1.1 2003/06/27 03:50:36 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
index 0b1833916308..7c8f68f2d3c3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml,v 1.4 2004/08/08 14:59:27 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index db24b137c1a5..4a948679ab4f 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -3,7 +3,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.883.2.7.2.1 2005/10/21 16:01:46 yar Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent
index 12086150fed8..776da7d72709 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*- -->
 
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent,v 1.3 2002/06/20 21:19:49 bmah Exp $ -->
 
 <!-- Text constants which probably don't need to be changed.-->
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile b/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile
index 494ef8123838..962f7a1b77b5 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile,v 1.7 2004/08/08 14:59:27 hrs Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
index d49e02b39e76..8d1c9036a5f8 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml,v 1.7 2004/08/08 14:59:27 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile b/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile
index f548b33ede17..2cd1b2bfb373 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile,v 1.1 2002/11/08 18:01:31 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
index 0c5323e09508..3ea2ce65ed53 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml,v 1.4 2004/08/08 14:59:27 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile b/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile
index f548b33ede17..c1dc0cbb527a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile,v 1.1 2002/05/31 18:00:39 nyan Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
index 87027bfbb2bd..cd40b39258e8 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml,v 1.4 2004/08/08 14:59:27 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile b/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile
index f548b33ede17..63c2012c1482 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile,v 1.1 2002/03/04 06:46:00 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
index 27636302e5d4..ba4465f501a9 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml,v 1.6 2004/08/08 14:59:27 hrs Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/en_US.ISO8859-1/share/sgml/catalog b/release/doc/en_US.ISO8859-1/share/sgml/catalog
index 9995d5af1340..7eb5ca7fa1f5 100644
--- a/release/doc/en_US.ISO8859-1/share/sgml/catalog
+++ b/release/doc/en_US.ISO8859-1/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/en_US.ISO8859-1/share/sgml/catalog,v 1.1 2001/07/09 16:01:35 bmah Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/en_US.ISO8859-1/share/sgml/release.dsl b/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
index 0dee5652284e..01bdf3b113d2 100644
--- a/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/share/sgml/release.dsl,v 1.8.6.1 2005/10/16 08:28:10 hrs Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
diff --git a/release/doc/fr_FR.ISO8859-1/Makefile b/release/doc/fr_FR.ISO8859-1/Makefile
index 9147d3f78e32..feafb4718007 100644
--- a/release/doc/fr_FR.ISO8859-1/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/Makefile,v 1.5 2002/11/02 14:16:09 gioria Exp $
 #      Original revision: 1.3
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile b/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
index 5bf7a1516988..326dc96ca433 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile,v 1.2 2003/01/18 18:03:01 gioria Exp $
 #      Original revision: 1.3
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml b/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
index 40c16340cb95..12183dc6d3b4 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml,v 1.3 2003/07/27 18:10:24 gioria Exp $
      Original revision: 1.3
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -37,7 +37,7 @@
       <corpauthor>L'&eacute;quipe de confection des versions de &os;</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml,v 1.3 2003/07/27 18:10:24 gioria Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/fr_FR.ISO8859-1/errata/Makefile b/release/doc/fr_FR.ISO8859-1/errata/Makefile
index df21579da984..bef1f3cb07cf 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/errata/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/errata/Makefile,v 1.1 2002/02/19 12:22:30 gioria Exp $
 #      Original revision: 1.5
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/errata/article.sgml b/release/doc/fr_FR.ISO8859-1/errata/article.sgml
index 449b3dd6d46e..4fe536ce4456 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/errata/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/errata/article.sgml,v 1.6 2004/08/22 09:53:23 hrs Exp $
      Original revision: 1.9
 
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
@@ -40,7 +40,7 @@
     Le projet &os;
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/errata/article.sgml,v 1.6 2004/08/22 09:53:23 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/Makefile
index 81b8b6372da1..c3067eadb762 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/Makefile,v 1.1 2002/09/09 22:09:46 gioria Exp $
 #      Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc b/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc
index 02eb4ca80394..3e2a93a080bb 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc
+++ b/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc,v 1.2 2003/01/18 18:03:01 gioria Exp $
 #      Original revision: 1.2
 
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
index 68f2784af8a6..e158d0d632b5 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile,v 1.1 2002/09/09 22:09:46 gioria Exp $
 #      Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
index f70bed890889..9aaebb1e3792 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml,v 1.2 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.4
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
index 3e2cb1c4020e..50247fc51a8f 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id: proc-alpha.sgml,v 1.5 2002/09/29 17:03:01 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.5 2002/12/30 21:18:04 schweikh Exp $
      Original revision: 1.43
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
index 35883b1d0020..74d7716cdf9b 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml,v 1.3 2003/01/06 22:17:26 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
index 1fd74f0e5133..aca62f579198 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id: dev.sgml,v 1.3 2002/09/29 21:03:53 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.7 2002/11/09 11:32:40 gioria Exp $
      Original revision: 1.114
 -->
 <!--
@@ -39,7 +39,7 @@
 
 <sect1>
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.7 2002/11/09 11:32:40 gioria Exp $</pubdate>
   </sect1info>
 
   <title>P&eacute;riph&eacute;riques support&eacute;s</title>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent b/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
index 103c5673858b..59566fea9048 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.4
 -->
 <!-- -*- sgml -*- -->
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
index 0503345828d1..cf4f0a7bd06d 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
index 4b7d052f03ef..310234fe3fae 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile,v 1.1 2002/09/09 22:09:47 gioria Exp $
 #      Original revision: 1.5
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
index 38228bb8e45a..d1f37238dbfb 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml,v 1.2 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
index 91e09f36d715..86c797e05fc7 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id: proc-i386.sgml,v 1.2 2002/09/28 23:23:21 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.3 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.3
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
index 180657b8fc54..3d9d5c27347e 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile,v 1.1 2002/09/09 22:09:47 gioria Exp $
 #      Original revision: 1.2
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
index 48ecd83910b1..9b8472883eea 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml,v 1.3 2002/11/09 11:32:41 gioria Exp $
      Original revision: 1.2
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
index 8319c1be9fd9..737a74720d81 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.1
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
index c900c54f0dc4..af96eb6d3432 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile,v 1.1 2002/09/09 22:09:47 gioria Exp $
 #      Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
index f1471b9dca3c..922415c60451 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml,v 1.2 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.1
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
index 5166bb128f13..8f53a8b4286b 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.1
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
index 51acc371b5d3..6c03bb8457e3 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile,v 1.1 2002/09/09 22:09:48 gioria Exp $
 #      Original revision: 1.1
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
index de8b4913e921..efca27d29cfc 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml,v 1.3 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.2
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index 4bc54a39b215..8decaca0a8fd 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -3,12 +3,12 @@
      The FreeBSD French Documentation Project
 
      $Id: dev-sparc64.sgml,v 1.2 2002/09/28 23:01:52 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.2 2002/09/28 23:15:58 gioria Exp $
      Original revision: 1.1
 -->
 <sect1>
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.2 2002/09/28 23:15:58 gioria Exp $</pubdate>
   </sect1info>
 
   <title>P&eacute;riph&eacute;riques support&eacute;s</title>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
index f434ac0874dc..9f0f38291439 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.2 2002/09/29 23:02:15 gioria Exp $
      Original revision: 1.4
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/Makefile b/release/doc/fr_FR.ISO8859-1/installation/Makefile
index 81b8b6372da1..b321a7da251b 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/Makefile,v 1.3 2002/10/19 21:49:09 gioria Exp $
 #      Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc b/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc
index a305abd65e88..63d634815689 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc
+++ b/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc,v 1.2 2002/05/26 16:49:48 gioria Exp $
 #      Original revision: 1.2
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
index 30b5589ddbb2..46b5139a66db 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile,v 1.2 2002/05/26 16:49:48 gioria Exp $
 #      Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
index 78045ad37f36..4b676161d8ae 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
index 34e7da3e6294..a376c9ce44f0 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml,v 1.3 2002/10/19 20:07:01 gioria Exp $
      Original revision: 1.2
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
index 8573012b061a..e29fd6544797 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml,v 1.3 2003/01/06 22:17:27 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
index 76db954deda9..dd80ea94fc58 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/install.ent,v 1.2 2002/05/26 16:49:48 gioria Exp $
      Original revision: 1.2
 -->
 <!-- -*- sgml -*- -->
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
index 9d29370f8305..4e5381758462 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml,v 1.8 2002/11/01 20:12:25 gioria Exp $
      Original revision: 1.14
 
      This file has architecture-dependent installation instructions, culled
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
index fe2147cbd4a5..c097a269dd75 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml,v 1.4 2002/10/27 08:47:38 gioria Exp $
      Original revision: 1.5
 
      This section contains the contents of the old LAYOUT.TXT file.
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
index 940f66f7aed3..77c6376ae9bf 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml,v 1.4 2003/01/01 18:48:45 schweikh Exp $
      Original revision: 1.5
 
 	This file contains the comments of the old TROUBLE.TXT file.
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
index a2609aa8cf8e..72eb1fd5852e 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml,v 1.3 2003/03/08 09:56:09 markm Exp $
      Original revision: 1.7
 	This section contains the contents of the old UPGRADE.TXT
 	file.
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
index a377905e3dad..eee51096d3d6 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile,v 1.2 2002/05/26 16:49:48 gioria Exp $
 #      Original revision: 1.4
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
index dfbec1edd691..51e7e10bc97d 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
index 6ff53b66239b..9c803a381144 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
@@ -3,7 +3,7 @@
 #     The FreeBSD French Documentation Project
 #     $Id$
 #
-#     $FreeBSD$
+#     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile,v 1.1 2002/10/19 21:49:09 gioria Exp $
 #     Original revision: 1.1
 #
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
index 5e68d6e4d555..4cd7811f3611 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml,v 1.1 2002/10/19 21:49:09 gioria Exp $
      Original revision: 1.1
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
index c3e7481e0ab3..e523041812db 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
@@ -3,7 +3,7 @@
 #     The FreeBSD French Documentation Project
 #     $Id$
 #
-#     $FreeBSD$
+#     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile,v 1.1 2002/10/19 21:49:09 gioria Exp $
 #     Original revision: 1.1
 #
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
index cdbbc68fecfc..9c21f65cdfda 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml,v 1.1 2002/10/19 21:49:09 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
index 56270ecaad71..21b06b3be703 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml,v 1.1 2002/10/19 21:49:09 gioria Exp $
      Original revision: 1.12
      Ce fichier contient les instructions pour l'installation
      specifique aux systemes sparc64.
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile
index f10e16dcbb1d..0590bebd9f56 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/Makefile,v 1.3 2002/10/19 16:26:21 gioria Exp $
 #      Original revision: 1.4
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc
index 0815194c50a5..562b2db96d60 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc,v 1.2 2003/01/18 18:03:01 gioria Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/relnotes/${.CURDIR:T}
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
index eaff0b77c2ff..78f15852f491 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile,v 1.1 2002/02/23 23:03:20 gioria Exp $
 #      Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
index f641c0a85f8b..955a88777450 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
index 5263ca4e85b7..a74832cf99f9 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
@@ -3,13 +3,13 @@
      The FreeBSD French Documentation Project
 
      $Id: new.sgml,v 1.5 2002/09/28 21:57:12 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml,v 1.26 2002/10/19 16:26:29 gioria Exp $
      Original revision: 1.423
 -->
 <articleinfo>
   <title>&os;/&arch; &release.current; notes de version</title>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml,v 1.26 2002/10/19 16:26:29 gioria Exp $</pubdate>
 
   <corpauthor>Le Projet FreeBSD</corpauthor>
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
index 2051522133b8..89753ea3ca85 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent,v 1.4 2002/10/19 16:26:31 gioria Exp $
      Original revision: 1.3
 -->
 <!-- Text constants which probably don't need to be changed.-->
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
index 10faa9d1a634..53b893a66914 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile,v 1.2 2002/10/19 16:26:33 gioria Exp $
 #      Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
index 7c0714ee5dd6..35c2af83553d 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/share/sgml/catalog b/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
index 9995d5af1340..57862d0eb501 100644
--- a/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
+++ b/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/catalog,v 1.1 2002/02/19 09:37:04 gioria Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl b/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
index 2de7155d09d1..a48e7bfe5cd8 100644
--- a/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl,v 1.6 2003/05/23 10:30:27 hrs Exp $
      Original revision: 1.6
 -->
 
diff --git a/release/doc/ja_JP.eucJP/Makefile b/release/doc/ja_JP.eucJP/Makefile
index eaccc8c52ead..8635471fe5d5 100644
--- a/release/doc/ja_JP.eucJP/Makefile
+++ b/release/doc/ja_JP.eucJP/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/Makefile,v 1.5 2005/06/30 12:54:30 rushani Exp $
 # Original revision: 1.7
 
 RELN_ROOT?= ${.CURDIR}/..
diff --git a/release/doc/ja_JP.eucJP/errata/Makefile b/release/doc/ja_JP.eucJP/errata/Makefile
index f9bbcfd977ed..33493355f145 100644
--- a/release/doc/ja_JP.eucJP/errata/Makefile
+++ b/release/doc/ja_JP.eucJP/errata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/errata/Makefile,v 1.3 2003/01/22 21:05:07 hrs Exp $
 # Original revision: 1.5
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/ja_JP.eucJP/errata/article.sgml b/release/doc/ja_JP.eucJP/errata/article.sgml
index 009dbd57a07d..2bd6194d56ab 100644
--- a/release/doc/ja_JP.eucJP/errata/article.sgml
+++ b/release/doc/ja_JP.eucJP/errata/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.32 2005/06/30 12:54:30 rushani Exp $
     Original revision: 1.73
 -->
 
@@ -50,7 +50,7 @@
 
     <corpauthor>&os; ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.32 2005/06/30 12:54:30 rushani Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/ja_JP.eucJP/hardware/Makefile b/release/doc/ja_JP.eucJP/hardware/Makefile
index 3154bd97d4a3..bfdf4e084bb5 100644
--- a/release/doc/ja_JP.eucJP/hardware/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/Makefile,v 1.4 2003/06/28 17:38:01 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/ja_JP.eucJP/hardware/Makefile.inc b/release/doc/ja_JP.eucJP/hardware/Makefile.inc
index bfcc09c801c6..cc1d3fd0da90 100644
--- a/release/doc/ja_JP.eucJP/hardware/Makefile.inc
+++ b/release/doc/ja_JP.eucJP/hardware/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/Makefile.inc,v 1.2 2004/09/20 11:19:32 hrs Exp $
 # Original revision: 1.3
 
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
index f431bf9cb7a6..8a1666692843 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/alpha/Makefile,v 1.4 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.7
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml b/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
index 65c72c08c63f..5b768a800fdd 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml,v 1.3 2004/10/24 14:31:26 hrs Exp $
     Original revision: 1.6
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
index fa57ac6b3d9b..e79ed8b1e319 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/amd64/Makefile,v 1.3 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.2
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml b/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
index 374409bb7e08..ee0ac1c5d174 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml,v 1.3 2004/10/24 14:31:26 hrs Exp $ -->
 <!-- Original revision: 1.3 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
index 8741b88de973..8d10b6d54df6 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml,v 1.4 2004/09/20 11:19:32 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml b/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
index b21ca826b6d2..34a8be81cebf 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml,v 1.4 2005/06/27 17:48:19 rushani Exp $
     Original revision: 1.7
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
index 6c743becfae4..2e0a772bdeed 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
@@ -26,13 +26,13 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 
-        $FreeBSD$
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.29 2005/06/30 12:54:57 rushani Exp $
         Original revision: 1.282
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.29 2005/06/30 12:54:57 rushani Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
diff --git a/release/doc/ja_JP.eucJP/hardware/common/hw.ent b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
index d31cd665c39a..e302aafd24c6 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/hw.ent
+++ b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*- -->
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/hw.ent,v 1.3 2003/06/28 17:38:02 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/intro.sgml b/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
index e8a2345a002e..b7f7d4a2f38b 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/intro.sgml,v 1.4 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.7
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/Makefile b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
index 9673692d8a90..39173b936e88 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/Makefile,v 1.3 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
index 00acf40d65e6..4eb015d9d7fc 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/article.sgml,v 1.4 2004/10/24 14:31:26 hrs Exp $
     Original revision: 1.6
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
index 2aa3fc74e1f8..981798443841 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml,v 1.8 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.14
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
index 97f456684761..d4f197d12ba0 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/ia64/Makefile,v 1.3 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.3
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml b/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
index 928734626cf9..f856d398b486 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml,v 1.5 2004/10/24 14:31:26 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
index 47134b3c0d01..268736c8f841 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml,v 1.5 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.9
 -->
 <sect1 id="proc-ia64">
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
index a83a68ca7908..cd87a64cf29f 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/pc98/Makefile,v 1.3 2004/10/24 14:31:27 hrs Exp $
 # Original revision: 1.2
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml b/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
index ee77a3600d04..11311f109769 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml,v 1.3 2004/10/24 14:31:27 hrs Exp $
     Original revision: 1.3
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
index 03df50efad8f..79f049dd9776 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml,v 1.4 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.5
 -->
 <sect1 id="support-sys">
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
index 74724537b8fb..c82ebda8e175 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile,v 1.5 2004/10/24 14:31:27 hrs Exp $
 # Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
index 92e3a8f800d6..9c8de575c982 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml,v 1.5 2004/10/24 14:31:27 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
index 209e72c419d8..a4106a1451c8 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml,v 1.6 2005/02/28 16:41:33 rushani Exp $
     Original revision: 1.12
 -->
 <sect1 id="support-sys">
diff --git a/release/doc/ja_JP.eucJP/relnotes/Makefile b/release/doc/ja_JP.eucJP/relnotes/Makefile
index 7a2bb9634860..761354bf1641 100644
--- a/release/doc/ja_JP.eucJP/relnotes/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/Makefile,v 1.6 2003/06/28 17:38:02 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/Makefile.inc b/release/doc/ja_JP.eucJP/relnotes/Makefile.inc
index a6dfcbe16433..d91ffbefcb3d 100644
--- a/release/doc/ja_JP.eucJP/relnotes/Makefile.inc
+++ b/release/doc/ja_JP.eucJP/relnotes/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/Makefile.inc,v 1.2 2001/09/04 17:48:06 hrs Exp $
 # Original revision: 1.2
 
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile b/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
index baf44f5c7d95..0df1e3b35866 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile,v 1.5 2002/06/25 18:54:38 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
index c1afb1df7bb4..d06df948e558 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml,v 1.6 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.6
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
index 647128cdbda1..0ac50cce5d3d 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile,v 1.1 2003/06/28 17:38:02 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
index 102a998a1537..b2b7728e6579 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml,v 1.4 2004/09/20 11:59:34 hrs Exp $
     Original revision: 1.4
 -->
 
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
index a695a35b5008..fe2fe191e6af 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.97 2004/01/12 15:39:46 hrs Exp $
 
     Original revision: 1.663.2.5
 -->
@@ -11,7 +11,7 @@
 
   <corpauthor>FreeBSD ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.97 2004/01/12 15:39:46 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
index cfd39c89edb3..562565aa98bb 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
+++ b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
@@ -3,7 +3,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent,v 1.5 2005/06/30 16:26:24 rushani Exp $
 
     Original revision: 1.3
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/Makefile b/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
index ed0d1e93a2ee..4b4f67af6035 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/i386/Makefile,v 1.6 2004/09/20 11:59:34 hrs Exp $
 # Original revision: 1.7
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
index a075a64b80c4..d5e8748373fa 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml,v 1.7 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.7
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
index 647128cdbda1..f167397134ef 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile,v 1.1 2003/01/05 20:40:43 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
index a8517b03b563..e6f4b40809f1 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml,v 1.4 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.4
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
index 647128cdbda1..60981a124270 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile,v 1.1 2002/06/25 18:54:39 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
index aead305540d8..864b45e728c7 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml,v 1.4 2004/09/20 11:59:34 hrs Exp $ -->
 <!-- Original revision: 1.4 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile b/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
index 647128cdbda1..1cf309d8e1fe 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile,v 1.2 2002/06/25 18:54:39 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
index 109234991104..8c328349cc68 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml,v 1.6 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.6
 -->
diff --git a/release/doc/ja_JP.eucJP/share/sgml/catalog b/release/doc/ja_JP.eucJP/share/sgml/catalog
index 19ce2927725b..254b8fae7cd2 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/catalog
+++ b/release/doc/ja_JP.eucJP/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/catalog,v 1.3 2004/10/24 14:31:27 hrs Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml b/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
index 57e4deacbb6b..2fa528068c94 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
+++ b/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml,v 1.2 2005/06/27 17:48:20 rushani Exp $ -->
 
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e '&man.aac.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.43922be022d49dabc274b2afffd0db8b '&man.adv.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë SCSI ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
diff --git a/release/doc/ja_JP.eucJP/share/sgml/release.dsl b/release/doc/ja_JP.eucJP/share/sgml/release.dsl
index 5cf5d795fa2a..f51929d0a502 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/release.dsl
+++ b/release/doc/ja_JP.eucJP/share/sgml/release.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/release.dsl,v 1.12 2004/12/29 17:11:02 hrs Exp $ -->
 <!-- Original revision: 1.8 -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
diff --git a/release/doc/ru_RU.KOI8-R/Makefile b/release/doc/ru_RU.KOI8-R/Makefile
index f6c2f08cfa36..7ec8a2ff5bf1 100644
--- a/release/doc/ru_RU.KOI8-R/Makefile
+++ b/release/doc/ru_RU.KOI8-R/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/Makefile,v 1.9 2004/09/20 09:53:02 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/Makefile,v 1.8 2005/03/10 11:44:05 den Exp $
 # 
 # Original revision: 1.7
 #
diff --git a/release/doc/ru_RU.KOI8-R/errata/Makefile b/release/doc/ru_RU.KOI8-R/errata/Makefile
index 569e28c75f03..e6c733a620ad 100644
--- a/release/doc/ru_RU.KOI8-R/errata/Makefile
+++ b/release/doc/ru_RU.KOI8-R/errata/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/Makefile,v 1.2 2004/06/29 07:55:42 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/errata/Makefile,v 1.1 2004/09/10 13:56:40 den Exp $
 #
 # Original revision: 1.5
 #
diff --git a/release/doc/ru_RU.KOI8-R/errata/article.sgml b/release/doc/ru_RU.KOI8-R/errata/article.sgml
index a4ca7db58bd4..11d03eee017b 100644
--- a/release/doc/ru_RU.KOI8-R/errata/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/errata/article.sgml
@@ -1,7 +1,7 @@
 <!--
    The FreeBSD Russian Documentation Project
 
-   $FreeBSD$
+   $FreeBSD: src/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.1 2004/09/10 13:56:40 den Exp $
    $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.5 2004/09/10 13:56:07 den Exp $
 
    Original revision: 1.72
@@ -34,7 +34,7 @@
     ðÒÏÅËÔ &os;
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.1 2004/09/10 13:56:40 den Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/Makefile b/release/doc/ru_RU.KOI8-R/hardware/Makefile
index f6063ce152ff..b33a78cb482c 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/Makefile,v 1.1 2004/05/31 11:43:21 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/Makefile,v 1.1 2004/05/27 06:09:42 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc b/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc
index a693cd58b458..29b602adcb44 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc
+++ b/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc,v 1.2 2004/08/11 10:25:20 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc,v 1.2 2004/08/11 10:04:26 den Exp $
 #
 # Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
index 4b097f502f6f..d0c4c35759f0 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile,v 1.3 2005/03/10 14:15:07 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile,v 1.3 2005/03/10 11:19:52 den Exp $
 #
 # Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
index dd7e6068b888..ae35043aad8c 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml,v 1.5 2005/03/10 14:15:07 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml,v 1.6 2005/03/10 11:04:19 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
index 3ee019da3d92..51b9dd125966 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile,v 1.3 2005/03/10 14:15:07 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile,v 1.3 2005/03/10 11:19:53 den Exp $
 #
 # Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
index 11ff4d3f2125..d4bde58f4069 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml,v 1.5 2005/03/10 14:15:07 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
index 1cdd4a9e3743..fc66b2714836 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml,v 1.3 2004/09/13 14:23:18 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml,v 1.3 2004/09/13 09:24:00 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
index 4c11f77691f8..155b6df8a322 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml,v 1.2 2005/04/25 12:22:25 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml,v 1.2 2005/04/25 12:23:24 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
index 6bb738c06ab2..667fad42c264 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.14 2005/06/30 11:35:03 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.18 2005/06/30 11:12:31 den Exp $
 
      Original revision: 1.282
@@ -37,7 +37,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.14 2005/06/30 11:35:03 den Exp $</pubdate>
   </sect1info>
 
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent b/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
index 3f86696b7c59..323a1a794b1f 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent,v 1.1 2004/05/31 11:43:22 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent,v 1.1 2004/05/27 06:09:42 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
index 739191ef7d4f..305babf991de 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml,v 1.2 2004/09/10 13:56:40 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml,v 1.2 2004/09/06 14:05:02 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
index 3aa62b541d11..643b82074f29 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile,v 1.3 2005/03/10 14:15:07 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile,v 1.3 2005/03/10 11:19:54 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
index ef074447f516..8a686d8fb218 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml,v 1.5 2005/03/10 14:15:07 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
index 905a9a3ed12c..4e3ccc311f04 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml,v 1.2 2005/03/09 14:03:58 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml,v 1.1 2004/05/27 06:09:43 den Exp $
 
      Original revision: 1.14
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
index 126215b50db3..d74749e69b15 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile,v 1.3 2005/03/10 14:15:08 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile,v 1.3 2005/03/10 11:19:54 den Exp $
 #
 # Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
index 1281aa45af5d..973599cf3b0d 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml,v 1.5 2005/03/10 14:15:08 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
index 4656bd6edeb5..336c48109968 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml,v 1.2 2004/08/03 13:12:10 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml,v 1.2 2004/08/03 12:53:39 den Exp $
 
      Original revision: 1.9
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
index 6fc857fd2f88..e2064e00ce5d 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile,v 1.3 2005/03/10 14:15:08 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile,v 1.3 2005/03/10 11:19:55 den Exp $
 #
 # Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
index bab60c052ed2..e9f449af4bda 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml,v 1.5 2005/03/10 14:15:08 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml,v 1.6 2005/03/10 11:04:21 den Exp $
 
      Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
index 224512b39546..385e4f3e5198 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml,v 1.2 2005/03/09 14:03:59 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml,v 1.1 2004/05/27 06:09:43 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
index ead67c9359cf..2cad03cabd75 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile,v 1.3 2005/03/10 14:15:08 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile,v 1.3 2005/03/10 11:19:56 den Exp $
 #
 # Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
index 2b0fc786fb30..f856ab376ff6 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml,v 1.5 2005/03/10 14:15:08 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml,v 1.6 2005/03/10 11:04:21 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
index 95fcebf0c260..e33abcff986b 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.2 2004/09/01 13:14:46 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.2 2004/09/01 12:23:40 den Exp $
 
      Original revision: 1.12
diff --git a/release/doc/ru_RU.KOI8-R/installation/Makefile b/release/doc/ru_RU.KOI8-R/installation/Makefile
index 53990ef4bfd9..3470922ab31f 100644
--- a/release/doc/ru_RU.KOI8-R/installation/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/Makefile,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/Makefile,v 1.1 2004/06/24 08:39:17 den Exp $
 #
 # Original revision: 1.6
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/Makefile.inc b/release/doc/ru_RU.KOI8-R/installation/Makefile.inc
index 5f7b50f7de95..36cc9d5cbee8 100644
--- a/release/doc/ru_RU.KOI8-R/installation/Makefile.inc
+++ b/release/doc/ru_RU.KOI8-R/installation/Makefile.inc
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/Makefile.inc,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/Makefile.inc,v 1.1 2004/06/24 08:39:17 den Exp $
 #
 # Original revision: 1.2
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
index 7241133f65b6..32e66acb27c2 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile,v 1.1 2004/06/24 08:39:18 den Exp $
 #
 # Original revision: 1.4
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
index d43057bcbe27..14b0ae7a9ab7 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml,v 1.5 2004/08/12 08:31:35 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
index 1c7ac4d9bbd5..fe8c536acc2c 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile,v 1.1 2004/06/24 08:39:18 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
index b46561a82b38..cfec337cae57 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml,v 1.5 2004/08/12 08:31:35 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml b/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
index 00bca530ae81..5ca0fe8344fb 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml,v 1.1 2004/06/24 08:39:18 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml,v 1.1 2004/06/24 07:21:47 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml b/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
index 0475eed4dd55..74d5f8cfb4b6 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.3 2005/06/30 11:35:03 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.3 2005/06/30 11:12:32 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.ent b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
index cfe8a868d617..2a2a933b89e8 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.ent
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.ent,v 1.1 2004/06/24 08:39:18 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.ent,v 1.1 2004/06/24 07:21:48 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.sgml b/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
index 9a87d7047a8a..3d20886bbea6 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
@@ -1,7 +1,7 @@
 <!--
 The FreeBSD Russian Documentation Project
 
-$FreeBSD$
+$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.8 2005/06/30 11:35:03 den Exp $
 $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.8 2005/06/30 11:12:32 den Exp $
 
 Original revision: 1.32
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml b/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
index 48191b6bd553..b7ecf7389ad6 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Russian Documentation Project
 
-	$FreeBSD$
+	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.5 2005/04/14 13:29:07 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.5 2005/04/14 13:30:11 den Exp $
 
 	Original revision: 1.10
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml b/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
index 4bc38b41e2e5..60b83a56bb40 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Russian Documentation Project
 
-	$FreeBSD$
+	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.5 2005/06/30 11:35:03 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.5 2005/06/30 11:12:32 den Exp $
 
 	Original revision: 1.19
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
index dffe1a55541f..8b28a06155db 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Russian Documentation Project
 
-	$FreeBSD$
+	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml,v 1.3 2004/09/10 13:56:41 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml,v 1.3 2004/09/06 14:05:03 den Exp $
 
 	Original revision: 1.13
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
index b1d897d9b39f..b88a88d31ace 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/i386/Makefile,v 1.1 2004/06/24 08:39:19 den Exp $
 #
 # Original revision: 1.4
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml b/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
index 14199c01d870..aade02982627 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
index adf6a2a28548..f2eb5edcc291 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile,v 1.1 2004/06/24 08:39:19 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
index df280dba03dd..621e62e9406d 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
index 9cd2b17582ba..2816dc73bf2a 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile,v 1.1 2004/06/24 08:39:19 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
index b6c1767f7c5b..3ab03d1c6ef1 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
index ac6fb72e90aa..78c17efa2d69 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile,v 1.1 2004/06/24 08:39:20 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
index 90b0ae44da0a..617a54de4092 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/readme/Makefile b/release/doc/ru_RU.KOI8-R/readme/Makefile
index 9b6f10fff328..59c186b94964 100644
--- a/release/doc/ru_RU.KOI8-R/readme/Makefile
+++ b/release/doc/ru_RU.KOI8-R/readme/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/Makefile,v 1.1 2004/06/24 13:32:02 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/Makefile,v 1.1 2004/06/24 13:45:38 den Exp $
 #
 # Original revision: 1.7
 #
diff --git a/release/doc/ru_RU.KOI8-R/readme/article.sgml b/release/doc/ru_RU.KOI8-R/readme/article.sgml
index fa45cd9d1632..d72ef20781b3 100644
--- a/release/doc/ru_RU.KOI8-R/readme/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/readme/article.sgml
@@ -1,7 +1,7 @@
 <!--
    The FreeBSD Russian Documentation Project
 
-   $FreeBSD$
+   $FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:35:03 den Exp $
    $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:12:33 den Exp $
 
    Original revision: 1.37
@@ -21,7 +21,7 @@
 
     <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:35:03 den Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/Makefile
index 3729b2091284..abbf069c5084 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/Makefile,v 1.1 2004/05/21 11:59:56 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/Makefile,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc b/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc
index 214855f61379..7399ec7fa761 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc
+++ b/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc,v 1.1 2004/05/21 11:59:56 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
index 2587e1c08635..efc4df251651 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
index 11ed2dc30d68..0ad1235b8873 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
index 97dedc60f8e2..02790744dab9 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
index 14ee72855531..a5568d37711f 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml b/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
index 4504e0ab787a..c94fc083c228 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
@@ -11,7 +11,7 @@
 
   <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.21 2005/07/08 14:34:10 den Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent b/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
index 96df30653d6e..616d06d7b54f 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent,v 1.1 2004/05/21 11:59:54 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent,v 1.1 2004/05/20 07:02:25 den Exp $
 
      Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
index 2bbe5e9a9f41..6580195efaa9 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile,v 1.3 2004/09/02 06:22:17 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile,v 1.3 2004/09/02 05:50:33 den Exp $
 #
 # Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
index debdea7acc2c..5dc37356fd3f 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
index 62016749f741..1882c7d55500 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile,v 1.1 2004/05/20 07:02:26 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
index 9c15d726694a..d9a0adb64718 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
index 2abd4f224717..aa4a868c5887 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile,v 1.1 2004/05/20 07:02:26 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
index ede9cc3f093d..f368211335c3 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
index 6084f36a6160..bfb9fc38e46b 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile,v 1.1 2004/05/21 11:59:56 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile,v 1.1 2004/05/20 07:02:26 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
index 957adaa190b4..cfd9dc8da3d4 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml,v 1.7 2004/08/12 08:31:38 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl b/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
index 7f36ca10d052..7df23afeb4dc 100644
--- a/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
+++ b/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl,v 1.3 2005/06/30 12:07:29 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl,v 1.4 2005/06/30 12:11:18 den Exp $
 #
 # Auto-translate some device entities from English to Russian (KOI8-R)
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/catalog b/release/doc/ru_RU.KOI8-R/share/sgml/catalog
index a8ea7378ae00..c0e630534456 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/catalog
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/catalog
@@ -2,7 +2,7 @@
   -- Language-specific --
 
   -- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.3 2005/03/10 11:04:21 den Exp $ --
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.2 2005/03/10 14:15:08 den Exp $ --
 
   -- Original revision: 1.1 --
 
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml b/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
index 9084f8981e04..2cc931d28df1 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
@@ -9,7 +9,7 @@
      script to update this file (-o option).
      This script maintained in HEAD branch.
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.4 2005/06/30 12:07:29 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.5 2005/06/30 12:11:18 den Exp $
 -->
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e 'ëÏÎÔÒÏÌÌÅÒÙ, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÄÒÁÊ×ÅÒÏÍ &man.aac.4;, ×ËÌÀÞÁÑ:'>
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl b/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
index 96cf087b371e..e9f04c4c5e40 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
@@ -2,7 +2,7 @@
   The FreeBSD Russian Documentation Project
 
   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl,v 1.5 2004/09/13 08:00:12 den Exp $
-  $FreeBSD$
+  $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl,v 1.3 2004/09/13 14:24:46 den Exp $
   
   Original revision: 1.8
 -->
diff --git a/release/doc/share/examples/Makefile.relnotesng b/release/doc/share/examples/Makefile.relnotesng
index 8ab4a3c15e29..b8e01632d9f7 100644
--- a/release/doc/share/examples/Makefile.relnotesng
+++ b/release/doc/share/examples/Makefile.relnotesng
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.11.2.1.2.1 2005/10/16 08:28:10 hrs Exp $
 #
 # Sample makefile for rendering and uploading RELNOTESng files outside
 # the build tree.
diff --git a/release/doc/share/misc/dev.archlist.txt b/release/doc/share/misc/dev.archlist.txt
index 2972146312a2..be46e0b17c53 100644
--- a/release/doc/share/misc/dev.archlist.txt
+++ b/release/doc/share/misc/dev.archlist.txt
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.62.2.3 2005/10/08 08:39:58 brueffer Exp $
 #
 
 #
diff --git a/release/doc/share/misc/man2hwnotes.pl b/release/doc/share/misc/man2hwnotes.pl
index 899bc1c6d33f..40734aef8a8f 100644
--- a/release/doc/share/misc/man2hwnotes.pl
+++ b/release/doc/share/misc/man2hwnotes.pl
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.12 2005/07/04 07:48:02 simon Exp $
 #
 
 # Parse the list of supported hardware out of section 4 manual pages
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index 2fe30d76b1fc..5a426fad8c8f 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.13 2004/08/08 09:23:49 hrs Exp $
 
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
diff --git a/release/doc/share/sgml/Makefile b/release/doc/share/sgml/Makefile
index 6860cb229bfd..6eec80545eab 100644
--- a/release/doc/share/sgml/Makefile
+++ b/release/doc/share/sgml/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/sgml/Makefile,v 1.2 2004/08/08 09:23:49 hrs Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/share/sgml/catalog b/release/doc/share/sgml/catalog
index e456e6743159..3dc20c751dce 100644
--- a/release/doc/share/sgml/catalog
+++ b/release/doc/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Release-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/share/sgml/catalog,v 1.3 2001/06/11 01:48:17 ache Exp $ --
 
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
diff --git a/release/doc/share/sgml/default.dsl b/release/doc/share/sgml/default.dsl
index 58d82314f960..8caa0a4b3ebe 100644
--- a/release/doc/share/sgml/default.dsl
+++ b/release/doc/share/sgml/default.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/default.dsl,v 1.2 2001/06/02 23:12:23 dd Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN" CDATA DSSSL>
diff --git a/release/doc/share/sgml/release.dsl b/release/doc/share/sgml/release.dsl
index 193f80897a85..4c9595f784aa 100644
--- a/release/doc/share/sgml/release.dsl
+++ b/release/doc/share/sgml/release.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.9 2005/05/05 17:10:37 murray Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.html		"IGNORE">
diff --git a/release/doc/share/sgml/release.ent b/release/doc/share/sgml/release.ent
index b8416d4ee969..89cdd3f18c03 100644
--- a/release/doc/share/sgml/release.ent
+++ b/release/doc/share/sgml/release.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*-
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.24.2.1.2.1 2005/10/16 08:28:10 hrs Exp $
 
      OS Release Information -->
 
diff --git a/release/doc/zh_CN.GB2312/Makefile b/release/doc/zh_CN.GB2312/Makefile
index fa31bdbe3449..c11497384f3f 100644
--- a/release/doc/zh_CN.GB2312/Makefile
+++ b/release/doc/zh_CN.GB2312/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
 # Original Revision: 1.7
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.1.10.1 2005/10/13 17:32:38 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/..
 
diff --git a/release/doc/zh_CN.GB2312/errata/Makefile b/release/doc/zh_CN.GB2312/errata/Makefile
index 859dfaa9eb2f..2061215e7021 100644
--- a/release/doc/zh_CN.GB2312/errata/Makefile
+++ b/release/doc/zh_CN.GB2312/errata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/errata/Makefile,v 1.1 2004/10/15 06:43:44 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/zh_CN.GB2312/errata/article.sgml b/release/doc/zh_CN.GB2312/errata/article.sgml
index 3810b6484a9b..595ca379e650 100644
--- a/release/doc/zh_CN.GB2312/errata/article.sgml
+++ b/release/doc/zh_CN.GB2312/errata/article.sgml
@@ -30,7 +30,7 @@
     The &os; Project
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.2.4.1 2005/10/13 17:32:38 delphij Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/zh_CN.GB2312/hardware/Makefile b/release/doc/zh_CN.GB2312/hardware/Makefile
index 9c38bf420871..fba8332f92ca 100644
--- a/release/doc/zh_CN.GB2312/hardware/Makefile
+++ b/release/doc/zh_CN.GB2312/hardware/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
 # Original Revision: 1.6
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/Makefile,v 1.1 2004/10/15 06:43:45 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/zh_CN.GB2312/hardware/Makefile.inc b/release/doc/zh_CN.GB2312/hardware/Makefile.inc
index 29076342ea7a..8636a5e27541 100644
--- a/release/doc/zh_CN.GB2312/hardware/Makefile.inc
+++ b/release/doc/zh_CN.GB2312/hardware/Makefile.inc
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
 # Original Revision: 1.3
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/Makefile.inc,v 1.1 2004/10/15 06:43:45 delphij Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/hardware/${.CURDIR:T}
diff --git a/release/doc/zh_CN.GB2312/hardware/amd64/Makefile b/release/doc/zh_CN.GB2312/hardware/amd64/Makefile
index 66193dccf89e..2e9be20bf06c 100644
--- a/release/doc/zh_CN.GB2312/hardware/amd64/Makefile
+++ b/release/doc/zh_CN.GB2312/hardware/amd64/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
 # Original Revision: 1.2
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/amd64/Makefile,v 1.1 2004/10/15 06:43:45 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml b/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml
index 67f7aa5b345c..c6131dddaf98 100644
--- a/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.3
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml,v 1.1 2004/10/15 06:43:45 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml b/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml
index b1f800382c7b..cca57c6abb8b 100644
--- a/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.5.2.1
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml,v 1.1.10.1 2005/10/13 17:32:38 delphij Exp $
 -->
 <sect1 id="proc">
   <title>Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å</title>
diff --git a/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml b/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml
index ed5f7688b2dd..a1cd086b28a7 100644
--- a/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.7
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml,v 1.2.4.1 2005/10/13 17:32:38 delphij Exp $
 -->
 
 <articleinfo>
diff --git a/release/doc/zh_CN.GB2312/hardware/common/dev.sgml b/release/doc/zh_CN.GB2312/hardware/common/dev.sgml
index d2558def2fa7..6a43ab31650a 100644
--- a/release/doc/zh_CN.GB2312/hardware/common/dev.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/common/dev.sgml
@@ -35,7 +35,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.3.4.1 2005/10/13 17:32:38 delphij Exp $</pubdate>
   </sect1info>
 
   <title>Ö§³ÖµÄÓ²¼þ</title>
diff --git a/release/doc/zh_CN.GB2312/hardware/common/hw.ent b/release/doc/zh_CN.GB2312/hardware/common/hw.ent
index 7ecdd6354850..cf29c8278c2a 100644
--- a/release/doc/zh_CN.GB2312/hardware/common/hw.ent
+++ b/release/doc/zh_CN.GB2312/hardware/common/hw.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*- -->
 <!-- Original Revision: 1.5 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/hw.ent,v 1.1 2004/10/15 06:43:45 delphij Exp $ -->
 
 <!-- Text constants which probably don't need to be changed.-->
 
diff --git a/release/doc/zh_CN.GB2312/hardware/common/intro.sgml b/release/doc/zh_CN.GB2312/hardware/common/intro.sgml
index d9148b0682a9..b28550135a73 100644
--- a/release/doc/zh_CN.GB2312/hardware/common/intro.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/common/intro.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.7
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml,v 1.1.10.1 2005/10/13 17:32:38 delphij Exp $
 -->
 
 <sect1 id="intro">
diff --git a/release/doc/zh_CN.GB2312/hardware/i386/Makefile b/release/doc/zh_CN.GB2312/hardware/i386/Makefile
index 6558920c74d5..76a098c9effd 100644
--- a/release/doc/zh_CN.GB2312/hardware/i386/Makefile
+++ b/release/doc/zh_CN.GB2312/hardware/i386/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.6
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/Makefile,v 1.1 2004/10/15 06:43:45 delphij Exp $
 RELN_ROOT?= ${.CURDIR}/../../..
 
 DOC?= article
diff --git a/release/doc/zh_CN.GB2312/hardware/i386/article.sgml b/release/doc/zh_CN.GB2312/hardware/i386/article.sgml
index dd96e4344d84..dfa8daf8332c 100644
--- a/release/doc/zh_CN.GB2312/hardware/i386/article.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/i386/article.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 	Original Revision: 1.6
 
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/article.sgml,v 1.1 2004/10/15 06:43:45 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml b/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml
index 7fdc4c6b6675..606cd9444b55 100644
--- a/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.14
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.2.4.1 2005/10/13 17:32:38 delphij Exp $
 -->
 <sect1 id="proc">
   <title>Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å</title>
diff --git a/release/doc/zh_CN.GB2312/installation/Makefile b/release/doc/zh_CN.GB2312/installation/Makefile
index 5283300b7d0a..2a742ca24723 100644
--- a/release/doc/zh_CN.GB2312/installation/Makefile
+++ b/release/doc/zh_CN.GB2312/installation/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.6
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/Makefile,v 1.1 2004/10/15 06:43:45 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/zh_CN.GB2312/installation/Makefile.inc b/release/doc/zh_CN.GB2312/installation/Makefile.inc
index b11ca6e6cd9e..5c39494b2ca6 100644
--- a/release/doc/zh_CN.GB2312/installation/Makefile.inc
+++ b/release/doc/zh_CN.GB2312/installation/Makefile.inc
@@ -1,5 +1,5 @@
 # Original Revision: 1.2
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/Makefile.inc,v 1.1 2004/10/15 06:43:45 delphij Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/installation/${.CURDIR:T}
diff --git a/release/doc/zh_CN.GB2312/installation/alpha/Makefile b/release/doc/zh_CN.GB2312/installation/alpha/Makefile
index 79e7d0dd59d5..2089e900cc02 100644
--- a/release/doc/zh_CN.GB2312/installation/alpha/Makefile
+++ b/release/doc/zh_CN.GB2312/installation/alpha/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.4
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/alpha/Makefile,v 1.1 2004/10/15 06:43:46 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/installation/alpha/article.sgml b/release/doc/zh_CN.GB2312/installation/alpha/article.sgml
index a36fc1f5a2bf..0bfdb0de04f1 100644
--- a/release/doc/zh_CN.GB2312/installation/alpha/article.sgml
+++ b/release/doc/zh_CN.GB2312/installation/alpha/article.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.4
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/alpha/article.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/installation/amd64/Makefile b/release/doc/zh_CN.GB2312/installation/amd64/Makefile
index 2ab78f7987c9..dabe49b721fd 100644
--- a/release/doc/zh_CN.GB2312/installation/amd64/Makefile
+++ b/release/doc/zh_CN.GB2312/installation/amd64/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.1
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/amd64/Makefile,v 1.1 2004/10/15 06:43:46 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/installation/amd64/article.sgml b/release/doc/zh_CN.GB2312/installation/amd64/article.sgml
index 9df4eb5d264f..4717eaaacc77 100644
--- a/release/doc/zh_CN.GB2312/installation/amd64/article.sgml
+++ b/release/doc/zh_CN.GB2312/installation/amd64/article.sgml
@@ -2,7 +2,7 @@
  	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.2
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/amd64/article.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/installation/common/abstract.sgml b/release/doc/zh_CN.GB2312/installation/common/abstract.sgml
index 4ecbadc8dd9b..3714f9c2a301 100644
--- a/release/doc/zh_CN.GB2312/installation/common/abstract.sgml
+++ b/release/doc/zh_CN.GB2312/installation/common/abstract.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.2
-	$FreeBSD$ -->
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/abstract.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $ -->
 
 <abstract>
   <para>ÕâƪÎÄÕ¶԰²×°
diff --git a/release/doc/zh_CN.GB2312/installation/common/artheader.sgml b/release/doc/zh_CN.GB2312/installation/common/artheader.sgml
index ccdf13300f7b..513a94f7bd2d 100644
--- a/release/doc/zh_CN.GB2312/installation/common/artheader.sgml
+++ b/release/doc/zh_CN.GB2312/installation/common/artheader.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.6
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml,v 1.1.10.1 2005/10/13 17:32:39 delphij Exp $
 -->
 
 <articleinfo>
diff --git a/release/doc/zh_CN.GB2312/installation/common/install.ent b/release/doc/zh_CN.GB2312/installation/common/install.ent
index 5d1bfff1303f..821972c2a8bc 100644
--- a/release/doc/zh_CN.GB2312/installation/common/install.ent
+++ b/release/doc/zh_CN.GB2312/installation/common/install.ent
@@ -4,7 +4,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.2
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.ent,v 1.1 2004/10/15 06:43:46 delphij Exp $
 -->
 
 <!-- Text constants which probably don't need to be changed.-->
diff --git a/release/doc/zh_CN.GB2312/installation/common/install.sgml b/release/doc/zh_CN.GB2312/installation/common/install.sgml
index a7064be40243..64d0580df338 100644
--- a/release/doc/zh_CN.GB2312/installation/common/install.sgml
+++ b/release/doc/zh_CN.GB2312/installation/common/install.sgml
@@ -3,7 +3,7 @@
 The FreeBSD Simplified Chinese Project
 
 Original Revision: 1.31
-$FreeBSD$
+$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.3 2005/04/03 17:41:21 delphij Exp $
 
 install.sgml
 
diff --git a/release/doc/zh_CN.GB2312/installation/common/layout.sgml b/release/doc/zh_CN.GB2312/installation/common/layout.sgml
index d50e631ce927..00e262d5c558 100644
--- a/release/doc/zh_CN.GB2312/installation/common/layout.sgml
+++ b/release/doc/zh_CN.GB2312/installation/common/layout.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.10
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/layout.sgml,v 1.2 2005/04/09 03:06:55 delphij Exp $
 
 	This section contains the contents of the old LAYOUT.TXT file.
 -->
diff --git a/release/doc/zh_CN.GB2312/installation/common/trouble.sgml b/release/doc/zh_CN.GB2312/installation/common/trouble.sgml
index ede4417d8e3a..7427a133d6e5 100644
--- a/release/doc/zh_CN.GB2312/installation/common/trouble.sgml
+++ b/release/doc/zh_CN.GB2312/installation/common/trouble.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.19
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml,v 1.2.4.1 2005/10/13 17:32:39 delphij Exp $
 
 	This file contains the comments of the old TROUBLE.TXT file.
 -->
diff --git a/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml b/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml
index 3ed22f453285..344a467fb4ef 100644
--- a/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml
+++ b/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.13
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml,v 1.1.10.1 2005/10/13 17:32:39 delphij Exp $
 
 	This section contains the contents of the old UPGRADE.TXT
 	file.
diff --git a/release/doc/zh_CN.GB2312/installation/i386/Makefile b/release/doc/zh_CN.GB2312/installation/i386/Makefile
index 79e7d0dd59d5..dd8cd5818be9 100644
--- a/release/doc/zh_CN.GB2312/installation/i386/Makefile
+++ b/release/doc/zh_CN.GB2312/installation/i386/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.4
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/i386/Makefile,v 1.1 2004/10/15 06:43:46 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/installation/i386/article.sgml b/release/doc/zh_CN.GB2312/installation/i386/article.sgml
index f7e795edcc3b..59b6b8b25ee6 100644
--- a/release/doc/zh_CN.GB2312/installation/i386/article.sgml
+++ b/release/doc/zh_CN.GB2312/installation/i386/article.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.5
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/i386/article.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/installation/ia64/Makefile b/release/doc/zh_CN.GB2312/installation/ia64/Makefile
index 2ab78f7987c9..397f2ee4056b 100644
--- a/release/doc/zh_CN.GB2312/installation/ia64/Makefile
+++ b/release/doc/zh_CN.GB2312/installation/ia64/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.1
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/ia64/Makefile,v 1.1 2004/10/15 06:43:46 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/installation/ia64/article.sgml b/release/doc/zh_CN.GB2312/installation/ia64/article.sgml
index 8565f96b34ec..ff87be47b886 100644
--- a/release/doc/zh_CN.GB2312/installation/ia64/article.sgml
+++ b/release/doc/zh_CN.GB2312/installation/ia64/article.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.2
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/ia64/article.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/installation/pc98/Makefile b/release/doc/zh_CN.GB2312/installation/pc98/Makefile
index 2ab78f7987c9..1301b19e25f5 100644
--- a/release/doc/zh_CN.GB2312/installation/pc98/Makefile
+++ b/release/doc/zh_CN.GB2312/installation/pc98/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.1
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/pc98/Makefile,v 1.1 2004/10/15 06:43:46 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/installation/pc98/article.sgml b/release/doc/zh_CN.GB2312/installation/pc98/article.sgml
index a1343ca4e8f9..badf02423c99 100644
--- a/release/doc/zh_CN.GB2312/installation/pc98/article.sgml
+++ b/release/doc/zh_CN.GB2312/installation/pc98/article.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.2
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/pc98/article.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/installation/sparc64/Makefile b/release/doc/zh_CN.GB2312/installation/sparc64/Makefile
index 5af96148f16f..8b24473694e7 100644
--- a/release/doc/zh_CN.GB2312/installation/sparc64/Makefile
+++ b/release/doc/zh_CN.GB2312/installation/sparc64/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.1
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/sparc64/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml b/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml
index 25be40c0968e..40283799e04e 100644
--- a/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml
+++ b/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 1.5
-	$FreeBSD$
+	$FreeBSD: src/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml,v 1.1 2004/10/15 06:43:47 delphij Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml b/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml
index 38ab6c424999..a29ba6c032e5 100644
--- a/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml
+++ b/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml
@@ -2,7 +2,7 @@
 The FreeBSD Simplified Chinese Project
 
 Original Revision: 1.14
-$FreeBSD$
+$FreeBSD: src/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 This file contains sparc64-specific installation instructions.
 
diff --git a/release/doc/zh_CN.GB2312/readme/Makefile b/release/doc/zh_CN.GB2312/readme/Makefile
index c2d2cf843f81..768f3ea0be34 100644
--- a/release/doc/zh_CN.GB2312/readme/Makefile
+++ b/release/doc/zh_CN.GB2312/readme/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.7
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/readme/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/zh_CN.GB2312/readme/article.sgml b/release/doc/zh_CN.GB2312/readme/article.sgml
index 8d908fafa53d..439d72981a36 100644
--- a/release/doc/zh_CN.GB2312/readme/article.sgml
+++ b/release/doc/zh_CN.GB2312/readme/article.sgml
@@ -18,7 +18,7 @@
 
     <corpauthor>The &os; Project</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.1.8.2 2005/10/16 07:35:40 delphij Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/zh_CN.GB2312/relnotes/Makefile b/release/doc/zh_CN.GB2312/relnotes/Makefile
index 7858ebaeb18c..5bdbfa27eebc 100644
--- a/release/doc/zh_CN.GB2312/relnotes/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.6
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/Makefile.inc b/release/doc/zh_CN.GB2312/relnotes/Makefile.inc
index 29d07c92d670..25bbd51ed5f1 100644
--- a/release/doc/zh_CN.GB2312/relnotes/Makefile.inc
+++ b/release/doc/zh_CN.GB2312/relnotes/Makefile.inc
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.2
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/Makefile.inc,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/relnotes/${.CURDIR:T}
diff --git a/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile b/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile
index 3bbd40a32f87..1bfb738de9c5 100644
--- a/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.6
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml b/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml
index 9177748cb446..3613c49eaa5e 100644
--- a/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!-- Original Revision: 1.6 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml,v 1.1 2004/10/15 06:43:47 delphij Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile b/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile
index fa21257f0f08..bc2c6a198470 100644
--- a/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.1
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml b/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml
index 121d20ed8267..4a0e5f3d4d4c 100644
--- a/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml
@@ -1,5 +1,5 @@
 <!-- Original Revision: 1.3 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml,v 1.1 2004/10/15 06:43:47 delphij Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/zh_CN.GB2312/relnotes/common/new.sgml b/release/doc/zh_CN.GB2312/relnotes/common/new.sgml
index 3b14cc8965d1..f45b069b5a80 100644
--- a/release/doc/zh_CN.GB2312/relnotes/common/new.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/common/new.sgml
@@ -8,7 +8,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.5.4.3 2005/10/27 17:54:31 delphij Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent b/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent
index 638ea7f47dd0..78def66a4778 100644
--- a/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent
+++ b/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent
@@ -1,7 +1,7 @@
 <!-- -*- sgml -*- -->
 
 <!-- Original Revision: 1.3 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent,v 1.1 2004/10/15 06:43:48 delphij Exp $ -->
 
 <!-- Text constants which probably don't need to be changed.-->
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/i386/Makefile b/release/doc/zh_CN.GB2312/relnotes/i386/Makefile
index 8d4b5f14fdc9..2a2b96686bf3 100644
--- a/release/doc/zh_CN.GB2312/relnotes/i386/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/i386/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.7
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/i386/Makefile,v 1.1 2004/10/15 06:43:48 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml b/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml
index ef0fe8dd97e7..2d46ca2e3edb 100644
--- a/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml
@@ -1,5 +1,5 @@
 <!-- Original Revision: 1.7 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml,v 1.1 2004/10/15 06:43:48 delphij Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile b/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile
index fa21257f0f08..bd68bb8ee68b 100644
--- a/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.1
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile,v 1.1 2004/10/15 06:43:48 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml b/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml
index b3a8c9b394fc..12b99962b2b4 100644
--- a/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!-- Original Revision: 1.4 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml,v 1.1 2004/10/15 06:43:48 delphij Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile b/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile
index fa21257f0f08..bfd85b3a56e4 100644
--- a/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.1
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile,v 1.1 2004/10/15 06:43:48 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml b/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml
index 7f38047b1b76..fc91cc496e2b 100644
--- a/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!-- Original Revision: 1.4 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml,v 1.1 2004/10/15 06:43:48 delphij Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
diff --git a/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile b/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile
index f548b33ede17..7808464897e0 100644
--- a/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile,v 1.1 2004/10/15 06:43:48 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml b/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml
index 798563f3c5fb..a6b8e03b6c47 100644
--- a/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml,v 1.1 2004/10/15 06:43:48 delphij Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 
diff --git a/release/doc/zh_CN.GB2312/share/sgml/catalog b/release/doc/zh_CN.GB2312/share/sgml/catalog
index a4d71599493f..0cd90984ee68 100644
--- a/release/doc/zh_CN.GB2312/share/sgml/catalog
+++ b/release/doc/zh_CN.GB2312/share/sgml/catalog
@@ -2,7 +2,7 @@
   -- Language-specific --
 
   -- Original Revision: 1.1 --
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/zh_CN.GB2312/share/sgml/catalog,v 1.1 2004/10/15 06:43:48 delphij Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/zh_CN.GB2312/share/sgml/release.dsl b/release/doc/zh_CN.GB2312/share/sgml/release.dsl
index b274f8e7fccc..5e0ef20d5913 100644
--- a/release/doc/zh_CN.GB2312/share/sgml/release.dsl
+++ b/release/doc/zh_CN.GB2312/share/sgml/release.dsl
@@ -1,5 +1,5 @@
 <!-- Original Revision: 1.8.2.1 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/share/sgml/release.dsl,v 1.1 2004/10/15 06:43:48 delphij Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
diff --git a/release/fixit.profile b/release/fixit.profile
index b81395ce7f7f..da40a299ac89 100644
--- a/release/fixit.profile
+++ b/release/fixit.profile
@@ -1,5 +1,5 @@
 :
-# $FreeBSD$
+# $FreeBSD: src/release/fixit.profile,v 1.10 2004/09/02 13:40:34 keramida Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
diff --git a/release/fixit.services b/release/fixit.services
index ff776b2b6265..a9f89f5ca5c4 100644
--- a/release/fixit.services
+++ b/release/fixit.services
@@ -3,7 +3,7 @@
 #
 # Stripped-down version.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/fixit.services,v 1.4 1999/08/28 01:33:10 peter Exp $
 #
 # WELL KNOWN PORT NUMBERS
 #
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index c5c68cb090be..dcb493664dee 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.59 2004/10/01 07:54:36 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/i386/fixit_crunch.conf b/release/i386/fixit_crunch.conf
index 49cc5f192d8a..908aa92dd574 100644
--- a/release/i386/fixit_crunch.conf
+++ b/release/i386/fixit_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.14 2004/10/01 07:54:36 ru Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
index cd796e500469..dd1b9bbc5910 100644
--- a/release/i386/mkisoimages.sh
+++ b/release/i386/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.13 2005/01/30 21:10:51 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/ia64/boot_crunch.conf b/release/ia64/boot_crunch.conf
index eb50eb18db29..ea9718cd030f 100644
--- a/release/ia64/boot_crunch.conf
+++ b/release/ia64/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.9 2004/10/01 07:54:37 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/ia64/mkisoimages.sh b/release/ia64/mkisoimages.sh
index 52a9f4a2c9dc..3f420d7ed15d 100644
--- a/release/ia64/mkisoimages.sh
+++ b/release/ia64/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf
index b630c887efd5..543f88ed8d7d 100644
--- a/release/pc98/boot_crunch.conf
+++ b/release/pc98/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.59.2.1 2005/10/07 15:56:29 nyan Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/pc98/fixit-small_crunch.conf b/release/pc98/fixit-small_crunch.conf
index 9ad70d57b55b..025cdced69fd 100644
--- a/release/pc98/fixit-small_crunch.conf
+++ b/release/pc98/fixit-small_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.7 2004/10/01 07:54:37 ru Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/pc98/fixit_crunch.conf b/release/pc98/fixit_crunch.conf
index 24881773d5ea..96bef610771e 100644
--- a/release/pc98/fixit_crunch.conf
+++ b/release/pc98/fixit_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.14 2004/10/01 07:54:37 ru Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD
index 5a2de4864108..b07c653e6ed6 100644
--- a/release/picobsd/bridge/PICOBSD
+++ b/release/picobsd/bridge/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.17 2004/11/16 21:23:11 jhb Exp $
 #
 # Line starting with #PicoBSD contains PicoBSD build parameters
 #marker         def_sz  init    MFS_inodes      floppy_inodes
diff --git a/release/picobsd/bridge/PICOBSD.hints b/release/picobsd/bridge/PICOBSD.hints
index 580dd1a3381e..849fa8c839c6 100644
--- a/release/picobsd/bridge/PICOBSD.hints
+++ b/release/picobsd/bridge/PICOBSD.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD.hints,v 1.1 2000/10/15 20:42:19 joe Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
index 9686bdc9eb6b..2f3d03329fcf 100644
--- a/release/picobsd/bridge/crunch.conf
+++ b/release/picobsd/bridge/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.18 2004/12/21 12:49:24 ru Exp $
 #
 # configuration file for "bridge" floppy.
 # Depending on your needs, almost surely you will need to
diff --git a/release/picobsd/build/Makefile.conf b/release/picobsd/build/Makefile.conf
index c4f048b735d5..e7a982daa4f3 100644
--- a/release/picobsd/build/Makefile.conf
+++ b/release/picobsd/build/Makefile.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/Makefile.conf,v 1.18 2001/11/01 16:17:37 luigi Exp $
 #
 # Makefile for building PICOBSD kernels and running crunchgen
 #
diff --git a/release/picobsd/build/mfs.mtree b/release/picobsd/build/mfs.mtree
index 5c8e70ce6b20..1ca6eee952e2 100644
--- a/release/picobsd/build/mfs.mtree
+++ b/release/picobsd/build/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/mfs.mtree,v 1.3 2000/11/07 20:40:20 joe Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 1f218051b8a0..cf3fc1ec3a5a 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/picobsd,v 1.37 2004/12/21 12:21:26 ru Exp $
 #
 # The new PicoBSD build script. Invoked as
 #
diff --git a/release/picobsd/floppy.tree/etc/fstab b/release/picobsd/floppy.tree/etc/fstab
index cf9673af6fbd..d7a8c4cc04fd 100644
--- a/release/picobsd/floppy.tree/etc/fstab
+++ b/release/picobsd/floppy.tree/etc/fstab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/fstab,v 1.6 2002/03/08 03:55:19 luigi Exp $
 proc				/proc		procfs	rw 0 0
 /dev/fd0c			/fd	ufs	rw,noauto 0 0
 /dev/ad0s1			/dos		msdosfs	rw,noauto 0 0
diff --git a/release/picobsd/floppy.tree/etc/hosts b/release/picobsd/floppy.tree/etc/hosts
index d4f9c541def9..392e36849d00 100644
--- a/release/picobsd/floppy.tree/etc/hosts
+++ b/release/picobsd/floppy.tree/etc/hosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/hosts,v 1.4 2002/03/08 04:54:52 luigi Exp $
 # This file contains ip <-> hostname mapping.
 # It is also used for autoconfiguration based on Ethernet address
 # and other things. The initial part is just a standard /etc/hosts
diff --git a/release/picobsd/floppy.tree/etc/ppp/ppp.conf b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
index 30981ef29ee1..71a7036d3511 100644
--- a/release/picobsd/floppy.tree/etc/ppp/ppp.conf
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/ppp/ppp.conf,v 1.2 2004/11/19 03:45:30 obrien Exp $
 #  	PPP  Sample Configuration File
 #	  Written by Toshiharu OHNO
 default:
diff --git a/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
index bfaab7681aa5..c8f98aab5df5 100644
--- a/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
@@ -12,7 +12,7 @@
 #  required for all server socket connections.  Refer to the ppp(8)
 #  and pppctl(8) man pages for further details.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample,v 1.2 1999/08/28 01:33:30 peter Exp $
 #
 ##################################################
 
diff --git a/release/picobsd/floppy.tree/etc/rc.conf.defaults b/release/picobsd/floppy.tree/etc/rc.conf.defaults
index 8b8bdf3f0e96..8c8e08ae34d7 100644
--- a/release/picobsd/floppy.tree/etc/rc.conf.defaults
+++ b/release/picobsd/floppy.tree/etc/rc.conf.defaults
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.conf.defaults,v 1.2 2002/03/09 18:27:02 luigi Exp $
 #
 # rc.conf for picobsd. This is sourced from /etc/rc1, and is supposed to
 # contain only shell functions that are used later in /etc/rc1.
diff --git a/release/picobsd/floppy.tree/etc/rc.firewall b/release/picobsd/floppy.tree/etc/rc.firewall
index 408fe6087f02..00dcb85568e0 100644
--- a/release/picobsd/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/floppy.tree/etc/rc.firewall
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.firewall,v 1.3 2002/03/08 05:15:08 luigi Exp $
 
 # Setup system for firewall service, with some sample configurations.
 # Select one using ${firewall_type} which you can set in /etc/rc.conf.local.
diff --git a/release/picobsd/floppy.tree/etc/rc1 b/release/picobsd/floppy.tree/etc/rc1
index 780311d285ba..2565c72c2ec6 100644
--- a/release/picobsd/floppy.tree/etc/rc1
+++ b/release/picobsd/floppy.tree/etc/rc1
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc1,v 1.5 2002/07/01 21:30:39 luigi Exp $
 ### rc1, next stage 'rc' for PicoBSD -- THIS IS NOT THE NORMAL /etc/rc 
 
 . /etc/rc.conf.defaults		# Load default procedures
diff --git a/release/picobsd/mfs_tree/etc/disktab b/release/picobsd/mfs_tree/etc/disktab
index f5b00975e20b..a83ba852bafa 100644
--- a/release/picobsd/mfs_tree/etc/disktab
+++ b/release/picobsd/mfs_tree/etc/disktab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/disktab,v 1.2 2001/04/24 07:46:27 joe Exp $
 # Floppy formats:
 #
 # To make a filesystem on a floppy:
diff --git a/release/picobsd/mfs_tree/etc/gettytab b/release/picobsd/mfs_tree/etc/gettytab
index 09173321819f..84ea3033ad49 100644
--- a/release/picobsd/mfs_tree/etc/gettytab
+++ b/release/picobsd/mfs_tree/etc/gettytab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/gettytab,v 1.2 2001/04/24 07:46:27 joe Exp $
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 default:\
diff --git a/release/picobsd/mfs_tree/etc/login.conf b/release/picobsd/mfs_tree/etc/login.conf
index 4337b1fb7481..ffd4a6e26dfa 100644
--- a/release/picobsd/mfs_tree/etc/login.conf
+++ b/release/picobsd/mfs_tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/login.conf,v 1.2 2001/04/24 07:46:27 joe Exp $
 #
 
 
diff --git a/release/picobsd/mfs_tree/etc/protocols b/release/picobsd/mfs_tree/etc/protocols
index 0ef23af6cb38..1d7bcb9d61a3 100644
--- a/release/picobsd/mfs_tree/etc/protocols
+++ b/release/picobsd/mfs_tree/etc/protocols
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/protocols,v 1.3 2002/03/24 21:13:53 luigi Exp $
 # Internet (IP) protocols
 ip	0	IP		# internet protocol, pseudo protocol number
 icmp	1	ICMP		# internet control message protocol
diff --git a/release/picobsd/mfs_tree/etc/rc b/release/picobsd/mfs_tree/etc/rc
index 30137187d576..9e3fa06fcab3 100644
--- a/release/picobsd/mfs_tree/etc/rc
+++ b/release/picobsd/mfs_tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/rc,v 1.9 2002/11/17 20:19:34 luigi Exp $
 
 stty status '^T'
 trap : 2
diff --git a/release/picobsd/mfs_tree/etc/rc.network b/release/picobsd/mfs_tree/etc/rc.network
index 3cd6d5dcdb5b..8a608846f9ab 100644
--- a/release/picobsd/mfs_tree/etc/rc.network
+++ b/release/picobsd/mfs_tree/etc/rc.network
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/rc.network,v 1.5 2002/05/11 06:06:11 dd Exp $
 
 network_pass1() {
     echo -n 'Doing initial network setup:'
diff --git a/release/picobsd/mfs_tree/etc/rc.serial b/release/picobsd/mfs_tree/etc/rc.serial
index 40fbd8a334cc..195f22dc9449 100644
--- a/release/picobsd/mfs_tree/etc/rc.serial
+++ b/release/picobsd/mfs_tree/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/rc.serial,v 1.2 2001/04/24 07:46:27 joe Exp $
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/release/picobsd/mfs_tree/etc/remote b/release/picobsd/mfs_tree/etc/remote
index f881f6b420a5..bea0ddd1e684 100644
--- a/release/picobsd/mfs_tree/etc/remote
+++ b/release/picobsd/mfs_tree/etc/remote
@@ -1,5 +1,5 @@
 #	@(#)remote	5.2 (Berkeley) 6/30/90
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/remote,v 1.3 2004/11/19 03:45:30 obrien Exp $
 # remote -- remote host description file
 # see tip(1), remote(5)
 #
diff --git a/release/picobsd/mfs_tree/etc/shells b/release/picobsd/mfs_tree/etc/shells
index cd386f6321c2..58e5aac9ff9f 100644
--- a/release/picobsd/mfs_tree/etc/shells
+++ b/release/picobsd/mfs_tree/etc/shells
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/shells,v 1.2 2001/04/24 07:46:27 joe Exp $
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
 # one of these shells.
diff --git a/release/picobsd/mfs_tree/etc/termcap b/release/picobsd/mfs_tree/etc/termcap
index 5b8f9498cec4..58889c625f1b 100644
--- a/release/picobsd/mfs_tree/etc/termcap
+++ b/release/picobsd/mfs_tree/etc/termcap
@@ -2,7 +2,7 @@
 # All rights reserved.
 #	@(#)termcap.src	5.88 (Berkeley) 4/30/91
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/termcap,v 1.6 2002/07/14 14:17:28 luigi Exp $
 #
 # for syscons
 # common entry without semigraphics
diff --git a/release/picobsd/mfs_tree/stand/update b/release/picobsd/mfs_tree/stand/update
index 072493a12f89..5577b15162ce 100755
--- a/release/picobsd/mfs_tree/stand/update
+++ b/release/picobsd/mfs_tree/stand/update
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/stand/update,v 1.5 2002/03/11 05:15:44 luigi Exp $
 # script to edit and save some config file(s).
 # If called with no arguments, it edits 3 files in /etc
 thefiles=$*
diff --git a/release/picobsd/tinyware/aps/Makefile b/release/picobsd/tinyware/aps/Makefile
index f2b481a11f54..0aa6b9daa56a 100644
--- a/release/picobsd/tinyware/aps/Makefile
+++ b/release/picobsd/tinyware/aps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/aps/Makefile,v 1.4 2004/12/21 08:47:05 ru Exp $
 #
 PROG=ps
 SRCS+=main.c
diff --git a/release/picobsd/tinyware/aps/README b/release/picobsd/tinyware/aps/README
index f455c7bae307..8f1c4f0e176e 100644
--- a/release/picobsd/tinyware/aps/README
+++ b/release/picobsd/tinyware/aps/README
@@ -16,4 +16,4 @@ more general (and less complicated) sysctl(3).
 (As of 1998.07.31 this program is no longer used in PicoBSD. See sps(1) in
 TinyWare collection).
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/aps/README,v 1.3 1999/08/28 01:33:52 peter Exp $
diff --git a/release/picobsd/tinyware/aps/main.c b/release/picobsd/tinyware/aps/main.c
index eece247af3bd..0132d6c69b55 100644
--- a/release/picobsd/tinyware/aps/main.c
+++ b/release/picobsd/tinyware/aps/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/aps/main.c,v 1.2 1999/08/28 01:33:52 peter Exp $
  *
  */
 
diff --git a/release/picobsd/tinyware/help/Makefile b/release/picobsd/tinyware/help/Makefile
index f7a90e8de490..6fc1b22b7c00 100644
--- a/release/picobsd/tinyware/help/Makefile
+++ b/release/picobsd/tinyware/help/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/help/Makefile,v 1.4 2004/12/21 08:47:05 ru Exp $
 #
 PROG=help
 SRCS+=help.c
diff --git a/release/picobsd/tinyware/help/README b/release/picobsd/tinyware/help/README
index 9c9900feba3f..1f2c2482cb66 100644
--- a/release/picobsd/tinyware/help/README
+++ b/release/picobsd/tinyware/help/README
@@ -5,4 +5,4 @@ and these files are just the beginning of it...
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/help/README,v 1.3 1999/08/28 01:33:53 peter Exp $
diff --git a/release/picobsd/tinyware/help/help.c b/release/picobsd/tinyware/help/help.c
index b57b4f6f1557..5b771cdf15ac 100644
--- a/release/picobsd/tinyware/help/help.c
+++ b/release/picobsd/tinyware/help/help.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/help/help.c,v 1.5 1999/08/28 01:33:54 peter Exp $
  */
 
 
diff --git a/release/picobsd/tinyware/login/Makefile b/release/picobsd/tinyware/login/Makefile
index 1f622f66c4df..a53791699281 100644
--- a/release/picobsd/tinyware/login/Makefile
+++ b/release/picobsd/tinyware/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.4 2004/12/21 12:49:24 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../usr.bin/login
 
diff --git a/release/picobsd/tinyware/login/README b/release/picobsd/tinyware/login/README
index 4dba3344e6da..ca2ee67c07f2 100644
--- a/release/picobsd/tinyware/login/README
+++ b/release/picobsd/tinyware/login/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/login/README,v 1.1 2001/10/01 16:58:28 luigi Exp $
 
 This is a modified login version for PicoBSD purposes, which does
 not demand PAM.
diff --git a/release/picobsd/tinyware/login/pathnames.h b/release/picobsd/tinyware/login/pathnames.h
index 333c2ca280fa..cf21ed3ea031 100644
--- a/release/picobsd/tinyware/login/pathnames.h
+++ b/release/picobsd/tinyware/login/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/9/93
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/login/pathnames.h,v 1.1 2001/10/01 16:58:28 luigi Exp $
  */
 
 #include <paths.h>
diff --git a/release/picobsd/tinyware/login/pico-login.c b/release/picobsd/tinyware/login/pico-login.c
index 2f333a439188..e7cc197ec121 100644
--- a/release/picobsd/tinyware/login/pico-login.c
+++ b/release/picobsd/tinyware/login/pico-login.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/release/picobsd/tinyware/login/pico-login.c,v 1.6 2005/05/13 16:31:10 ume Exp $";
 #endif /* not lint */
 
 /*
diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile
index db07e7808b4c..739fb099f0ba 100644
--- a/release/picobsd/tinyware/msg/Makefile
+++ b/release/picobsd/tinyware/msg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/msg/Makefile,v 1.4 2004/12/21 08:47:05 ru Exp $
 #
 PROG=msg
 SRCS= 	msg.c
diff --git a/release/picobsd/tinyware/msg/README b/release/picobsd/tinyware/msg/README
index d26e38326a9e..f8832f004c59 100644
--- a/release/picobsd/tinyware/msg/README
+++ b/release/picobsd/tinyware/msg/README
@@ -12,4 +12,4 @@ kernel tree, contact me directly - the patches are very small and simple.
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/msg/README,v 1.3 1999/08/28 01:33:55 peter Exp $
diff --git a/release/picobsd/tinyware/msg/msg.c b/release/picobsd/tinyware/msg/msg.c
index c9f87efbbb6a..11d8148c894c 100644
--- a/release/picobsd/tinyware/msg/msg.c
+++ b/release/picobsd/tinyware/msg/msg.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/msg/msg.c,v 1.3 2001/07/03 19:51:53 tmm Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/msh/Makefile b/release/picobsd/tinyware/msh/Makefile
index e1a1b541ca35..3589f736f34e 100644
--- a/release/picobsd/tinyware/msh/Makefile
+++ b/release/picobsd/tinyware/msh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/msh/Makefile,v 1.3 2001/02/10 22:57:33 abial Exp $
 #
 PROG=msh
 SRCS= sh1.c sh2.c sh3.c sh4.c sh5.c sh6.c
diff --git a/release/picobsd/tinyware/ns/Makefile b/release/picobsd/tinyware/ns/Makefile
index 46f5e2413c6d..710ae4bd6edf 100644
--- a/release/picobsd/tinyware/ns/Makefile
+++ b/release/picobsd/tinyware/ns/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/ns/Makefile,v 1.10 2004/12/21 08:47:05 ru Exp $
 
 PROG=	ns
 SRCS=	ns.c
diff --git a/release/picobsd/tinyware/ns/README b/release/picobsd/tinyware/ns/README
index 8d5f50358415..77bafe7ae3e6 100644
--- a/release/picobsd/tinyware/ns/README
+++ b/release/picobsd/tinyware/ns/README
@@ -40,4 +40,4 @@ Bugs
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/ns/README,v 1.5 2001/07/23 12:05:23 kris Exp $
diff --git a/release/picobsd/tinyware/ns/ns.c b/release/picobsd/tinyware/ns/ns.c
index 777a7bed195f..db499595609a 100644
--- a/release/picobsd/tinyware/ns/ns.c
+++ b/release/picobsd/tinyware/ns/ns.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/ns/ns.c,v 1.16 2002/03/27 20:10:53 abial Exp $
  */
 
 
diff --git a/release/picobsd/tinyware/oinit/Makefile b/release/picobsd/tinyware/oinit/Makefile
index c5fc1f3f0e61..5b527f6a6127 100644
--- a/release/picobsd/tinyware/oinit/Makefile
+++ b/release/picobsd/tinyware/oinit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/oinit/Makefile,v 1.5 2004/12/21 08:47:06 ru Exp $
 #
 PROG=		oinit
 
diff --git a/release/picobsd/tinyware/oinit/README b/release/picobsd/tinyware/oinit/README
index e34c404f4a8d..ff7e89186141 100644
--- a/release/picobsd/tinyware/oinit/README
+++ b/release/picobsd/tinyware/oinit/README
@@ -120,4 +120,4 @@ The overall framework was taken from FreeBSD /sbin/init.
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/oinit/README,v 1.3 1999/08/28 01:33:58 peter Exp $
diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c
index b02434a7132b..5e4b68bdb425 100644
--- a/release/picobsd/tinyware/oinit/oinit.c
+++ b/release/picobsd/tinyware/oinit/oinit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/oinit/oinit.c,v 1.7 2002/10/10 00:25:33 alfred Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/passwd/Makefile b/release/picobsd/tinyware/passwd/Makefile
index 5f6b8c45bd15..214282c99e22 100644
--- a/release/picobsd/tinyware/passwd/Makefile
+++ b/release/picobsd/tinyware/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/passwd/Makefile,v 1.4 2004/12/21 12:49:24 ru Exp $
 
 # Only NO_PAM is used by PicoBSD and supported here
 
diff --git a/release/picobsd/tinyware/passwd/extern.h b/release/picobsd/tinyware/passwd/extern.h
index eae768c6e82a..4dda6a5b887f 100644
--- a/release/picobsd/tinyware/passwd/extern.h
+++ b/release/picobsd/tinyware/passwd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/passwd/extern.h,v 1.1 2002/06/20 21:17:33 luigi Exp $
  */
 
 int	krb_passwd(char *, char *, char *, char *);
diff --git a/release/picobsd/tinyware/passwd/local_passwd.c b/release/picobsd/tinyware/passwd/local_passwd.c
index 6bbf24d3c47b..6154e9c06b5c 100644
--- a/release/picobsd/tinyware/passwd/local_passwd.c
+++ b/release/picobsd/tinyware/passwd/local_passwd.c
@@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)local_passwd.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/release/picobsd/tinyware/passwd/local_passwd.c,v 1.1 2002/06/20 21:17:33 luigi Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/release/picobsd/tinyware/passwd/passwd.c b/release/picobsd/tinyware/passwd/passwd.c
index d24165037a5a..a1690467f54b 100644
--- a/release/picobsd/tinyware/passwd/passwd.c
+++ b/release/picobsd/tinyware/passwd/passwd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)passwd.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/release/picobsd/tinyware/passwd/passwd.c,v 1.1 2002/05/05 20:43:27 luigi Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/passwd/pw_copy.c b/release/picobsd/tinyware/passwd/pw_copy.c
index ba3c8865dde7..fe9d4f1a855a 100644
--- a/release/picobsd/tinyware/passwd/pw_copy.c
+++ b/release/picobsd/tinyware/passwd/pw_copy.c
@@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pw_copy.c	8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/release/picobsd/tinyware/passwd/pw_copy.c,v 1.3 2004/02/10 20:42:33 cperciva Exp $");
 
 /*
  * This module is used to copy the master password file, replacing a single
diff --git a/release/picobsd/tinyware/passwd/pw_util.c b/release/picobsd/tinyware/passwd/pw_util.c
index 1c163d2d57ed..5d71bd281155 100644
--- a/release/picobsd/tinyware/passwd/pw_util.c
+++ b/release/picobsd/tinyware/passwd/pw_util.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/release/picobsd/tinyware/passwd/pw_util.c,v 1.1 2002/06/20 21:17:33 luigi Exp $";
 #endif /* not lint */
 
 /*
diff --git a/release/picobsd/tinyware/passwd/pw_util.h b/release/picobsd/tinyware/passwd/pw_util.h
index 1000a9abdc7f..622f7270ac81 100644
--- a/release/picobsd/tinyware/passwd/pw_util.h
+++ b/release/picobsd/tinyware/passwd/pw_util.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pw_util.h	8.2 (Berkeley) 4/1/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/passwd/pw_util.h,v 1.1 2002/06/20 21:17:33 luigi Exp $
  */
 
 void	pw_edit(int);
diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile
index cb4b149e5470..5595020a9492 100644
--- a/release/picobsd/tinyware/simple_httpd/Makefile
+++ b/release/picobsd/tinyware/simple_httpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/simple_httpd/Makefile,v 1.8 2004/12/21 08:47:06 ru Exp $
 #
 PROG=simple_httpd
 SRCS= 	simple_httpd.c
diff --git a/release/picobsd/tinyware/simple_httpd/README b/release/picobsd/tinyware/simple_httpd/README
index 6961954615d4..6b7fc1d85e33 100644
--- a/release/picobsd/tinyware/simple_httpd/README
+++ b/release/picobsd/tinyware/simple_httpd/README
@@ -164,4 +164,4 @@ This program was originally contributed by Marc Nicholas <marc@netstor.com>
 
 Major rewrite by William Lloyd <wlloyd@slap.net>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/simple_httpd/README,v 1.6 1999/08/28 01:33:59 peter Exp $
diff --git a/release/picobsd/tinyware/simple_httpd/simple_httpd.c b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
index ab35b55ae04c..fa5492953a47 100644
--- a/release/picobsd/tinyware/simple_httpd/simple_httpd.c
+++ b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/simple_httpd/simple_httpd.c,v 1.16 2004/08/16 09:38:34 dwmalone Exp $
  */
 
 #include <sys/stat.h>
diff --git a/release/picobsd/tinyware/sps/Makefile b/release/picobsd/tinyware/sps/Makefile
index 348ea32b5140..551c2234e065 100644
--- a/release/picobsd/tinyware/sps/Makefile
+++ b/release/picobsd/tinyware/sps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/sps/Makefile,v 1.4 2004/12/21 08:47:06 ru Exp $
 #
 PROG=sps
 SRCS= 	sps.c
diff --git a/release/picobsd/tinyware/sps/README b/release/picobsd/tinyware/sps/README
index 2357113bf2ca..b227dd0b10af 100644
--- a/release/picobsd/tinyware/sps/README
+++ b/release/picobsd/tinyware/sps/README
@@ -8,4 +8,4 @@ When I have some time, I'll add usual switches and other functions that normal
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/sps/README,v 1.4 2000/11/11 16:12:38 abial Exp $
diff --git a/release/picobsd/tinyware/sps/sps.c b/release/picobsd/tinyware/sps/sps.c
index f79d01983b9f..7abaef212aed 100644
--- a/release/picobsd/tinyware/sps/sps.c
+++ b/release/picobsd/tinyware/sps/sps.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/sps/sps.c,v 1.6 2002/03/11 08:03:50 luigi Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/view/Makefile b/release/picobsd/tinyware/view/Makefile
index e49baa191adc..553a2b3e5b29 100644
--- a/release/picobsd/tinyware/view/Makefile
+++ b/release/picobsd/tinyware/view/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/view/Makefile,v 1.5 2004/12/21 08:47:06 ru Exp $
 
 PROG=view
 SRCS=view.c
diff --git a/release/picobsd/tinyware/view/README b/release/picobsd/tinyware/view/README
index df5f774a95f6..20add44d15f9 100644
--- a/release/picobsd/tinyware/view/README
+++ b/release/picobsd/tinyware/view/README
@@ -83,4 +83,4 @@ Andrzej Bialecki
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/view/README,v 1.3 1999/08/28 01:34:02 peter Exp $
diff --git a/release/picobsd/tinyware/view/view.c b/release/picobsd/tinyware/view/view.c
index 2727ebe24426..29f39a6aa051 100644
--- a/release/picobsd/tinyware/view/view.c
+++ b/release/picobsd/tinyware/view/view.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/view/view.c,v 1.7 2002/10/10 00:25:33 alfred Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/vm/Makefile b/release/picobsd/tinyware/vm/Makefile
index b1d662913d41..28867a8bf0e0 100644
--- a/release/picobsd/tinyware/vm/Makefile
+++ b/release/picobsd/tinyware/vm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/vm/Makefile,v 1.4 2004/12/21 08:47:06 ru Exp $
 #
 PROG=vm
 #CFLAGS+=
diff --git a/release/picobsd/tinyware/vm/README b/release/picobsd/tinyware/vm/README
index c4a940c629e8..ef4a18eb73cc 100644
--- a/release/picobsd/tinyware/vm/README
+++ b/release/picobsd/tinyware/vm/README
@@ -7,4 +7,4 @@ consequently it is not displayed in stock version of sysctl(8).
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/vm/README,v 1.3 1999/08/28 01:34:03 peter Exp $
diff --git a/release/picobsd/tinyware/vm/vm.c b/release/picobsd/tinyware/vm/vm.c
index 695f2afb5766..4b4cffdcf2a6 100644
--- a/release/picobsd/tinyware/vm/vm.c
+++ b/release/picobsd/tinyware/vm/vm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/vm/vm.c,v 1.8 2001/10/25 01:29:21 luigi Exp $
  */
 
 #include <stdio.h>
diff --git a/release/powerpc/boot.tbxi b/release/powerpc/boot.tbxi
index 70897866bec8..59613d34ec5f 100644
--- a/release/powerpc/boot.tbxi
+++ b/release/powerpc/boot.tbxi
@@ -1,6 +1,6 @@
 <CHRP-BOOT>
 <LICENSE>
-$FreeBSD$
+$FreeBSD: src/release/powerpc/boot.tbxi,v 1.1 2004/08/18 11:08:18 grehan Exp $
 </LICENSE>
 <COMPATIBLE>
 MacRISC MacRISC3 MacRISC4
diff --git a/release/powerpc/boot_crunch.conf b/release/powerpc/boot_crunch.conf
index fa65cf9f65c6..aa0dca81e655 100644
--- a/release/powerpc/boot_crunch.conf
+++ b/release/powerpc/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.3 2004/10/01 07:54:37 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/powerpc/hfs.map b/release/powerpc/hfs.map
index 7048d0a991d4..5396b8b60380 100644
--- a/release/powerpc/hfs.map
+++ b/release/powerpc/hfs.map
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/release/powerpc/hfs.map,v 1.1 2004/08/18 11:08:19 grehan Exp $
 .tbxi   -     'chrp'  'tbxi'  "bootstrap"
 *       -     'fbsd'  'TEXT'  "FreeBSD file"
diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh
index 31e69971f3a5..61281a308c82 100644
--- a/release/powerpc/mkisoimages.sh
+++ b/release/powerpc/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/powerpc/mkisoimages.sh,v 1.1 2004/08/18 11:08:19 grehan Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/scripts/base-install.sh b/release/scripts/base-install.sh
index c87a38bf86a9..c7e31ad38afa 100755
--- a/release/scripts/base-install.sh
+++ b/release/scripts/base-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/base-install.sh,v 1.6 2002/04/30 09:57:21 ru Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/catpages-install.sh b/release/scripts/catpages-install.sh
index 2e618ca76eeb..bd41425c166c 100755
--- a/release/scripts/catpages-install.sh
+++ b/release/scripts/catpages-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/catpages-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/catpages-make.sh b/release/scripts/catpages-make.sh
index 755057d40ccb..d9d3c3048160 100755
--- a/release/scripts/catpages-make.sh
+++ b/release/scripts/catpages-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/catpages-make.sh,v 1.7 2002/05/25 17:31:27 ru Exp $
 #
 
 # Move all the catpages out to their own dist, using the base dist as a
diff --git a/release/scripts/checkindex.pl b/release/scripts/checkindex.pl
index 44612dcbee5c..55a837fbda21 100644
--- a/release/scripts/checkindex.pl
+++ b/release/scripts/checkindex.pl
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------
 # 08 Apr 2000
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/checkindex.pl,v 1.1 2003/03/03 09:42:47 murray Exp $
 #
 
 use Getopt::Long;
diff --git a/release/scripts/chkINDEX b/release/scripts/chkINDEX
index d2b9e0eed8b7..4db2b4cba2ca 100755
--- a/release/scripts/chkINDEX
+++ b/release/scripts/chkINDEX
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/chkINDEX,v 1.3 2002/12/08 18:31:03 murray Exp $
 
 usage()
 {
diff --git a/release/scripts/commerce-install.sh b/release/scripts/commerce-install.sh
index 9bf67a338b44..9089a4e4400e 100755
--- a/release/scripts/commerce-install.sh
+++ b/release/scripts/commerce-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/commerce-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/dict-install.sh b/release/scripts/dict-install.sh
index 4f57aaa11ec9..5a4c5a152a01 100755
--- a/release/scripts/dict-install.sh
+++ b/release/scripts/dict-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/dict-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/dict-make.sh b/release/scripts/dict-make.sh
index c0ca6a5880ed..4ff2f47db970 100755
--- a/release/scripts/dict-make.sh
+++ b/release/scripts/dict-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/dict-make.sh,v 1.10 2002/04/26 07:40:08 ru Exp $
 #
 
 # Move the dict stuff out to its own dist
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh
index cb8cb9293193..7f72a85d32b1 100644
--- a/release/scripts/doFS.sh
+++ b/release/scripts/doFS.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/doFS.sh,v 1.60 2004/08/25 01:39:52 kensmith Exp $
 #
 
 set -ex
diff --git a/release/scripts/doc-install.sh b/release/scripts/doc-install.sh
index 5609720ada37..dfbff0eaffe7 100755
--- a/release/scripts/doc-install.sh
+++ b/release/scripts/doc-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/doc-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/doc-make.sh b/release/scripts/doc-make.sh
index 033554007abe..0f3d773bb920 100755
--- a/release/scripts/doc-make.sh
+++ b/release/scripts/doc-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/doc-make.sh,v 1.3 2002/04/23 22:16:40 obrien Exp $
 #
 
 # Create the doc dist.
diff --git a/release/scripts/games-install.sh b/release/scripts/games-install.sh
index 6c940776b55e..cf8564d651a2 100755
--- a/release/scripts/games-install.sh
+++ b/release/scripts/games-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/games-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/games-make.sh b/release/scripts/games-make.sh
index 6e83d1474737..29eb462c8c54 100755
--- a/release/scripts/games-make.sh
+++ b/release/scripts/games-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/games-make.sh,v 1.5 2002/04/23 22:16:40 obrien Exp $
 #
 
 # Move all the games out to their own dist
diff --git a/release/scripts/info-install.sh b/release/scripts/info-install.sh
index 30c12bf23850..e5ba91ea53b6 100755
--- a/release/scripts/info-install.sh
+++ b/release/scripts/info-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/info-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/info-make.sh b/release/scripts/info-make.sh
index 12fd29d93873..ac1284e0c71e 100755
--- a/release/scripts/info-make.sh
+++ b/release/scripts/info-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/info-make.sh,v 1.4 2002/04/23 22:16:40 obrien Exp $
 #
 
 # Move the info files out to their own dist
diff --git a/release/scripts/info.sh b/release/scripts/info.sh
index e25ceb73dbe9..8ba12b603ada 100644
--- a/release/scripts/info.sh
+++ b/release/scripts/info.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $ANA: info.sh,v 1.3 1996/06/04 16:25:30 wollman Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/info.sh,v 1.5 2001/04/08 23:09:21 obrien Exp $
 #
 
 ls $1.[a-z][a-z] | wc | awk '{ print "Pieces = ",$1 }'
diff --git a/release/scripts/lib32-make.sh b/release/scripts/lib32-make.sh
index 37e16d4c719a..ffbcbfac0c12 100644
--- a/release/scripts/lib32-make.sh
+++ b/release/scripts/lib32-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/lib32-make.sh,v 1.1 2005/06/16 18:16:13 ru Exp $
 #
 
 # Clean the dust.
diff --git a/release/scripts/manpages-install.sh b/release/scripts/manpages-install.sh
index 35eb4b7a17ca..0ef9cbd6271a 100755
--- a/release/scripts/manpages-install.sh
+++ b/release/scripts/manpages-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/manpages-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/manpages-make.sh b/release/scripts/manpages-make.sh
index bb1326f3d506..bc3b018d39de 100755
--- a/release/scripts/manpages-make.sh
+++ b/release/scripts/manpages-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/manpages-make.sh,v 1.5 2002/05/25 17:31:27 ru Exp $
 #
 
 # Move all the manpages out to their own dist, using the base dist as a
diff --git a/release/scripts/mkpkghier b/release/scripts/mkpkghier
index c14b62868018..60507ee74c8c 100755
--- a/release/scripts/mkpkghier
+++ b/release/scripts/mkpkghier
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/mkpkghier,v 1.2 2002/12/08 18:31:03 murray Exp $
 
 usage()
 {
diff --git a/release/scripts/mkpkgindex.sh b/release/scripts/mkpkgindex.sh
index b70a258257df..fb6b36c083e2 100644
--- a/release/scripts/mkpkgindex.sh
+++ b/release/scripts/mkpkgindex.sh
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/mkpkgindex.sh,v 1.2 2004/01/02 22:58:29 obrien Exp $
 
 # Creates an INDEX file suitable for an ISO distribution image from a master
 # INDEX file.  The generated INDEX file contains only the packages in the
diff --git a/release/scripts/package-split.py b/release/scripts/package-split.py
index 61dbc39c7c5e..69b5854218af 100644
--- a/release/scripts/package-split.py
+++ b/release/scripts/package-split.py
@@ -7,7 +7,7 @@
 #
 # Usage: package-split.py <INDEX> <master INDEX>
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/package-split.py,v 1.6.4.1 2005/11/03 00:35:25 kensmith Exp $
 
 import os
 import sys
diff --git a/release/scripts/package-trees.sh b/release/scripts/package-trees.sh
index f054a5ea7ddf..f70198616411 100644
--- a/release/scripts/package-trees.sh
+++ b/release/scripts/package-trees.sh
@@ -7,7 +7,7 @@
 #
 # Usage: package-tress.sh <copy method> <INDEX> <package tree> <destination>
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/package-trees.sh,v 1.2 2005/05/03 04:19:07 marcel Exp $
 
 # Verify the command line
 if [ $# -ne 4 ]; then
diff --git a/release/scripts/ports-install.sh b/release/scripts/ports-install.sh
index 81c4023c77ee..57ddaac34ac7 100755
--- a/release/scripts/ports-install.sh
+++ b/release/scripts/ports-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/ports-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/proflibs-install.sh b/release/scripts/proflibs-install.sh
index 5dd2b4239938..b6f2c7111cd4 100755
--- a/release/scripts/proflibs-install.sh
+++ b/release/scripts/proflibs-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/proflibs-install.sh,v 1.4 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/proflibs-make.sh b/release/scripts/proflibs-make.sh
index 5ff447ac9068..a7c47671b21f 100755
--- a/release/scripts/proflibs-make.sh
+++ b/release/scripts/proflibs-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/proflibs-make.sh,v 1.8 2004/01/18 09:06:40 ru Exp $
 #
 
 # Move the profiled libraries out to their own dist
diff --git a/release/scripts/split-file.sh b/release/scripts/split-file.sh
index 40b8eaa044e4..27308058121c 100755
--- a/release/scripts/split-file.sh
+++ b/release/scripts/split-file.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/split-file.sh,v 1.2 2004/08/26 19:15:20 ru Exp $
 #
 
 # Bail if things fail and be verbose about what we are doing
diff --git a/release/scripts/src-install.sh b/release/scripts/src-install.sh
index be0f1dacd10c..1481561ed67b 100755
--- a/release/scripts/src-install.sh
+++ b/release/scripts/src-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/src-install.sh,v 1.10 2004/08/06 08:42:05 cperciva Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/tar.sh b/release/scripts/tar.sh
index e0933f29d778..9e3310782b75 100644
--- a/release/scripts/tar.sh
+++ b/release/scripts/tar.sh
@@ -25,7 +25,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/release/scripts/tar.sh,v 1.7 2001/04/08 23:09:21 obrien Exp $
 #
 
 #
diff --git a/release/scripts/xperimnt-install.sh b/release/scripts/xperimnt-install.sh
index 394265892f2c..f153c4fd57ba 100755
--- a/release/scripts/xperimnt-install.sh
+++ b/release/scripts/xperimnt-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/xperimnt-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/sparc64/boot_crunch.conf b/release/sparc64/boot_crunch.conf
index c5c68cb090be..2e43c0a4e857 100644
--- a/release/sparc64/boot_crunch.conf
+++ b/release/sparc64/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.7 2004/10/01 07:54:37 ru Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/sparc64/mkisoimages.sh b/release/sparc64/mkisoimages.sh
index b101306d9a92..abf05e4bd38b 100644
--- a/release/sparc64/mkisoimages.sh
+++ b/release/sparc64/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.9 2005/01/30 21:10:52 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/texts/README b/release/texts/README
index 70986f8a409d..4ef07ddf9c28 100644
--- a/release/texts/README
+++ b/release/texts/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/release/texts/README,v 1.3 2002/03/06 07:59:18 bmah Exp $
 
 The release notes and other documentation files formerly in this
 directory are now rendered from SGML as part of the release build.
diff --git a/rescue/Makefile b/rescue/Makefile
index 0945ed35a6ab..302ff938b3b6 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/rescue/Makefile,v 1.1 2003/06/29 18:35:36 gordon Exp $
 
 SUBDIR=	librescue \
 	rescue
diff --git a/rescue/README b/rescue/README
index 3a8cb463fe5e..be420b6b1c73 100644
--- a/rescue/README
+++ b/rescue/README
@@ -41,4 +41,4 @@ To compile:
 Note that rebuilds don't always work correctly; if you run into
 trouble, try 'make clean' before recompiling.
 
-$FreeBSD$
+$FreeBSD: src/rescue/README,v 1.1 2003/06/29 18:35:36 gordon Exp $
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile
index f73984cd83a0..75cc2102721c 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/rescue/librescue/Makefile,v 1.6 2004/11/13 20:40:29 bz Exp $
 #
 
 # Certain library entries have hard-coded references to
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index a601be2ad7e9..87c640fea43c 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.45 2005/06/07 04:51:24 brooks Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	rescue
diff --git a/sbin/Makefile b/sbin/Makefile
index 596da4df491a..085683d6e36b 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.156 2005/06/21 13:02:45 dumbbell Exp $
 
 # XXX MISSING:		icheck ncheck
 
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index d1fed2690a19..9ce2641295e8 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.14 2004/12/21 09:59:42 ru Exp $
 
 BINDIR?=	/sbin
 WARNS?=	2
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index 27c128916f9b..cd38438b55d6 100644
--- a/sbin/adjkerntz/Makefile
+++ b/sbin/adjkerntz/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/adjkerntz/Makefile,v 1.6 2001/12/04 02:19:43 obrien Exp $
 
 PROG=   adjkerntz
 MAN=	adjkerntz.8
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 5591f2e10b76..3dcfcaa7929e 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 2005/02/13 22:25:15 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index bf390107ea95..5afeb1e10dbc 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.29 2004/04/27 14:43:03 ghelmer Exp $");
 
 /*
  * Andrey A. Chernov   <ache@astral.msk.su>    Dec 20 1993
diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 73b916080d42..6cf21e7317ba 100644
--- a/sbin/atacontrol/Makefile
+++ b/sbin/atacontrol/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sbin/atacontrol/Makefile,v 1.8 2003/11/05 19:20:41 johan Exp $
 
 PROG=	atacontrol
 MAN=	atacontrol.8
diff --git a/sbin/atacontrol/atacontrol.8 b/sbin/atacontrol/atacontrol.8
index 8cc5aa837d6d..1df73453d91e 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.26.2.1 2005/08/19 15:54:42 brueffer Exp $
 .\"
 .Dd August 16, 2005
 .Dt ATACONTROL 8
diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c
index 20698cd0cd77..de0c6d8fccef 100644
--- a/sbin/atacontrol/atacontrol.c
+++ b/sbin/atacontrol/atacontrol.c
@@ -25,7 +25,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.36.2.1 2005/08/07 11:16:58 sos Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index ed7ca1a849a7..76d5a00fa59a 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.5 2003/08/18 15:32:16 obrien Exp $
 
 SUBDIR=	atm \
 	atmconfig \
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index 3d5738afdbc4..29cdbeba00cb 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 2003/08/18 15:32:16 obrien Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index 973e5cce4cd4..592ae9bc27d0 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/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/atm/Makefile,v 1.12 2004/05/14 13:31:20 cognet Exp $
 
 PROG=	atm
 SRCS=	atm.c atm_fore200.c atm_inet.c atm_print.c \
diff --git a/sbin/atm/atm/atm.8 b/sbin/atm/atm/atm.8
index 25c4b75d1718..d1b6afa6245f 100644
--- a/sbin/atm/atm/atm.8
+++ b/sbin/atm/atm/atm.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/atm/atm.8,v 1.6 2003/07/28 15:27:12 harti Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/atm/atm.c b/sbin/atm/atm/atm.c
index 94cde38582d7..f6999274a520 100644
--- a/sbin/atm/atm/atm.c
+++ b/sbin/atm/atm/atm.c
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.10 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h
index 09f5c87987cb..9213fa06dcbf 100644
--- a/sbin/atm/atm/atm.h
+++ b/sbin/atm/atm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.9 2005/05/02 10:31:27 delphij Exp $
  *
  */
 
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index d6da01790392..39bf0f58570f 100644
--- a/sbin/atm/atm/atm_fore200.c
+++ b/sbin/atm/atm/atm_fore200.c
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_fore200.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_inet.c b/sbin/atm/atm/atm_inet.c
index 2f916a091bdc..eba21d30d6f3 100644
--- a/sbin/atm/atm/atm_inet.c
+++ b/sbin/atm/atm/atm_inet.c
@@ -53,7 +53,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_inet.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_print.c b/sbin/atm/atm/atm_print.c
index a3f0ce3bfd0e..edae60588913 100644
--- a/sbin/atm/atm/atm_print.c
+++ b/sbin/atm/atm/atm_print.c
@@ -60,7 +60,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_print.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_set.c b/sbin/atm/atm/atm_set.c
index 790bfc179919..78d1368f90b1 100644
--- a/sbin/atm/atm/atm_set.c
+++ b/sbin/atm/atm/atm_set.c
@@ -54,7 +54,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_set.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c
index e744c755fd41..413f13694911 100644
--- a/sbin/atm/atm/atm_show.c
+++ b/sbin/atm/atm/atm_show.c
@@ -53,7 +53,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_show.c,v 1.10 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_subr.c b/sbin/atm/atm/atm_subr.c
index a612beef2066..2ed18f07f2bc 100644
--- a/sbin/atm/atm/atm_subr.c
+++ b/sbin/atm/atm/atm_subr.c
@@ -53,7 +53,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_subr.c,v 1.9 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index 1db0fa46dc00..a300aa82321f 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 2005/03/15 07:38:15 harti Exp $
 
 PROG=	atmconfig
 .ifndef RESCUE
diff --git a/sbin/atm/atmconfig/atm_oid.list b/sbin/atm/atmconfig/atm_oid.list
index ca64afa44267..e1f4efcf3cba 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 2004/08/12 12:31:43 harti Exp $
 begemotAtmIfTable
 begemotAtmIfName
 begemotAtmIfNodeId
diff --git a/sbin/atm/atmconfig/atmconfig.8 b/sbin/atm/atmconfig/atmconfig.8
index 1ff76a100cd8..c17cc8589a70 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 2004/05/17 20:45:21 ru Exp $
 .\"
 .Dd August 11, 2003
 .Dt ATMCONFIG 8
diff --git a/sbin/atm/atmconfig/atmconfig.h b/sbin/atm/atmconfig/atmconfig.h
index 5e5b04172cb0..3d781b7a5531 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 2004/08/12 12:31:43 harti Exp $
  */
 #ifndef _ATMCONFIG_H
 #define	_ATMCONFIG_H
diff --git a/sbin/atm/atmconfig/atmconfig.help b/sbin/atm/atmconfig/atmconfig.help
index 8c6e7cec7f2f..30b79f5cdbfc 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 2004/08/12 12:31:43 harti Exp $
 #
 ^0 intro
 ATM configuration utility.
diff --git a/sbin/atm/atmconfig/atmconfig_device.c b/sbin/atm/atmconfig/atmconfig_device.c
index 082494df95a5..c2e2e6630c7d 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 2004/08/12 12:31:43 harti 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..b2a50da67512 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 2005/05/02 10:31:27 delphij 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..020d0ee6be4c 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 2004/08/12 12:31:43 harti 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 74d39011219c..9e79ab9f120b 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.6 2004/07/28 16:34:42 harti 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..1f3c1cb5e051 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 2004/01/26 12:17:49 harti Exp $
  */
 
 struct diagif {
diff --git a/sbin/atm/atmconfig/main.c b/sbin/atm/atmconfig/main.c
index d2543f7d1f36..c59108f9f0a7 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 2004/08/12 12:31:43 harti 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..b250a9e9f491 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 2004/07/28 16:32:17 harti 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..9243bb890850 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 2004/08/12 12:31:43 harti Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sbin/atm/fore_dnld/COPYRIGHT b/sbin/atm/fore_dnld/COPYRIGHT
index f934d4293724..771e38e69db8 100644
--- a/sbin/atm/fore_dnld/COPYRIGHT
+++ b/sbin/atm/fore_dnld/COPYRIGHT
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sbin/atm/fore_dnld/COPYRIGHT,v 1.1 2000/02/15 13:20:57 phk Exp $
 
 This copyright applies to the microcode image in the file pca200e.c.
 
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index abcec31b2363..f7484775d2dd 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/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/fore_dnld/Makefile,v 1.11 2003/08/18 15:32:16 obrien Exp $
 
 PROG=	fore_dnld
 MAN=	fore_dnld.8
diff --git a/sbin/atm/fore_dnld/fore_dnld.8 b/sbin/atm/fore_dnld/fore_dnld.8
index c7afb78b9fb7..3f7c6fe7ce8a 100644
--- a/sbin/atm/fore_dnld/fore_dnld.8
+++ b/sbin/atm/fore_dnld/fore_dnld.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.10 2005/02/09 18:03:37 ru Exp $
 .\"
 .Dd December 3, 1996
 .Dt FORE_DNLD 8
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index dc52effc9702..d7bfe024a63d 100644
--- a/sbin/atm/fore_dnld/fore_dnld.c
+++ b/sbin/atm/fore_dnld/fore_dnld.c
@@ -62,7 +62,7 @@
 #include <unistd.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.17 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 extern u_char pca200e_microcode_3[];
diff --git a/sbin/atm/fore_dnld/pca200e.c b/sbin/atm/fore_dnld/pca200e.c
index c208a4ddf3a1..4b7b87bca864 100644
--- a/sbin/atm/fore_dnld/pca200e.c
+++ b/sbin/atm/fore_dnld/pca200e.c
@@ -36,7 +36,7 @@
  * This are binary copies of the PCA200E firmware versions 3.0.1 and
  * 4.1.12
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/fore_dnld/pca200e.c,v 1.2 2003/07/31 14:26:07 harti Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index 67d9bab32b9c..3f31368c3ca8 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/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/ilmid/Makefile,v 1.12 2004/05/14 13:31:20 cognet Exp $
 
 PROG=	ilmid
 MAN=	ilmid.8
diff --git a/sbin/atm/ilmid/ilmid.8 b/sbin/atm/ilmid/ilmid.8
index 8ffa9fe12563..e1dbe4063dcd 100644
--- a/sbin/atm/ilmid/ilmid.8
+++ b/sbin/atm/ilmid/ilmid.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.8 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd September 14, 1998
 .Dt ILMID 8
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 4a1e5eca101f..f48a7d545268 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -71,7 +71,7 @@
 #include <ctype.h>
 
 #ifndef	lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.34 2005/05/02 10:31:27 delphij Exp $");
 #endif
 
 
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index a39227716b77..57bdd837b4f5 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 2003/02/22 21:33:42 johan Exp $
 
 PROG=	badsect
 DPADD=	${LIBUFS}
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 293e9589a281..133895c6653e 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 2005/02/13 22:25:15 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 93891714c193..f95af2766eee 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 2005/01/03 19:03:40 rwatson Exp $");
 
 /*
  * badsect
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index 716dab3db69e..3d404ec6ba6d 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.19 2004/01/11 09:11:10 nyan Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index a0bb82ee4e54..f4982d5f9d14 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 2004/04/09 19:58:25 markm Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 28d482e7b1fe..c2bc1afec937 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.60.2.1 2005/09/20 00:34:54 rodrigc Exp $
 .\"
 .Dd March 15, 2003
 .Dt BSDLABEL 8
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 3d12834f6030..73514a5dfb30 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.110 2005/01/07 12:19:57 rse Exp $");
 
 #include <sys/param.h>
 #include <stdint.h>
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index c8a9ef362e54..51887855dee9 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 2004/04/09 19:58:25 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/bsdlabel/runtest.sh b/sbin/bsdlabel/runtest.sh
index 9d561f39ab82..7513dce3512c 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 2003/06/07 09:09:39 phk Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index bf2ba4a864e2..b0856cf878bb 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.16 2004/05/14 13:31:21 cognet Exp $
 
 PROG=	camcontrol
 SRCS=	camcontrol.c util.c
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 3923d5a5a5b0..bd0b3da9213d 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.41 2005/06/14 11:24:55 ru Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index a8447eea2d17..a4cb1726b5b8 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.53 2005/03/26 05:34:54 ken Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index eebbe8553ed5..55b757870fa6 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 2000/08/08 06:24:15 kbyanc Exp $
  */
 
 #ifndef _CAMCONTROL_H
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 3fb9587e206a..b93ce2094398 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 2004/01/22 07:23:35 grehan Exp $");
 
 #include <sys/queue.h>
 #include <sys/types.h>
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 67f4e4f0cd15..57a9b195c530 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 2003/08/05 09:19:07 johan Exp $");
 
 #include <sys/stdint.h>
 #include <sys/types.h>
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index ac7558409ed6..66bbcb0ef7e7 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.10 2003/08/07 19:10:35 johan Exp $
 
 PROG=	ccdconfig
 WARNS?=	6
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 4ba08be643c2..92f140ce553d 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.33.2.2 2005/08/24 15:42:12 keramida Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 5159bfa1ed48..a46d0aa0147b 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.35 2005/02/10 09:19:28 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 538cfeda096d..b762105f8788 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 2003/01/17 14:53:53 phk Exp $
  */
 
 #define _PATH_CCDCONF		"/etc/ccd.conf"
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index c68c312f269b..e89723640f7f 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 2001/12/04 02:19:44 obrien Exp $
 
 PROG=	clri
 MAN=	clri.8
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index c3c37960cbb2..60c57d61f36c 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 2004/04/09 19:58:26 markm Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index dc77a41c66d5..73342692f940 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 2005/05/29 16:07:10 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index a7720d81b41e..ca636f9d70ce 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 2003/08/08 19:51:01 johan Exp $
 
 PROG=	comcontrol
 MAN=	comcontrol.8
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 87a7630582e3..2b89167cbe15 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 2005/01/18 10:09:31 ru Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 753ded36d1a9..a974a064003d 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 2003/08/08 19:51:01 johan Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile
index ddd2434e6cc5..609206b5a594 100644
--- a/sbin/conscontrol/Makefile
+++ b/sbin/conscontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/conscontrol/Makefile,v 1.5 2001/12/04 02:19:44 obrien Exp $
 
 PROG=	conscontrol
 MAN=	conscontrol.8
diff --git a/sbin/conscontrol/conscontrol.8 b/sbin/conscontrol/conscontrol.8
index 726041e4087b..d2db6bd2b5c7 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 2005/02/10 09:19:28 ru Exp $
 .\"
 .Dd October 23, 2001
 .Dt CONSCONTROL 8
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index d8e5bc52c11a..aef283cbc49c 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 2004/06/18 06:33:44 green Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 469e1e247b97..1df325a60cd6 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devd/Makefile,v 1.6 2004/12/21 09:59:42 ru 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 a3056ebe4dc5..91e7c71e4972 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.14 2005/01/10 16:17:32 ru Exp $
 .\"
 .Dd October 17, 2002
 .Dt DEVD 8
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index c9f6a8673bdb..418c18fbe5aa 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.22.2.3.2.1 2005/10/25 20:07:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index 1452eca524f2..638a8f07dd5e 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.8 2003/03/03 11:51:30 ru 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..44ac1c8059eb 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 2005/07/10 03:37:15 imp Exp $
  */
 
 #ifndef DEVD_H
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index 55af222ccadb..9585780d7dd8 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.3 2005/07/10 03:37:15 imp Exp $
  */
 
 #ifndef DEVD_HH
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 28b8a908adb1..dc72625c8a91 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 2005/07/10 03:37:15 imp Exp $
  */
 
 #include "devd.h"
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 0fa78da4ebc3..27806a4ca3c0 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 2005/07/10 03:37:15 imp Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index 95d2540272e6..a176a641d477 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devfs/Makefile,v 1.2 2002/07/28 06:52:47 dd Exp $
 
 PROG=	devfs
 SRCS=	devfs.c rule.c
diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index ec517b0ce265..e3c4e57ffa6f 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.15 2005/06/14 11:24:55 ru Exp $
 .\"
 .Dd July 1, 2002
 .Dt DEVFS 8
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index f531f7521cb1..d404dc408dae 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.5 2004/01/22 07:23:35 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h
index a9f8d224838d..64218809e00b 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 2004/06/02 23:02:31 stefanf Exp $
  */
 
 #ifndef __DEVFS_H__
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index e57f6de052ba..bad2793dd36e 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.7 2005/02/27 17:22:36 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 7e32326ff00a..1fedf279fb1e 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 2005/06/25 11:03:06 ru 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..0b8be3df7b3b 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index 53e2afde6c16..17ec7064476f 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.2.2.2 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 #include <sys/ioctl.h>
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index e43a876e0310..ff7e8f83cc38 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 #include "dhctoken.h"
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 3c8932dbd5b2..3273839432b7 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include <ctype.h>
 
diff --git a/sbin/dhclient/convert.c b/sbin/dhclient/convert.c
index adca0929a07c..9e2a067d225a 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/dhclient-script b/sbin/dhclient/dhclient-script
index fbf6e39a63b1..997b040e3dcc 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.4.2.2 2005/09/10 17:01:16 brooks 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..cab4adf4501b 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 2005/06/22 14:55:59 ru Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT-SCRIPT 8
diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8
index af48631242bb..ec7873b18042 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.2.2.2 2005/09/10 17:01:16 brooks Exp $
 .\"
 .Dd July 22, 2005
 .Dt DHCLIENT 8
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 36a64788188d..ff91624ba69a 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.6.2.2 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 #include "privsep.h"
diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index 167239ef63c3..51c22b453cb0 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 2005/06/22 14:55:59 ru 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..5aa07ea979b7 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 2005/06/22 14:55:59 ru Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT.LEASES 5
diff --git a/sbin/dhclient/dhcp-options.5 b/sbin/dhclient/dhcp-options.5
index 35b47e609c00..50d3e43e5e2a 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.2 2005/06/22 14:55:59 ru Exp $
 .\"
 .Dd January 1, 1995
 .Dt DHCP-OPTIONS 5
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index db1c05c4fddc..bc17f9a2b678 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.2 2005/06/30 05:50:52 brooks Exp $	*/
 
 /* Protocol structures... */
 
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 2fec9136986d..30a38bada05e 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c
index de3458322fda..c88840c83dc9 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include <errno.h>
 
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index 040236ab735b..979fa1f0034e 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index 4b7b1cef1bad..df0ef42e51a8 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index 09aa4d8ffb64..a24f7bbe64a9 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include <ctype.h>
 
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 484953ca2d98..38cf8900fa76 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 6a54fd0a4c88..550fdae171d4 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.2.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 #include "dhctoken.h"
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index b42572f2895b..6f8b7631e09a 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 #include "privsep.h"
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 2c3add2a27c8..ae1bf22b570d 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.1.1.1.2.2 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 0ed2919bb314..1eaad1c38c1a 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.1.1.1.2.1 2005/09/10 17:01:16 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 8472f56c461f..e7b68377b171 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 2005/01/17 13:56:46 delphij Exp $
 
 PROG=	dmesg
 MAN=	dmesg.8
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index 9d05e6c70b75..0dd7f8a74b9a 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 2004/04/09 19:58:26 markm Exp $
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index d1f7ef5c56d9..00b885f58f83 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.27 2005/01/17 13:56:46 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 608162aa570e..e8eaa5705790 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 2003/11/14 13:07:38 johan Exp $
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/cache.c b/sbin/dump/cache.c
index 906ac2716959..2a6ac95ab71d 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 2003/01/25 19:06:30 dillon Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index b6dda401f3b6..c72831e4b271 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.70.2.1 2005/08/07 18:49:50 ceri Exp $
 .\"
 .Dd March 1, 2002
 .Dt DUMP 8
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 2224782a4c38..40700dde8d10 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.27 2004/12/02 13:56:53 maxim Exp $
  */
 
 /*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index dd02642bdbf6..cea935135718 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 2004/04/10 02:22:35 bde Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index de880bbc030c..f8ae316a510f 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 2004/12/02 13:56:53 maxim Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 6af099522d0f..9c17e1f0da6d 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.63 2005/04/18 15:08:29 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 3dc17b67db67..8dec55dab5a8 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.32 2005/02/16 06:48:35 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index eb3ce3977af2..035f7f15ac37 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 2004/04/09 19:58:27 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 913409fb7b01..f30045a071d9 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 2005/03/02 02:30:08 iedowse Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 878f400c0d96..2f3931d03d97 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.36 2005/05/02 10:00:39 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 3720ebf550fd..538ca4af80de 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 2004/04/09 19:58:27 markm Exp $";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 99faa77ad725..ee8b003fa3c7 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 2003/11/14 13:13:23 johan Exp $
 
 PROG=	dumpfs
 DPADD=	${LIBUFS}
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index c673b083a051..83ee34e9011a 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.15 2005/02/10 09:19:28 ru Exp $
 .\"
 .Dd January 19, 2003
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 325cdcbf9864..8ac138b0af0d 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.43 2004/04/09 19:58:27 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index c273f93470a2..e4ba142de810 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpon/Makefile,v 1.10 2004/10/03 23:39:14 des Exp $
 
 PROG=	dumpon
 WARNS?=	6
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 096cbde246d0..4a40a2262f61 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.33 2005/01/18 10:09:31 ru Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index df6f88a7e632..b84966db53e1 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.22 2004/10/04 06:54:19 des Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 6899c47c8356..47fbd4b260cc 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/Makefile,v 1.11.8.1 2005/08/16 22:46:05 phk Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_mbr_enc.c
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index a7730ead3496..dfdb216e6615 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.36 2004/07/02 21:45:01 ru Exp $
 .\"
 .Dd April 18, 2002
 .Dt FDISK 8
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index d0b12b766db1..85431ee39183 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.79.2.2 2005/10/05 01:16:39 rodrigc Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/fdisk/runtest.sh b/sbin/fdisk/runtest.sh
index f25f4272bb0f..3acca05045f2 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 2003/04/13 21:57:08 phk 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..62952051155e 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk_pc98/Makefile,v 1.7.2.1 2005/08/19 12:43:09 nyan 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 c4b25c75c964..ccf28ffe8c6f 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.15 2004/07/02 21:45:01 ru Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
diff --git a/sbin/fdisk_pc98/fdisk.c b/sbin/fdisk_pc98/fdisk.c
index b5d6cc755048..256dec828a8c 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.17.2.2 2005/09/30 13:09:01 nyan Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index a1ffef7989a0..e6fc5a578cf0 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 2004/04/01 20:31:48 johan Exp $
 #
 
 GROWFS= ${.CURDIR}/../growfs
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index ff5afe44c391..4edf84768c5f 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.17 2005/04/08 10:32:22 ceri Exp $
 .\"
 .Dd September 8, 2000
 .Dt FSINFO 8
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 8df4b4190d6d..65c9454d7470 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.10 2005/03/31 04:05:17 rwatson Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index bc445fda26f7..f27f719f04b7 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 2003/10/29 16:10:17 trhodes Exp $
 
 PROG=	fsck
 SRCS=	fsck.c fsutil.c preen.c
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index b7360d9bd8c0..c2a56e0f8f52 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 2005/02/10 09:19:29 ru Exp $
 .\"
 .Dd April 25, 2001
 .Dt FSCK 8
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 490a29af919a..8291356412e3 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 2005/02/10 09:19:29 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index a4578bd63eb6..229e656aa7cb 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 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index 84e72909592d..60bb9a8f32ee 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 2003/12/27 13:54:02 bde Exp $
  */
 
 void perror(const char *);
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 6204685833f4..fb2ac196c180 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 2004/04/09 19:58:28 markm Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index 5b7474fd338b..736ba521e4c6 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.16 2004/09/01 08:26:39 scottl 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..a9503e5f7ee6 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 2004/04/09 19:58:29 markm 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..9b67a6cfbf27 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 2004/04/09 19:58:29 markm 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..841085ad2d7c 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 2004/04/09 19:58:29 markm 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..90aad68073b3 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 2004/04/09 19:58:29 markm 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..4ecd2dc30190 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 2004/04/09 19:58:29 markm 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..18b9ffd00477 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 2000/10/09 08:26:35 adrian 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..f7ee2cb72d43 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 2004/10/08 20:44:47 truckman 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..02e69064e0ca 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 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 32f9cfaa7eae..1074b1f2ce35 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.36 2005/03/07 08:42:49 delphij Exp $
  */
 
 #include <unistd.h>
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index a64c7ce8b5e7..7184ef0b43cb 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.33.2.1 2005/09/24 01:59:36 keramida Exp $
 .\"
 .Dd April 24, 2001
 .Dt FSCK_FFS 8
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 6bb590eb67c1..b10ad85387b7 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.25 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index e470f9970247..46401251b682 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.37 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index a7179691542a..233c2ac45557 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.44 2005/02/10 09:19:29 ru 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..0cf2aab5258b 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 2004/10/08 20:44:47 truckman 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..f54d4ae00c90 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 2004/10/10 06:37:56 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index c4fdd2a8a578..993543d3c888 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 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 22309cbbde57..2558784e7441 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 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 8a426eaa081e..606a7de4d613 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 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 693831fe1578..89fcd0705cb0 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.42 2005/03/07 08:42:49 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index f6b736d2ec79..b43a6a4daf39 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.49 2005/03/07 08:42:49 delphij 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..f7d145a3ea87 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 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/fsck_msdosfs/Makefile b/sbin/fsck_msdosfs/Makefile
index fd539b94f9d7..ed8598972174 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 2004/02/23 20:13:51 johan Exp $
 
 FSCK=	${.CURDIR}/../fsck
 .PATH: ${FSCK}
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 32ed8633e037..8582596759c3 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 2004/04/20 11:41:57 tjr Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 48ae5ca20eb1..324a8b9cca67 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 2004/02/05 15:47:46 bde Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index b87a916c17ff..0cb317fa8c5f 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 2003/12/26 17:24:37 trhodes Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index 3a5d4394c506..5420e2580c6c 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 2003/12/26 17:24:37 trhodes Exp $
  */
 
 #ifndef DOSFS_H
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 53127cf44ab4..2987870a072c 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 2005/03/09 10:10:51 stefanf Exp $
  */
 
 #ifndef EXT_H
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index 0b0bd9e11e89..6d7845c08c09 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 2004/02/05 15:18:18 bde 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..21f1b5033327 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 2005/02/10 09:39:51 ru 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..a807dbb21328 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 2005/02/10 09:39:51 ru Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 65333ef07252..cf2f513dee98 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 2004/10/09 15:56:34 le Exp $
 
 PROG=	fsdb
 MAN=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 71d8b4e6b943..ea369157194b 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.28 2005/02/12 23:23:53 trhodes Exp $
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 01a9696da5d9..cc1d478d4e15 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.29.2.1 2005/10/09 03:45:28 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index a739c47f1a0a..59773d655a2c 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.10 2002/07/30 13:01:25 phk Exp $
  */
 
 extern int bread(int fd, char *buf, ufs2_daddr_t blk, long size);
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index b00061941e00..4cd8311c9b03 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.18 2003/11/13 19:08:43 johan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 7e2da62408e3..56118b111b4e 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 2004/02/23 20:13:51 johan Exp $
 
 PROG=	fsirand
 WARNS?=	0
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 00f0eeee4c99..f45c3dd36268 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 2004/07/02 21:45:02 ru Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index defdf5250d33..f6d5acbc8bb3 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 2004/07/28 05:59:22 kan Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index 87058028533e..3c26f5b9542a 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/Makefile,v 1.11 2003/10/17 19:52:07 phk Exp $
 
 PROG=	gbde
 SRCS=	gbde.c template.c
diff --git a/sbin/gbde/gbde.8 b/sbin/gbde/gbde.8
index fe3d55d98728..a24daaa898fe 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.13 2005/02/12 21:47:05 ru Exp $
 .\"
 .Dd February 12, 2005
 .Dt GBDE 8
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 00c8e1c3fc94..66841f6c3653 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.30 2005/03/11 22:07:04 ume Exp $
  *
  * XXX: Future stuff
  *
diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu
index 82e6f2e47489..1868464e5d86 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 2003/10/07 09:31:51 phk 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..6bd638fa3a41 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 2002/10/20 11:16:13 phk 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 67d8b3809c37..2cc69f64b097 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.4 2004/02/07 22:58:39 phk Exp $
 
 set -e
 
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 95f00d914756..6967e80d1b21 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/Makefile,v 1.1 2004/05/20 10:09:55 pjd Exp $
 
 SUBDIR=	core class
 
diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index 94ca09f3889c..153d99c883d3 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 2004/08/02 09:05:29 pjd Exp $
 
 WARNS?=	6
 CLASS_DIR?=/lib/geom
diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile
index e172bbf4e56f..9c7ef7404dc0 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/Makefile,v 1.5.2.3 2005/09/14 21:21:45 marius Exp $
 
 SUBDIR=	concat
 .if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index 63109c29df6a..7901d72109cf 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 2005/04/07 15:57:38 pjd Exp $
 
 SHLIBDIR?=${CLASS_DIR}
 SHLIB_NAME?=geom_${CLASS}.so
diff --git a/sbin/geom/class/concat/Makefile b/sbin/geom/class/concat/Makefile
index b3a3e23c449d..70473f791d40 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 2004/05/21 22:12:24 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/concat/gconcat.8 b/sbin/geom/class/concat/gconcat.8
index c91c0b9808de..a42b43a2609c 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.17 2005/03/14 13:14:02 pjd 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 20b5b89656f1..a914dade0ca5 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.8 2005/03/14 14:25:46 pjd Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/eli/Makefile b/sbin/geom/class/eli/Makefile
index 041e738465cf..9fa9a7037204 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.2.1 2005/08/05 19:58:13 pjd 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 f7970a09b53a..1873435a956e 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.2.2.3 2005/08/30 15:27:30 pjd Exp $
 .\"
 .Dd April 11, 2005
 .Dt GELI 8
diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c
index a5f796446d3a..048fddfaed4f 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.1.2.4 2005/09/15 14:12:54 pjd Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/sbin/geom/class/label/Makefile b/sbin/geom/class/label/Makefile
index cba7ac6b4483..c6dee337c35e 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 2004/07/02 19:40:34 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/label/geom_label.c b/sbin/geom/class/label/geom_label.c
index 83c713b4c1c7..45011db4a4ce 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.6 2005/03/14 14:25:46 pjd 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 f607c7b251fc..ae508f985dbe 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.12.2.1 2005/08/16 08:20:48 pjd Exp $
 .\"
 .Dd July 2, 2004
 .Dt GLABEL 8
diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile
index f07a790539b6..451002f63c27 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 2004/08/18 15:48:18 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/mirror/geom_mirror.c b/sbin/geom/class/mirror/geom_mirror.c
index 74be6e54d05f..2dba7e98ed91 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.10 2005/03/14 14:25:46 pjd 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 e789c92a75dd..7b3182e97e67 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.16.2.1 2005/10/06 18:19:13 pjd Exp $
 .\"
 .Dd July 9, 2004
 .Dt GMIRROR 8
diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile
index 75a20376ff45..b7867a1c6fad 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 2004/05/21 22:12:24 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/nop/geom_nop.c b/sbin/geom/class/nop/geom_nop.c
index cf72f544b566..b74ed983cbaa 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.6 2005/03/14 14:25:47 pjd Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/sbin/geom/class/nop/gnop.8 b/sbin/geom/class/nop/gnop.8
index 2663508044ae..0beeea836b84 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.18 2005/03/14 13:14:03 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GNOP 8
diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile
index 1791669dec92..4640a7488be1 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 2004/08/18 16:41:29 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/raid3/geom_raid3.c b/sbin/geom/class/raid3/geom_raid3.c
index 7a8527f3f262..8f27da146347 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.11.2.2 2005/08/30 15:09:06 pjd 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 b2da0bf9e791..3eaf48a05482 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.16 2005/03/14 13:14:03 pjd Exp $
 .\"
 .Dd August 22, 2004
 .Dt GRAID3 8
diff --git a/sbin/geom/class/shsec/Makefile b/sbin/geom/class/shsec/Makefile
index ea38f159241a..634a704d97a7 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 2005/01/11 18:06:44 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/shsec/geom_shsec.c b/sbin/geom/class/shsec/geom_shsec.c
index e8756c97ee37..7cb4569f883c 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.5 2005/03/14 14:25:47 pjd 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..8806c75332db 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 2005/03/14 13:14:03 pjd Exp $
 .\"
 .Dd January 8, 2005
 .Dt GSHSEC 8
diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile
index 53a35fff46bf..9024ebd44ce0 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 2004/05/21 22:12:24 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/stripe/geom_stripe.c b/sbin/geom/class/stripe/geom_stripe.c
index d3fec881a0c9..16ca877ec2cf 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.11 2005/03/14 14:25:47 pjd 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..7097d31d5430 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 2005/04/26 09:23:21 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GSTRIPE 8
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index d76c35b0512d..0209bcb5819a 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 2004/12/21 09:59:42 ru Exp $
 
 .PATH: ${.CURDIR}/../misc
 
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index 72aff692d2b4..0803037b5fcf 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.17 2005/03/14 13:06:09 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GEOM 8
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 3db7cf4dddc6..05713993b297 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.22.2.1 2005/08/16 08:45:11 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/geom/core/geom.h b/sbin/geom/core/geom.h
index e4d94beee161..daddbe2a928c 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.2 2005/03/14 14:24:46 pjd Exp $
  */
 
 #ifndef _GEOM_H_
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index 599223a80e5f..2db356601ac1 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.3.8.1 2005/08/30 15:09:06 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/geom/misc/subr.h b/sbin/geom/misc/subr.h
index 164c3b46dc0e..be96f0027323 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.3.8.1 2005/08/30 15:09:06 pjd Exp $
  */
 
 #ifndef _SUBR_H_
diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index 97094d6f9fb5..d99d2fa12e5f 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.2 2005/07/10 15:16:49 pjd Exp $
 
 SUBDIR=	${_ggatec} \
 	${_ggated} \
diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc
index e55271f7ddc5..c46de5819935 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 2004/05/20 20:05:05 pjd Exp $
 
 WARNS?=	6
 
diff --git a/sbin/ggate/ggatec/Makefile b/sbin/ggate/ggatec/Makefile
index c49cfe819816..ba0dc4d37ba6 100644
--- a/sbin/ggate/ggatec/Makefile
+++ b/sbin/ggate/ggatec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.6 2005/07/10 21:10:20 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 9f6bc0065f59..ad9a138f773d 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.5.2.1 2005/08/04 18:05:33 pjd Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEC 8
diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index 70f667dfbfe0..3ed804a9005c 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.6 2005/07/10 21:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile
index 4e7708ebffa3..4c734cc0699f 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 2005/07/10 21:10:20 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index 3024a04230d7..dd34771f8442 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 2005/01/18 10:09:34 ru Exp $
 .\"
 .Dd April 29, 2004
 .Dt GGATED 8
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index 82d66e17ad35..056cb9e0c0be 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.7 2005/07/10 21:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile
index 604a75480313..72be0b5542b4 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 2004/06/21 09:20:06 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index 01b964a947e6..e37686e7536e 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 2005/01/18 10:09:34 ru Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEL 8
diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c
index 03979c3f9f72..2e7b2d72d21b 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 2005/07/10 21:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index c8428a66b601..bf07088437fe 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.5 2005/07/08 21:28:26 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index acbdaaa07422..fef45dec567e 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.3 2005/07/08 21:28:26 pjd Exp $
  */
 
 #ifndef _GGATE_H_
diff --git a/sbin/gpt/Makefile b/sbin/gpt/Makefile
index cfae78d03cf2..bc4685c294f8 100644
--- a/sbin/gpt/Makefile
+++ b/sbin/gpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.6.8.1 2005/09/06 23:59:01 marcel Exp $
 
 PROG=	gpt
 SRCS=	add.c create.c destroy.c gpt.c label.c map.c migrate.c recover.c \
diff --git a/sbin/gpt/add.c b/sbin/gpt/add.c
index 3b60720092b4..181ae611f7a9 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.11.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/create.c b/sbin/gpt/create.c
index 24a6a6d014fb..240a2ec5d440 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.10.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/destroy.c b/sbin/gpt/destroy.c
index 7c2c198608bc..a21b700d5650 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.5.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/gpt.8 b/sbin/gpt/gpt.8
index 419ec9a00f78..584df9ff6ee7 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.13.2.1 2005/09/06 23:59:01 marcel Exp $
 .\"
 .Dd August 31, 2005
 .Os
diff --git a/sbin/gpt/gpt.c b/sbin/gpt/gpt.c
index 79b2893761fa..f4de5e15f5e5 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.10.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/gpt/gpt.h b/sbin/gpt/gpt.h
index fc9e2d5843e7..c59bde85de51 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.7.2.1 2005/09/06 23:59:01 marcel Exp $
  */
 
 #ifndef _GPT_H_
diff --git a/sbin/gpt/label.c b/sbin/gpt/label.c
index 59beb35daa2a..512f53889b70 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.1.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/map.c b/sbin/gpt/map.c
index 91b56850b9c4..daa36beaf050 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.5.8.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/sbin/gpt/map.h b/sbin/gpt/map.h
index 4c3f0992d59a..c67b15d14bb9 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.5.8.1 2005/09/06 23:59:01 marcel Exp $
  */
 
 #ifndef _MAP_H_
diff --git a/sbin/gpt/migrate.c b/sbin/gpt/migrate.c
index 8f3b4ecff32c..f3e8a49eebc3 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.13.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/sbin/gpt/recover.c b/sbin/gpt/recover.c
index dd13a64951ed..09c08f449e76 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.7.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/remove.c b/sbin/gpt/remove.c
index 500dd4d9ef8e..c285f56c7cae 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.4.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/show.c b/sbin/gpt/show.c
index 4df3be1c5e03..087be0f6ef1e 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.11.2.1 2005/09/06 23:59:01 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index a5e9937e8f16..32f848ca7c9f 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 2005/03/31 04:10:31 rwatson Exp $
 #
 
 #GFSDBG=
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index d97fae31af88..7a593f7f2665 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.9 2004/04/03 17:40:19 le Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 3cad9d97874c..4d80bd053a59 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 2004/07/06 17:48:34 stefanf Exp $
  *
  */
 
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index 387e5114bdc0..34be0929ea90 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 2005/01/18 10:09:34 ru Exp $
 .\"
 .Dd September 8, 2000
 .Dt GROWFS 8
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index fa5b680006ab..692a1fb90e06 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.24 2005/01/16 14:37:30 charnier Exp $");
 
 /* ********************************************************** INCLUDES ***** */
 #include <sys/param.h>
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index 2e9b7c5c35b2..9d49122bbeed 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gvinum/Makefile,v 1.3 2004/12/21 08:47:07 ru Exp $
 
 PROG=	gvinum
 SRCS=	gvinum.c gvinum.h geom_vinum_share.c
diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c
index bb3166c6ff64..ffe2050d3e23 100644
--- a/sbin/gvinum/gvinum.c
+++ b/sbin/gvinum/gvinum.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/gvinum/gvinum.c,v 1.4 2004/11/26 12:31:36 le Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h
index d1b45a07749b..f59801df88c7 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 2004/06/12 21:22:47 le Exp $ */
 
 #define GVINUMMOD	"geom_vinum"
diff --git a/sbin/idmapd/Makefile b/sbin/idmapd/Makefile
index 462bc599eb3f..c92d6711a7e8 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.3 2005/01/28 16:08:06 ru Exp $
 
 PROG=	idmapd
 MAN=	idmapd.8
diff --git a/sbin/idmapd/idmapd.8 b/sbin/idmapd/idmapd.8
index 256897d90f8d..2be3456605c0 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.4 2005/01/21 10:27:44 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt IDMAPD 8
diff --git a/sbin/idmapd/idmapd.c b/sbin/idmapd/idmapd.c
index fa3a082d3ddb..4abd5cfbc47d 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 2005/04/14 20:27:30 rees 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 7d00149d8830..e341c27866e3 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.29 2005/06/05 03:32:51 thompsa Exp $
 
 PROG=	ifconfig
 
diff --git a/sbin/ifconfig/af_atalk.c b/sbin/ifconfig/af_atalk.c
index 0ceb8b92b318..6ca61f7127a3 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.1 2004/12/08 19:18:07 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index 7678daa1aa97..28eac9eaeaf7 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.2 2005/06/16 19:37:09 ume Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index 2aae38225235..814f4a46be58 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.3 2005/06/16 19:37:09 ume Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/af_ipx.c b/sbin/ifconfig/af_ipx.c
index d16e2eb86d97..8351209965d7 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.1 2004/12/08 19:18:07 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c
index 57a1e271a660..09fc83346fa6 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.2 2004/12/31 19:46:27 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
index 36e308bb7655..09ce6a0253af 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.1.2.1 2005/10/08 21:19:15 thompsa Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifcarp.c b/sbin/ifconfig/ifcarp.c
index 36f1bb6a47b7..9c961b71c500 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 2005/02/22 14:07:47 glebius 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 8b613ad78407..a34ec1be9a28 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.1 2004/12/08 19:18:07 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 54687a2ef00f..f95488bfead6 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.95.2.7 2005/10/07 14:00:02 glebius Exp $
 .\"
 .Dd October 1, 2005
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index ee0f0666247e..f80382eff7cc 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.113.2.3 2005/10/06 15:01:56 yar Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index dc68a8196a80..457fcc515c73 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.16.2.1 2005/07/21 12:25:40 rwatson Exp $
  */
 
 #define	__constructor	__attribute__((constructor))
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 8430fa1fdd35..0cfd121dc024 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.18.2.4 2005/09/03 22:47:47 sam Exp $
  */
 
 /*-
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index bb021060ea44..3c9a2d171cdf 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 2004/12/31 19:46:27 sam Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index 780a16f2fbd0..d3fe626c6a2f 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.19 2005/01/27 16:40:12 ambrisko Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
index 413cd748d648..7eccad6caf40 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.3 2005/05/03 16:59:14 mlaier Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 361f415c1859..aee6a9375a27 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.7.2.1 2005/10/06 15:01:56 yar Exp $";
 #endif
 static int			__tag = 0;
 static int			__have_tag = 0;
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 1d7c39f63e9c..4325c271ee22 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.32 2005/01/11 14:34:29 delphij Exp $
 
 PROG=	init
 MAN=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 064eac7e455a..ff2c86e1e411 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.46.2.1 2005/10/04 17:28:59 rse Exp $
 .\"
 .Dd September 15, 2005
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 393955f0abde..b6bb4c01f8ca 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.60.2.1 2005/10/04 17:28:59 rse Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h
index 335445bb0634..563376e3307b 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 2004/04/09 19:58:30 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/ip6fw/Makefile b/sbin/ip6fw/Makefile
index 17f330d1f0f2..07650b7cf0ed 100644
--- a/sbin/ip6fw/Makefile
+++ b/sbin/ip6fw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ip6fw/Makefile,v 1.6 2004/03/03 20:21:15 johan Exp $
 
 PROG=   ip6fw
 WARNS?=	2
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index 9d296cfd71b0..faae8d72cd2c 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.25 2005/02/13 22:25:15 ru Exp $
 .\"
 .\"	$KAME$
 .\"
diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c
index 9ceabbff04c8..0b4c53efa722 100644
--- a/sbin/ip6fw/ip6fw.c
+++ b/sbin/ip6fw/ip6fw.c
@@ -48,7 +48,7 @@
  * NEW command line interface for IP firewall facility
  *
  * $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.18 2004/07/29 18:04:06 kan Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/ip6fw/sample.sh b/sbin/ip6fw/sample.sh
index 00641401f6e7..b020a176bdfa 100644
--- a/sbin/ip6fw/sample.sh
+++ b/sbin/ip6fw/sample.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $FreeBSD$
+# $FreeBSD: src/sbin/ip6fw/sample.sh,v 1.2 2000/05/04 17:33:27 phantom Exp $
 
 fwcmd=/sbin/ip6fw
 
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index df57c807a02b..323934428ffa 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/Makefile,v 1.16 2005/04/25 18:55:50 darrenr Exp $
 
 #.WAIT
 SUBDIR=		libipf
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc
index 3373b557bd8c..55951553f72b 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 2005/05/17 14:29:06 ru 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 e0b887fb62e1..72271c7c6e83 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipf/Makefile,v 1.3 2005/05/16 16:22:55 darrenr Exp $
 
 PROG=		ipf
 SRCS=		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..e4c3b5e1d43a 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 2005/04/25 18:55:50 darrenr Exp $
 
 PROG=	ipfs
 MAN=	ipfs.8
diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile
index a33c5df38d8f..8e1b529c613f 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 2005/04/25 18:55:50 darrenr Exp $
 
 NOGCCERROR=	# defined
 
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index 02816cb24fdf..97347e227c89 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipftest/Makefile,v 1.3 2005/04/28 16:26:34 darrenr Exp $
 
 PROG=		ipftest
 SRCS=		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 8103aee0a15d..86dc2ee38862 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipmon/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
 
 PROG=		ipmon
 SRCS=		ipmon.c ipmon_y.c ipmon_l.c
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index 2e24d26af10f..35b5c7637d20 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipnat/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
 
 PROG=		ipnat
 SRCS=		ipnat.c ipnat_y.c ipnat_l.c
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index 9ff7c6e3015f..84e5ef23de14 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ippool/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
 
 PROG=		ippool
 SRCS=		ippool_y.c ippool_l.c kmem.c ippool.c
diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile
index 5e0ac15cbb1f..272fb8252dab 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 2005/04/28 16:26:34 darrenr 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..3eec653f9cee 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 2005/04/28 16:26:35 darrenr Exp $
 
 NOGCCERROR=	# defined
 
diff --git a/sbin/ipf/iptest/Makefile b/sbin/ipf/iptest/Makefile
index 647471cf4cef..96a3b593a236 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 2005/04/25 18:55:52 darrenr Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile
index 5df741fcb43c..30680563b50e 100644
--- a/sbin/ipf/libipf/Makefile
+++ b/sbin/ipf/libipf/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/libipf/Makefile,v 1.2 2005/04/28 16:26:35 darrenr Exp $
 
 LIB=		ipf
 INTERNALLIB=
diff --git a/sbin/ipf/rules/Makefile b/sbin/ipf/rules/Makefile
index a90907fc9853..111eb54cbc20 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 2005/04/25 18:55:52 darrenr Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index 023f682b25f5..8cdfd53ca485 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfw/Makefile,v 1.14 2004/10/03 06:32:37 green Exp $
 
 PROG=	ipfw
 SRCS=	ipfw2.c
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index f51f44afe054..42ef7e0886ef 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.175.2.1.2.1 2005/10/26 21:58:42 csjp Exp $
 .\"
 .Dd August 13, 2005
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index ee1b3628e9e0..1e3e85edddc1 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.76.2.1 2005/08/20 08:36:57 bz Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/kldconfig/Makefile b/sbin/kldconfig/Makefile
index e92daf6c6f7c..d0fa74b7246f 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 2003/04/23 20:22:32 johan Exp $
 #
 
 PROG=		kldconfig
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index 18fbaf609ac4..8b9a23fd347b 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 2005/02/10 09:19:29 ru Exp $
 .\"
 .Dd June 15, 2001
 .Dt KLDCONFIG 8
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 6da8d530c192..ba7c5aa00994 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.7 2005/02/10 09:19:29 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index da597d4594f9..0c442b4e5e37 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 2003/04/23 20:22:33 johan Exp $
 #
 
 PROG=	kldload
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 71187816cca1..09930e2d7314 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.22.2.1 2005/08/31 13:57:37 keramida Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 9e841bccf908..1822307eb9f4 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 2003/05/03 18:41:57 obrien Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index b602a3edfb1f..fcea3e08bb9a 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 2003/04/23 20:24:13 johan Exp $
 #
 
 PROG=	kldstat
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index 5a8565e1c838..8b0ccd8b8af5 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.13.4.1 2005/10/14 14:38:56 glebius Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 74f375e0ec6c..fb291ebfd752 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.17.4.1 2005/10/14 14:38:56 glebius Exp $");
 
 #include <err.h>
 #include <stdint.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 1f71a8f8313e..855258d5380c 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.9 2003/04/23 20:26:21 johan Exp $
 #
 
 PROG=	kldunload
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 3cd8de71df5c..6cc239bb4cf4 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.16 2005/02/09 22:06:16 glebius Exp $
 .\"
 .Dd July 13, 2004
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index cdf8f0412a1d..d13ef9e1a8b9 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.15 2005/01/30 13:23:04 ru Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 442ae6350713..715af866598a 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ldconfig/Makefile,v 1.20 2005/01/14 12:22:57 delphij 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..62ab6b0db883 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 2001/05/02 23:56:18 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 007d30d44a2c..a1e637e1d470 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.33 2004/07/02 21:45:03 ru Exp $
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index b49cf20a1a8a..45c3126f9f44 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.45 2005/02/10 09:19:29 ru Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 859bcbd204bc..23265ff334a7 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 2002/03/21 13:14:19 imp Exp $
  */
 
 #ifndef LDCONFIG_H
diff --git a/sbin/mca/Makefile b/sbin/mca/Makefile
index 25199d375d89..2ca48b6194c4 100644
--- a/sbin/mca/Makefile
+++ b/sbin/mca/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mca/Makefile,v 1.4 2004/12/21 08:47:08 ru Exp $
 PROG=	mca
 WARNS?=	4
 NO_MAN=
diff --git a/sbin/mca/mca.c b/sbin/mca/mca.c
index 0c4e1a0c5a80..1d761ae634fe 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 2002/11/01 06:34:35 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 07c4109e0d79..84e861af1e71 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 2005/03/09 19:23:04 cperciva Exp $
 
 PROG=	md5
 
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index a771fb76132c..1bfadda46dcf 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 2005/03/10 09:56:39 cperciva Exp $
 .Dd June 6, 2004
 .Dt MD5 1
 .Os
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 1423b16bcb9a..f4e1c5b7e0f2 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.34 2005/03/09 19:23:04 cperciva Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 1d5aff263653..2b9c09adf1ab 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdconfig/Makefile,v 1.8 2004/09/16 21:32:13 pjd Exp $
 
 PROG=		mdconfig
 MAN=		mdconfig.8
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 7e722752cfb1..9f9db18f0f50 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.33 2005/01/22 20:02:01 pjd Exp $
 .\"
 .Dd November 6, 2004
 .Dt MDCONFIG 8
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index e3ca148d7fa9..da6395e4da9a 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.43.2.1 2005/09/09 21:39:47 csjp Exp $
  *
  */
 
diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile
index 1ef708454267..b55f32f8165f 100644
--- a/sbin/mdmfs/Makefile
+++ b/sbin/mdmfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.6 2005/01/25 14:28:31 ssouhlal Exp $
 
 PROG=		mdmfs
 LINKS=		${BINDIR}/${PROG} ${BINDIR}/mount_mfs
diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8
index 39af0cba69bf..6af704b06919 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.20 2004/05/17 08:35:41 ru Exp $
 .\"
 .Dd February 26, 2004
 .Dt MDMFS 8
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index b855d332bdcd..6464de672a89 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.23 2005/02/10 09:19:30 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/mdioctl.h>
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index d28d3a595377..7e263caf8920 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 2004/02/23 20:13:53 johan Exp $
 
 PROG=	mknod
 WARNS?=	0
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 54b544153c97..d0cc38097014 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 2005/02/10 09:19:30 ru Exp $
 .\"
 .Dd December 15, 2004
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 4c0493c1ddb6..05dc55f29515 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.14 2004/04/09 19:58:30 markm Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index 3c08f565225d..bc4271f8047f 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 2003/03/02 01:50:33 mckusick 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 2465f557f2ff..dad6de648e94 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 2003/09/07 14:11:02 charnier 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..5893cddb4e7c 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 2004/12/08 11:54:50 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 407abea2f1f3..8d5e30971007 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.15 2004/04/26 15:13:45 bmilekic Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 638f8a4a1eb2..f24526a9d1cc 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.4 2002/03/21 13:14:19 imp Exp $
  */
 
 /* vfslist.c */
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index a033ac169dff..a68a7e7951a1 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.13 2004/04/09 19:58:30 markm Exp $
 .\"
 .Dd March 30, 1995
 .Dt GETMNTOPTS 3
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index d0880f90b792..c505401dbe0f 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.15 2004/11/25 16:14:27 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 17674da1b600..5a1c8751e907 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.26 2005/06/10 09:51:40 delphij Exp $
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 7fb0708f432a..bb4d64f6bbdf 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.73 2005/06/16 21:35:33 brueffer Exp $
 .\"
 .Dd November 26, 2004
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 64944261473d..b075312d594d 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.69 2005/03/26 04:45:53 cperciva Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index 178dd48ff822..afb7196dc1ff 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/mount_ufs.c,v 1.26 2005/06/10 09:51:40 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index aaa0a2c10e1e..a49945ec1305 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 2004/04/09 19:58:31 markm Exp $
  */
 
 #define	_PATH_MOUNTDPID	"/var/run/mountd.pid"
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index f95a76efdb24..6e6e1b41c60b 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 2004/04/09 19:58:31 markm Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/sbin/mount_autofs/Makefile b/sbin/mount_autofs/Makefile
index e7d040d4d08c..09a881f1e4d0 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 2004/09/08 08:44:14 alfred 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..42f7f4158c83 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 2005/01/24 20:03:04 charnier 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..af31b33c4c38 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 2004/09/12 07:06:48 alfred Exp $
  */
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 044985cecc87..fc3f6b98bf11 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.10 2004/12/21 09:59:42 ru 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 a2de093f706a..a79ecf4e267a 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.28 2005/02/13 22:25:16 ru Exp $
 .\"
 .Dd September 26, 2003
 .Dt MOUNT_CD9660 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 1633f4fd6d82..c17edfd5e110 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.30 2005/06/10 09:51:41 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 3eefb92eb8c0..9f623e68b19a 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 2003/11/13 19:18:43 johan 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..a112f2f94be2 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 2004/04/09 19:58:31 markm 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 4e72454d177a..6824e12145f8 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.20 2005/06/10 09:51:41 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index 084377407787..65750e9aad6d 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 2004/02/23 20:13:53 johan Exp $
 #
 
 PROG=	mount_hpfs
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index 0cdcb20e2e15..a75604c09534 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 2002/12/27 12:15:32 schweikh 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..385d9be0088e 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 2005/06/10 09:51:41 delphij Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 273ac01037c0..c1dcc822c1c6 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdosfs/Makefile,v 1.27 2004/12/21 09:59:42 ru Exp $
 #
 
 PROG=	mount_msdosfs
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 6147aa42b137..69195f0da827 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.31.2.1 2005/09/24 01:59:36 keramida 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 c73b438d2320..576207d18bc2 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.36 2005/06/10 09:51:41 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 68fe70ac3e13..a9df9031a1fc 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.14 2004/02/23 20:13:54 johan 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 9aef0352435f..db0b40dcc9ea 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.43 2005/02/10 09:19:30 ru Exp $
 .\"
 .Dd May 11, 2003
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index a2e058649447..ac0c4d11ef45 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -42,7 +42,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.65 2005/06/10 09:51:41 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_nfs4/Makefile b/sbin/mount_nfs4/Makefile
index 881d11904ae1..38fcbca7021b 100644
--- a/sbin/mount_nfs4/Makefile
+++ b/sbin/mount_nfs4/Makefile
@@ -1,6 +1,6 @@
 #	${.CURDIR}(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nfs4/Makefile,v 1.2 2004/02/23 20:13:54 johan Exp $
 
 PROG=	mount_nfs4
 SRCS=	mount_nfs4.c getmntopts.c mounttab.c
diff --git a/sbin/mount_nfs4/mount_nfs4.8 b/sbin/mount_nfs4/mount_nfs4.8
index 8ef824581fce..f87cfe18f630 100644
--- a/sbin/mount_nfs4/mount_nfs4.8
+++ b/sbin/mount_nfs4/mount_nfs4.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nfs4/mount_nfs4.8,v 1.5 2005/02/10 09:19:31 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt MOUNT_NFS4 8
diff --git a/sbin/mount_nfs4/mount_nfs4.c b/sbin/mount_nfs4/mount_nfs4.c
index 94d0d935d507..0c20840e7306 100644
--- a/sbin/mount_nfs4/mount_nfs4.c
+++ b/sbin/mount_nfs4/mount_nfs4.c
@@ -72,7 +72,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_nfs4/mount_nfs4.c,v 1.7 2005/06/10 09:51:42 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 5938b0dd52a6..ae09f3f55e17 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 2004/12/21 09:59:43 ru Exp $
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 15f49dffc2a0..52acabb94856 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 2005/02/10 09:19:31 ru Exp $
 .\"
 .Dd January 3, 1999
 .Dt MOUNT_NTFS 8
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 4bd118f2b527..defd98d9b140 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 2005/06/10 09:51:42 delphij Exp $
  *
  */
 
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 9a6be28a960c..38fe75aee457 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.11 2004/02/23 20:13:54 johan 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 752040ff48e6..9694c6004f89 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.30 2005/01/18 10:09:36 ru 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 410562469172..c298dbb7b77f 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.25 2005/06/10 09:51:42 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_reiserfs/Makefile b/sbin/mount_reiserfs/Makefile
index 686629fe1843..fd1d241a4b4d 100644
--- a/sbin/mount_reiserfs/Makefile
+++ b/sbin/mount_reiserfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_reiserfs/Makefile,v 1.1 2005/05/24 12:34:45 dumbbell 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..45d63512cf77 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 2005/06/24 10:57:53 ru 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 b7c71ad01457..742c4871443a 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.3 2005/06/10 09:51:42 delphij Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 110a5256cf22..b450a3f85df0 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.11 2004/02/23 20:13:54 johan 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 3a4df0fb2837..155ed00d5016 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.23 2004/11/29 09:35:01 ru 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 ec8041d241c7..c6b2df9f0e97 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -39,7 +39,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.21 2005/06/10 09:51:42 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index e83328a2f9f5..6b65b50bdf93 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_udf/Makefile,v 1.5 2004/12/21 09:59:43 ru 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..0a9a94c851ab 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 2005/02/10 09:19:31 ru 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..410449549c4d 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 2005/06/10 09:51:43 delphij Exp $
  */
 
 /*
diff --git a/sbin/mount_ufs/Makefile b/sbin/mount_ufs/Makefile
index f7d331defca4..1ecfd567dc4c 100644
--- a/sbin/mount_ufs/Makefile
+++ b/sbin/mount_ufs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ufs/Makefile,v 1.2 2004/12/21 09:59:43 ru Exp $
 
 PROG=	mount_ufs
 SRCS=	mount_ufs.c getmntopts.c
diff --git a/sbin/mount_ufs/mount_ufs.c b/sbin/mount_ufs/mount_ufs.c
index 4292af4c120c..d0f6df856fc0 100644
--- a/sbin/mount_ufs/mount_ufs.c
+++ b/sbin/mount_ufs/mount_ufs.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_ufs/mount_ufs.c,v 1.4 2005/06/10 09:51:43 delphij Exp $
  */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_umapfs/Makefile b/sbin/mount_umapfs/Makefile
index 0f5891fb2bf8..bf52d0868b62 100644
--- a/sbin/mount_umapfs/Makefile
+++ b/sbin/mount_umapfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_umapfs/Makefile,v 1.12 2004/02/23 20:13:54 johan Exp $
 
 PROG=	mount_umapfs
 SRCS=	mount_umapfs.c getmntopts.c
diff --git a/sbin/mount_umapfs/mount_umapfs.8 b/sbin/mount_umapfs/mount_umapfs.8
index 1bbaadb84bcf..1732335a045c 100644
--- a/sbin/mount_umapfs/mount_umapfs.8
+++ b/sbin/mount_umapfs/mount_umapfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_umap.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_umapfs/mount_umapfs.8,v 1.22 2005/01/18 10:09:36 ru Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_UMAPFS 8
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index b16cf10a98da..438d25ff575b 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.5 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_umapfs/mount_umapfs.c,v 1.25 2005/06/10 09:51:43 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 02965042dd87..1107c9ed99f8 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.12 2004/02/23 20:13:54 johan 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 20f1451aa884..7ab0f7c8315c 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.20 2005/01/18 10:09:36 ru Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_UNIONFS 8
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 7b619eaf57fd..ac0125493abd 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -41,7 +41,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.24 2005/06/10 09:51:43 delphij Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index c6bf3267a7cf..2c2367228f3e 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/Makefile,v 1.9 2004/02/23 20:13:55 johan Exp $
 
 PROG		= natd
 SRCS		= natd.c icmp.c
diff --git a/sbin/natd/README b/sbin/natd/README
index d2e8a9ae6709..f55a7ffe92d3 100644
--- a/sbin/natd/README
+++ b/sbin/natd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/README,v 1.3 2003/01/23 08:35:21 ru Exp $
 
 	A Network Address Translation Daemon for FreeBSD
 
diff --git a/sbin/natd/icmp.c b/sbin/natd/icmp.c
index 1509b965f4b8..4fb0f150c5e4 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 2004/07/04 12:53:54 phk Exp $
  */
 
 #include <stdlib.h>
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 254948a02abc..c4ae50376ddf 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 2005/01/15 12:28:00 ru Exp $
 .Dd February 28, 2003
 .Dt NATD 8
 .Os
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index e7c3600a1726..56053c785d2b 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.49 2005/05/02 10:13:38 delphij Exp $");
 
 #define SYSLOG_NAMES
 
diff --git a/sbin/natd/natd.h b/sbin/natd/natd.h
index a05d1f7e4dca..38a7d95f468c 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 2004/07/04 12:53:54 phk 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..db33c28aa2c9 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 1999/09/13 18:18:33 ru Exp $
 #
 #
 # Configuration file for natd.
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index efbe7abfe492..c67ce2675f57 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 2003/02/11 03:06:45 jmallett Exp $
 
 PROG=	newfs
 DPADD=	${LIBUFS}
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 0b653d55ac5c..3543a3d951a7 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.89 2005/02/20 11:32:49 delphij Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index f907642090eb..eb351a0a25a1 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.69 2005/01/22 14:36:51 ru Exp $
 .\"
 .Dd January 21, 2005
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 289d05582593..54fe29048449 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.80 2005/01/22 14:37:57 ru Exp $");
 
 /*
  * newfs: friendly front end to mkfs
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index dae9fd877255..17f7dd2d9f41 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.17 2005/01/21 22:20:25 wes Exp $
  */
 
 #include <libufs.h>
diff --git a/sbin/newfs/ref.test b/sbin/newfs/ref.test
index 1967e247d4e5..eee6b632255b 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 2003/02/22 23:26:11 mckusick Exp $
 00c08266df6b0c79d2673515c182216a
 c00458f223a9119190591e8b8679bf97
 7d5b3c75244898dbb07a4cd20860c8a1
diff --git a/sbin/newfs/runtest00.sh b/sbin/newfs/runtest00.sh
index a95dbcc83b25..1ef96f34bc93 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 2002/03/19 21:05:29 phk Exp $
 
 set -e
 
diff --git a/sbin/newfs/runtest01.sh b/sbin/newfs/runtest01.sh
index 47128326ed24..f87aec93904c 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 2002/03/19 21:05:29 phk Exp $
 
 set -e
 
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index 5ee8277d42a9..ba09f7025abb 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 2005/01/24 01:56:06 cognet 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..93e284feeec7 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 2005/02/13 22:25:16 ru 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 b645fb7155b8..3aa16b6e57e6 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.21 2005/01/17 14:14:00 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 22717c576f42..d36527836fe2 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 2002/08/10 20:19:04 mux Exp $
 
 PROG=	nfsiod
 WARNS?=	6
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 44bf1af28ad2..61f7cc926ff6 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 2005/01/17 07:44:10 ru Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 31559cc61bd7..689af584f473 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 2005/04/07 20:37:04 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile
index e128b62160f7..a42140407d60 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 2004/02/23 20:13:55 johan Exp $
 
 PROG=	nos-tun
 WARNS?=	0
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 405d43007b62..548e36dc8ea9 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 2005/02/13 22:25:16 ru 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..f11b7447b059 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 2005/02/10 09:19:32 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index 4ffa6a781c4a..7fdf148d99e8 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pfctl/Makefile,v 1.5 2005/05/03 16:57:38 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/pfctl
 .PATH:	${.CURDIR}/../../contrib/pf/man
diff --git a/sbin/pfctl/missing/altq/altq.h b/sbin/pfctl/missing/altq/altq.h
index c740ed359ad1..154b298ccf81 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 2004/02/28 21:50:49 mlaier 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..1c1b68a7d7cb 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 2004/02/28 21:50:49 mlaier 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..ab5dcc2f4bd6 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 2004/04/09 19:58:34 markm 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..19f0610e784c 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 2004/02/28 21:50:49 mlaier 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..8e73bbd26488 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 2004/02/28 21:50:49 mlaier 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..7b25d3ee08ac 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 2004/02/28 21:50:49 mlaier 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..a00bf58d2681 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 2004/02/28 21:50:49 mlaier 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..c48ddf97c2c1 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 2004/04/09 19:58:34 markm 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..5131f55ede97 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 2004/02/28 21:50:49 mlaier 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..3c0ab7eb325e 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 2004/02/28 21:50:49 mlaier 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..f455417b6d54 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 2004/02/28 21:50:49 mlaier 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..8eca296eb3e5 100644
--- a/sbin/pflogd/Makefile
+++ b/sbin/pflogd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pflogd/Makefile,v 1.3 2004/10/24 14:25:53 ru Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/pflogd
 
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 24882d3d7d6d..f6837e8a9954 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.19 2004/02/23 20:13:55 johan Exp $
 
 PROG=	ping
 MAN=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index ee723a0ea8a2..fc3fdcadcbef 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.51.8.1 2005/08/19 09:29:25 glebius Exp $
 .\"
 .Dd August 15, 2005
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 633a64a2a114..73a74605dbc0 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.106.2.1 2005/08/19 09:29:25 glebius Exp $");
 
 /*
  *			P I N G . C
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 2d0cad43e1c2..b27c3228397a 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping6/Makefile,v 1.12 2005/01/08 22:56:08 trhodes Exp $
 
 PROG=	ping6
 MAN=	ping6.8
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 89a81684cf55..460d87d1b271 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 2005/02/10 09:19:32 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index d9c2f82fd2d5..9f4b13f0a67d 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.29 2005/02/10 09:19:32 ru Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index b54eda312880..71174f3ef946 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/quotacheck/Makefile,v 1.8 2004/02/23 20:13:55 johan Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	quotacheck
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index 93ce142cc362..8d379b850cfb 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.25 2004/04/09 19:58:35 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 0eb3eb8cb3a9..010bb9c119eb 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.16 2005/02/10 09:19:32 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 634124e11043..278aa3eabd06 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.25 2005/02/10 09:19:33 ru Exp $");
 
 /*
  * Fix up / report on disk quotas & usage
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 3f34be55206f..f3c47aad67db 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.5 2004/02/23 20:13:55 johan Exp $
 
 PROG=   rcorder
 SRCS=   ealloc.c hash.c rcorder.c
diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8
index 6a0c570c4e0d..c856d95fad47 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 2004/07/02 18:37:52 ru Exp $
 .\"
 .Dd July 17, 2000
 .Dt RCORDER 8
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index 1cb270cd8a60..4ea0e875cc0f 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.14 2005/01/25 08:14:00 delphij Exp $
 
 PROG=	reboot
 WARNS?=	6
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 5e59eecdb9af..9d12008bcd2e 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.52.2.1 2005/09/24 01:59:36 keramida Exp $
 .\"
 .Dd August 18, 2005
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/nextboot.8 b/sbin/reboot/nextboot.8
index 765fa796fe04..d33b9fe3627b 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 2002/12/12 17:25:56 ru Exp $
 .\"
 .Dd November 4, 2002
 .Dt NEXTBOOT 8
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index 56e53f60a1a9..8e937eb70a05 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.1 2002/05/24 04:06:03 gordon Exp $
 
 delete="NO"
 force="NO"
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 39022ab90ae9..bf14a503eff4 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.23 2005/02/10 09:19:33 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 0a52ba4e1d29..ad6bcb0c74c2 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.24 2005/03/21 23:44:04 pjd Exp $");
 
 #include <sys/reboot.h>
 #include <sys/types.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index c06a3db9116c..07d29803bf6c 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 2005/03/25 17:30:20 imp Exp $
 
 .PATH: ${.CURDIR}/../dump
 
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index f12f932fe85e..12637905801b 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.30 2005/04/03 16:35:58 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 603a56105942..9094c9db08d9 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.10 2004/05/24 16:24:26 stefanf Exp $
  */
 
 struct entry	*addentry(char *, ino_t, int);
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index e3391d0eb77c..44a58a4655de 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.17.2.1 2005/10/09 03:50:30 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 63fb4efd347d..e07e44f633fd 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.26 2005/05/29 15:57:00 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index bb3186f2ceb2..1709071963e7 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.50 2005/03/18 17:49:08 imp Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 046c0d27afc2..864ea23a4b72 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.18 2005/05/29 15:57:00 charnier Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 04048dc5de19..94b40241ed1d 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.10 2005/04/03 05:18:28 imp Exp $
  */
 
 /*
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index b7eff268e653..fb1d5cec68fa 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 2004/04/09 19:58:36 markm Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 32459260c13e..90864e32173e 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.44 2005/05/29 15:57:00 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 6b984e409749..ba8840bd605b 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 2004/04/09 19:58:36 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index fede01d4dcc4..38179cf6bc4b 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.20 2004/02/23 20:13:56 johan Exp $
 
 PROG=	route
 MAN=	route.8
diff --git a/sbin/route/keywords b/sbin/route/keywords
index 18f995d2b85e..8d5d4cda79ac 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.5 2001/06/12 13:31:53 ru Exp $
 
 add
 atalk
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index c1043e2498cb..690ac9d8b810 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.44.2.1 2005/10/02 13:44:05 ru Exp $
 .\"
 .Dd October 2, 2005
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 21691270494d..c6e8cb769ae8 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.79.2.1 2005/09/26 15:00:34 glebius Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 1ac16c41e32c..75e0cedd1e3e 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 2004/08/13 14:18:24 ru 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..5789693e70bc 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 2001/10/25 08:37:12 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 9860e4d77b7f..07f7915ccb96 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 2004/06/16 05:08:57 bms Exp $
  */
 
 #ifdef  sgi
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/defs.h,v 1.18 2004/06/16 05:08:57 bms Exp $"
 #endif
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 291eb191fc7f..3942b036cb3c 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.15 2005/05/31 20:28:48 stefanf 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.15 2005/05/31 20:28:48 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 085ba9502bf6..015a8b0fd7c1 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.13 2005/05/31 20:28:48 stefanf 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.13 2005/05/31 20:28:48 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 722061e80374..8a0d1c1ab9eb 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.18 2005/05/31 20:28:48 stefanf 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.18 2005/05/31 20:28:48 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index c9db470b9b46..0d6913effd12 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 2005/05/31 20:28:48 stefanf 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 2005/05/31 20:28:48 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index 356ac8e9da36..2c43dbb44015 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 2005/05/31 20:28:48 stefanf 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 2005/05/31 20:28:48 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index c45405ed9e55..7908351043d6 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 2004/04/09 19:58:37 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index 7f3768853abc..64dea2b16604 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 2005/05/31 20:28:49 stefanf Exp $
  */
 
 /*
@@ -40,7 +40,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/radix.c,v 1.9 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.23 $");
 #ident "$Revision: 2.23 $"
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index 6cf196fa4da6..21c95d61c346 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 2004/04/09 19:58:37 markm Exp $
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 047b3d123047..3fc01a9e1f8f 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 2005/05/31 20:28:49 stefanf 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 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 25998c9bd83c..5d121b8348be 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 2005/01/18 10:09:37 ru Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 7076158727f6..979a0cc683af 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 2004/08/13 14:18:24 ru Exp $
 
 PROG=	rtquery
 MAN=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 4f16e88d5c09..775dfc6cfa35 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 2004/02/25 23:45:57 bms Exp $
 .\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 1b3a47bef5da..1fb65dde0df8 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 2004/04/09 19:58:38 markm 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 2004/04/09 19:58:38 markm Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 491c5cfa0ab1..7baea54ff10c 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 2005/05/31 20:28:49 stefanf 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 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 320056f76c8f..faff945a1513 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 2005/05/31 20:28:49 stefanf 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 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index d3d40e871e0e..d3dad34e0dc0 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -11,7 +11,7 @@
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
-# $FreeBSD$
+# $FreeBSD: src/sbin/rtsol/Makefile,v 1.11 2004/12/21 08:47:08 ru Exp $
 
 SRCDIR=	${.CURDIR}/../../usr.sbin/rtsold
 
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 525f281b598c..b8aa44691817 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/savecore/Makefile,v 1.13 2005/01/10 10:44:56 delphij Exp $
 
 PROG=	savecore
 WARNS?=	6
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 447e008d67dc..a69d072fc063 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 2005/06/14 11:24:56 ru Exp $
 .\"
 .Dd February 24, 2005
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 0d88b20e80bc..f25e022242b2 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.75.2.2 2005/10/08 17:56:00 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index 5923692aad47..220d58ae6b89 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 2004/01/21 13:22:08 ru Exp $
 
 PROG=	sconfig
 MAN=	sconfig.8
diff --git a/sbin/sconfig/sconfig.8 b/sbin/sconfig/sconfig.8
index 3fe7abcff686..0fbd396b2cd8 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 2004/12/30 01:48:12 brueffer Exp $
 .Dd May 19, 2004
 .Dt SCONFIG 8 i386
 .Os
diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c
index d2130dfb6109..6416239d6963 100644
--- a/sbin/sconfig/sconfig.c
+++ b/sbin/sconfig/sconfig.c
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: sconfig.c,v 1.2.2.4 2003/06/20 16:20:48 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/sconfig/sconfig.c,v 1.2 2003/12/03 17:03:20 imp Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index b7f232d090b5..21f62d4a4f1a 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 2005/01/25 08:37:04 delphij Exp $
 
 PROG=	shutdown
 MAN=	shutdown.8
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index e68687f20b96..14c7abc700ca 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 2005/01/18 20:36:37 ru Exp $
 .\"
 .Dd December 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index c4f3f41e6c51..818627c17452 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 2005/01/25 08:40:51 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 84b0c1282865..bd499b0aebaa 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 2004/02/23 20:13:56 johan Exp $
 
 PROG=	slattach
 WARNS?=	0
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index a359dd25605d..200f143a0712 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 2005/02/10 09:19:33 ru Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index afdfce8a2e71..cc247d96fb3d 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 2005/02/10 09:19:33 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile
index b394c39a4e83..05c538781182 100644
--- a/sbin/spppcontrol/Makefile
+++ b/sbin/spppcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/spppcontrol/Makefile,v 1.6 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	spppcontrol
 MAN=	spppcontrol.8
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index 4389c8f66ec1..01ecd31b19bf 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 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd December 30, 2001
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index a1df0f49942b..c708aa7944cd 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 2003/05/03 18:41:59 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/sbin/startslip/Makefile b/sbin/startslip/Makefile
index 1bf91dd82169..69171e25e194 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 2004/08/02 08:10:28 stefanf Exp $
 
 PROG=	startslip
 WARNS?=	3
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 2d6f43b3c52e..3f9eb2fb1812 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.23.8.1 2005/07/17 15:03:34 brueffer Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index 2d4d3bfb124a..1d422ed7d092 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 2005/02/10 09:19:34 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile
index 143b6c72bb0f..c5e5e5bc3167 100644
--- a/sbin/sunlabel/Makefile
+++ b/sbin/sunlabel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.12 2004/02/01 13:09:26 ceri Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
diff --git a/sbin/sunlabel/runtest.sh b/sbin/sunlabel/runtest.sh
index 73833e0b7fee..fe784b8bae18 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 2003/04/23 08:25:44 phk Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/sunlabel/sunlabel.8 b/sbin/sunlabel/sunlabel.8
index 60096048dafa..f40540661488 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 2005/03/30 18:54:41 joerg Exp $
 .\"
 .Dd March 30, 2005
 .Dt SUNLABEL 8
diff --git a/sbin/sunlabel/sunlabel.c b/sbin/sunlabel/sunlabel.c
index 7bf051ef4786..de020bcb2ab2 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 2005/03/30 09:33:09 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 85b0f0ab60bb..bb0e1788a017 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 2002/12/28 23:39:47 dillon Exp $
 
 PROG=	swapon
 MAN=	swapon.8
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index f4ecd14145f7..edda603940a8 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 2005/02/10 09:19:34 ru Exp $
 .\"
 .Dd December 28, 2002
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 13297f9178dc..60e5235b0d0c 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 2005/02/10 09:19:34 ru Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 381f19918be3..69d85ab7b9ce 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 2004/02/23 20:13:56 johan Exp $
 
 PROG=	sysctl
 WARNS?=	0
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index e7db649212ce..13c762b76e5b 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.57.2.2 2005/09/22 15:30:21 rwatson Exp $
 .\"
 .Dd March 10, 2002
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index fd38ceaa56a9..49feb33ee69a 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.67.2.1 2005/09/22 15:30:21 rwatson Exp $";
 #endif /* not lint */
 
 #ifdef __i386__
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index d501d104b4b7..682fcdc9c7ee 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 2003/01/23 08:15:05 ru Exp $
 
 PROG=	tunefs
 DPADD=	${LIBUFS}
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index ac8641c0de01..eaa07a4d6867 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.36 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd May 18, 2002
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index e8ab8d367711..b9b09068c919 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.42 2004/04/09 19:58:40 markm Exp $");
 
 /*
  * tunefs: change layout parameters to an existing file system.
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 70ccc5a06624..370e748525ee 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 2004/02/23 20:13:57 johan Exp $
 
 PROG=	umount
 SRCS=	umount.c vfslist.c mounttab.c
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index d19ea9ae7a49..c732e449c6ec 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 2004/04/09 19:58:40 markm Exp $
 .\"
 .Dd July 18, 2003
 .Dt UMOUNT 8
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index c00a09d8da22..e273cb06d974 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 2005/02/10 09:19:34 ru Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/secure/Makefile b/secure/Makefile
index c6d2ff41e345..401bd7681816 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/Makefile,v 1.26 2004/12/21 10:16:01 ru Exp $
 
 SUBDIR= lib libexec usr.bin usr.sbin
 
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 346c0eee38dc..6c76e4f31260 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/Makefile.inc,v 1.24 2004/08/06 07:27:05 cperciva Exp $
 
 .if exists(${.CURDIR}/../../lib/libcrypt/obj)
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index 049fd398f31c..b31d01568c2f 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/Makefile,v 1.33 2003/07/16 20:59:14 markm Exp $
 
 SUBDIR= 
 .if !defined(NO_OPENSSL)
diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc
index 002a3f70ef33..84e4673e7dc7 100644
--- a/secure/lib/Makefile.inc
+++ b/secure/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/Makefile.inc,v 1.9 2003/04/30 07:54:38 ru Exp $
 
 .include "../Makefile.inc"
 .if exists(${.CURDIR}/../../../lib/Makefile.inc)
diff --git a/secure/lib/libcrypt/blowfish.c b/secure/lib/libcrypt/blowfish.c
index 5b33f025fdfd..c830cdafbd48 100644
--- a/secure/lib/libcrypt/blowfish.c
+++ b/secure/lib/libcrypt/blowfish.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/lib/libcrypt/blowfish.c,v 1.4 2003/06/02 19:17:24 markm Exp $");
 
 /*
  * This code is derived from section 14.3 and the given source
diff --git a/secure/lib/libcrypt/blowfish.h b/secure/lib/libcrypt/blowfish.h
index 2ea64749b9f1..902befcc8b35 100644
--- a/secure/lib/libcrypt/blowfish.h
+++ b/secure/lib/libcrypt/blowfish.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/secure/lib/libcrypt/blowfish.h,v 1.3 2003/06/02 19:17:24 markm Exp $
  */
 
 /*
diff --git a/secure/lib/libcrypt/crypt-blowfish.c b/secure/lib/libcrypt/crypt-blowfish.c
index 649d07cb30fd..10dd7f5f7643 100644
--- a/secure/lib/libcrypt/crypt-blowfish.c
+++ b/secure/lib/libcrypt/crypt-blowfish.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/lib/libcrypt/crypt-blowfish.c,v 1.4 2003/06/02 19:17:24 markm Exp $");
 
 /* This password hashing algorithm was designed by David Mazieres
  * <dm@lcs.mit.edu> and works as follows:
diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c
index 9adff936f3ad..72ce1d63e906 100644
--- a/secure/lib/libcrypt/crypt-des.c
+++ b/secure/lib/libcrypt/crypt-des.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/lib/libcrypt/crypt-des.c,v 1.16 2002/03/06 17:18:09 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 5c22f97b0440..859f5f87f501 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.73.2.1 2005/07/22 17:29:09 kensmith Exp $
 
 LIB=		crypto
 SHLIBDIR?=	/lib
diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
index 50584ee03ed6..f321a2105ff1 100644
--- a/secure/lib/libcrypto/Makefile.asm
+++ b/secure/lib/libcrypto/Makefile.asm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile.asm,v 1.5 2005/02/25 06:04:09 nectar Exp $
 # Use this to help generate the asm *.s files after an import.  It is not
 # perfect by any means, but does what is needed.
 # Do a 'make -f Makefile.asm all' and it will generate *.s.  Move them
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 82ace34308a4..32ae451ac89a 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile.inc,v 1.40 2005/02/25 06:04:09 nectar Exp $
 
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
 LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl/doc
diff --git a/secure/lib/libcrypto/Makefile.man b/secure/lib/libcrypto/Makefile.man
index 9a5f259080c8..27ed8c429911 100644
--- a/secure/lib/libcrypto/Makefile.man
+++ b/secure/lib/libcrypto/Makefile.man
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile.man,v 1.3 2005/02/25 06:04:09 nectar Exp $
 # DO NOT EDIT: generated from man-makefile-update target
 MAN+= ASN1_OBJECT_new.3
 MAN+= ASN1_STRING_length.3
diff --git a/secure/lib/libcrypto/i386/bf-586.s b/secure/lib/libcrypto/i386/bf-586.s
index 73e0042430ce..aa97f39d3017 100644
--- a/secure/lib/libcrypto/i386/bf-586.s
+++ b/secure/lib/libcrypto/i386/bf-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/bf-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/bf-686.s b/secure/lib/libcrypto/i386/bf-686.s
index d3b4cb895586..ab47c92f8dcd 100644
--- a/secure/lib/libcrypto/i386/bf-686.s
+++ b/secure/lib/libcrypto/i386/bf-686.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/bf-686.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/bn-586.s b/secure/lib/libcrypto/i386/bn-586.s
index 88c73fa3c9f9..684c4aab6eba 100644
--- a/secure/lib/libcrypto/i386/bn-586.s
+++ b/secure/lib/libcrypto/i386/bn-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/bn-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/cast-586.s b/secure/lib/libcrypto/i386/cast-586.s
index bb31376b5747..40b48f1b9a8a 100644
--- a/secure/lib/libcrypto/i386/cast-586.s
+++ b/secure/lib/libcrypto/i386/cast-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/cast-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/co-586.s b/secure/lib/libcrypto/i386/co-586.s
index 4e554b0387ed..efe5582bc6b7 100644
--- a/secure/lib/libcrypto/i386/co-586.s
+++ b/secure/lib/libcrypto/i386/co-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/co-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/crypt586.s b/secure/lib/libcrypto/i386/crypt586.s
index dc594e4809e3..7391e0b8588d 100644
--- a/secure/lib/libcrypto/i386/crypt586.s
+++ b/secure/lib/libcrypto/i386/crypt586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/crypt586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/des-586.s b/secure/lib/libcrypto/i386/des-586.s
index b7612905cf20..5a8f6cdbe98f 100644
--- a/secure/lib/libcrypto/i386/des-586.s
+++ b/secure/lib/libcrypto/i386/des-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/des-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/md5-586.s b/secure/lib/libcrypto/i386/md5-586.s
index b97c35741169..b04275ecf355 100644
--- a/secure/lib/libcrypto/i386/md5-586.s
+++ b/secure/lib/libcrypto/i386/md5-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/md5-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/rc4-586.s b/secure/lib/libcrypto/i386/rc4-586.s
index ad274986ac25..88b07be6dc32 100644
--- a/secure/lib/libcrypto/i386/rc4-586.s
+++ b/secure/lib/libcrypto/i386/rc4-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/rc4-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/rc5-586.s b/secure/lib/libcrypto/i386/rc5-586.s
index a33eff94806e..266d5c9f34de 100644
--- a/secure/lib/libcrypto/i386/rc5-586.s
+++ b/secure/lib/libcrypto/i386/rc5-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/rc5-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/rmd-586.s b/secure/lib/libcrypto/i386/rmd-586.s
index fb541db16e7a..bf11cddd3354 100644
--- a/secure/lib/libcrypto/i386/rmd-586.s
+++ b/secure/lib/libcrypto/i386/rmd-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/rmd-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/sha1-586.s b/secure/lib/libcrypto/i386/sha1-586.s
index 4a35f9ddb962..05966e9f26cb 100644
--- a/secure/lib/libcrypto/i386/sha1-586.s
+++ b/secure/lib/libcrypto/i386/sha1-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/sha1-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/opensslconf-alpha.h b/secure/lib/libcrypto/opensslconf-alpha.h
index 14e5af5bf018..274a691544c0 100644
--- a/secure/lib/libcrypto/opensslconf-alpha.h
+++ b/secure/lib/libcrypto/opensslconf-alpha.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-alpha.h,v 1.5 2003/01/29 01:06:15 nectar Exp $ */
 /* opensslconf.h */
 
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
diff --git a/secure/lib/libcrypto/opensslconf-amd64.h b/secure/lib/libcrypto/opensslconf-amd64.h
index 14e5af5bf018..743a19846fd8 100644
--- a/secure/lib/libcrypto/opensslconf-amd64.h
+++ b/secure/lib/libcrypto/opensslconf-amd64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-amd64.h,v 1.5 2003/01/29 01:06:15 nectar Exp $ */
 /* opensslconf.h */
 
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
diff --git a/secure/lib/libcrypto/opensslconf-arm.h b/secure/lib/libcrypto/opensslconf-arm.h
index 736c996ce4c3..291759cff3bd 100644
--- a/secure/lib/libcrypto/opensslconf-arm.h
+++ b/secure/lib/libcrypto/opensslconf-arm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-arm.h,v 1.1 2004/05/14 12:26:51 cognet Exp $ */
 /* opensslconf.h */
 
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
diff --git a/secure/lib/libcrypto/opensslconf-i386.h b/secure/lib/libcrypto/opensslconf-i386.h
index 736c996ce4c3..f8e940826a28 100644
--- a/secure/lib/libcrypto/opensslconf-i386.h
+++ b/secure/lib/libcrypto/opensslconf-i386.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-i386.h,v 1.5 2003/01/29 01:06:15 nectar Exp $ */
 /* opensslconf.h */
 
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
diff --git a/secure/lib/libcrypto/opensslconf-ia64.h b/secure/lib/libcrypto/opensslconf-ia64.h
index 14e5af5bf018..cf90ceaf3984 100644
--- a/secure/lib/libcrypto/opensslconf-ia64.h
+++ b/secure/lib/libcrypto/opensslconf-ia64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-ia64.h,v 1.4 2003/01/29 01:06:15 nectar Exp $ */
 /* opensslconf.h */
 
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
diff --git a/secure/lib/libcrypto/opensslconf-powerpc.h b/secure/lib/libcrypto/opensslconf-powerpc.h
index 736c996ce4c3..e71f4f334647 100644
--- a/secure/lib/libcrypto/opensslconf-powerpc.h
+++ b/secure/lib/libcrypto/opensslconf-powerpc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-powerpc.h,v 1.3 2003/01/29 01:06:15 nectar Exp $ */
 /* opensslconf.h */
 
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
diff --git a/secure/lib/libcrypto/opensslconf-sparc64.h b/secure/lib/libcrypto/opensslconf-sparc64.h
index 14e5af5bf018..0524750b499c 100644
--- a/secure/lib/libcrypto/opensslconf-sparc64.h
+++ b/secure/lib/libcrypto/opensslconf-sparc64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-sparc64.h,v 1.4 2003/01/29 01:06:15 nectar Exp $ */
 /* opensslconf.h */
 
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index a8a1f74a5b37..2b078007748b 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.34.2.2 2005/09/11 16:50:33 des Exp $
 
 LIB=	ssh
 SHLIB_MAJOR=	3
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 4db4b0a4d7c5..404ea00fda8c 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.21.2.1 2005/07/22 17:29:10 kensmith Exp $
 
 LIB=		ssl
 SHLIB_MAJOR=	4
diff --git a/secure/lib/libssl/Makefile.man b/secure/lib/libssl/Makefile.man
index 402bdb7a8770..444c135b6afa 100644
--- a/secure/lib/libssl/Makefile.man
+++ b/secure/lib/libssl/Makefile.man
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssl/Makefile.man,v 1.1 2003/02/10 19:57:53 nectar Exp $
 # DO NOT EDIT: generated from man-makefile-update target
 MAN+= SSL_CIPHER_get_name.3
 MAN+= SSL_COMP_add_compression_method.3
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index b60b4cea0d06..32a89daa8421 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/Makefile,v 1.15 2003/07/16 20:59:15 markm Exp $
 
 SUBDIR=
 .if !defined(NO_OPENSSL)
diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc
index 6d620e245bff..e72145674278 100644
--- a/secure/libexec/Makefile.inc
+++ b/secure/libexec/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/Makefile.inc,v 1.8 2003/04/30 07:54:38 ru Exp $
 
 BINDIR?=	/usr/libexec
 
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 28cff683e037..6e30aff8a47c 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/sftp-server/Makefile,v 1.13 2005/06/07 09:31:26 des Exp $
 
 PROG=   sftp-server
 SRCS=   sftp-server.c sftp-common.c
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 3f2ed519dcb0..20c5bfcc355a 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/ssh-keysign/Makefile,v 1.6 2005/06/07 09:31:26 des Exp $
 
 PROG=	ssh-keysign
 SRCS=	ssh-keysign.c readconf.c
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 4d78845f6c6f..ef3450388a6c 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/Makefile,v 1.24 2003/07/16 20:59:15 markm Exp $
 
 SUBDIR=
 .if !defined(NO_OPENSSL)
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc
index 4cec6fe01a45..355a54c9b4a5 100644
--- a/secure/usr.bin/Makefile.inc
+++ b/secure/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/Makefile.inc,v 1.8 2003/04/30 07:54:38 ru Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile
index 306fc2cfe054..d60cff6be703 100644
--- a/secure/usr.bin/bdes/Makefile
+++ b/secure/usr.bin/bdes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/bdes/Makefile,v 1.14 2004/02/23 20:25:27 johan Exp $
 
 PROG=	bdes
 
diff --git a/secure/usr.bin/bdes/bdes.1 b/secure/usr.bin/bdes/bdes.1
index 367d32d5065c..d4dd9f429010 100644
--- a/secure/usr.bin/bdes/bdes.1
+++ b/secure/usr.bin/bdes/bdes.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bdes.1	8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/secure/usr.bin/bdes/bdes.1,v 1.7 2003/06/02 19:10:59 markm Exp $
 .\"
 .Dd June 29, 1993
 .Dt BDES 1
diff --git a/secure/usr.bin/bdes/bdes.c b/secure/usr.bin/bdes/bdes.c
index 8e8125a85773..ddc3e7001934 100644
--- a/secure/usr.bin/bdes/bdes.c
+++ b/secure/usr.bin/bdes/bdes.c
@@ -81,7 +81,7 @@ static char sccsid[] = "@(#)bdes.c	8.1 (Berkeley) 6/6/93";
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.9 2005/02/10 14:47:06 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 76665dd37ff6..8dce2719655f 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.24 2005/02/25 06:04:12 nectar Exp $
 
 PROG=	openssl
 
diff --git a/secure/usr.bin/openssl/Makefile.man b/secure/usr.bin/openssl/Makefile.man
index f82cd8a17b47..1cb2d4619ccd 100644
--- a/secure/usr.bin/openssl/Makefile.man
+++ b/secure/usr.bin/openssl/Makefile.man
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/openssl/Makefile.man,v 1.2 2005/02/25 06:04:12 nectar Exp $
 # DO NOT EDIT: generated from man-makefile-update target
 MAN+= CA.pl.1
 MAN+= asn1parse.1
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index d6d5abafc383..1bce719dca73 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/scp/Makefile,v 1.14 2005/06/07 09:31:26 des Exp $
 
 PROG=	scp
 CFLAGS+=-I${SSHDIR}
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 08512e860457..f0f2003aec8e 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/sftp/Makefile,v 1.12 2005/06/07 09:31:27 des Exp $
 
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 2716a62ed5b3..050e5b91eb18 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-add/Makefile,v 1.14 2005/06/07 09:31:27 des Exp $
 
 PROG=	ssh-add
 CFLAGS+=-I${SSHDIR}
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index 2f88a6d969c5..789ceda42a98 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-agent/Makefile,v 1.14 2005/06/07 09:31:27 des Exp $
 
 PROG=	ssh-agent
 CFLAGS+=-I${SSHDIR}
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 5dc86992ec96..681321a455b9 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-keygen/Makefile,v 1.15 2005/06/07 09:31:27 des Exp $
 
 PROG=	ssh-keygen
 CFLAGS+=-I${SSHDIR}
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index 1c5ab3ed6b80..5f59b38277f4 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-keyscan/Makefile,v 1.9 2005/06/07 09:31:28 des Exp $
 
 PROG=	ssh-keyscan
 CFLAGS+=-I${SSHDIR}
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 274e481e23f7..3af4142334bd 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.31 2005/06/07 09:31:27 des Exp $
 #
 
 PROG=	ssh
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile
index b8636e5c4333..8f1add5641c0 100644
--- a/secure/usr.sbin/Makefile
+++ b/secure/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.sbin/Makefile,v 1.5 2000/10/24 16:04:51 gshapiro Exp $
 
 SUBDIR= 
 .if !defined(NO_OPENSSH) && !defined(NO_OPENSSL)
diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc
index 282198ea8d8c..81e5a154c775 100644
--- a/secure/usr.sbin/Makefile.inc
+++ b/secure/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.sbin/Makefile.inc,v 1.5 2003/04/30 07:54:39 ru Exp $
 
 BINDIR?=	/usr/sbin
 
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 4e73571084a5..1b7b08e4d62c 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.44 2005/06/07 09:31:28 des Exp $
 #
 
 PROG=	sshd
diff --git a/share/Makefile b/share/Makefile
index e27be2d08698..76fd21093dd7 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/Makefile,v 1.33 2005/04/13 10:02:58 phk Exp $
 
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
diff --git a/share/Makefile.inc b/share/Makefile.inc
index dbe7ccfdebca..78a517201901 100644
--- a/share/Makefile.inc
+++ b/share/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/Makefile.inc,v 1.4 1999/08/28 00:17:58 peter Exp $
 
 BINDIR?=	${SHAREDIR}
 BINOWN=		${SHAREOWN}
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 1ada2dece619..21031ff86f86 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/Makefile,v 1.69 2005/03/04 14:24:29 ru Exp $
 
 LOCALES=	bg_BG.CP1251 \
 		be_BY.CP1131 \
diff --git a/share/colldef/README b/share/colldef/README
index b2fc9f2d650c..c294cf37a4a5 100644
--- a/share/colldef/README
+++ b/share/colldef/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/colldef/README,v 1.2 2002/04/08 09:28:22 ache Exp $
 
 WARNING: For the compatibility sake try to keep collating table backward 
 compatible with ASCII, i.e.  add other symbols to the existent ASCII order.
diff --git a/share/colldef/be_BY.CP1131.src b/share/colldef/be_BY.CP1131.src
index ed9f3cb0bb41..dd4d23b22a53 100644
--- a/share/colldef/be_BY.CP1131.src
+++ b/share/colldef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 charmap map.CP1131
 order \
 # controls
diff --git a/share/colldef/be_BY.CP1251.src b/share/colldef/be_BY.CP1251.src
index aae4c7de78f6..b9e89a58bd56 100644
--- a/share/colldef/be_BY.CP1251.src
+++ b/share/colldef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 charmap map.CP1251
 order \
 # controls
diff --git a/share/colldef/be_BY.ISO8859-5.src b/share/colldef/be_BY.ISO8859-5.src
index bd1e08be2ae2..ae35705509fa 100644
--- a/share/colldef/be_BY.ISO8859-5.src
+++ b/share/colldef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 charmap map.ISO8859-5
 order \
 # controls
diff --git a/share/colldef/bg_BG.CP1251.src b/share/colldef/bg_BG.CP1251.src
index 6c3ed8febac0..587438e3778c 100644
--- a/share/colldef/bg_BG.CP1251.src
+++ b/share/colldef/bg_BG.CP1251.src
@@ -1,6 +1,6 @@
 # CP1251 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/bg_BG.CP1251.src,v 1.2 2003/06/07 03:26:21 ache Exp $
 #
 charmap map.CP1251
 order \
diff --git a/share/colldef/ca_ES.ISO8859-1.src b/share/colldef/ca_ES.ISO8859-1.src
index 138ff848de27..eebbf5b5c3c3 100644
--- a/share/colldef/ca_ES.ISO8859-1.src
+++ b/share/colldef/ca_ES.ISO8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:57 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/ca_ES.ISO8859-15.src b/share/colldef/ca_ES.ISO8859-15.src
index 7aa54f60f7de..19ad5d1caff9 100644
--- a/share/colldef/ca_ES.ISO8859-15.src
+++ b/share/colldef/ca_ES.ISO8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ca_ES.ISO8859-15.src,v 1.1 2002/12/30 09:09:57 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/cs_CZ.ISO8859-2.src b/share/colldef/cs_CZ.ISO8859-2.src
index 2a7c79864155..0f44e341606c 100644
--- a/share/colldef/cs_CZ.ISO8859-2.src
+++ b/share/colldef/cs_CZ.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Latin2 (for Czech; partially according to CSN 97 6030)
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/cs_CZ.ISO8859-2.src,v 1.4 2002/04/08 09:40:52 ache Exp $
 #
 charmap map.ISO8859-2
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-1.src b/share/colldef/de_DE.ISO8859-1.src
index 888623f65383..b4ceddec566f 100644
--- a/share/colldef/de_DE.ISO8859-1.src
+++ b/share/colldef/de_DE.ISO8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/de_DE.ISO8859-1.src,v 1.8 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-15.src b/share/colldef/de_DE.ISO8859-15.src
index 4bb6bbc94b7a..164c40a31bfa 100644
--- a/share/colldef/de_DE.ISO8859-15.src
+++ b/share/colldef/de_DE.ISO8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/de_DE.ISO8859-15.src,v 1.6 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/el_GR.ISO8859-7.src b/share/colldef/el_GR.ISO8859-7.src
index c345b81595e0..8ee6d6c15f10 100644
--- a/share/colldef/el_GR.ISO8859-7.src
+++ b/share/colldef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/el_GR.ISO8859-7.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 # Greek/ISO 8859-7 (backward compatible with ASCII)
 #
diff --git a/share/colldef/es_ES.ISO8859-1.src b/share/colldef/es_ES.ISO8859-1.src
index 138ff848de27..cd841b101215 100644
--- a/share/colldef/es_ES.ISO8859-1.src
+++ b/share/colldef/es_ES.ISO8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/es_ES.ISO8859-1.src,v 1.5 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/es_ES.ISO8859-15.src b/share/colldef/es_ES.ISO8859-15.src
index 7aa54f60f7de..9528615e3388 100644
--- a/share/colldef/es_ES.ISO8859-15.src
+++ b/share/colldef/es_ES.ISO8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/es_ES.ISO8859-15.src,v 1.4 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/et_EE.ISO8859-15.src b/share/colldef/et_EE.ISO8859-15.src
index e05a90ac2956..c0bee860fd08 100644
--- a/share/colldef/et_EE.ISO8859-15.src
+++ b/share/colldef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/et_EE.ISO8859-15.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 # latin1 (backward compatible with ASCII)
 #
 #
diff --git a/share/colldef/hi_IN.ISCII-DEV.src b/share/colldef/hi_IN.ISCII-DEV.src
index fcd8b21b6f63..8119124f6faa 100644
--- a/share/colldef/hi_IN.ISCII-DEV.src
+++ b/share/colldef/hi_IN.ISCII-DEV.src
@@ -1,6 +1,6 @@
 # ISCII-DEV
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:03 ache Exp $
 #
 
 charmap map.ISCII-DEV
diff --git a/share/colldef/hy_AM.ARMSCII-8.src b/share/colldef/hy_AM.ARMSCII-8.src
index 8fa1ed092985..cbb51667a883 100644
--- a/share/colldef/hy_AM.ARMSCII-8.src
+++ b/share/colldef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:16 ache Exp $
 #
 # LC_COLLATE source for Armenian/ARMSCII-8 (backward compatible with ASCII)
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/colldef/is_IS.ISO8859-1.src b/share/colldef/is_IS.ISO8859-1.src
index 68a96c7d26e9..85aa51aedeaf 100644
--- a/share/colldef/is_IS.ISO8859-1.src
+++ b/share/colldef/is_IS.ISO8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/is_IS.ISO8859-1.src,v 1.6 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/is_IS.ISO8859-15.src b/share/colldef/is_IS.ISO8859-15.src
index 0fcbe63b5d47..882e4846fc10 100644
--- a/share/colldef/is_IS.ISO8859-15.src
+++ b/share/colldef/is_IS.ISO8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/is_IS.ISO8859-15.src,v 1.4 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/kk_KZ.PT154.src b/share/colldef/kk_KZ.PT154.src
index a9cde3e51fbf..df762a9b658b 100644
--- a/share/colldef/kk_KZ.PT154.src
+++ b/share/colldef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:20 ache Exp $
 # PT154 (backward compatible with ASCII)
 #
 # Birsh T <birsh@mail.kz>, 2003-12-12
diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 89e1abb17163..24961ae6d487 100644
--- a/share/colldef/la_LN.ISO8859-1.src
+++ b/share/colldef/la_LN.ISO8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-1.src,v 1.10 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/la_LN.ISO8859-15.src b/share/colldef/la_LN.ISO8859-15.src
index 40d0bf4cca32..55fe7c88246f 100644
--- a/share/colldef/la_LN.ISO8859-15.src
+++ b/share/colldef/la_LN.ISO8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-15.src,v 1.4 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/la_LN.ISO8859-2.src b/share/colldef/la_LN.ISO8859-2.src
index 6672d8782576..e5ad30bb7ed9 100644
--- a/share/colldef/la_LN.ISO8859-2.src
+++ b/share/colldef/la_LN.ISO8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-2.src,v 1.3 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-2
 order \
diff --git a/share/colldef/la_LN.ISO8859-4.src b/share/colldef/la_LN.ISO8859-4.src
index 5b8417dbca99..0668af3b364d 100644
--- a/share/colldef/la_LN.ISO8859-4.src
+++ b/share/colldef/la_LN.ISO8859-4.src
@@ -1,6 +1,6 @@
 # latin4 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-4.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-4
 order \
diff --git a/share/colldef/la_LN.US-ASCII.src b/share/colldef/la_LN.US-ASCII.src
index df3c34088764..b868b824685d 100644
--- a/share/colldef/la_LN.US-ASCII.src
+++ b/share/colldef/la_LN.US-ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.US-ASCII.src,v 1.2 1999/08/28 00:59:47 peter Exp $
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/lt_LT.ISO8859-13.src b/share/colldef/lt_LT.ISO8859-13.src
index 811db89f7c8b..118b19e14056 100644
--- a/share/colldef/lt_LT.ISO8859-13.src
+++ b/share/colldef/lt_LT.ISO8859-13.src
@@ -1,6 +1,6 @@
 # Lithuanian (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
 #
 charmap map.ISO8859-13
 order \
diff --git a/share/colldef/lt_LT.ISO8859-4.src b/share/colldef/lt_LT.ISO8859-4.src
index 961ce6ea7388..8bc5f56efe9a 100644
--- a/share/colldef/lt_LT.ISO8859-4.src
+++ b/share/colldef/lt_LT.ISO8859-4.src
@@ -1,6 +1,6 @@
 # Lithuanian (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/lt_LT.ISO8859-4.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-4
 order \
diff --git a/share/colldef/map.ARMSCII-8 b/share/colldef/map.ARMSCII-8
index b9dc826817a3..e85504fbcebd 100644
--- a/share/colldef/map.ARMSCII-8
+++ b/share/colldef/map.ARMSCII-8
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ARMSCII-8,v 1.1 2003/07/05 12:03:16 ache Exp $
 #
 # map.ARMSCII-8 defined by Vahe Khachikyan <vahe@khachikyan.de>
 # 
diff --git a/share/colldef/map.CP1131 b/share/colldef/map.CP1131
index 1f49cdcc9bb0..8c1d7bffb8ef 100644
--- a/share/colldef/map.CP1131
+++ b/share/colldef/map.CP1131
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.CP1131,v 1.1 2003/12/20 11:20:05 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.CP1251 b/share/colldef/map.CP1251
index dac8eb7c7791..af8f6000bb65 100644
--- a/share/colldef/map.CP1251
+++ b/share/colldef/map.CP1251
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.CP1251,v 1.1 2001/11/05 06:58:02 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.CP866 b/share/colldef/map.CP866
index 16f09b414370..452fbbad8d1b 100644
--- a/share/colldef/map.CP866
+++ b/share/colldef/map.CP866
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.CP866,v 1.2 2003/06/07 02:51:52 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISCII-DEV b/share/colldef/map.ISCII-DEV
index 93ef1564b7df..62995fbbe0db 100644
--- a/share/colldef/map.ISCII-DEV
+++ b/share/colldef/map.ISCII-DEV
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISCII-DEV,v 1.1 2001/11/28 07:23:03 ache Exp $
 NU 							 \x00
 SH 							 \x01
 SX 							 \x02
diff --git a/share/colldef/map.ISO8859-13 b/share/colldef/map.ISO8859-13
index 8cb2afe0f2cd..3907ef0bbb3c 100644
--- a/share/colldef/map.ISO8859-13
+++ b/share/colldef/map.ISO8859-13
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-13,v 1.1 2002/10/25 22:02:09 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISO8859-4 b/share/colldef/map.ISO8859-4
index 8bbeb57ea1dc..f9681096f6fd 100644
--- a/share/colldef/map.ISO8859-4
+++ b/share/colldef/map.ISO8859-4
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-4,v 1.1 1999/12/24 05:47:10 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISO8859-5 b/share/colldef/map.ISO8859-5
index 230b559c659b..37fe88bccc4d 100644
--- a/share/colldef/map.ISO8859-5
+++ b/share/colldef/map.ISO8859-5
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-5,v 1.1 1999/10/03 01:22:22 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISO8859-7 b/share/colldef/map.ISO8859-7
index b45066a32b73..46b528a5ccce 100644
--- a/share/colldef/map.ISO8859-7
+++ b/share/colldef/map.ISO8859-7
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-7,v 1.1 2001/01/17 16:47:28 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.KOI8-R b/share/colldef/map.KOI8-R
index 62dd2f45dbdd..3fef2915565b 100644
--- a/share/colldef/map.KOI8-R
+++ b/share/colldef/map.KOI8-R
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.KOI8-R,v 1.2 2003/06/07 02:51:52 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.KOI8-U b/share/colldef/map.KOI8-U
index fd6a6e302c80..46ca161a6d59 100644
--- a/share/colldef/map.KOI8-U
+++ b/share/colldef/map.KOI8-U
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.KOI8-U,v 1.3 2003/06/07 02:59:28 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.PT154 b/share/colldef/map.PT154
index 79b2fb31fe3c..ac780af9bddb 100644
--- a/share/colldef/map.PT154
+++ b/share/colldef/map.PT154
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.PT154,v 1.1 2004/01/29 16:28:20 ache Exp $
 # Birsh T <birsh@mail.kz>, 2003-12-12
 NU \x00
 SH \x01
diff --git a/share/colldef/pl_PL.ISO8859-2.src b/share/colldef/pl_PL.ISO8859-2.src
index 6518d7200bc6..23760580b885 100644
--- a/share/colldef/pl_PL.ISO8859-2.src
+++ b/share/colldef/pl_PL.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Latin2 (for Polish) by Michal Pasternak <michal@pasternak.w.lub.pl> 
 # with much help from Adam Liberacki and Jan Srzednicki
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/pl_PL.ISO8859-2.src,v 1.1 2002/07/14 13:17:12 ache Exp $
 #
 charmap map.ISO8859-2
 order \
diff --git a/share/colldef/ru_RU.CP1251.src b/share/colldef/ru_RU.CP1251.src
index 06e064197a0e..9cd8b3d9a025 100644
--- a/share/colldef/ru_RU.CP1251.src
+++ b/share/colldef/ru_RU.CP1251.src
@@ -1,6 +1,6 @@
 # CP1251 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.CP1251.src,v 1.2 2003/06/07 00:46:20 ache Exp $
 #
 charmap map.CP1251
 order \
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index 425cb30805c3..066527ae76ce 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.CP866.src,v 1.10 2003/06/07 02:51:52 ache Exp $
 #
 charmap map.CP866
 order \
diff --git a/share/colldef/ru_RU.ISO8859-5.src b/share/colldef/ru_RU.ISO8859-5.src
index 2fd9f5ac3223..e04601ba8786 100644
--- a/share/colldef/ru_RU.ISO8859-5.src
+++ b/share/colldef/ru_RU.ISO8859-5.src
@@ -1,6 +1,6 @@
 # Russian part of ISO8859-5 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.ISO8859-5.src,v 1.3 2003/06/07 00:46:20 ache Exp $
 #
 charmap map.ISO8859-5
 order \
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index f7c69d2fb642..32e9332f314b 100644
--- a/share/colldef/ru_RU.KOI8-R.src
+++ b/share/colldef/ru_RU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.KOI8-R.src,v 1.10 2003/06/07 02:51:52 ache Exp $
 #
 charmap map.KOI8-R
 order \
diff --git a/share/colldef/sl_SI.ISO8859-2.src b/share/colldef/sl_SI.ISO8859-2.src
index db5db89a981b..22d1b55f1967 100644
--- a/share/colldef/sl_SI.ISO8859-2.src
+++ b/share/colldef/sl_SI.ISO8859-2.src
@@ -2,7 +2,7 @@
 # Slovenian collation sequence
 # 2003-03-20 simon.zekar@literal.si
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sl_SI.ISO8859-2.src,v 1.1 2003/10/09 00:55:33 ache Exp $
 #
 
 charmap map.ISO8859-2
diff --git a/share/colldef/sr_YU.ISO8859-5.src b/share/colldef/sr_YU.ISO8859-5.src
index ce2f4d28f850..382e4d208a4b 100644
--- a/share/colldef/sr_YU.ISO8859-5.src
+++ b/share/colldef/sr_YU.ISO8859-5.src
@@ -1,6 +1,6 @@
 # Serbian part of ISO8859-5 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 12:59:19 ache Exp $
 #
 charmap map.ISO8859-5
 order \
diff --git a/share/colldef/sv_SE.ISO8859-1.src b/share/colldef/sv_SE.ISO8859-1.src
index 567d7a0d8bed..430f940679ba 100644
--- a/share/colldef/sv_SE.ISO8859-1.src
+++ b/share/colldef/sv_SE.ISO8859-1.src
@@ -2,7 +2,7 @@
 #
 # (Based on the German de_DE.ISO_8859-1)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sv_SE.ISO8859-1.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/sv_SE.ISO8859-15.src b/share/colldef/sv_SE.ISO8859-15.src
index e5946b3e8a59..098a5d80e429 100644
--- a/share/colldef/sv_SE.ISO8859-15.src
+++ b/share/colldef/sv_SE.ISO8859-15.src
@@ -2,7 +2,7 @@
 #
 # (Based on the German de_DE.ISO_8859-15)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sv_SE.ISO8859-15.src,v 1.3 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/uk_UA.CP1251.src b/share/colldef/uk_UA.CP1251.src
index 6bf3454748cc..8ac50457e44a 100644
--- a/share/colldef/uk_UA.CP1251.src
+++ b/share/colldef/uk_UA.CP1251.src
@@ -1,6 +1,6 @@
 # CP1251 (for Ukrainian)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:29 ru Exp $
 #
 charmap map.CP1251
 order \
diff --git a/share/colldef/uk_UA.ISO8859-5.src b/share/colldef/uk_UA.ISO8859-5.src
index 4024e2d99699..1d90ea548933 100644
--- a/share/colldef/uk_UA.ISO8859-5.src
+++ b/share/colldef/uk_UA.ISO8859-5.src
@@ -1,6 +1,6 @@
 # Ukrainian part of ISO8859-5 with russian letters (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/uk_UA.ISO8859-5.src,v 1.2 2001/12/21 03:31:12 ache Exp $
 #
 charmap map.ISO8859-5
 order \
diff --git a/share/colldef/uk_UA.KOI8-U.src b/share/colldef/uk_UA.KOI8-U.src
index bb31d239e01f..f579e39b6210 100644
--- a/share/colldef/uk_UA.KOI8-U.src
+++ b/share/colldef/uk_UA.KOI8-U.src
@@ -1,6 +1,6 @@
 # koi8-u (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/uk_UA.KOI8-U.src,v 1.4 2003/06/07 03:37:16 ache Exp $
 #
 charmap map.KOI8-U
 order \
diff --git a/share/dict/Makefile b/share/dict/Makefile
index d9e455d6b54c..bd34246b14af 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/dict/Makefile,v 1.14 2004/12/21 08:46:52 ru Exp $
 
 NO_OBJ=
 
diff --git a/share/dict/README b/share/dict/README
index 1a51c20a95a1..767c561c87c7 100644
--- a/share/dict/README
+++ b/share/dict/README
@@ -1,5 +1,5 @@
 #	@(#)README	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/dict/README,v 1.13 2003/01/24 20:51:03 wollman Exp $
 
 WEB ---- (introduction provided by jaw@riacs) -------------------------
 
diff --git a/share/dict/freebsd b/share/dict/freebsd
index 66f57a5e9137..2a22010e52b3 100644
--- a/share/dict/freebsd
+++ b/share/dict/freebsd
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/dict/freebsd,v 1.11 2005/05/04 14:19:36 murray Exp $
 ABI
 ACL
 ACPI
diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION
index bd7bb915f026..713ffb14428a 100644
--- a/share/doc/IPv6/IMPLEMENTATION
+++ b/share/doc/IPv6/IMPLEMENTATION
@@ -3,7 +3,7 @@
 	KAME Project
 	http://www.kame.net/
 	$KAME: IMPLEMENTATION,v 1.216 2001/05/25 07:43:01 jinmei Exp $
-	$FreeBSD$
+	$FreeBSD: src/share/doc/IPv6/IMPLEMENTATION,v 1.7 2003/11/05 12:00:32 ume Exp $
 
 NOTE: The document tries to describe behaviors/implementation choices
 of the latest KAME/*BSD stack (like KAME/NetBSD 1.5.1).  The description
diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile
index 62e160cbfcf1..d4523039cf92 100644
--- a/share/doc/IPv6/Makefile
+++ b/share/doc/IPv6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/IPv6/Makefile,v 1.4 2004/12/21 08:46:52 ru Exp $
 
 NO_OBJ=
 FILES=		IMPLEMENTATION
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 6f2742ac8e4d..c3e57fc3c79d 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/Makefile,v 1.19 2004/09/25 09:11:39 dougb Exp $
 
 SUBDIR=	${_bind9} IPv6 papers psd smm usd
 
diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
index 1e0bae0b8b50..213dbea36140 100644
--- a/share/doc/bind9/Makefile
+++ b/share/doc/bind9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/bind9/Makefile,v 1.4 2005/03/17 10:15:29 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 SRCDIR=		${BIND_DIR}/doc
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index eeaf63fa6760..1da666f82fe1 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/Makefile,v 1.15.2.1 2005/08/16 22:39:27 phk Exp $
 
 SUBDIR=	beyond4.3 \
 	bufbio \
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index 7d1fa492d9a5..bc08c6acd229 100644
--- a/share/doc/papers/beyond4.3/Makefile
+++ b/share/doc/papers/beyond4.3/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/beyond4.3/Makefile,v 1.9 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=	papers
 DOC=	beyond43
diff --git a/share/doc/papers/beyond4.3/beyond43.ms b/share/doc/papers/beyond4.3/beyond43.ms
index b682ffc0d836..a59698fc3f3f 100644
--- a/share/doc/papers/beyond4.3/beyond43.ms
+++ b/share/doc/papers/beyond4.3/beyond43.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)beyond43.ms	5.1 (Berkeley) 6/5/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/beyond4.3/beyond43.ms,v 1.3 2000/11/28 11:32:03 ru Exp $
 .\"
 .\" *troff -ms
 .rm CM
diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile
index 9bdd4874fb20..22e3e15509a4 100644
--- a/share/doc/papers/bufbio/Makefile
+++ b/share/doc/papers/bufbio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/bufbio/Makefile,v 1.5 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		bio
diff --git a/share/doc/papers/bufbio/bio.ms b/share/doc/papers/bufbio/bio.ms
index 123f8e7699b7..77795cc55a14 100644
--- a/share/doc/papers/bufbio/bio.ms
+++ b/share/doc/papers/bufbio/bio.ms
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/bufbio/bio.ms,v 1.3 2000/11/29 08:51:24 ru Exp $
 .\"
 .if n .ftr C R
 .nr PI 2n
diff --git a/share/doc/papers/bufbio/bufsize.eps b/share/doc/papers/bufbio/bufsize.eps
index 2396ac62aa40..6dee88740fcb 100644
--- a/share/doc/papers/bufbio/bufsize.eps
+++ b/share/doc/papers/bufbio/bufsize.eps
@@ -1,6 +1,6 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: a.ps
-%%Creator: $FreeBSD$
+%%Creator: $FreeBSD: src/share/doc/papers/bufbio/bufsize.eps,v 1.1 2000/07/30 08:57:03 phk Exp $
 %%CreationDate: Sat Apr  8 08:32:58 2000
 %%DocumentFonts: (atend)
 %%BoundingBox: 50 50 410 302
diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile
index d15ff9c3b4ea..b2051f0314d1 100644
--- a/share/doc/papers/contents/Makefile
+++ b/share/doc/papers/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/contents/Makefile,v 1.6 2001/12/17 13:45:49 ru Exp $
 
 VOLUME=	papers
 DOC=	contents
diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms
index 12b287a919c3..84e30f6f5cce 100644
--- a/share/doc/papers/contents/contents.ms
+++ b/share/doc/papers/contents/contents.ms
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/contents/contents.ms,v 1.8 2005/05/26 23:01:30 eivind Exp $
 .\"
 .OH '''Papers Contents'
 .EH 'Papers Contents'''
diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile
index 53a79fccab9a..5fcd4d89d22a 100644
--- a/share/doc/papers/devfs/Makefile
+++ b/share/doc/papers/devfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/devfs/Makefile,v 1.4 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		devfs
diff --git a/share/doc/papers/devfs/paper.me b/share/doc/papers/devfs/paper.me
index 9b775e938b92..a0940bbdb38c 100644
--- a/share/doc/papers/devfs/paper.me
+++ b/share/doc/papers/devfs/paper.me
@@ -1,5 +1,5 @@
 .\" format with ditroff -me
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/devfs/paper.me,v 1.2 2002/02/18 16:22:23 sobomax Exp $
 .\" format made to look as a paper for the proceedings is to look
 .\" (as specified in the text)
 .if n \{ .po 0
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 7f7670c45533..b9eef9a8090c 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/diskperf/Makefile,v 1.7 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		diskperf
diff --git a/share/doc/papers/diskperf/conclusions.ms b/share/doc/papers/diskperf/conclusions.ms
index 9e20f1a64708..f01b51d013f6 100644
--- a/share/doc/papers/diskperf/conclusions.ms
+++ b/share/doc/papers/diskperf/conclusions.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)conclusions.ms	6.2 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/diskperf/conclusions.ms,v 1.6 1999/08/28 00:18:04 peter Exp $
 .\"
 .ds RH Conclusions
 .NH
diff --git a/share/doc/papers/diskperf/motivation.ms b/share/doc/papers/diskperf/motivation.ms
index d5fde9d1b933..69f82f0c7bf1 100644
--- a/share/doc/papers/diskperf/motivation.ms
+++ b/share/doc/papers/diskperf/motivation.ms
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)motivation.ms	6.2 (Berkeley) 4/16/91
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/papers/diskperf/motivation.ms,v 1.2 2003/01/01 18:48:46 schweikh Exp $
 .\"
 .ds RH Motivation
 .NH
diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms
index e9379311301c..0247b1cb80bb 100644
--- a/share/doc/papers/diskperf/tests.ms
+++ b/share/doc/papers/diskperf/tests.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tests.ms	6.2 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/diskperf/tests.ms,v 1.6 2003/01/01 18:48:46 schweikh Exp $
 .\"
 .ds RH Tests
 .NH
diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile
index f11021b0d27c..32d185f6909e 100644
--- a/share/doc/papers/fsinterface/Makefile
+++ b/share/doc/papers/fsinterface/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/fsinterface/Makefile,v 1.7 2002/10/25 08:10:40 ru Exp $
 
 VOLUME=	papers
 DOC=	fsinterface
diff --git a/share/doc/papers/fsinterface/fsinterface.ms b/share/doc/papers/fsinterface/fsinterface.ms
index 453cc7e9d594..797ca41f761b 100644
--- a/share/doc/papers/fsinterface/fsinterface.ms
+++ b/share/doc/papers/fsinterface/fsinterface.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsinterface.ms	1.4 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/fsinterface/fsinterface.ms,v 1.9 2002/06/20 07:09:23 peter Exp $
 .\"
 .nr UX 0
 .de UX
diff --git a/share/doc/papers/hwpmc/Makefile b/share/doc/papers/hwpmc/Makefile
index d24fe06d9d2d..6bc1fd08670d 100644
--- a/share/doc/papers/hwpmc/Makefile
+++ b/share/doc/papers/hwpmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/hwpmc/Makefile,v 1.1 2005/04/19 04:01:22 jkoshy Exp $
 
 VOLUME=	papers
 DOC=	hwpmc
diff --git a/share/doc/papers/hwpmc/hwpmc.ms b/share/doc/papers/hwpmc/hwpmc.ms
index 9061bb7a69a3..bfeda9d1df0f 100644
--- a/share/doc/papers/hwpmc/hwpmc.ms
+++ b/share/doc/papers/hwpmc/hwpmc.ms
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/hwpmc/hwpmc.ms,v 1.1 2005/04/19 04:01:22 jkoshy Exp $
 .\"
 .OH '''Using Hardware Performance Monitoring Counters'
 .EH 'HWPMC'''
diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile
index 5d493542ea98..c0be903c5e5d 100644
--- a/share/doc/papers/jail/Makefile
+++ b/share/doc/papers/jail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/jail/Makefile,v 1.6 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		jail
diff --git a/share/doc/papers/jail/future.ms b/share/doc/papers/jail/future.ms
index 01c325d4d19c..d1e009778979 100644
--- a/share/doc/papers/jail/future.ms
+++ b/share/doc/papers/jail/future.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/future.ms,v 1.1 2000/05/29 18:18:07 phk Exp $
 .\"
 .NH
 Future Directions
diff --git a/share/doc/papers/jail/implementation.ms b/share/doc/papers/jail/implementation.ms
index eafc8f25c9c7..edff4ddc19fa 100644
--- a/share/doc/papers/jail/implementation.ms
+++ b/share/doc/papers/jail/implementation.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/implementation.ms,v 1.1 2000/05/29 18:18:07 phk Exp $
 .\"
 .NH
 Implementation jail in the FreeBSD kernel.
diff --git a/share/doc/papers/jail/jail01.eps b/share/doc/papers/jail/jail01.eps
index ffcfa30386f1..56289171a205 100644
--- a/share/doc/papers/jail/jail01.eps
+++ b/share/doc/papers/jail/jail01.eps
@@ -2,7 +2,7 @@
 %%Title: jail01.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 1
 %%CreationDate: Fri Mar 24 20:37:59 2000
-%%For: $FreeBSD$
+%%For: $FreeBSD: src/share/doc/papers/jail/jail01.eps,v 1.1 2000/05/29 18:18:07 phk Exp $
 %%Orientation: Portrait
 %%BoundingBox: 0 0 425 250
 %%Pages: 0
diff --git a/share/doc/papers/jail/jail01.fig b/share/doc/papers/jail/jail01.fig
index d4ef1655e195..5486df089485 100644
--- a/share/doc/papers/jail/jail01.fig
+++ b/share/doc/papers/jail/jail01.fig
@@ -1,5 +1,5 @@
 #FIG 3.2
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/jail/jail01.fig,v 1.1 2000/05/29 18:18:07 phk Exp $
 Landscape
 Center
 Inches
diff --git a/share/doc/papers/jail/mgt.ms b/share/doc/papers/jail/mgt.ms
index e2835d7f4947..ec39c5ecfffe 100644
--- a/share/doc/papers/jail/mgt.ms
+++ b/share/doc/papers/jail/mgt.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/mgt.ms,v 1.3 2002/01/16 06:55:29 arr Exp $
 .\"
 .NH
 Managing Jails and the Jail File System Environment
diff --git a/share/doc/papers/jail/paper.ms b/share/doc/papers/jail/paper.ms
index 60be9f2748bd..0024a56b398a 100644
--- a/share/doc/papers/jail/paper.ms
+++ b/share/doc/papers/jail/paper.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/paper.ms,v 1.7 2000/12/06 11:56:34 ru Exp $
 .\"
 .if n .ftr C R
 .ig TL
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index e706f0a38962..d3707aa139e5 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/kernmalloc/Makefile,v 1.7 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		kernmalloc
diff --git a/share/doc/papers/kernmalloc/kernmalloc.t b/share/doc/papers/kernmalloc/kernmalloc.t
index d074c9ed48d4..65fcf35c8fc4 100644
--- a/share/doc/papers/kernmalloc/kernmalloc.t
+++ b/share/doc/papers/kernmalloc/kernmalloc.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kernmalloc.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/kernmalloc/kernmalloc.t,v 1.6 2000/11/28 19:26:53 ru Exp $
 .\"
 .\" reference a system routine name
 .de RN
diff --git a/share/doc/papers/kerntune/1.t b/share/doc/papers/kerntune/1.t
index 49b653f501f8..f5ebcd55ee61 100644
--- a/share/doc/papers/kerntune/1.t
+++ b/share/doc/papers/kerntune/1.t
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	1.2 (Berkeley) 11/8/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/kerntune/1.t,v 1.5 1999/08/28 00:18:07 peter Exp $
 .\"
 .ds RH Introduction
 .NH 1
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index 33416d6e3c1b..914a7cc537be 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.5 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/kerntune/Makefile,v 1.8 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		kerntune
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index 00e1e3d87a3e..b95e3f5636b0 100644
--- a/share/doc/papers/malloc/Makefile
+++ b/share/doc/papers/malloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/malloc/Makefile,v 1.5 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=	papers
 DOC=	malloc
diff --git a/share/doc/papers/malloc/abs.ms b/share/doc/papers/malloc/abs.ms
index f58d719f4c28..28ff9782175f 100644
--- a/share/doc/papers/malloc/abs.ms
+++ b/share/doc/papers/malloc/abs.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/abs.ms,v 1.6 2002/03/25 14:11:34 phk Exp $
 .\"
 .if n .ND
 .TL
diff --git a/share/doc/papers/malloc/alternatives.ms b/share/doc/papers/malloc/alternatives.ms
index 5a46f9520984..7d4e147ef5a6 100644
--- a/share/doc/papers/malloc/alternatives.ms
+++ b/share/doc/papers/malloc/alternatives.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/alternatives.ms,v 1.7 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Alternative implementations
 .NH
diff --git a/share/doc/papers/malloc/conclusion.ms b/share/doc/papers/malloc/conclusion.ms
index da7d7e98bdb5..10fa99416390 100644
--- a/share/doc/papers/malloc/conclusion.ms
+++ b/share/doc/papers/malloc/conclusion.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/conclusion.ms,v 1.7 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Conclusion and experience.
 .NH
diff --git a/share/doc/papers/malloc/implementation.ms b/share/doc/papers/malloc/implementation.ms
index 2507e4cb1b77..24713e130550 100644
--- a/share/doc/papers/malloc/implementation.ms
+++ b/share/doc/papers/malloc/implementation.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/implementation.ms,v 1.10 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Implementation
 .NH
diff --git a/share/doc/papers/malloc/intro.ms b/share/doc/papers/malloc/intro.ms
index 0ee87c959a2b..f147b283a3ce 100644
--- a/share/doc/papers/malloc/intro.ms
+++ b/share/doc/papers/malloc/intro.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/intro.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Introduction
 .NH
diff --git a/share/doc/papers/malloc/kernel.ms b/share/doc/papers/malloc/kernel.ms
index 952e95ccd962..65000418638f 100644
--- a/share/doc/papers/malloc/kernel.ms
+++ b/share/doc/papers/malloc/kernel.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/kernel.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH The kernel and memory
 .NH
diff --git a/share/doc/papers/malloc/malloc.ms b/share/doc/papers/malloc/malloc.ms
index 4f3cf7d80def..7f18ccea3307 100644
--- a/share/doc/papers/malloc/malloc.ms
+++ b/share/doc/papers/malloc/malloc.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/malloc.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Malloc and free
 .NH
diff --git a/share/doc/papers/malloc/performance.ms b/share/doc/papers/malloc/performance.ms
index 773f92ab7832..5a67f36805ec 100644
--- a/share/doc/papers/malloc/performance.ms
+++ b/share/doc/papers/malloc/performance.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/performance.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Performance
 .NH
diff --git a/share/doc/papers/malloc/problems.ms b/share/doc/papers/malloc/problems.ms
index 980f2e97ddba..e638145846db 100644
--- a/share/doc/papers/malloc/problems.ms
+++ b/share/doc/papers/malloc/problems.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/problems.ms,v 1.6 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH The problems
 .NH
diff --git a/share/doc/papers/newvm/1.t b/share/doc/papers/newvm/1.t
index 02ac8be22d1a..c3cbf983deb9 100644
--- a/share/doc/papers/newvm/1.t
+++ b/share/doc/papers/newvm/1.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/newvm/1.t,v 1.6 1999/08/28 00:18:13 peter Exp $
 .\"
 .NH
 Motivations for a New Virtual Memory System
diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile
index 6b1a9e32bc03..92b64cff9e99 100644
--- a/share/doc/papers/newvm/Makefile
+++ b/share/doc/papers/newvm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.4 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/newvm/Makefile,v 1.6 2002/10/25 08:40:24 ru Exp $
 
 VOLUME=	papers
 DOC=	newvm
diff --git a/share/doc/papers/newvm/a.t b/share/doc/papers/newvm/a.t
index bb20df115a55..86b845bc2c79 100644
--- a/share/doc/papers/newvm/a.t
+++ b/share/doc/papers/newvm/a.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/newvm/a.t,v 1.6 1999/08/28 00:18:14 peter Exp $
 .\"
 .sp 2
 .ne 2i
diff --git a/share/doc/papers/relengr/0.t b/share/doc/papers/relengr/0.t
index 569be698d4fd..1703d32e0a9f 100644
--- a/share/doc/papers/relengr/0.t
+++ b/share/doc/papers/relengr/0.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)0.t	5.1 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/relengr/0.t,v 1.3 2002/10/30 13:07:33 ru Exp $
 .\"
 .rm CM
 .nr PO 1.25i
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index 88ab5afcc287..75368a2b32ab 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/relengr/Makefile,v 1.10 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		releng
diff --git a/share/doc/papers/sysperf/4.t b/share/doc/papers/sysperf/4.t
index 373a0d0ce14a..2d407c3c226f 100644
--- a/share/doc/papers/sysperf/4.t
+++ b/share/doc/papers/sysperf/4.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)4.t	5.1 (Berkeley) 4/17/91
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/papers/sysperf/4.t,v 1.3 2003/01/01 18:48:46 schweikh Exp $
 .\"
 .ds RH Performance Improvements
 .NH
diff --git a/share/doc/papers/sysperf/5.t b/share/doc/papers/sysperf/5.t
index ff008c336c34..821e57a6dc73 100644
--- a/share/doc/papers/sysperf/5.t
+++ b/share/doc/papers/sysperf/5.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)5.t	5.1 (Berkeley) 4/17/91
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/sysperf/5.t,v 1.2 2002/12/30 21:18:05 schweikh Exp $
 .\"
 .ds RH Functional Extensions
 .NH
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index 9ddbc9df5474..10b0a92a2d42 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/sysperf/Makefile,v 1.9 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		sysperf
diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile
index f6d158ba4034..97932a64f631 100644
--- a/share/doc/papers/timecounter/Makefile
+++ b/share/doc/papers/timecounter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/timecounter/Makefile,v 1.3 2004/10/24 15:32:41 ru Exp $
 
 # You really want:
 # PRINTERDEVICE=ps
diff --git a/share/doc/papers/timecounter/fig1.eps b/share/doc/papers/timecounter/fig1.eps
index 012fed28d80f..998350473996 100644
--- a/share/doc/papers/timecounter/fig1.eps
+++ b/share/doc/papers/timecounter/fig1.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig1.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig1.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 191 194
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig2.eps b/share/doc/papers/timecounter/fig2.eps
index 67714356dccd..002f7df1db85 100644
--- a/share/doc/papers/timecounter/fig2.eps
+++ b/share/doc/papers/timecounter/fig2.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig2.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig2.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 191 194
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig3.eps b/share/doc/papers/timecounter/fig3.eps
index 997282374dcf..45a5e531c5cd 100644
--- a/share/doc/papers/timecounter/fig3.eps
+++ b/share/doc/papers/timecounter/fig3.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig3.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig3.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 181 56
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig4.eps b/share/doc/papers/timecounter/fig4.eps
index 7a5684f26a71..b19321dffdc3 100644
--- a/share/doc/papers/timecounter/fig4.eps
+++ b/share/doc/papers/timecounter/fig4.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig4.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig4.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 119 203
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig5.eps b/share/doc/papers/timecounter/fig5.eps
index b6274c1f6d40..ab7224adbeb9 100644
--- a/share/doc/papers/timecounter/fig5.eps
+++ b/share/doc/papers/timecounter/fig5.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig5.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig5.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 140 225
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/gps.ps b/share/doc/papers/timecounter/gps.ps
index aaaae8173f7f..f1971ba4eea7 100644
--- a/share/doc/papers/timecounter/gps.ps
+++ b/share/doc/papers/timecounter/gps.ps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: _.ps
 %%Creator: gnuplot 3.7 patchlevel 1
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/gps.ps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%DocumentFonts: (atend)
 %%BoundingBox: 50 50 266 201
 %%Orientation: Portrait
diff --git a/share/doc/papers/timecounter/intr.ps b/share/doc/papers/timecounter/intr.ps
index a6bb7ce078a2..8fce26705ba3 100644
--- a/share/doc/papers/timecounter/intr.ps
+++ b/share/doc/papers/timecounter/intr.ps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: _.ps
 %%Creator: gnuplot 3.7 patchlevel 1
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/intr.ps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%DocumentFonts: (atend)
 %%BoundingBox: 50 50 266 201
 %%Orientation: Portrait
diff --git a/share/doc/papers/timecounter/timecounter.ms b/share/doc/papers/timecounter/timecounter.ms
index 96ac3d900b28..3121456232b1 100644
--- a/share/doc/papers/timecounter/timecounter.ms
+++ b/share/doc/papers/timecounter/timecounter.ms
@@ -9,7 +9,7 @@ delim øø
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/timecounter/timecounter.ms,v 1.3 2004/02/23 23:39:42 phk Exp $
 .\"
 .if n .ND
 .TI
diff --git a/share/doc/papers/timecounter/tmac.usenix b/share/doc/papers/timecounter/tmac.usenix
index c0c13c20cd08..9efc48c9e143 100644
--- a/share/doc/papers/timecounter/tmac.usenix
+++ b/share/doc/papers/timecounter/tmac.usenix
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/timecounter/tmac.usenix,v 1.1 2003/06/15 18:49:46 phk Exp $
 .ds CC "
 .nr PS 10
 .nr FU 0.0i	\" priniter prints this much too low
diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index 14a2f703e5b9..39fda88471ff 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/01.cacm/Makefile,v 1.8 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/01.cacm
 SRCS=		stubs p.mac p1 p2 p3 p4 p5 p6
diff --git a/share/doc/psd/01.cacm/p.mac b/share/doc/psd/01.cacm/p.mac
index 5450b5dc96f7..d75be7584d24 100644
--- a/share/doc/psd/01.cacm/p.mac
+++ b/share/doc/psd/01.cacm/p.mac
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p.mac	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p.mac,v 1.1 2002/05/19 05:31:37 grog Exp $
 .de P1
 .DS
 ..
diff --git a/share/doc/psd/01.cacm/p1 b/share/doc/psd/01.cacm/p1
index 88987e02bb06..5a4ccfd5ca2b 100644
--- a/share/doc/psd/01.cacm/p1
+++ b/share/doc/psd/01.cacm/p1
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p1	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p1,v 1.3 2002/10/30 13:07:34 ru Exp $
 .OH 'The UNIX Time-Sharing System''PSD:1-%'
 .EH 'PSD:1-%''The UNIX Time-Sharing System'
 .ds n \s+2
diff --git a/share/doc/psd/01.cacm/p2 b/share/doc/psd/01.cacm/p2
index 8373c0ed9d58..4e711715e2a5 100644
--- a/share/doc/psd/01.cacm/p2
+++ b/share/doc/psd/01.cacm/p2
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p2	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p2,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 3.6 I/O calls
 .PP
diff --git a/share/doc/psd/01.cacm/p3 b/share/doc/psd/01.cacm/p3
index 2dc86d28e755..d63414d9c161 100644
--- a/share/doc/psd/01.cacm/p3
+++ b/share/doc/psd/01.cacm/p3
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p3	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p3,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 V. PROCESSES AND IMAGES
 .PP
diff --git a/share/doc/psd/01.cacm/p4 b/share/doc/psd/01.cacm/p4
index 09adb2bb6e8b..de0a2f5678da 100644
--- a/share/doc/psd/01.cacm/p4
+++ b/share/doc/psd/01.cacm/p4
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p4	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p4,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 VI. THE SHELL
 .PP
diff --git a/share/doc/psd/01.cacm/p5 b/share/doc/psd/01.cacm/p5
index cf40f2d6b016..bdab82a85eec 100644
--- a/share/doc/psd/01.cacm/p5
+++ b/share/doc/psd/01.cacm/p5
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p5	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p5,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 VII. TRAPS
 .PP
diff --git a/share/doc/psd/01.cacm/p6 b/share/doc/psd/01.cacm/p6
index 77af7e762292..52b649e06dc8 100644
--- a/share/doc/psd/01.cacm/p6
+++ b/share/doc/psd/01.cacm/p6
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p6	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p6,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 IX. STATISTICS
 .PP
diff --git a/share/doc/psd/01.cacm/ref.bib b/share/doc/psd/01.cacm/ref.bib
index c4283b5806c3..679ab97205fd 100644
--- a/share/doc/psd/01.cacm/ref.bib
+++ b/share/doc/psd/01.cacm/ref.bib
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/01.cacm/ref.bib,v 1.1 2002/10/24 12:56:20 ru Exp $
 
 %A L. P. Deutsch
 %A B. W. Lampson
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index 89d0dc3c3b95..2f7704e0bc80 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/02.implement/Makefile,v 1.8 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/02.implement
 SRCS=		stubs implement
diff --git a/share/doc/psd/02.implement/fig1.pic b/share/doc/psd/02.implement/fig1.pic
index 2d4b3d3c2231..43bc9035e4f3 100644
--- a/share/doc/psd/02.implement/fig1.pic
+++ b/share/doc/psd/02.implement/fig1.pic
@@ -39,7 +39,7 @@
 .\" 
 .\"	@(#)fig1.pic	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/02.implement/fig1.pic,v 1.2 2002/05/19 05:52:57 grog Exp $
 .PS
 .ps 9
 [
diff --git a/share/doc/psd/02.implement/fig2.pic b/share/doc/psd/02.implement/fig2.pic
index 2dc291556d02..370ddff5aded 100644
--- a/share/doc/psd/02.implement/fig2.pic
+++ b/share/doc/psd/02.implement/fig2.pic
@@ -39,7 +39,7 @@
 .\" 
 .\"	@(#)fig2.pic	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/02.implement/fig2.pic,v 1.2 2002/05/19 05:52:57 grog Exp $
 .PS
 .ps 9
 [
diff --git a/share/doc/psd/02.implement/implement b/share/doc/psd/02.implement/implement
index f6ad7d759191..0f9f21b0e72d 100644
--- a/share/doc/psd/02.implement/implement
+++ b/share/doc/psd/02.implement/implement
@@ -39,7 +39,7 @@
 .\" 
 .\"	@(#)implement	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/02.implement/implement,v 1.4 2002/10/30 13:07:34 ru Exp $
 .EH 'PSD:2-%''UNIX Implementation'
 .OH 'UNIX Implementation''PSD:2-%'
 .de P1
diff --git a/share/doc/psd/02.implement/ref.bib b/share/doc/psd/02.implement/ref.bib
index 34140640e8bc..84e5b140e10b 100644
--- a/share/doc/psd/02.implement/ref.bib
+++ b/share/doc/psd/02.implement/ref.bib
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/02.implement/ref.bib,v 1.1 2002/10/24 12:56:20 ru Exp $
 
 %T U\s-2NIX\s0 Time-Sharing System: The U\s-2NIX\s0 Shell
 %A S. R. Bourne
diff --git a/share/doc/psd/03.iosys/Makefile b/share/doc/psd/03.iosys/Makefile
index 113bf90fd4fe..cbb9211ddf81 100644
--- a/share/doc/psd/03.iosys/Makefile
+++ b/share/doc/psd/03.iosys/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/03.iosys/Makefile,v 1.3 2002/05/22 10:41:09 ru Exp $
 
 VOLUME=	psd/03.iosys
 SRCS=	iosys
diff --git a/share/doc/psd/03.iosys/iosys b/share/doc/psd/03.iosys/iosys
index ce63bc25319a..0c1a41d2fb01 100644
--- a/share/doc/psd/03.iosys/iosys
+++ b/share/doc/psd/03.iosys/iosys
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)iosys	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/03.iosys/iosys,v 1.2 2002/05/19 06:03:05 grog Exp $
 .EH 'PSD:3-%''The UNIX I/O System'
 .OH 'The UNIX I/O System''PSD:3-%'
 .TL
diff --git a/share/doc/psd/04.uprog/Makefile b/share/doc/psd/04.uprog/Makefile
index f149dcf27423..e6efff7e9b23 100644
--- a/share/doc/psd/04.uprog/Makefile
+++ b/share/doc/psd/04.uprog/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/04.uprog/Makefile,v 1.3 2002/05/20 00:45:20 grog Exp $
 
 VOLUME=	psd/04.uprog
 SRCS=	p.mac p0 p1 p2 p3 p4 p5 p6 p8 p9
diff --git a/share/doc/psd/04.uprog/p.mac b/share/doc/psd/04.uprog/p.mac
index 7f9295c729ac..22e3d63c2812 100644
--- a/share/doc/psd/04.uprog/p.mac
+++ b/share/doc/psd/04.uprog/p.mac
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p.mac,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p.mac	8.1 (Berkeley) 6/8/93
 .de UC
diff --git a/share/doc/psd/04.uprog/p0 b/share/doc/psd/04.uprog/p0
index 5aaf32555f91..9a86f5c1832a 100644
--- a/share/doc/psd/04.uprog/p0
+++ b/share/doc/psd/04.uprog/p0
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p0,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p0	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p1 b/share/doc/psd/04.uprog/p1
index 848862ec7942..6248cef20a97 100644
--- a/share/doc/psd/04.uprog/p1
+++ b/share/doc/psd/04.uprog/p1
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p1,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p1	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p2 b/share/doc/psd/04.uprog/p2
index 280f65cd51cd..95e8b2edebaf 100644
--- a/share/doc/psd/04.uprog/p2
+++ b/share/doc/psd/04.uprog/p2
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p2,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p2	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p3 b/share/doc/psd/04.uprog/p3
index 201c4a904af2..fb69fd41f2df 100644
--- a/share/doc/psd/04.uprog/p3
+++ b/share/doc/psd/04.uprog/p3
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p3,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p3	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p4 b/share/doc/psd/04.uprog/p4
index fe23ac31d540..68ded4c62d2c 100644
--- a/share/doc/psd/04.uprog/p4
+++ b/share/doc/psd/04.uprog/p4
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p4,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p4	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p5 b/share/doc/psd/04.uprog/p5
index 652641fbfe7d..713589bd0b0c 100644
--- a/share/doc/psd/04.uprog/p5
+++ b/share/doc/psd/04.uprog/p5
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p5,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p5	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p6 b/share/doc/psd/04.uprog/p6
index c323d94b64e4..c6dec5f7a079 100644
--- a/share/doc/psd/04.uprog/p6
+++ b/share/doc/psd/04.uprog/p6
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p6,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p6	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p8 b/share/doc/psd/04.uprog/p8
index 3c7c7b4c2084..36a8345aa3d9 100644
--- a/share/doc/psd/04.uprog/p8
+++ b/share/doc/psd/04.uprog/p8
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p8,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p8	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p9 b/share/doc/psd/04.uprog/p9
index 2366444ea52e..5bb5b92e7623 100644
--- a/share/doc/psd/04.uprog/p9
+++ b/share/doc/psd/04.uprog/p9
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p9,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p9	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/05.sysman/1.1.t b/share/doc/psd/05.sysman/1.1.t
index 223cf831e556..fa7682ac5ec1 100644
--- a/share/doc/psd/05.sysman/1.1.t
+++ b/share/doc/psd/05.sysman/1.1.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.1.t	8.1 (Berkeley) 6/8/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/psd/05.sysman/1.1.t,v 1.2 2000/11/26 22:20:17 kris Exp $
 .\"
 .sh "Processes and protection
 .NH 3
diff --git a/share/doc/psd/05.sysman/1.2.t b/share/doc/psd/05.sysman/1.2.t
index 8527a75f8f3e..999ea68cfdac 100644
--- a/share/doc/psd/05.sysman/1.2.t
+++ b/share/doc/psd/05.sysman/1.2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.2.t	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/05.sysman/1.2.t,v 1.5 1999/08/28 00:18:18 peter Exp $
 .\"
 .sh "Memory management\(dg
 .NH 3
diff --git a/share/doc/psd/05.sysman/2.3.t b/share/doc/psd/05.sysman/2.3.t
index edf3e10fb52e..f0262358cf4b 100644
--- a/share/doc/psd/05.sysman/2.3.t
+++ b/share/doc/psd/05.sysman/2.3.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.3.t	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/05.sysman/2.3.t,v 1.5 1999/08/28 00:18:19 peter Exp $
 .\"
 .sh "Interprocess communications
 .NH 3
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index 2c0ec7b8c9d3..7530c5c0ff11 100644
--- a/share/doc/psd/05.sysman/Makefile
+++ b/share/doc/psd/05.sysman/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/05.sysman/Makefile,v 1.7 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/05.sysman
 SRCS=		0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
diff --git a/share/doc/psd/06.Clang/Clang.ms b/share/doc/psd/06.Clang/Clang.ms
index 639591349e82..ba17d6550b19 100644
--- a/share/doc/psd/06.Clang/Clang.ms
+++ b/share/doc/psd/06.Clang/Clang.ms
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)Clang.ms	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/06.Clang/Clang.ms,v 1.3 2002/10/12 14:50:50 schweikh Exp $
 .nr Cl 2
 .TL
 The C Programming Language - Reference Manual
diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile
index 877a97cd7073..275ee939fb89 100644
--- a/share/doc/psd/06.Clang/Makefile
+++ b/share/doc/psd/06.Clang/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/06.Clang/Makefile,v 1.7 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/06.Clang
 SRCS=		Clang.ms
diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index fdc38a78aecf..8c7a710bdbeb 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/12.make/Makefile,v 1.7 2002/10/29 14:56:07 ru Exp $
 
 VOLUME=	psd/12.make
 SRCS=	stubs tutorial.ms
diff --git a/share/doc/psd/13.rcs/Makefile b/share/doc/psd/13.rcs/Makefile
index ed497da4d8db..093121983f1e 100644
--- a/share/doc/psd/13.rcs/Makefile
+++ b/share/doc/psd/13.rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/Makefile,v 1.2 1999/08/28 00:18:21 peter Exp $
 
 SUBDIR=	rcs rcs_func
 
diff --git a/share/doc/psd/13.rcs/Makefile.inc b/share/doc/psd/13.rcs/Makefile.inc
index 666dbd862ff2..06329a502192 100644
--- a/share/doc/psd/13.rcs/Makefile.inc
+++ b/share/doc/psd/13.rcs/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/Makefile.inc,v 1.2 1999/08/28 00:18:21 peter Exp $
 
 VOLUME=	psd/13.rcs
 MACROS=	-ms
diff --git a/share/doc/psd/13.rcs/rcs/Makefile b/share/doc/psd/13.rcs/rcs/Makefile
index 6d94aed2bb44..7539c3ef258a 100644
--- a/share/doc/psd/13.rcs/rcs/Makefile
+++ b/share/doc/psd/13.rcs/rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/rcs/Makefile,v 1.6 2004/10/24 15:32:41 ru Exp $
 
 SRCS=		rcs.ms
 USE_PIC=
diff --git a/share/doc/psd/13.rcs/rcs_func/Makefile b/share/doc/psd/13.rcs/rcs_func/Makefile
index 09e5a9b226c2..214722a9df27 100644
--- a/share/doc/psd/13.rcs/rcs_func/Makefile
+++ b/share/doc/psd/13.rcs/rcs_func/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/rcs_func/Makefile,v 1.4 2002/10/29 15:01:56 ru Exp $
 
 DOC=	rcs_func
 SRCS=	rcs_func.ms
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index 4381c98d7f86..06d3a8bd8303 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/15.yacc/Makefile,v 1.8 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/15.yacc
 SRCS=		stubs ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \
diff --git a/share/doc/psd/15.yacc/ref.bib b/share/doc/psd/15.yacc/ref.bib
index a1364f608f51..e5d36f23459b 100644
--- a/share/doc/psd/15.yacc/ref.bib
+++ b/share/doc/psd/15.yacc/ref.bib
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/15.yacc/ref.bib,v 1.1 2002/10/24 12:56:20 ru Exp $
 
 %T The C Programming Language
 %A B. W. Kernighan
diff --git a/share/doc/psd/15.yacc/ss.. b/share/doc/psd/15.yacc/ss..
index 7dd9ea84cdf9..b265b4c8b7ea 100644
--- a/share/doc/psd/15.yacc/ss..
+++ b/share/doc/psd/15.yacc/ss..
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss..	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss..,v 1.4 2002/10/30 13:07:34 ru Exp $
 .EH 'PSD:15-%''Yacc: Yet Another Compiler-Compiler'
 .OH 'Yacc: Yet Another Compiler-Compiler''PSD:15-%'
 .\".RP
diff --git a/share/doc/psd/15.yacc/ss0 b/share/doc/psd/15.yacc/ss0
index 223e90fbac54..33558614f539 100644
--- a/share/doc/psd/15.yacc/ss0
+++ b/share/doc/psd/15.yacc/ss0
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss0	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss0,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 0: Introduction
 .PP
diff --git a/share/doc/psd/15.yacc/ss1 b/share/doc/psd/15.yacc/ss1
index f9369fb4bf5d..b4b4f0475855 100644
--- a/share/doc/psd/15.yacc/ss1
+++ b/share/doc/psd/15.yacc/ss1
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss1	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss1,v 1.2 2002/05/19 05:14:02 grog Exp $
 .tr *\(**
 .tr |\(or
 .SH
diff --git a/share/doc/psd/15.yacc/ss2 b/share/doc/psd/15.yacc/ss2
index f1fdb4407581..341f582d556c 100644
--- a/share/doc/psd/15.yacc/ss2
+++ b/share/doc/psd/15.yacc/ss2
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss2	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss2,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 2: Actions
 .PP
diff --git a/share/doc/psd/15.yacc/ss3 b/share/doc/psd/15.yacc/ss3
index fa06acb75b09..fe60a16ce9cd 100644
--- a/share/doc/psd/15.yacc/ss3
+++ b/share/doc/psd/15.yacc/ss3
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss3	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss3,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 3: Lexical Analysis
 .PP
diff --git a/share/doc/psd/15.yacc/ss4 b/share/doc/psd/15.yacc/ss4
index e548d53cfc7d..b5dc99573f48 100644
--- a/share/doc/psd/15.yacc/ss4
+++ b/share/doc/psd/15.yacc/ss4
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss4	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss4,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 4: How the Parser Works
 .PP
diff --git a/share/doc/psd/15.yacc/ss5 b/share/doc/psd/15.yacc/ss5
index e2c34626f333..5a43cb080f09 100644
--- a/share/doc/psd/15.yacc/ss5
+++ b/share/doc/psd/15.yacc/ss5
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss5	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss5,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 5: Ambiguity and Conflicts
 .PP
diff --git a/share/doc/psd/15.yacc/ss6 b/share/doc/psd/15.yacc/ss6
index 513d042a8203..64b424c26b4f 100644
--- a/share/doc/psd/15.yacc/ss6
+++ b/share/doc/psd/15.yacc/ss6
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss6	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss6,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 6: Precedence
 .PP
diff --git a/share/doc/psd/15.yacc/ss7 b/share/doc/psd/15.yacc/ss7
index b6440c793857..adb02e765dd0 100644
--- a/share/doc/psd/15.yacc/ss7
+++ b/share/doc/psd/15.yacc/ss7
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss7	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss7,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 7: Error Handling
 .PP
diff --git a/share/doc/psd/15.yacc/ss8 b/share/doc/psd/15.yacc/ss8
index 75c66ab383a5..da9b489da58f 100644
--- a/share/doc/psd/15.yacc/ss8
+++ b/share/doc/psd/15.yacc/ss8
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss8	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss8,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 8: The Yacc Environment
 .PP
diff --git a/share/doc/psd/15.yacc/ss9 b/share/doc/psd/15.yacc/ss9
index 9d05fecd4abd..9ee7b426e20c 100644
--- a/share/doc/psd/15.yacc/ss9
+++ b/share/doc/psd/15.yacc/ss9
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss9	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss9,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 9: Hints for Preparing Specifications
 .PP
diff --git a/share/doc/psd/15.yacc/ssA b/share/doc/psd/15.yacc/ssA
index f6f1702de803..6dbe760b8c14 100644
--- a/share/doc/psd/15.yacc/ssA
+++ b/share/doc/psd/15.yacc/ssA
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssA	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssA,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 10: Advanced Topics
 .PP
diff --git a/share/doc/psd/15.yacc/ssB b/share/doc/psd/15.yacc/ssB
index c16bb52b9422..8e37ae2b7c1f 100644
--- a/share/doc/psd/15.yacc/ssB
+++ b/share/doc/psd/15.yacc/ssB
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssB	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssB,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 11: Acknowledgements
 .PP
diff --git a/share/doc/psd/15.yacc/ssa b/share/doc/psd/15.yacc/ssa
index 17e815edfcb1..318099c48d0f 100644
--- a/share/doc/psd/15.yacc/ssa
+++ b/share/doc/psd/15.yacc/ssa
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssa	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssa,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix A:  A Simple Example
 .PP
diff --git a/share/doc/psd/15.yacc/ssb b/share/doc/psd/15.yacc/ssb
index 2dba020cd015..5389fe7dd12e 100644
--- a/share/doc/psd/15.yacc/ssb
+++ b/share/doc/psd/15.yacc/ssb
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssb	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssb,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix B: Yacc Input Syntax
 .PP
diff --git a/share/doc/psd/15.yacc/ssc b/share/doc/psd/15.yacc/ssc
index 95fca5c516b0..eda188ee9896 100644
--- a/share/doc/psd/15.yacc/ssc
+++ b/share/doc/psd/15.yacc/ssc
@@ -35,7 +35,7 @@
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"	@(#)ssc	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssc,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix C: An Advanced Example
 .PP
diff --git a/share/doc/psd/15.yacc/ssd b/share/doc/psd/15.yacc/ssd
index 988e0a0da09e..b0757caac10d 100644
--- a/share/doc/psd/15.yacc/ssd
+++ b/share/doc/psd/15.yacc/ssd
@@ -35,7 +35,7 @@
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"	@(#)ssd	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssd,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix D: Old Features Supported but not Encouraged
 .PP
diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile
index 6dea7c028991..326c396771c7 100644
--- a/share/doc/psd/16.lex/Makefile
+++ b/share/doc/psd/16.lex/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/16.lex/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/16.lex
 SRCS=		lex.ms
diff --git a/share/doc/psd/16.lex/lex.ms b/share/doc/psd/16.lex/lex.ms
index 8b3c82ee23b3..3772c5674c82 100644
--- a/share/doc/psd/16.lex/lex.ms
+++ b/share/doc/psd/16.lex/lex.ms
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)lex.ms	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/16.lex/lex.ms,v 1.4 2002/10/24 13:21:29 ru Exp $
 .nr tm 0
 .de MH
 Bell Laboratories, Murray Hill, NJ 07974.
diff --git a/share/doc/psd/17.m4/Makefile b/share/doc/psd/17.m4/Makefile
index c48921f09a15..58c3df884093 100644
--- a/share/doc/psd/17.m4/Makefile
+++ b/share/doc/psd/17.m4/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/17.m4/Makefile,v 1.4 2002/05/22 10:41:12 ru Exp $
 
 VOLUME=	psd/17.m4
 SRCS=	m4.ms
diff --git a/share/doc/psd/17.m4/m4.ms b/share/doc/psd/17.m4/m4.ms
index c7a2fd941a86..8f127cf4c417 100644
--- a/share/doc/psd/17.m4/m4.ms
+++ b/share/doc/psd/17.m4/m4.ms
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)m4.ms	6.3 (Berkeley) 6/5/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/17.m4/m4.ms,v 1.3 2002/10/24 13:31:34 ru Exp $
 .de MH
 Bell Laboratories, Murray Hill, NJ 07974.
 ..
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 1097072fe0eb..b1db26009d58 100644
--- a/share/doc/psd/18.gprof/Makefile
+++ b/share/doc/psd/18.gprof/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/18.gprof/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/18.gprof
 SRCS=		header.me abstract.me intro.me profiling.me gathering.me \
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index 934cdeaf5eb6..fe04190f935c 100644
--- a/share/doc/psd/20.ipctut/Makefile
+++ b/share/doc/psd/20.ipctut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/20.ipctut/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/20.ipctut
 SRCS=		tutor.me
diff --git a/share/doc/psd/21.ipc/3.t b/share/doc/psd/21.ipc/3.t
index 6e7eb0622364..d792087583c7 100644
--- a/share/doc/psd/21.ipc/3.t
+++ b/share/doc/psd/21.ipc/3.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)3.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/psd/21.ipc/3.t,v 1.3 2003/07/06 10:37:00 charnier Exp $
 .\"
 .\".ds RH "Network Library Routines
 .bp
diff --git a/share/doc/psd/21.ipc/4.t b/share/doc/psd/21.ipc/4.t
index 22e6836d28a4..85c7e38deb15 100644
--- a/share/doc/psd/21.ipc/4.t
+++ b/share/doc/psd/21.ipc/4.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)4.t	8.1 (Berkeley) 6/8/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/psd/21.ipc/4.t,v 1.2 2003/07/06 10:37:00 charnier Exp $
 .\"
 .\".ds RH "Client/Server Model
 .bp
diff --git a/share/doc/psd/21.ipc/5.t b/share/doc/psd/21.ipc/5.t
index 8ce44b2018c1..6bcddcb7b3af 100644
--- a/share/doc/psd/21.ipc/5.t
+++ b/share/doc/psd/21.ipc/5.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)5.t	8.1 (Berkeley) 8/14/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/21.ipc/5.t,v 1.5 1999/08/28 00:18:26 peter Exp $
 .\"
 .\".ds RH "Advanced Topics
 .bp
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index 67c3d6c40a17..63108733b92d 100644
--- a/share/doc/psd/21.ipc/Makefile
+++ b/share/doc/psd/21.ipc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/21.ipc/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/21.ipc
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t
diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile
index 4c38add5ba8c..949e1fe58ab5 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/22.rpcgen/Makefile,v 1.6 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/22.rpcgen
 SRCS=		stubs rpcgen.ms
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index 77849b657aa9..faefd665b843 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/23.rpc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/23.rpc
 SRCS=		stubs rpc.prog.ms
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index 878dca1c280e..759d91684985 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/24.xdr/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/24.xdr
 SRCS=		stubs xdr.nts.ms
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index 105135e217bc..390a989ebff8 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/25.xdrrfc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/25.xdrrfc
 SRCS=		stubs xdr.rfc.ms
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index 79214f1c5971..0864796832a9 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/26.rpcrfc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/26.rpcrfc
 SRCS=		stubs rpc.rfc.ms
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index 590478780cef..5a241612f85b 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/27.nfsrpc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/27.nfsrfc
 SRCS=		stubs nfs.rfc.ms
diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile
index a62473284e36..51be2da484fd 100644
--- a/share/doc/psd/28.cvs/Makefile
+++ b/share/doc/psd/28.cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/28.cvs/Makefile,v 1.4 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/28.cvs
 SRCS=		cvs-paper.ms
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index d50f05b1b2c6..2c1031c2ee49 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/Makefile,v 1.21 2004/01/20 13:08:33 ru Exp $
 
 # The following modules do not build/install:
 # 10.gdb
diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile
index 38864e96a4fe..920983fc9576 100644
--- a/share/doc/psd/contents/Makefile
+++ b/share/doc/psd/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/contents/Makefile,v 1.6 2002/10/29 15:01:57 ru Exp $
 
 VOLUME=	psd
 DOC=	contents
diff --git a/share/doc/psd/contents/contents.ms b/share/doc/psd/contents/contents.ms
index 9f374dc47cdd..158e228d91d6 100644
--- a/share/doc/psd/contents/contents.ms
+++ b/share/doc/psd/contents/contents.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)00.contents	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/contents/contents.ms,v 1.6 2002/05/22 11:58:34 ru Exp $
 .\"
 .OH '''PSD Contents'
 .EH 'PSD Contents'''
diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index d073730b322c..cc169548664a 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/title/Makefile,v 1.9 2002/10/29 16:13:20 ru Exp $
 
 VOLUME=	psd
 DOC=	Title
diff --git a/share/doc/psd/title/Title b/share/doc/psd/title/Title
index 014b3d54dcdb..2cfd2c4be2d9 100644
--- a/share/doc/psd/title/Title
+++ b/share/doc/psd/title/Title
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)Title	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/title/Title,v 1.2 2000/11/23 11:08:17 ru Exp $
 .\"
 .ps 18
 .vs 22
diff --git a/share/doc/smm/01.setup/0.t b/share/doc/smm/01.setup/0.t
index 1951cd024d88..e4a1c8d56e48 100644
--- a/share/doc/smm/01.setup/0.t
+++ b/share/doc/smm/01.setup/0.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)0.t	8.1 (Berkeley) 7/27/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/0.t,v 1.2 2000/11/27 18:00:51 ru Exp $
 .\"
 .ds Ux \s-1UNIX\s0
 .ds Bs \s-1BSD\s0
diff --git a/share/doc/smm/01.setup/2.t b/share/doc/smm/01.setup/2.t
index 4220a6d9b811..1837329bb8c3 100644
--- a/share/doc/smm/01.setup/2.t
+++ b/share/doc/smm/01.setup/2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.t	8.1 (Berkeley) 7/27/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/2.t,v 1.7 1999/08/28 00:18:35 peter Exp $
 .\"
 .ds lq ``
 .ds rq ''
diff --git a/share/doc/smm/01.setup/3.t b/share/doc/smm/01.setup/3.t
index 5b0afd4775ca..5601eb4f5629 100644
--- a/share/doc/smm/01.setup/3.t
+++ b/share/doc/smm/01.setup/3.t
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/3.t,v 1.4 2003/04/30 17:01:42 markm Exp $
 .\"	@(#)3.t	8.1 (Berkeley) 7/27/93
 .\"
 .ds lq ``
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index b2d9c301b16b..c08c2daa339b 100644
--- a/share/doc/smm/01.setup/Makefile
+++ b/share/doc/smm/01.setup/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 7/27/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/01.setup/Makefile,v 1.9 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/01.setup
 SRCS=		stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/01.setup/stubs b/share/doc/smm/01.setup/stubs
index b26f4d5fcbbe..d557360f1f11 100644
--- a/share/doc/smm/01.setup/stubs
+++ b/share/doc/smm/01.setup/stubs
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/stubs,v 1.1 2000/11/27 18:00:51 ru Exp $
 .\"
 .if n \{\
 .	ftr CW R
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index 26ed70a09779..4c56b2900c87 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/02.config/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/02.config
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile
index fbdc0091f8ef..48a3fbe47dab 100644
--- a/share/doc/smm/03.fsck/Makefile
+++ b/share/doc/smm/03.fsck/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/03.fsck/Makefile,v 1.5 2000/10/09 10:23:31 adrian Exp $
 
 VOLUME=	smm/03.fsck
 SRCS=	0.t 1.t 2.t 3.t 4.t
diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile
index e3c68ff48c56..13f5b353131d 100644
--- a/share/doc/smm/04.quotas/Makefile
+++ b/share/doc/smm/04.quotas/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/04.quotas/Makefile,v 1.5 1999/08/28 00:18:37 peter Exp $
 
 VOLUME=	smm/04.quotas
 SRCS=	quotas.ms
diff --git a/share/doc/smm/05.fastfs/3.t b/share/doc/smm/05.fastfs/3.t
index 23db86aead85..eebc05ba499d 100644
--- a/share/doc/smm/05.fastfs/3.t
+++ b/share/doc/smm/05.fastfs/3.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)3.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/smm/05.fastfs/3.t,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .ds RH New file system
 .NH
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index d63aae2d877d..e00c4c4b6c42 100644
--- a/share/doc/smm/05.fastfs/Makefile
+++ b/share/doc/smm/05.fastfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/05.fastfs/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/05.fastfs
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/06.nfs/1.t b/share/doc/smm/06.nfs/1.t
index 96415dabec0e..a8ecc22246c7 100644
--- a/share/doc/smm/06.nfs/1.t
+++ b/share/doc/smm/06.nfs/1.t
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)1.t	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/06.nfs/1.t,v 1.5 2003/04/30 17:01:43 markm Exp $
 .\"
 .sh 1 "NFS Implementation"
 .pp
diff --git a/share/doc/smm/06.nfs/2.t b/share/doc/smm/06.nfs/2.t
index 85e28963fd3f..a54725239368 100644
--- a/share/doc/smm/06.nfs/2.t
+++ b/share/doc/smm/06.nfs/2.t
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)2.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/smm/06.nfs/2.t,v 1.2 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .sh 1 "Not Quite NFS, Crash Tolerant Cache Consistency for NFS"
 .pp
diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile
index 99f0762ac6ef..7f38cea52460 100644
--- a/share/doc/smm/06.nfs/Makefile
+++ b/share/doc/smm/06.nfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/06.nfs/Makefile,v 1.5 1999/08/28 00:18:39 peter Exp $
 
 VOLUME=	smm/06.nfs
 SRCS=	0.t 1.t 2.t ref.t
diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile
index 482ed798a95e..6ddd1a011ef4 100644
--- a/share/doc/smm/08.sendmailop/Makefile
+++ b/share/doc/smm/08.sendmailop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 2/28/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/08.sendmailop/Makefile,v 1.9 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/08.sendmailop
 SRCS=		op.me
diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile
index ad09e787076a..f998f67aaff0 100644
--- a/share/doc/smm/11.timedop/Makefile
+++ b/share/doc/smm/11.timedop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/11.timedop/Makefile,v 1.4 1999/08/28 00:18:42 peter Exp $
 
 VOLUME=	smm/11.timedop
 SRCS=	timed.ms
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index 1d9ed5c2eab5..63e1a9f2e1ec 100644
--- a/share/doc/smm/12.timed/Makefile
+++ b/share/doc/smm/12.timed/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/12.timed/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/12.timed
 SRCS=		timed.ms
diff --git a/share/doc/smm/18.net/7.t b/share/doc/smm/18.net/7.t
index e165de0e8f4a..3936367c857b 100644
--- a/share/doc/smm/18.net/7.t
+++ b/share/doc/smm/18.net/7.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)7.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/smm/18.net/7.t,v 1.2 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .nr H2 1
 .br
diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile
index 47e7e11bd201..7518c6d0a434 100644
--- a/share/doc/smm/18.net/Makefile
+++ b/share/doc/smm/18.net/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/18.net/Makefile,v 1.7 2002/10/25 09:05:10 ru Exp $
 
 VOLUME=	smm/18.net
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index 6f8afc463703..ea6a65dac376 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/Makefile,v 1.19 2004/01/20 13:08:33 ru Exp $
 
 # The following modules do not describe FreeBSD:
 # 14.uucpimpl, 15.uucpnet
diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile
index aa73faaf4e95..16a2e53795db 100644
--- a/share/doc/smm/contents/Makefile
+++ b/share/doc/smm/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/contents/Makefile,v 1.6 2002/10/29 15:01:58 ru Exp $
 
 VOLUME=	smm
 DOC=	contents
diff --git a/share/doc/smm/contents/contents.ms b/share/doc/smm/contents/contents.ms
index 1b8038a22d44..5b38a8481ec4 100644
--- a/share/doc/smm/contents/contents.ms
+++ b/share/doc/smm/contents/contents.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)00.contents	8.1 (Berkeley) 7/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/contents/contents.ms,v 1.5 2002/10/25 09:03:09 ru Exp $
 .\"
 .OH '''SMM Contents'
 .EH 'SMM Contents'''
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index c1f1c9b64419..e30e02692389 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/title/Makefile,v 1.9 2002/10/29 16:13:21 ru Exp $
 
 VOLUME=	smm
 DOC=	Title
diff --git a/share/doc/smm/title/Title b/share/doc/smm/title/Title
index 5faa11f6960c..b447d146cf39 100644
--- a/share/doc/smm/title/Title
+++ b/share/doc/smm/title/Title
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)Title	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/title/Title,v 1.5 2000/11/27 07:19:05 ru Exp $
 .\"
 .ps 18
 .vs 22
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index d22a7b928970..603c66b8aca2 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/04.csh/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		usd/04.csh
 SRCS=		tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile
index d5a6d3c0b554..aeb8cfd0ef92 100644
--- a/share/doc/usd/07.mail/Makefile
+++ b/share/doc/usd/07.mail/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/07.mail/Makefile,v 1.6 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		usd/07.mail
 SRCS=		mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile
index 8df4f7208726..5c9bf9fd5a60 100644
--- a/share/doc/usd/10.exref/Makefile
+++ b/share/doc/usd/10.exref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/Makefile,v 1.10 1999/08/28 00:18:49 peter Exp $
 
 SUBDIR=	exref summary 
 
diff --git a/share/doc/usd/10.exref/Makefile.inc b/share/doc/usd/10.exref/Makefile.inc
index c5c2f55a2d1f..bf02d9e2d053 100644
--- a/share/doc/usd/10.exref/Makefile.inc
+++ b/share/doc/usd/10.exref/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/Makefile.inc,v 1.3 2002/10/25 09:14:09 ru Exp $
 
 VOLUME=	usd/10.exref
 MACROS=	-ms
diff --git a/share/doc/usd/10.exref/exref/Makefile b/share/doc/usd/10.exref/exref/Makefile
index 7af18f93ef38..fcef84d58838 100644
--- a/share/doc/usd/10.exref/exref/Makefile
+++ b/share/doc/usd/10.exref/exref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/exref/Makefile,v 1.4 1999/08/28 00:18:50 peter Exp $
 
 SRCS=	ex.rm
 
diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile
index 143333f6ea2c..4cc91215ac6c 100644
--- a/share/doc/usd/10.exref/summary/Makefile
+++ b/share/doc/usd/10.exref/summary/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/summary/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 DOC=		summary
 SRCS=		ex.summary
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index f412b627fa92..2a8ff7a890da 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/11.vitut/Makefile,v 1.7 2004/10/24 15:32:45 ru Exp $
 
 VOLUME=		usd/11.edit
 SRCS=		edittut.ms
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index 7b2c080434cf..bb3da501c5fb 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/Makefile,v 1.10 2002/10/29 15:01:58 ru Exp $
 
 SUBDIR=	vi viapwh summary
 
diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc
index 42d417f046bf..34e60e725621 100644
--- a/share/doc/usd/12.vi/Makefile.inc
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/Makefile.inc,v 1.4 2002/10/29 15:01:58 ru Exp $
 
 VOLUME=		usd/12.vi
 MACROS=		-ms
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
index 425536dce4d6..ff7ba1270342 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/summary/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 DOC=		summary
 SRCS=		vi.summary
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index 6021b092e236..91f03b5e5204 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/vi/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 SRCS=		vi.in vi.chars
 USE_TBL=
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index f20582dda5aa..cc95be49b5dc 100644
--- a/share/doc/usd/12.vi/viapwh/Makefile
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/viapwh/Makefile,v 1.4 2002/10/29 15:01:59 ru Exp $
 
 DOC=	viapwh
 SRCS=	vi.apwh.ms
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index d7bb392ef844..3e0290e7dd58 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.16 (Berkeley) 8/15/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/13.viref/Makefile,v 1.15 2004/10/24 15:32:45 ru Exp $
 
 VOLUME=		usd/13.viref
 SRCS=		vi.ref-patched
diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile
index faf76bbb64f3..e1043e5c32b2 100644
--- a/share/doc/usd/18.msdiffs/Makefile
+++ b/share/doc/usd/18.msdiffs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/18.msdiffs/Makefile,v 1.5 1999/08/28 00:18:57 peter Exp $
 
 VOLUME=	usd/18.msdiffs
 SRCS=	ms.diffs
diff --git a/share/doc/usd/18.msdiffs/ms.diffs b/share/doc/usd/18.msdiffs/ms.diffs
index be6883f15b7a..2f05cedf5331 100644
--- a/share/doc/usd/18.msdiffs/ms.diffs
+++ b/share/doc/usd/18.msdiffs/ms.diffs
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)ms.diffs	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/usd/18.msdiffs/ms.diffs,v 1.2.12.1 2005/08/16 22:36:54 phk Exp $
 .\"
 .nr LL 6.5i
 .nr FL 6.0i
diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile
index 4966e36f611f..81fe800f35ad 100644
--- a/share/doc/usd/19.memacros/Makefile
+++ b/share/doc/usd/19.memacros/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/19.memacros/Makefile,v 1.8 2002/10/29 14:56:08 ru Exp $
 
 VOLUME=		usd/19.memacros
 SRCS=		meintro.me-sed
diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile
index af30e9b64fa5..366ccd55611a 100644
--- a/share/doc/usd/20.meref/Makefile
+++ b/share/doc/usd/20.meref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/20.meref/Makefile,v 1.8 2002/10/29 14:56:09 ru Exp $
 
 VOLUME=		usd/20.meref
 SRCS=		meref.me-sed
diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile
index 92ed42959bf4..4a6534858c98 100644
--- a/share/doc/usd/21.troff/Makefile
+++ b/share/doc/usd/21.troff/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/21.troff/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 VOLUME=		usd/21.troff
 SRCS=		m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2
diff --git a/share/doc/usd/21.troff/m.mac b/share/doc/usd/21.troff/m.mac
index 6e68c4ee7983..694c564e6f88 100644
--- a/share/doc/usd/21.troff/m.mac
+++ b/share/doc/usd/21.troff/m.mac
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m.mac	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m.mac,v 1.3 2002/05/20 13:52:35 ru Exp $
 .if \n(mo=1 .ds mo January
 .if \n(mo=2 .ds mo February
 .if \n(mo=3 .ds mo March
diff --git a/share/doc/usd/21.troff/m0 b/share/doc/usd/21.troff/m0
index d91c08f6313a..8c26f793290b 100644
--- a/share/doc/usd/21.troff/m0
+++ b/share/doc/usd/21.troff/m0
@@ -37,7 +37,7 @@
 .\"
 .\"	@(#)m0	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m0,v 1.2 2002/05/19 04:01:02 grog Exp $
 .br
 .rs
 .sp |1.0i
diff --git a/share/doc/usd/21.troff/m0a b/share/doc/usd/21.troff/m0a
index 1a0be6c58f54..23f3a6bc9bd8 100644
--- a/share/doc/usd/21.troff/m0a
+++ b/share/doc/usd/21.troff/m0a
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)m0a	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m0a,v 1.3 2002/05/20 13:52:35 ru Exp $
 .br
 .tr |
 .ce
diff --git a/share/doc/usd/21.troff/m1 b/share/doc/usd/21.troff/m1
index 0df1d52ac56c..3d329324bb71 100644
--- a/share/doc/usd/21.troff/m1
+++ b/share/doc/usd/21.troff/m1
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m1	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m1,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .nr p 0 1
 .tr |
 .tr ~|
diff --git a/share/doc/usd/21.troff/m2 b/share/doc/usd/21.troff/m2
index b94f4788164f..4f8daa215d94 100644
--- a/share/doc/usd/21.troff/m2
+++ b/share/doc/usd/21.troff/m2
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m2	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m2,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .tr |
 .rm mx
 .br
diff --git a/share/doc/usd/21.troff/m3 b/share/doc/usd/21.troff/m3
index 01e0023d03a4..e822622f96f8 100644
--- a/share/doc/usd/21.troff/m3
+++ b/share/doc/usd/21.troff/m3
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)m3	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m3,v 1.2 2002/05/19 04:02:29 grog Exp $
 .tr |
 .rm mx
 .mh
diff --git a/share/doc/usd/21.troff/m4 b/share/doc/usd/21.troff/m4
index 931ac480a2e0..0d712f69206d 100644
--- a/share/doc/usd/21.troff/m4
+++ b/share/doc/usd/21.troff/m4
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m4	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m4,v 1.2 2002/05/19 04:02:29 grog Exp $
 .tr |
 .mh
 Hyphenation.
diff --git a/share/doc/usd/21.troff/m5 b/share/doc/usd/21.troff/m5
index 692db286d85c..47b30429274b 100644
--- a/share/doc/usd/21.troff/m5
+++ b/share/doc/usd/21.troff/m5
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m5	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m5,v 1.3 2002/05/20 13:52:35 ru Exp $
 .ds H T
 .tr |
 .tr ~|
diff --git a/share/doc/usd/21.troff/table1 b/share/doc/usd/21.troff/table1
index d0fad8f31ecd..c9fb8cfa07e8 100644
--- a/share/doc/usd/21.troff/table1
+++ b/share/doc/usd/21.troff/table1
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)table1	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/table1,v 1.2 2002/05/19 04:02:29 grog Exp $
 .pn 30
 .rm mx
 .br
diff --git a/share/doc/usd/21.troff/table2 b/share/doc/usd/21.troff/table2
index 7d212c0e6a24..fff039c961f1 100644
--- a/share/doc/usd/21.troff/table2
+++ b/share/doc/usd/21.troff/table2
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)table2	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/table2,v 1.3 2002/05/20 13:52:35 ru Exp $
 .sp 100
 .br
 .de mx
diff --git a/share/doc/usd/22.trofftut/Makefile b/share/doc/usd/22.trofftut/Makefile
index a3f32fd27d07..396670c8c3dc 100644
--- a/share/doc/usd/22.trofftut/Makefile
+++ b/share/doc/usd/22.trofftut/Makefile
@@ -35,7 +35,7 @@
 # OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/22.trofftut/Makefile,v 1.3 2002/10/29 14:56:09 ru Exp $
 
 VOLUME=	usd/22.trofftut
 SRCS=	tt.mac tt00 tt01 tt02 tt03 tt04 tt05 tt06 tt07 tt08 tt09 tt10 \
diff --git a/share/doc/usd/22.trofftut/tt.mac b/share/doc/usd/22.trofftut/tt.mac
index 4bc3bb7d9f56..0466774b9640 100644
--- a/share/doc/usd/22.trofftut/tt.mac
+++ b/share/doc/usd/22.trofftut/tt.mac
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt.mac,v 1.3 2002/10/24 12:59:10 ru Exp $
 .\"
 .tr _\(em
 .tr *\(**
diff --git a/share/doc/usd/22.trofftut/tt00 b/share/doc/usd/22.trofftut/tt00
index f8c5ea7cf4b8..dafebb1c213f 100644
--- a/share/doc/usd/22.trofftut/tt00
+++ b/share/doc/usd/22.trofftut/tt00
@@ -40,7 +40,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt00,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .EH 'USD:22-%''A TROFF Tutorial'
 .OH 'A TROFF Tutorial''USD:22-%'
diff --git a/share/doc/usd/22.trofftut/tt01 b/share/doc/usd/22.trofftut/tt01
index ff6fb83e4f2d..6ff83bafa72b 100644
--- a/share/doc/usd/22.trofftut/tt01
+++ b/share/doc/usd/22.trofftut/tt01
@@ -40,7 +40,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt01,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Introduction
diff --git a/share/doc/usd/22.trofftut/tt02 b/share/doc/usd/22.trofftut/tt02
index 4d14a5297e2f..ba8b978f3564 100644
--- a/share/doc/usd/22.trofftut/tt02
+++ b/share/doc/usd/22.trofftut/tt02
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt02,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Point Sizes; Line Spacing
diff --git a/share/doc/usd/22.trofftut/tt03 b/share/doc/usd/22.trofftut/tt03
index e475d45c8265..a95177fbc45c 100644
--- a/share/doc/usd/22.trofftut/tt03
+++ b/share/doc/usd/22.trofftut/tt03
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt03,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Fonts and Special Characters
diff --git a/share/doc/usd/22.trofftut/tt04 b/share/doc/usd/22.trofftut/tt04
index c44c94baa51f..3be9f4349e0f 100644
--- a/share/doc/usd/22.trofftut/tt04
+++ b/share/doc/usd/22.trofftut/tt04
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt04,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .NH
 Indents and Line Lengths
diff --git a/share/doc/usd/22.trofftut/tt05 b/share/doc/usd/22.trofftut/tt05
index b7bff82a3ee1..2383cdaf67fa 100644
--- a/share/doc/usd/22.trofftut/tt05
+++ b/share/doc/usd/22.trofftut/tt05
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt05,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Tabs
diff --git a/share/doc/usd/22.trofftut/tt06 b/share/doc/usd/22.trofftut/tt06
index 3f739582c4e9..8a0f3fa08a03 100644
--- a/share/doc/usd/22.trofftut/tt06
+++ b/share/doc/usd/22.trofftut/tt06
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt06,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Local Motions: Drawing lines and characters
diff --git a/share/doc/usd/22.trofftut/tt07 b/share/doc/usd/22.trofftut/tt07
index 3a8cf5748e21..1be9bde54c74 100644
--- a/share/doc/usd/22.trofftut/tt07
+++ b/share/doc/usd/22.trofftut/tt07
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt07,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Strings
diff --git a/share/doc/usd/22.trofftut/tt08 b/share/doc/usd/22.trofftut/tt08
index 8f5075d97b2b..19096ba90e3c 100644
--- a/share/doc/usd/22.trofftut/tt08
+++ b/share/doc/usd/22.trofftut/tt08
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt08,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Introduction to Macros
diff --git a/share/doc/usd/22.trofftut/tt09 b/share/doc/usd/22.trofftut/tt09
index 4a44d34bbd6a..80911d7467bf 100644
--- a/share/doc/usd/22.trofftut/tt09
+++ b/share/doc/usd/22.trofftut/tt09
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt09,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Titles, Pages and Numbering
diff --git a/share/doc/usd/22.trofftut/tt10 b/share/doc/usd/22.trofftut/tt10
index a63bebdfd43f..c42308b8b5cc 100644
--- a/share/doc/usd/22.trofftut/tt10
+++ b/share/doc/usd/22.trofftut/tt10
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt10,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Number Registers and Arithmetic
diff --git a/share/doc/usd/22.trofftut/tt11 b/share/doc/usd/22.trofftut/tt11
index 538fac77920d..cb0266f1397a 100644
--- a/share/doc/usd/22.trofftut/tt11
+++ b/share/doc/usd/22.trofftut/tt11
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt11,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Macros with arguments
diff --git a/share/doc/usd/22.trofftut/tt12 b/share/doc/usd/22.trofftut/tt12
index 8cb389365e5d..d18f1e19e2c9 100644
--- a/share/doc/usd/22.trofftut/tt12
+++ b/share/doc/usd/22.trofftut/tt12
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt12,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Conditionals
diff --git a/share/doc/usd/22.trofftut/tt13 b/share/doc/usd/22.trofftut/tt13
index 67c97e285a01..0ac1326f5377 100644
--- a/share/doc/usd/22.trofftut/tt13
+++ b/share/doc/usd/22.trofftut/tt13
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt13,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Environments
diff --git a/share/doc/usd/22.trofftut/tt14 b/share/doc/usd/22.trofftut/tt14
index 6a83f5129ade..88d62edc4afa 100644
--- a/share/doc/usd/22.trofftut/tt14
+++ b/share/doc/usd/22.trofftut/tt14
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt14,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Diversions
diff --git a/share/doc/usd/22.trofftut/ttack b/share/doc/usd/22.trofftut/ttack
index ee633f729483..ac5d41ebeadc 100644
--- a/share/doc/usd/22.trofftut/ttack
+++ b/share/doc/usd/22.trofftut/ttack
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/ttack,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .SH
 Acknowledgements
diff --git a/share/doc/usd/22.trofftut/ttcharset b/share/doc/usd/22.trofftut/ttcharset
index 551e79d8d570..a076afb9bab6 100644
--- a/share/doc/usd/22.trofftut/ttcharset
+++ b/share/doc/usd/22.trofftut/ttcharset
@@ -40,7 +40,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/ttcharset,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .bp
 .tr __
diff --git a/share/doc/usd/22.trofftut/ttindex b/share/doc/usd/22.trofftut/ttindex
index ca032e829145..3ed5154e1c85 100644
--- a/share/doc/usd/22.trofftut/ttindex
+++ b/share/doc/usd/22.trofftut/ttindex
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/ttindex,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .bp
 .2C
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index e7939feb6630..ed0afd25e76e 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/Makefile,v 1.16 2004/01/20 13:08:33 ru Exp $
 
 # The following modules are not provided:
 # 14.jove
diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile
index ec0c508f39ba..49a18d078e6b 100644
--- a/share/doc/usd/contents/Makefile
+++ b/share/doc/usd/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/contents/Makefile,v 1.6 2002/10/29 15:01:59 ru Exp $
 
 VOLUME=	usd
 DOC=	contents
diff --git a/share/doc/usd/contents/contents.ms b/share/doc/usd/contents/contents.ms
index 15bc07a6467a..507ccf8b9022 100644
--- a/share/doc/usd/contents/contents.ms
+++ b/share/doc/usd/contents/contents.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)00.contents	8.2 (Berkeley) 4/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/contents/contents.ms,v 1.3 2000/11/29 08:36:36 ru Exp $
 .\"
 .de ND
 .KE
diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile
index b773fc3c1358..b30dc073c00a 100644
--- a/share/doc/usd/title/Makefile
+++ b/share/doc/usd/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/title/Makefile,v 1.8 2002/10/29 16:13:21 ru Exp $
 
 VOLUME=	usd
 DOC=	Title
diff --git a/share/doc/usd/title/Title b/share/doc/usd/title/Title
index 1de72972dd67..664198737649 100644
--- a/share/doc/usd/title/Title
+++ b/share/doc/usd/title/Title
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)Title	8.2 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/usd/title/Title,v 1.2 2000/11/27 07:19:06 ru Exp $
 .\"
 .ps 18
 .vs 22
diff --git a/share/examples/BSD_daemon/FreeBSD.pfa b/share/examples/BSD_daemon/FreeBSD.pfa
index bcd7c70aff63..8da55dcaa3d9 100644
--- a/share/examples/BSD_daemon/FreeBSD.pfa
+++ b/share/examples/BSD_daemon/FreeBSD.pfa
@@ -1,5 +1,5 @@
 %!PS-AdobeFont-1.0: (FreeBSD)  001.003
-%$FreeBSD$
+%$FreeBSD: src/share/examples/BSD_daemon/FreeBSD.pfa,v 1.1 2001/02/17 19:14:42 phk Exp $
 %Created by NRB Systems
 10 dict begin
 /FontInfo 9 dict dup begin
diff --git a/share/examples/BSD_daemon/README b/share/examples/BSD_daemon/README
index 9aa1173836a9..ef05d4903d25 100644
--- a/share/examples/BSD_daemon/README
+++ b/share/examples/BSD_daemon/README
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/README,v 1.2 2001/03/04 09:13:17 phk Exp $
 #
 
 This directory contains various stuff relating to the FreeBSD daemon
diff --git a/share/examples/BSD_daemon/beastie.eps b/share/examples/BSD_daemon/beastie.eps
index 587fe508c36b..d2bedd88620d 100644
--- a/share/examples/BSD_daemon/beastie.eps
+++ b/share/examples/BSD_daemon/beastie.eps
@@ -2,7 +2,7 @@
 %%Title: beastie.eps
 %%Creator: fig2dev Version 3.2.3 Patchlevel 
 %%CreationDate: Sat Mar  3 15:57:53 2001
-%%For: $FreeBSD$
+%%For: $FreeBSD: src/share/examples/BSD_daemon/beastie.eps,v 1.2 2001/03/04 09:13:17 phk Exp $
 %%BoundingBox: 0 0 384 417
 %%Magnification: 1.0000
 %%EndComments
diff --git a/share/examples/BSD_daemon/beastie.fig b/share/examples/BSD_daemon/beastie.fig
index 1c156ca5eced..98fc89cda61e 100644
--- a/share/examples/BSD_daemon/beastie.fig
+++ b/share/examples/BSD_daemon/beastie.fig
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/beastie.fig,v 1.2 2001/03/04 09:13:17 phk Exp $
 #
 Landscape
 Center
diff --git a/share/examples/BSD_daemon/eps.patch b/share/examples/BSD_daemon/eps.patch
index 984921449a1c..38b4132f1cde 100644
--- a/share/examples/BSD_daemon/eps.patch
+++ b/share/examples/BSD_daemon/eps.patch
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/eps.patch,v 1.2 2001/03/04 09:13:17 phk Exp $
 --- beastie.eps.ref	Sun Feb 11 22:46:59 2001
 +++ beastie.eps	Sun Feb 11 23:01:43 2001
 @@ -19,6 +19,23 @@
diff --git a/share/examples/BSD_daemon/poster.sh b/share/examples/BSD_daemon/poster.sh
index 1407701029f0..2ffe89ae67a0 100644
--- a/share/examples/BSD_daemon/poster.sh
+++ b/share/examples/BSD_daemon/poster.sh
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/poster.sh,v 1.2 2001/08/07 22:09:47 phk Exp $
 #
 
 echo '%!'
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile
index fcfc6b314506..17f056e8f21d 100644
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/FreeBSD_version/Makefile,v 1.5 2004/12/21 08:47:08 ru Exp $
 
 PROG=	FreeBSD_version
 NO_MAN=
diff --git a/share/examples/IPv6/USAGE b/share/examples/IPv6/USAGE
index 7e40f76bcb53..cf99e45fda7e 100644
--- a/share/examples/IPv6/USAGE
+++ b/share/examples/IPv6/USAGE
@@ -1,7 +1,7 @@
 	USAGE
 	KAME Project
 	$KAME: USAGE,v 1.33 2000/11/22 10:22:57 itojun Exp $
-	$FreeBSD$
+	$FreeBSD: src/share/examples/IPv6/USAGE,v 1.5 2002/12/19 22:56:20 trhodes Exp $
 
 This is an introduction of how to use the commands provided in the KAME
 kit.  For more information, please refer to each man page.
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 82d940a158fa..d5b972816433 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/Makefile,v 1.48 2005/01/12 20:55:01 keramida Exp $
 #
 # Doing a make install builds /usr/share/examples
 
diff --git a/share/examples/atm/NOTES b/share/examples/atm/NOTES
index aad41906178e..d2acda0fcf68 100644
--- a/share/examples/atm/NOTES
+++ b/share/examples/atm/NOTES
@@ -50,5 +50,5 @@ without halting on systems which can't support the larger sizes.
 
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/NOTES,v 1.2 1999/08/28 00:19:06 peter Exp $
 
diff --git a/share/examples/atm/README b/share/examples/atm/README
index a2e23f28bbbf..bdbae0ac4ce0 100644
--- a/share/examples/atm/README
+++ b/share/examples/atm/README
@@ -136,5 +136,5 @@ copyright notices are reproduced in the files where the material appears.
 
 --------------------------------------------------------------------------------
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/README,v 1.2 1999/08/28 00:19:06 peter Exp $
 
diff --git a/share/examples/atm/Startup b/share/examples/atm/Startup
index 8898e45c8821..9be739794fd4 100644
--- a/share/examples/atm/Startup
+++ b/share/examples/atm/Startup
@@ -123,5 +123,5 @@ See the file atm-config.sh for an example ATM startup script.
 
     See the man pages scspd(8) and atmarpd(8) for further information.
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/Startup,v 1.2 1999/08/28 00:19:07 peter Exp $
 
diff --git a/share/examples/atm/atm-config.sh b/share/examples/atm/atm-config.sh
index b15060e83714..d39843e0b4c3 100755
--- a/share/examples/atm/atm-config.sh
+++ b/share/examples/atm/atm-config.sh
@@ -24,7 +24,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/share/examples/atm/atm-config.sh,v 1.2 1999/08/28 00:19:07 peter Exp $
 #
 #
 
diff --git a/share/examples/atm/atm-sockets.txt b/share/examples/atm/atm-sockets.txt
index b4cc8e9d00d1..f1a0d49291c3 100644
--- a/share/examples/atm/atm-sockets.txt
+++ b/share/examples/atm/atm-sockets.txt
@@ -568,5 +568,5 @@ main(argc, argv)
 	exit(0);
 }
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/atm-sockets.txt,v 1.3 1999/08/28 00:19:07 peter Exp $
 
diff --git a/share/examples/atm/cpcs-design.txt b/share/examples/atm/cpcs-design.txt
index 94901f23998e..d589ecefbf31 100644
--- a/share/examples/atm/cpcs-design.txt
+++ b/share/examples/atm/cpcs-design.txt
@@ -80,5 +80,5 @@ o The Streaming Mode service is not supported.
 o The Abort service is not supported.
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/cpcs-design.txt,v 1.2 1999/08/28 00:19:07 peter Exp $
 
diff --git a/share/examples/atm/fore-microcode.txt b/share/examples/atm/fore-microcode.txt
index 8abcaf23e4de..2c542e725c74 100644
--- a/share/examples/atm/fore-microcode.txt
+++ b/share/examples/atm/fore-microcode.txt
@@ -90,4 +90,4 @@ file. The command syntax is:
 Move the resulting <out-file> in binary mode back to the HARP machine as
 /etc/pca200e.bin and try to initialize the ATM system again.
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/fore-microcode.txt,v 1.2 2004/06/20 13:07:25 mpp Exp $
diff --git a/share/examples/atm/sscf-design.txt b/share/examples/atm/sscf-design.txt
index 5334d74bdbac..814a487738e7 100644
--- a/share/examples/atm/sscf-design.txt
+++ b/share/examples/atm/sscf-design.txt
@@ -125,5 +125,5 @@ o The Parameter Data parameter is not supported for the following primitives:
 	AAL-RELEASE indication
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/sscf-design.txt,v 1.2 1999/08/28 00:19:08 peter Exp $
 
diff --git a/share/examples/atm/sscop-design.txt b/share/examples/atm/sscop-design.txt
index 2b546bd6aeac..b1b01d996935 100644
--- a/share/examples/atm/sscop-design.txt
+++ b/share/examples/atm/sscop-design.txt
@@ -216,5 +216,5 @@ o For the AA-ESTABLISH request and response signals, only BR=YES is supported
 o For the AA-DATA request signal, only PR=NO is supported (Q.SAAL1 only)
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/sscop-design.txt,v 1.2 1999/08/28 00:19:08 peter Exp $
 
diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile
index 7a0f159cc5d3..bedc948ba11a 100644
--- a/share/examples/autofs/driver/Makefile
+++ b/share/examples/autofs/driver/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2004/09/08 08:27:12 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/share/examples/autofs/driver/Makefile,v 1.5 2004/12/21 08:47:08 ru Exp $
 
 PROG=autodriver
 
diff --git a/share/examples/autofs/driver/autodriver.c b/share/examples/autofs/driver/autodriver.c
index 69af0c557eff..b7f8c1021c80 100644
--- a/share/examples/autofs/driver/autodriver.c
+++ b/share/examples/autofs/driver/autodriver.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $Id: autodriver.c,v 1.9 2004/09/08 08:12:21 bright Exp $
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/autofs/driver/autodriver.c,v 1.3 2004/09/09 01:26:11 alfred Exp $
  */
 #include <ctype.h>
 #include <err.h>
diff --git a/share/examples/autofs/driver/autotab b/share/examples/autofs/driver/autotab
index c56e0721926d..52bb7900620a 100644
--- a/share/examples/autofs/driver/autotab
+++ b/share/examples/autofs/driver/autotab
@@ -1,5 +1,5 @@
 # $Id: autotab,v 1.8 2004/09/08 08:12:21 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/share/examples/autofs/driver/autotab,v 1.2 2004/09/08 08:44:14 alfred Exp $
 # autofs, directory, fstype, opts, path
 /auto	share	nfs	ro,-R=1	big:/vol/share direct
 #/auto	src	nfs	ro,-R=1	big:/vol/share/src indirect
diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README
index b8eb8a0f3a16..887d3f837413 100644
--- a/share/examples/bootforth/README
+++ b/share/examples/bootforth/README
@@ -32,4 +32,4 @@ configuration to distinguish one from the other.
 Daniel C. Sobral
 <dcs@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/share/examples/bootforth/README,v 1.3 1999/08/28 00:19:09 peter Exp $
diff --git a/share/examples/bootforth/boot.4th b/share/examples/bootforth/boot.4th
index 8f26e0d0a38d..1a4809a2f5e0 100644
--- a/share/examples/bootforth/boot.4th
+++ b/share/examples/bootforth/boot.4th
@@ -1,6 +1,6 @@
 \ Example of the file which is automatically loaded by /boot/loader
 \ on startup.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/boot.4th,v 1.3 2001/12/11 00:49:33 jhb Exp $
 
 \ Load the screen manipulation words
 
diff --git a/share/examples/bootforth/frames.4th b/share/examples/bootforth/frames.4th
index 3b1f4046891f..9ff2c81785eb 100644
--- a/share/examples/bootforth/frames.4th
+++ b/share/examples/bootforth/frames.4th
@@ -1,6 +1,6 @@
 \ Words implementing frame drawing
 \ XXX Filled boxes are left as an exercise for the reader... ;-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/frames.4th,v 1.3 2004/01/18 15:16:12 nyan Exp $
 
 marker task-frames.4th
 
diff --git a/share/examples/bootforth/loader.rc b/share/examples/bootforth/loader.rc
index 617bc3db4104..ecdfdff3f9ee 100644
--- a/share/examples/bootforth/loader.rc
+++ b/share/examples/bootforth/loader.rc
@@ -1,6 +1,6 @@
 \ Example of the file which is automatically loaded by /boot/loader
 \ on startup.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/loader.rc,v 1.4 2001/12/11 00:49:33 jhb Exp $
 
 cr .( Loading Forth extensions:)
 
diff --git a/share/examples/bootforth/menu.4th b/share/examples/bootforth/menu.4th
index 5c5c3e98c74e..e0c83afad326 100644
--- a/share/examples/bootforth/menu.4th
+++ b/share/examples/bootforth/menu.4th
@@ -1,7 +1,7 @@
 \ Simple greeting screen, presenting basic options.
 \ XXX This is far too trivial - I don't have time now to think
 \ XXX about something more fancy... :-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/menu.4th,v 1.4 1999/08/28 00:19:10 peter Exp $
 
 : title
 	f_single
diff --git a/share/examples/bootforth/menuconf.4th b/share/examples/bootforth/menuconf.4th
index a769f77e3543..0db589ed0a77 100644
--- a/share/examples/bootforth/menuconf.4th
+++ b/share/examples/bootforth/menuconf.4th
@@ -1,7 +1,7 @@
 \ Simple greeting screen, presenting basic options.
 \ XXX This is far too trivial - I don't have time now to think
 \ XXX about something more fancy... :-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/menuconf.4th,v 1.5 2000/09/05 16:30:09 dcs Exp $
 
 : title
 	f_single
diff --git a/share/examples/bootforth/screen.4th b/share/examples/bootforth/screen.4th
index 3ea79e453d80..b0cea0b6be97 100644
--- a/share/examples/bootforth/screen.4th
+++ b/share/examples/bootforth/screen.4th
@@ -1,5 +1,5 @@
 \ Screen manipulation related words.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/screen.4th,v 1.2 1999/08/28 00:19:10 peter Exp $
 
 marker task-screen.4th
 
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index e025e8fefb14..a6e8a72d882f 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/README,v 1.18 2002/07/30 14:08:16 blackend Exp $
 
 This directory contains sample "supfiles" for obtaining and updating
 the FreeBSD sources via the Internet.  These supfiles will work
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index a1f80de33087..901e2d68c535 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.43 2004/05/24 06:23:15 cjc Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # CVS development tree of the FreeBSD system.
diff --git a/share/examples/cvsup/doc-supfile b/share/examples/cvsup/doc-supfile
index dfd306e9fbef..4da60d294136 100644
--- a/share/examples/cvsup/doc-supfile
+++ b/share/examples/cvsup/doc-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/doc-supfile,v 1.9 2004/05/24 06:23:15 cjc Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # source of the FreeBSD doc tree
diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile
index 086276682642..6e691698acdf 100644
--- a/share/examples/cvsup/gnats-supfile
+++ b/share/examples/cvsup/gnats-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.7 2004/05/24 06:23:15 cjc Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD GNATS bug report database.
diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile
index 27db06da5b07..e20bda8f6fca 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.33 2004/12/19 02:31:45 brueffer Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current ports collection.
diff --git a/share/examples/cvsup/refuse.README b/share/examples/cvsup/refuse.README
index 4fb0f61a3b1a..855451632127 100644
--- a/share/examples/cvsup/refuse.README
+++ b/share/examples/cvsup/refuse.README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.12 2005/03/15 12:21:44 maxim Exp $
 
 This describes the "refuse" file found in this directory.  The
 explanation cannot be put inside the file itself because:
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 7b28e4d21692..84822a09a0f1 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/stable-supfile,v 1.29.2.1 2005/09/28 14:00:13 kensmith Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-stable source tree.
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index e6954cff8022..790fd1972d99 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.23.4.1.2.1 2005/10/16 08:15:29 hrs Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
diff --git a/share/examples/cvsup/www-supfile b/share/examples/cvsup/www-supfile
index 722c65c638cd..7e38958a3ffa 100644
--- a/share/examples/cvsup/www-supfile
+++ b/share/examples/cvsup/www-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/www-supfile,v 1.6 2004/05/24 06:23:15 cjc Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # source of the FreeBSD www tree
diff --git a/share/examples/diskless/ME b/share/examples/diskless/ME
index ff06be2c5393..563a45164d9b 100644
--- a/share/examples/diskless/ME
+++ b/share/examples/diskless/ME
@@ -11,7 +11,7 @@ actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2,
 and the /usr/share/examples/diskless/clone_root script which can
 be useful to set up clients and server for diskless boot.
 
---- $FreeBSD$ ---
+--- $FreeBSD: src/share/examples/diskless/ME,v 1.4 2002/03/15 06:47:37 luigi Exp $ ---
 ------------------------------------------------------------------------
 
 When templating, /conf/ME is typically a softlink to
diff --git a/share/examples/diskless/README.BOOTP b/share/examples/diskless/README.BOOTP
index 5ee53437a6f6..466fdfeba071 100644
--- a/share/examples/diskless/README.BOOTP
+++ b/share/examples/diskless/README.BOOTP
@@ -11,7 +11,7 @@ actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2,
 and the /usr/share/examples/diskless/clone_root script which can
 be useful to set up clients and server for diskless boot.
 
---- $FreeBSD$ ---
+--- $FreeBSD: src/share/examples/diskless/README.BOOTP,v 1.4 2004/06/20 13:17:37 mpp Exp $ ---
 ------------------------------------------------------------------------
 
 		        BOOTP configuration mechanism
diff --git a/share/examples/diskless/README.TEMPLATING b/share/examples/diskless/README.TEMPLATING
index b094267ceb26..886d7c4ebc2b 100644
--- a/share/examples/diskless/README.TEMPLATING
+++ b/share/examples/diskless/README.TEMPLATING
@@ -11,7 +11,7 @@ actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2,
 and the /usr/share/examples/diskless/clone_root script which can
 be useful to set up clients and server for diskless boot.
 
---- $FreeBSD$ ---
+--- $FreeBSD: src/share/examples/diskless/README.TEMPLATING,v 1.5 2004/06/20 13:17:37 mpp Exp $ ---
 ------------------------------------------------------------------------
 
 		      TEMPLATING machine configurations
diff --git a/share/examples/diskless/clone_root b/share/examples/diskless/clone_root
index 9402c23db3ca..0503760cd025 100755
--- a/share/examples/diskless/clone_root
+++ b/share/examples/diskless/clone_root
@@ -4,7 +4,7 @@
 #	<Standard BSD copyright>
 # Revised 2001.04.16
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/diskless/clone_root,v 1.3 2004/09/23 21:17:31 brooks Exp $
 #
 # clone root filesystem for diskless root stuff
 #
diff --git a/share/examples/drivers/README b/share/examples/drivers/README
index d74089b9feab..fa2a3e499037 100644
--- a/share/examples/drivers/README
+++ b/share/examples/drivers/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/drivers/README,v 1.3 2001/03/10 05:28:46 billf Exp $
 
 Author: Julian Elischer
 
diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh
index 14e3d3ba1616..df32fb3e51a0 100755
--- a/share/examples/drivers/make_device_driver.sh
+++ b/share/examples/drivers/make_device_driver.sh
@@ -19,7 +19,7 @@
 #   o generate foo_isa.c, foo_pci.c, foo_pccard.c, foo_cardbus.c, and foovar.h
 #   o Put pccard stuff in here.
 #
-# $FreeBSD$"
+# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.21 2003/10/03 19:31:55 dds Exp $"
 #
 #
 if [ "X${1}" = "X" ]; then
diff --git a/share/examples/drivers/make_pseudo_driver.sh b/share/examples/drivers/make_pseudo_driver.sh
index 5a90474541c0..7cd64df162a6 100644
--- a/share/examples/drivers/make_pseudo_driver.sh
+++ b/share/examples/drivers/make_pseudo_driver.sh
@@ -4,7 +4,7 @@
 #
 # Trust me, RUN THIS SCRIPT :)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.10 2005/03/09 12:29:07 stefanf Exp $
 #
 #-------cut here------------------
 cd /sys/i386/conf
diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples
index e947529352a4..9d040a60d16c 100644
--- a/share/examples/etc/README.examples
+++ b/share/examples/etc/README.examples
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/etc/README.examples,v 1.14 2004/06/20 13:33:35 mpp Exp $
 
 The /usr/share/examples/etc directory contains the original
 distribution versions of the files which are shipped in /etc.  This is
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 21ac75377317..264801ea0cab 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/etc/make.conf,v 1.265.2.1 2005/10/09 03:36:41 delphij Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile
index ac6de9cf7f05..23889c7b1257 100644
--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/find_interface/Makefile,v 1.5 2004/12/21 08:47:09 ru Exp $
 
 PROG=	find_interface
 NO_MAN=
diff --git a/share/examples/find_interface/find_interface.c b/share/examples/find_interface/find_interface.c
index 73a7fe839d79..f793f86af82e 100644
--- a/share/examples/find_interface/find_interface.c
+++ b/share/examples/find_interface/find_interface.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/find_interface/find_interface.c,v 1.5 1999/08/28 00:19:18 peter Exp $
  */
 
 /*
diff --git a/share/examples/hwpmc/README b/share/examples/hwpmc/README
index 035e68d22575..b6d162229d74 100644
--- a/share/examples/hwpmc/README
+++ b/share/examples/hwpmc/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/hwpmc/README,v 1.1 2005/04/19 04:01:22 jkoshy Exp $
 
 Examples illustrating the use of the hwpmc(4) driver and pmc(3)
 library interface.
diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile
index 4826dac39694..645783aa2f4b 100644
--- a/share/examples/ipfilter/Makefile
+++ b/share/examples/ipfilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/Makefile,v 1.5 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 
diff --git a/share/examples/ipfilter/README b/share/examples/ipfilter/README
index aefd2cd5ec8f..0c298df37030 100644
--- a/share/examples/ipfilter/README
+++ b/share/examples/ipfilter/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/README,v 1.1 2001/10/20 04:17:06 darrenr Exp $
 
 This directory contains various files related to ipfilter.
 
diff --git a/share/examples/ipfilter/example.14 b/share/examples/ipfilter/example.14
index f1f2be450fb8..dcb476c9f881 100644
--- a/share/examples/ipfilter/example.14
+++ b/share/examples/ipfilter/example.14
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/example.14,v 1.1 2001/10/20 04:17:06 darrenr Exp $
 #
 # log all inbound packet on le0 which has IP options present
 #
diff --git a/share/examples/ipfilter/examples.txt b/share/examples/ipfilter/examples.txt
index a323a8457752..ecb829b649a4 100644
--- a/share/examples/ipfilter/examples.txt
+++ b/share/examples/ipfilter/examples.txt
@@ -512,4 +512,4 @@ pass in quick proto tcp from any to any port = WWW keep state group 100
 
   ------------------------------------------------------------------------
 Return to the IP Filter home page
-$FreeBSD$
+$FreeBSD: src/share/examples/ipfilter/examples.txt,v 1.2 2003/01/01 18:48:48 schweikh Exp $
diff --git a/share/examples/ipfilter/firewall.1 b/share/examples/ipfilter/firewall.1
index 47acb5cd3a22..c1db27ddde15 100644
--- a/share/examples/ipfilter/firewall.1
+++ b/share/examples/ipfilter/firewall.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/firewall.1,v 1.2 2002/12/27 12:15:33 schweikh Exp $
 #
 #  This is an example of a very light firewall used to guard against
 #  some of the most easily exploited common security holes.
diff --git a/share/examples/ipfilter/firewall.2 b/share/examples/ipfilter/firewall.2
index ba00504a37c8..fa324b145ca2 100644
--- a/share/examples/ipfilter/firewall.2
+++ b/share/examples/ipfilter/firewall.2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/firewall.2,v 1.2 2002/12/27 12:15:33 schweikh Exp $
 #
 #  This is an example of a fairly heavy firewall used to keep everyone
 #  out of a particular network while still allowing people within that
diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt
index 73a1ecf54611..f69f67305e50 100644
--- a/share/examples/ipfilter/ipf-howto.txt
+++ b/share/examples/ipfilter/ipf-howto.txt
@@ -8,7 +8,7 @@
 
               Brendan Conoboy <synk@swcp.com>
             Erik Fichtner <emf@obfuscation.org>
-            $FreeBSD$
+            $FreeBSD: src/share/examples/ipfilter/ipf-howto.txt,v 1.2 2003/01/01 18:48:48 schweikh Exp $
 
                 Fri Apr 20 09:31:14 EDT 2001
 
diff --git a/share/examples/ipfilter/ipf.conf.permissive b/share/examples/ipfilter/ipf.conf.permissive
index 714d7d99bc69..5393203454f9 100644
--- a/share/examples/ipfilter/ipf.conf.permissive
+++ b/share/examples/ipfilter/ipf.conf.permissive
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipf.conf.permissive,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 # augmented rules generated by mkfilters
 block in log quick from any with ipopts
 block in log quick proto tcp from any to any with short
diff --git a/share/examples/ipfilter/ipf.conf.restrictive b/share/examples/ipfilter/ipf.conf.restrictive
index ad3de82f58c8..2e233717761e 100644
--- a/share/examples/ipfilter/ipf.conf.restrictive
+++ b/share/examples/ipfilter/ipf.conf.restrictive
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipf.conf.restrictive,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 #--------------------------------------------------------------------------
 # ed1 - external interface
 # fxp0 - internal interface
diff --git a/share/examples/ipfilter/ipf.conf.sample b/share/examples/ipfilter/ipf.conf.sample
index c5d47bc1c9f9..7ec4dc1acb46 100644
--- a/share/examples/ipfilter/ipf.conf.sample
+++ b/share/examples/ipfilter/ipf.conf.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipf.conf.sample,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 block in log quick from any with ipopts
 block in log quick proto tcp from any to any with short
 pass out on ed1 all head 150
diff --git a/share/examples/ipfilter/ipnat.conf.sample b/share/examples/ipfilter/ipnat.conf.sample
index 67956bceae06..ce995b5b85c6 100644
--- a/share/examples/ipfilter/ipnat.conf.sample
+++ b/share/examples/ipfilter/ipnat.conf.sample
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipnat.conf.sample,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 map ed1 192.168.0.0/24 -> 192.168.1.110/32 portmap tcp/udp 40000:65000
 map ed1 192.168.0.0/24 -> 192.168.1.110/32
diff --git a/share/examples/ipfilter/rules.txt b/share/examples/ipfilter/rules.txt
index 26a51d02b064..44fd08275543 100644
--- a/share/examples/ipfilter/rules.txt
+++ b/share/examples/ipfilter/rules.txt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/rules.txt,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 #
 # block all incoming TCP packets on le0 from host "foo" to any destination.
 #
diff --git a/share/examples/ipfw/change_rules.sh b/share/examples/ipfw/change_rules.sh
index be7f7644064e..73c16ca2b27b 100755
--- a/share/examples/ipfw/change_rules.sh
+++ b/share/examples/ipfw/change_rules.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfw/change_rules.sh,v 1.6 2003/09/07 07:52:56 jmg Exp $
 
 # Change ipfw(8) rules with safety guarantees for remote operation
 #
diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ
index b32ce7ba7dcd..5ce74b45823d 100644
--- a/share/examples/isdn/FAQ
+++ b/share/examples/isdn/FAQ
@@ -5,7 +5,7 @@
 
                 last edit-date: [Wed Nov  1 15:08:03 2000]
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/FAQ,v 1.14 2003/01/01 18:48:48 schweikh Exp $
 
 --------------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/KERNEL b/share/examples/isdn/KERNEL
index a80dcce47f5d..6d188c5688b2 100644
--- a/share/examples/isdn/KERNEL
+++ b/share/examples/isdn/KERNEL
@@ -7,7 +7,7 @@
 #
 #	last edit-date: [Sun Oct 21 11:03:37 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/KERNEL,v 1.3 2001/12/22 09:59:56 gj Exp $
 #
 #---------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview
index 831350630b57..ae09500cbde4 100644
--- a/share/examples/isdn/Overview
+++ b/share/examples/isdn/Overview
@@ -4,7 +4,7 @@
 
 	Copyright (c) 1998 Hellmuth Michaelis. All rights reserved.
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/Overview,v 1.4 2003/01/01 18:48:48 schweikh Exp $
 
 	Last edit-date: [Tue Oct 27 11:26:03 1998]
 
diff --git a/share/examples/isdn/README b/share/examples/isdn/README
index 0a817f123582..cdae585f33ee 100644
--- a/share/examples/isdn/README
+++ b/share/examples/isdn/README
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/README,v 1.15 2002/08/12 07:53:55 hm Exp $
 
 --------------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/ROADMAP b/share/examples/isdn/ROADMAP
index 33cc055b5125..2f58c83c41b3 100644
--- a/share/examples/isdn/ROADMAP
+++ b/share/examples/isdn/ROADMAP
@@ -2,7 +2,7 @@
 	Roadmap of isdn4bsd as integrated into FreeBSD
 	==============================================
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/ROADMAP,v 1.5 2002/08/12 07:53:55 hm Exp $
 
 	last edit-date: [Mon Aug 12 09:42:53 2002]
 
diff --git a/share/examples/isdn/ReleaseNotes b/share/examples/isdn/ReleaseNotes
index cf93e6559113..9a3cff0ae0b2 100644
--- a/share/examples/isdn/ReleaseNotes
+++ b/share/examples/isdn/ReleaseNotes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/ReleaseNotes,v 1.9 2002/08/12 07:53:55 hm Exp $
 
 ReleaseNotes for isdn4bsd             last edit-date: [Mon Aug 12 09:47:59 2002]
 ================================================================================
diff --git a/share/examples/isdn/Resources b/share/examples/isdn/Resources
index c26aec0927fc..83ec7c617256 100644
--- a/share/examples/isdn/Resources
+++ b/share/examples/isdn/Resources
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/Resources,v 1.9 2002/03/26 15:14:58 hm Exp $
 
 
 Bugfixes, improvements and patches for i4b
diff --git a/share/examples/isdn/SupportedCards b/share/examples/isdn/SupportedCards
index 1c470021c027..eed5309f515f 100644
--- a/share/examples/isdn/SupportedCards
+++ b/share/examples/isdn/SupportedCards
@@ -5,7 +5,7 @@
 
                  last edit-date: [Sun Oct 21 11:09:24 2001]
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/SupportedCards,v 1.7 2002/04/28 11:51:14 gj Exp $
 
 --------------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/ThankYou b/share/examples/isdn/ThankYou
index 3ad4cb06c55d..0dfcfef054a8 100644
--- a/share/examples/isdn/ThankYou
+++ b/share/examples/isdn/ThankYou
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/ThankYou,v 1.10 2002/08/12 07:53:55 hm Exp $
 
 Thanks a lot for postcards from:
 --------------------------------
diff --git a/share/examples/isdn/contrib/README b/share/examples/isdn/contrib/README
index ae5969f09e84..e9a9a4caa43a 100644
--- a/share/examples/isdn/contrib/README
+++ b/share/examples/isdn/contrib/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/contrib/README,v 1.1 2001/05/25 13:25:58 hm Exp $
 
 This directory contains various unsupported contributions to isdn4bsd
 ---------------------------------------------------------------------
diff --git a/share/examples/isdn/contrib/anleitung.ppp b/share/examples/isdn/contrib/anleitung.ppp
index 01466e2f4880..7853b392f9fc 100644
--- a/share/examples/isdn/contrib/anleitung.ppp
+++ b/share/examples/isdn/contrib/anleitung.ppp
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/contrib/anleitung.ppp,v 1.1 2001/05/25 13:25:58 hm Exp $
 
 i4b Anleitung für syncPPP Internet-Zugang und Anrufbeantworter
 unter FreeBSD 2.2.x mit Teles.S0/16.3-Karte
diff --git a/share/examples/isdn/contrib/answer.c b/share/examples/isdn/contrib/answer.c
index aac431f17e01..218d2534b880 100644
--- a/share/examples/isdn/contrib/answer.c
+++ b/share/examples/isdn/contrib/answer.c
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/share/examples/isdn/contrib/answer.c,v 1.2 2002/04/22 13:44:29 des Exp $
 // changed ".g711a" to ".al" (-hm)
 // Tue Mar  3 02:42:14 MET 1998 	dave@turbocat.de
 // started
diff --git a/share/examples/isdn/contrib/answer.sh b/share/examples/isdn/contrib/answer.sh
index 34073d359923..6cd2ec1af982 100644
--- a/share/examples/isdn/contrib/answer.sh
+++ b/share/examples/isdn/contrib/answer.sh
@@ -6,7 +6,7 @@
 #
 #	last edit-date: [Fri May 25 15:21:05 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/answer.sh,v 1.1 2001/05/25 13:25:58 hm Exp $
 #
 #---------------------------------------------------------------------------
 VARDIR=/var/isdn
diff --git a/share/examples/isdn/contrib/convert.sh b/share/examples/isdn/contrib/convert.sh
index b4a6e7d8d852..49a067af07e0 100644
--- a/share/examples/isdn/contrib/convert.sh
+++ b/share/examples/isdn/contrib/convert.sh
@@ -5,7 +5,7 @@
 # by:		Stefan Herrmann <stefan@asterix.webaffairs.net>
 # Date:	Fr  22 Mai 1998 14:18:40 CEST
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/convert.sh,v 1.1 2001/05/25 13:25:58 hm Exp $
 
 CAT=/bin/cat
 RM=/bin/rm
diff --git a/share/examples/isdn/contrib/hplay.c b/share/examples/isdn/contrib/hplay.c
index 10660ac7b7b1..d788227c2151 100644
--- a/share/examples/isdn/contrib/hplay.c
+++ b/share/examples/isdn/contrib/hplay.c
@@ -12,7 +12,7 @@
  *
  *	last edit-date: [Fri May 25 15:21:33 2001]
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/contrib/hplay.c,v 1.1 2001/05/25 13:25:59 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/share/examples/isdn/contrib/i4b-ppp-newbie.txt b/share/examples/isdn/contrib/i4b-ppp-newbie.txt
index 7d6c4b0870ae..b6889a6ef314 100644
--- a/share/examples/isdn/contrib/i4b-ppp-newbie.txt
+++ b/share/examples/isdn/contrib/i4b-ppp-newbie.txt
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/contrib/i4b-ppp-newbie.txt,v 1.1 2001/05/25 13:25:59 hm Exp $
 
                               PPP mit isdn4bsd
      _________________________________________________________________
diff --git a/share/examples/isdn/contrib/isdnctl b/share/examples/isdn/contrib/isdnctl
index 57fab4561cc6..ddec9ff274c4 100644
--- a/share/examples/isdn/contrib/isdnctl
+++ b/share/examples/isdn/contrib/isdnctl
@@ -19,7 +19,7 @@
 # Alexander Langer
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/isdnctl,v 1.2 2002/04/22 13:44:29 des Exp $
 #
 
 
diff --git a/share/examples/isdn/contrib/isdnd_acct b/share/examples/isdn/contrib/isdnd_acct
index 21223b7cd0f4..30a8acf77fc5 100644
--- a/share/examples/isdn/contrib/isdnd_acct
+++ b/share/examples/isdn/contrib/isdnd_acct
@@ -31,7 +31,7 @@
 #
 #	last edit-date: [Fri May 25 15:28:20 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/isdnd_acct,v 1.1 2001/05/25 13:25:59 hm Exp $
 #
 #---------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/contrib/isdnd_acct.pl b/share/examples/isdn/contrib/isdnd_acct.pl
index 03062160104d..7db40c22ac72 100644
--- a/share/examples/isdn/contrib/isdnd_acct.pl
+++ b/share/examples/isdn/contrib/isdnd_acct.pl
@@ -18,7 +18,7 @@
 #           Tests und Zug?nge nachts durchzuf?hren... Aber die meisten
 #           Einheiten werden immer noch im 90s-Takt verbraucht :-(
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/isdnd_acct.pl,v 1.1 2001/05/25 13:25:59 hm Exp $
 #
 #---------------------------------------------------------------------------
 #
diff --git a/share/examples/isdn/contrib/isdntelmux.c b/share/examples/isdn/contrib/isdntelmux.c
index 318ebfcb937e..1536d1122c85 100644
--- a/share/examples/isdn/contrib/isdntelmux.c
+++ b/share/examples/isdn/contrib/isdntelmux.c
@@ -28,7 +28,7 @@
  *	i4btemux - record while playing
  *      ===============================
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/contrib/isdntelmux.c,v 1.1 2001/05/25 13:25:59 hm Exp $
  *
  *----------------------------------------------------------------------------*/
 
diff --git a/share/examples/isdn/contrib/mrtg-isp0.sh b/share/examples/isdn/contrib/mrtg-isp0.sh
index bdc9671883ac..dd02ee19873b 100644
--- a/share/examples/isdn/contrib/mrtg-isp0.sh
+++ b/share/examples/isdn/contrib/mrtg-isp0.sh
@@ -8,7 +8,7 @@
 #
 #	last edit-date: [Fri May 25 15:22:45 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/mrtg-isp0.sh,v 1.1 2001/05/25 13:25:59 hm Exp $
 #
 #---------------------------------------------------------------------------
 #
diff --git a/share/examples/isdn/i4brunppp/Makefile b/share/examples/isdn/i4brunppp/Makefile
index e1eeceaa18c5..4fe1bac4af09 100644
--- a/share/examples/isdn/i4brunppp/Makefile
+++ b/share/examples/isdn/i4brunppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/i4brunppp/Makefile,v 1.4 2004/09/26 09:25:03 ru Exp $
 
 PROG	 =	i4brunppp
 SRCS	 =	i4brunppp.c
diff --git a/share/examples/isdn/i4brunppp/README b/share/examples/isdn/i4brunppp/README
index 81ebe75cf30d..65e586f4536a 100644
--- a/share/examples/isdn/i4brunppp/README
+++ b/share/examples/isdn/i4brunppp/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/i4brunppp/README,v 1.2 2003/01/01 18:48:48 schweikh Exp $
 
 BEWARE: HIGHLY EXPERIMENTAL!
 ---------------------------
diff --git a/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc b/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
index 962022045cae..f9a4c8e8cce4 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
+++ b/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
@@ -3,7 +3,7 @@
 #    sample isdnd.rc for taking incoming calls with userland ppp
 #    -----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc,v 1.1 2001/07/21 11:49:28 hm Exp $
 #
 #    last edit-date: [Sat Jul 21 13:40:50 2001]
 #
diff --git a/share/examples/isdn/i4brunppp/i4brunppp.8 b/share/examples/isdn/i4brunppp/i4brunppp.8
index bc4799032ea2..00c5595b2158 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp.8
+++ b/share/examples/isdn/i4brunppp/i4brunppp.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp.8,v 1.4 2002/12/11 15:55:29 ru Exp $
 .\"
 .\"	last edit-date: [Sat Jul 21 13:37:00 2001]
 .\"
diff --git a/share/examples/isdn/i4brunppp/i4brunppp.c b/share/examples/isdn/i4brunppp/i4brunppp.c
index 7d1fe3cd51dc..662201fd76f2 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp.c
+++ b/share/examples/isdn/i4brunppp/i4brunppp.c
@@ -27,7 +27,7 @@
  *	i4brunppp - run userland ppp for incoming call from rbch i/f
  *	------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp.c,v 1.3 2003/01/01 18:48:48 schweikh Exp $
  *
  *      last edit-date: [Sat Jul 21 13:38:10 2001]
  *
diff --git a/share/examples/isdn/v21/Makefile b/share/examples/isdn/v21/Makefile
index 261cec10441f..0554ed5e3a54 100644
--- a/share/examples/isdn/v21/Makefile
+++ b/share/examples/isdn/v21/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/v21/Makefile,v 1.4 2004/12/21 08:47:09 ru Exp $
 
 PROG=		v21modem
 NO_MAN=
diff --git a/share/examples/isdn/v21/README b/share/examples/isdn/v21/README
index 52f553c31307..1acdb5f5c1e2 100644
--- a/share/examples/isdn/v21/README
+++ b/share/examples/isdn/v21/README
@@ -47,4 +47,4 @@ entry
 Poul-Henning (phk@freebsd.org)
 19991212
 
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/v21/README,v 1.1 2001/05/25 13:04:58 hm Exp $
diff --git a/share/examples/isdn/v21/v21modem.c b/share/examples/isdn/v21/v21modem.c
index f49eb06bf6f7..7bcca16288ea 100644
--- a/share/examples/isdn/v21/v21modem.c
+++ b/share/examples/isdn/v21/v21modem.c
@@ -8,7 +8,7 @@
  *
  * This is a V.21 modem for ISDN4BSD.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/v21/v21modem.c,v 1.2 2001/07/09 09:23:44 brian Exp $
  */
 
 #include <string.h>
diff --git a/share/examples/kld/Makefile b/share/examples/kld/Makefile
index 6c539bd50ac4..548b17272e12 100644
--- a/share/examples/kld/Makefile
+++ b/share/examples/kld/Makefile
@@ -64,7 +64,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/kld/Makefile,v 1.3 2000/07/15 10:25:52 abial Exp $
 #
 
 SUBDIR=	cdev syscall dyn_sysctl
diff --git a/share/examples/kld/cdev/Makefile b/share/examples/kld/cdev/Makefile
index 5c8f8f608f38..83afe978ec94 100644
--- a/share/examples/kld/cdev/Makefile
+++ b/share/examples/kld/cdev/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/Makefile,v 1.2 2002/07/11 13:38:05 ru Exp $
 
 SUBDIR=	module test
 
diff --git a/share/examples/kld/cdev/README b/share/examples/kld/cdev/README
index dc650f111358..a85d4f11a7fd 100644
--- a/share/examples/kld/cdev/README
+++ b/share/examples/kld/cdev/README
@@ -58,7 +58,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/README,v 1.2 2000/10/02 14:14:04 sobomax Exp $
 #
 
 1.0	Overview
diff --git a/share/examples/kld/cdev/module/Makefile b/share/examples/kld/cdev/module/Makefile
index a35c5001395d..6f44c34b66e8 100644
--- a/share/examples/kld/cdev/module/Makefile
+++ b/share/examples/kld/cdev/module/Makefile
@@ -1,5 +1,5 @@
 # Makefile for kld char device driver.
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/module/Makefile,v 1.6 2003/08/03 10:39:28 mbr Exp $
 
 KMOD=	cdev
 SRCS=	cdev.c cdevmod.c
diff --git a/share/examples/kld/cdev/module/cdev.c b/share/examples/kld/cdev/module/cdev.c
index dda63c4fa70e..defd6567ec4e 100644
--- a/share/examples/kld/cdev/module/cdev.c
+++ b/share/examples/kld/cdev/module/cdev.c
@@ -65,7 +65,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/module/cdev.c,v 1.8 2004/07/16 06:55:34 tjr Exp $
  */
 #include <sys/param.h>
 #include <sys/uio.h>
diff --git a/share/examples/kld/cdev/module/cdev.h b/share/examples/kld/cdev/module/cdev.h
index b09e53ae3dba..bc717db78d42 100644
--- a/share/examples/kld/cdev/module/cdev.h
+++ b/share/examples/kld/cdev/module/cdev.h
@@ -66,7 +66,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/module/cdev.h,v 1.4 2000/10/02 14:14:06 sobomax Exp $
  */
 
 #ifndef __CDEV_H_
diff --git a/share/examples/kld/cdev/module/cdevmod.c b/share/examples/kld/cdev/module/cdevmod.c
index 7b9a4531cff0..064917a16e42 100644
--- a/share/examples/kld/cdev/module/cdevmod.c
+++ b/share/examples/kld/cdev/module/cdevmod.c
@@ -65,7 +65,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/module/cdevmod.c,v 1.7 2004/08/30 09:49:58 pjd Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile
index 333cdcb8c42a..5a8b6c4ac4b6 100644
--- a/share/examples/kld/cdev/test/Makefile
+++ b/share/examples/kld/cdev/test/Makefile
@@ -64,7 +64,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/test/Makefile,v 1.5 2004/12/21 08:47:09 ru Exp $
 #
 PROG=	testcdev
 NO_MAN=
diff --git a/share/examples/kld/cdev/test/testcdev.c b/share/examples/kld/cdev/test/testcdev.c
index 0a6118103c03..915e02f7e9af 100644
--- a/share/examples/kld/cdev/test/testcdev.c
+++ b/share/examples/kld/cdev/test/testcdev.c
@@ -68,7 +68,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/test/testcdev.c,v 1.5 2003/08/03 10:39:29 mbr Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/kld/dyn_sysctl/Makefile b/share/examples/kld/dyn_sysctl/Makefile
index 695320de6080..fba809c11114 100644
--- a/share/examples/kld/dyn_sysctl/Makefile
+++ b/share/examples/kld/dyn_sysctl/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/kld/dyn_sysctl/Makefile,v 1.2 2001/05/18 13:56:29 ru Exp $
 
 SRCS	= dyn_sysctl.c
 KMOD	= dyn_sysctl
diff --git a/share/examples/kld/dyn_sysctl/README b/share/examples/kld/dyn_sysctl/README
index 4dfa3c6bdfbd..ee73d2a099e7 100644
--- a/share/examples/kld/dyn_sysctl/README
+++ b/share/examples/kld/dyn_sysctl/README
@@ -5,4 +5,4 @@ The framework should deal with this case gracefully.
 
 Andrzej Bialecki <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/share/examples/kld/dyn_sysctl/README,v 1.1 2000/07/15 10:26:00 abial Exp $
diff --git a/share/examples/kld/dyn_sysctl/dyn_sysctl.c b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
index bcef7d472c5e..6724033c0a64 100644
--- a/share/examples/kld/dyn_sysctl/dyn_sysctl.c
+++ b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $FreeBSD$
+ *     $FreeBSD: src/share/examples/kld/dyn_sysctl/dyn_sysctl.c,v 1.3 2004/08/30 09:49:58 pjd Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/syscall/Makefile b/share/examples/kld/syscall/Makefile
index 5c8f8f608f38..3f2b3dcd052e 100644
--- a/share/examples/kld/syscall/Makefile
+++ b/share/examples/kld/syscall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/syscall/Makefile,v 1.2 2002/07/11 13:38:05 ru Exp $
 
 SUBDIR=	module test
 
diff --git a/share/examples/kld/syscall/module/Makefile b/share/examples/kld/syscall/module/Makefile
index 17066d141fce..6ff2e5837b67 100644
--- a/share/examples/kld/syscall/module/Makefile
+++ b/share/examples/kld/syscall/module/Makefile
@@ -1,5 +1,5 @@
 # Makefile for building the sample syscall module
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/syscall/module/Makefile,v 1.2 2001/09/18 12:03:42 ru Exp $
 
 KMOD=	syscall
 SRCS=	syscall.c
diff --git a/share/examples/kld/syscall/module/syscall.c b/share/examples/kld/syscall/module/syscall.c
index f65668b3a907..ef5fb175cdd0 100644
--- a/share/examples/kld/syscall/module/syscall.c
+++ b/share/examples/kld/syscall/module/syscall.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/syscall/module/syscall.c,v 1.4 2004/08/30 09:49:59 pjd Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile
index c02d89d108db..a5234e5e616f 100644
--- a/share/examples/kld/syscall/test/Makefile
+++ b/share/examples/kld/syscall/test/Makefile
@@ -1,5 +1,5 @@
 # Makefile for simple caller of syscall
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/syscall/test/Makefile,v 1.3 2004/12/21 08:47:10 ru Exp $
 
 PROG  = call
 NO_MAN =
diff --git a/share/examples/kld/syscall/test/call.c b/share/examples/kld/syscall/test/call.c
index 9183997821cd..23cfb338ccfd 100644
--- a/share/examples/kld/syscall/test/call.c
+++ b/share/examples/kld/syscall/test/call.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/syscall/test/call.c,v 1.3 1999/08/28 00:19:24 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile
index 6b4e916851da..c70ad6aa202c 100644
--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/libvgl/Makefile,v 1.5 2004/12/21 08:47:10 ru Exp $
 
 PROG=	demo
 NO_MAN=
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c
index 781f6a1a063b..16f36a8a98e8 100644
--- a/share/examples/libvgl/demo.c
+++ b/share/examples/libvgl/demo.c
@@ -25,7 +25,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/share/examples/libvgl/demo.c,v 1.6 2002/06/02 20:05:40 schweikh Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/mdoc/POSIX-copyright b/share/examples/mdoc/POSIX-copyright
index d1bea592679b..8b0ca05871c1 100644
--- a/share/examples/mdoc/POSIX-copyright
+++ b/share/examples/mdoc/POSIX-copyright
@@ -32,5 +32,5 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/POSIX-copyright,v 1.1 2005/01/10 18:09:17 simon Exp $
 .\"
diff --git a/share/examples/mdoc/deshallify.sh b/share/examples/mdoc/deshallify.sh
index 361753f63efb..464c1056a1c8 100644
--- a/share/examples/mdoc/deshallify.sh
+++ b/share/examples/mdoc/deshallify.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script to remove shall clauses.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/mdoc/deshallify.sh,v 1.2 2005/01/10 18:54:55 ru Exp $
 #
 sed -e 's/s shall define/s define/g' \
     -e 's/shall define/defines/g' \
diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1
index a578502fafbf..e82c5d1f1b6b 100644
--- a/share/examples/mdoc/example.1
+++ b/share/examples/mdoc/example.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.1,v 1.23 2005/01/16 22:22:28 ru Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index bbdd068e8ea0..6d9eacaedcae 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.3,v 1.28 2005/01/12 20:56:15 keramida Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4
index c292dae2cff0..6ba573be26a2 100644
--- a/share/examples/mdoc/example.4
+++ b/share/examples/mdoc/example.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.21 2005/05/07 11:02:34 brueffer Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/mdoc/example.9 b/share/examples/mdoc/example.9
index 7eb7088b324e..7fd27c7900b8 100644
--- a/share/examples/mdoc/example.9
+++ b/share/examples/mdoc/example.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.9,v 1.3 2005/01/15 16:01:19 jkoshy Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/netgraph/bluetooth/rc.bluetooth b/share/examples/netgraph/bluetooth/rc.bluetooth
index 7749395454ed..858f570d268a 100644
--- a/share/examples/netgraph/bluetooth/rc.bluetooth
+++ b/share/examples/netgraph/bluetooth/rc.bluetooth
@@ -27,7 +27,7 @@
 # SUCH DAMAGE.
 #
 # $Id: rc.bluetooth,v 1.5 2003/03/30 04:03:16 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/bluetooth/rc.bluetooth,v 1.2 2004/11/02 20:06:33 emax Exp $
 #
 
            logger="/usr/bin/logger -i -s -p user.err"
diff --git a/share/examples/netgraph/ether.bridge b/share/examples/netgraph/ether.bridge
index 273e4c4c26d0..ab8a491b7734 100644
--- a/share/examples/netgraph/ether.bridge
+++ b/share/examples/netgraph/ether.bridge
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/ether.bridge,v 1.4 2002/04/22 13:44:33 des Exp $
 # This script sets up an Ethernet bridging network across multiple
 # Ethernet interfaces using the ng_bridge(4) and ng_ether(4) netgraph
 # node types.
diff --git a/share/examples/netgraph/frame_relay b/share/examples/netgraph/frame_relay
index 0becb471c810..78421e35a35f 100644
--- a/share/examples/netgraph/frame_relay
+++ b/share/examples/netgraph/frame_relay
@@ -1,7 +1,7 @@
 #!/bin/sh
 # script to set up a frame relay link on the sr card.
 # The dlci used is selected below. The default is 16
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/frame_relay,v 1.1 1999/11/19 06:56:34 julian Exp $
 
 CARD=sr0
 DLCI=16
diff --git a/share/examples/netgraph/ngctl b/share/examples/netgraph/ngctl
index 80a7f22d13fd..3a2096177053 100644
--- a/share/examples/netgraph/ngctl
+++ b/share/examples/netgraph/ngctl
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/ngctl,v 1.3 2003/11/15 15:26:35 harti Exp $
 
 #
 # This is an example that shows how to send ASCII formatted control
diff --git a/share/examples/netgraph/raw b/share/examples/netgraph/raw
index e0970f3c0b33..4bcfc4ce1fc2 100644
--- a/share/examples/netgraph/raw
+++ b/share/examples/netgraph/raw
@@ -1,7 +1,7 @@
 #!/bin/sh
 # script to connect a raw synchronous card to a system interface.
 # Assumes the file if_sr was compiled with options NETGRAPH.
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/raw,v 1.1 1999/11/19 07:04:36 julian Exp $
 
 CARD=sr0
 
diff --git a/share/examples/netgraph/udp.tunnel b/share/examples/netgraph/udp.tunnel
index fc5810b84436..dc92827e8b58 100644
--- a/share/examples/netgraph/udp.tunnel
+++ b/share/examples/netgraph/udp.tunnel
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/udp.tunnel,v 1.2 2003/09/30 22:39:22 julian Exp $
 
 # This script sets up a virtual point-to-point WAN link between
 # two subnets, using UDP packets as the ``WAN connection.''
diff --git a/share/examples/nwclient/dot.nwfsrc b/share/examples/nwclient/dot.nwfsrc
index 03bc1d00f7e9..f188954b28b8 100644
--- a/share/examples/nwclient/dot.nwfsrc
+++ b/share/examples/nwclient/dot.nwfsrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/nwclient/dot.nwfsrc,v 1.2 2002/04/20 05:04:21 bp Exp $
 #
 # Example for .nwfsrc file
 #
diff --git a/share/examples/nwclient/nwfs.sh.sample b/share/examples/nwclient/nwfs.sh.sample
index cb8b631f0b7d..55d39176cd93 100644
--- a/share/examples/nwclient/nwfs.sh.sample
+++ b/share/examples/nwclient/nwfs.sh.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/nwclient/nwfs.sh.sample,v 1.1 1999/11/03 12:06:13 bp Exp $
 #
 # Location: /usr/local/etc/rc.d/nwfs.sh
 #
diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile
index de59b9effcf0..14c0a6393f72 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/perfmon/Makefile,v 1.5 2004/12/21 08:47:10 ru Exp $
 
 PROG=	perfmon
 NO_MAN=
diff --git a/share/examples/perfmon/README b/share/examples/perfmon/README
index ffa2cafa92c8..e9f00acf27df 100644
--- a/share/examples/perfmon/README
+++ b/share/examples/perfmon/README
@@ -22,4 +22,4 @@ There is one mandatory argument, which is the event number to be
 monitored, defined in <machine/perfmon.h>.  All numbers can be
 specified in any format acceptable to strtol(3).
 
-$FreeBSD$
+$FreeBSD: src/share/examples/perfmon/README,v 1.5 2001/04/29 03:54:48 dd Exp $
diff --git a/share/examples/perfmon/perfmon.c b/share/examples/perfmon/perfmon.c
index 34e38849b22b..57c40ff95ca8 100644
--- a/share/examples/perfmon/perfmon.c
+++ b/share/examples/perfmon/perfmon.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/perfmon/perfmon.c,v 1.5 1999/08/28 00:19:26 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile
index 9eabea1f4f5d..faefb56ea98e 100644
--- a/share/examples/pf/Makefile
+++ b/share/examples/pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/Makefile,v 1.3 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 
diff --git a/share/examples/pf/ackpri b/share/examples/pf/ackpri
index 18f008d0b3fd..bbe41694f66e 100644
--- a/share/examples/pf/ackpri
+++ b/share/examples/pf/ackpri
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/ackpri,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: ackpri,v 1.2 2003/03/10 14:24:33 henning Exp $
 
 # Use a simple priority queue to prioritize empty (no payload) TCP ACKs,
diff --git a/share/examples/pf/faq-example1 b/share/examples/pf/faq-example1
index 2981203b8b80..c9683ef7b02b 100644
--- a/share/examples/pf/faq-example1
+++ b/share/examples/pf/faq-example1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/faq-example1,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: faq-example1,v 1.2 2003/08/06 16:04:45 henning Exp $
 
 #
diff --git a/share/examples/pf/faq-example2 b/share/examples/pf/faq-example2
index 66e2f25a9592..66fab25344c8 100644
--- a/share/examples/pf/faq-example2
+++ b/share/examples/pf/faq-example2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/faq-example2,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: faq-example2,v 1.2 2003/08/06 16:04:45 henning Exp $
 
 #
diff --git a/share/examples/pf/faq-example3 b/share/examples/pf/faq-example3
index c6b7355eeb01..68ccd1f12587 100644
--- a/share/examples/pf/faq-example3
+++ b/share/examples/pf/faq-example3
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/faq-example3,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: faq-example3,v 1.2 2003/08/06 16:04:45 henning Exp $
 
 #
diff --git a/share/examples/pf/queue1 b/share/examples/pf/queue1
index 73c38398d151..c33b87c56889 100644
--- a/share/examples/pf/queue1
+++ b/share/examples/pf/queue1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue1,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: queue1,v 1.3 2003/01/20 16:14:23 henning Exp $
 
 ext_if = "dc0"
diff --git a/share/examples/pf/queue2 b/share/examples/pf/queue2
index 20684e9ac05b..153baaf03812 100644
--- a/share/examples/pf/queue2
+++ b/share/examples/pf/queue2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue2,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: queue2,v 1.2 2003/01/20 16:14:23 henning Exp $
 # advanced queue example.
 # give interactive ssh traffic priority over ssh bulk transfers (scp, sftp)
diff --git a/share/examples/pf/queue3 b/share/examples/pf/queue3
index 855e74f9e048..b288f245254a 100644
--- a/share/examples/pf/queue3
+++ b/share/examples/pf/queue3
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue3,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: queue3,v 1.2 2003/01/20 16:14:23 henning Exp $
 # simple PRIQ example
 
diff --git a/share/examples/pf/queue4 b/share/examples/pf/queue4
index 0a24a066f896..79b2955d32eb 100644
--- a/share/examples/pf/queue4
+++ b/share/examples/pf/queue4
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue4,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: queue4,v 1.2 2003/08/22 21:50:34 david Exp $
 #
 # Hierarchical queueing for a university.
diff --git a/share/examples/pf/spamd b/share/examples/pf/spamd
index 780e879b89f0..76f7d41df511 100644
--- a/share/examples/pf/spamd
+++ b/share/examples/pf/spamd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/spamd,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: spamd,v 1.1 2003/08/22 15:25:01 henning Exp $
 
 # spamd-setup puts addresses to be redirected into table <spamd>.
diff --git a/share/examples/portal/README b/share/examples/portal/README
index d8dc1fc6aeea..86f7f8d89ecc 100644
--- a/share/examples/portal/README
+++ b/share/examples/portal/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/portal/README,v 1.2 2001/05/24 13:15:49 ru Exp $
 
 This contains a couple of examples for using the portal filing system.
 
diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile
index 9b0d0d59c3d3..d9c16e67012c 100644
--- a/share/examples/ppi/Makefile
+++ b/share/examples/ppi/Makefile
@@ -1,6 +1,6 @@
 # Makefile to build LCD control software for ppi(4) interface.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppi/Makefile,v 1.6 2004/12/21 08:47:11 ru Exp $
 
 PROG=	ppilcd
 NO_MAN=
diff --git a/share/examples/ppi/ppilcd.c b/share/examples/ppi/ppilcd.c
index fd2506d66cd5..77539e77566a 100644
--- a/share/examples/ppi/ppilcd.c
+++ b/share/examples/ppi/ppilcd.c
@@ -2,7 +2,7 @@
  * Control LCD module hung off parallel port using the
  * ppi 'geek port' interface.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/ppi/ppilcd.c,v 1.6 2005/04/17 21:55:00 iedowse Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/ppp/chap-auth b/share/examples/ppp/chap-auth
index 1e56b07575c0..cc1ce175016b 100755
--- a/share/examples/ppp/chap-auth
+++ b/share/examples/ppp/chap-auth
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/chap-auth,v 1.2 1999/08/28 00:19:28 peter Exp $
 
 #
 # Display a window to request a users CHAP secret, accepting the relevant
diff --git a/share/examples/ppp/isdnd.rc b/share/examples/ppp/isdnd.rc
index 0ceef6d2f836..324d90e711d0 100644
--- a/share/examples/ppp/isdnd.rc
+++ b/share/examples/ppp/isdnd.rc
@@ -1,6 +1,6 @@
 #	example of a configuration file for the isdn daemon & user-ppp
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/isdnd.rc,v 1.4 2000/11/30 23:08:36 brian Exp $
 
 
 # SYSTEM section: isdnd global configuration parameters
diff --git a/share/examples/ppp/login-auth b/share/examples/ppp/login-auth
index e866e1d9c092..1507c92e0ff8 100755
--- a/share/examples/ppp/login-auth
+++ b/share/examples/ppp/login-auth
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/login-auth,v 1.2 1999/08/28 00:19:29 peter Exp $
 
 #
 # Display a window to request a users password, expecting a login name
diff --git a/share/examples/ppp/ppp.conf.isdn b/share/examples/ppp/ppp.conf.isdn
index 8946b4bb3010..021770011535 100644
--- a/share/examples/ppp/ppp.conf.isdn
+++ b/share/examples/ppp/ppp.conf.isdn
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.isdn,v 1.12 2004/12/13 17:54:30 brian Exp $
 
 # This is an example ppp profile for bringing up a multilink ppp connection
 # over ISDN.  It needs at least version 0.83.0 of the i4b code.  An example
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index f59d18dde874..2bca55df7d3a 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -4,7 +4,7 @@
 #
 #           Originally written by Toshiharu OHNO
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.sample,v 1.35 2004/12/13 17:54:30 brian Exp $
 #
 #################################################################
 
diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp
index 446cee373cfb..aad639743883 100644
--- a/share/examples/ppp/ppp.conf.span-isp
+++ b/share/examples/ppp/ppp.conf.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp,v 1.7 2004/12/13 17:54:30 brian Exp $
 
 # This advanced ppp configuration file explains how to implement
 # the following:
diff --git a/share/examples/ppp/ppp.conf.span-isp.working b/share/examples/ppp/ppp.conf.span-isp.working
index 09893b6a87fd..62ec8a9fad0c 100644
--- a/share/examples/ppp/ppp.conf.span-isp.working
+++ b/share/examples/ppp/ppp.conf.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp.working,v 1.7 2004/12/13 17:54:30 brian Exp $
 
 # This is a working example of ppp.conf.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.linkdown.sample b/share/examples/ppp/ppp.linkdown.sample
index c7da79ead8eb..d1baa6789f10 100644
--- a/share/examples/ppp/ppp.linkdown.sample
+++ b/share/examples/ppp/ppp.linkdown.sample
@@ -12,7 +12,7 @@
 #  3) If no label has been found, use MYADDR if it exists.
 #
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.sample,v 1.3 1999/09/07 07:56:54 brian Exp $
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkdown.span-isp b/share/examples/ppp/ppp.linkdown.span-isp
index 795a55951b25..bbf557dd5fe4 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp
+++ b/share/examples/ppp/ppp.linkdown.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.span-isp,v 1.3 2001/12/17 22:05:23 cjc Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Gateway machine.
diff --git a/share/examples/ppp/ppp.linkdown.span-isp.working b/share/examples/ppp/ppp.linkdown.span-isp.working
index ba34d05dddd6..87f783019ee3 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp.working
+++ b/share/examples/ppp/ppp.linkdown.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.span-isp.working,v 1.3 2001/12/17 22:05:23 cjc Exp $
 
 # This is a working example of ppp.linkdown.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.linkup.sample b/share/examples/ppp/ppp.linkup.sample
index 18073cf712e7..ccdb16ac6898 100644
--- a/share/examples/ppp/ppp.linkup.sample
+++ b/share/examples/ppp/ppp.linkup.sample
@@ -12,7 +12,7 @@
 #  3) If no label has been found, use MYADDR if it exists.
 #
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.sample,v 1.2 1999/08/28 00:19:31 peter Exp $
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkup.span-isp b/share/examples/ppp/ppp.linkup.span-isp
index 8768bea25b72..56b39412ea5b 100644
--- a/share/examples/ppp/ppp.linkup.span-isp
+++ b/share/examples/ppp/ppp.linkup.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.span-isp,v 1.3 2001/11/01 23:44:09 cjc Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Gateway machine.
diff --git a/share/examples/ppp/ppp.linkup.span-isp.working b/share/examples/ppp/ppp.linkup.span-isp.working
index 274296e73dbd..28584f99d691 100644
--- a/share/examples/ppp/ppp.linkup.span-isp.working
+++ b/share/examples/ppp/ppp.linkup.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.span-isp.working,v 1.3 2001/11/01 23:44:09 cjc Exp $
 
 # This is a working example of ppp.linkup.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.secret.sample b/share/examples/ppp/ppp.secret.sample
index 57d2375fb6b0..fd979fd875a2 100644
--- a/share/examples/ppp/ppp.secret.sample
+++ b/share/examples/ppp/ppp.secret.sample
@@ -27,7 +27,7 @@
 #  ``auth'' or ``cbcp'' callback is enabled (see ``set callback'').
 #  A ``*'' specifies that the client must specify the number.
 #  
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.sample,v 1.2 1999/08/28 00:19:32 peter Exp $
 #
 ##################################################
 
diff --git a/share/examples/ppp/ppp.secret.span-isp b/share/examples/ppp/ppp.secret.span-isp
index 8370f379717e..8b05afc2032d 100644
--- a/share/examples/ppp/ppp.secret.span-isp
+++ b/share/examples/ppp/ppp.secret.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.span-isp,v 1.2 1999/08/28 00:19:32 peter Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Receiver machine.
diff --git a/share/examples/ppp/ppp.secret.span-isp.working b/share/examples/ppp/ppp.secret.span-isp.working
index cc8bc3d63dbe..afffb5d047bf 100644
--- a/share/examples/ppp/ppp.secret.span-isp.working
+++ b/share/examples/ppp/ppp.secret.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.span-isp.working,v 1.2 1999/08/28 00:19:32 peter Exp $
 
 # This is a working example of ppp.secret.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/pppd/auth-down.sample b/share/examples/pppd/auth-down.sample
index b2da150dc040..b68c6cf92d29 100644
--- a/share/examples/pppd/auth-down.sample
+++ b/share/examples/pppd/auth-down.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/auth-down.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/auth-down file.
 
diff --git a/share/examples/pppd/auth-up.sample b/share/examples/pppd/auth-up.sample
index 3d9c07e80344..73b0a39fbc70 100644
--- a/share/examples/pppd/auth-up.sample
+++ b/share/examples/pppd/auth-up.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/auth-up.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/auth-up file.
 
diff --git a/share/examples/pppd/chap-secrets.sample b/share/examples/pppd/chap-secrets.sample
index 40d5dfdc86e3..c01f018bece9 100644
--- a/share/examples/pppd/chap-secrets.sample
+++ b/share/examples/pppd/chap-secrets.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/chap-secrets.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/chap-secrets file.
 #
diff --git a/share/examples/pppd/chat.sh.sample b/share/examples/pppd/chat.sh.sample
index 6418ebfdf6a4..62016be361ae 100644
--- a/share/examples/pppd/chat.sh.sample
+++ b/share/examples/pppd/chat.sh.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/chat.sh.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for chat.sh file.
 
diff --git a/share/examples/pppd/ip-down.sample b/share/examples/pppd/ip-down.sample
index 45b8eb45675d..8999def213a0 100644
--- a/share/examples/pppd/ip-down.sample
+++ b/share/examples/pppd/ip-down.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ip-down.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/ip-down file.
 
diff --git a/share/examples/pppd/ip-up.sample b/share/examples/pppd/ip-up.sample
index a0fc1b02aaaf..3c6256389384 100644
--- a/share/examples/pppd/ip-up.sample
+++ b/share/examples/pppd/ip-up.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ip-up.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/ip-up file.
 
diff --git a/share/examples/pppd/options.sample b/share/examples/pppd/options.sample
index fd0a927c57c8..75beefcdae85 100644
--- a/share/examples/pppd/options.sample
+++ b/share/examples/pppd/options.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/options.sample,v 1.2 2004/11/19 17:31:31 obrien Exp $
 #
 # Example for /etc/ppp/options file.
 #
diff --git a/share/examples/pppd/pap-secrets.sample b/share/examples/pppd/pap-secrets.sample
index 8896bdd7a65f..7e55283b793d 100644
--- a/share/examples/pppd/pap-secrets.sample
+++ b/share/examples/pppd/pap-secrets.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/pap-secrets.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/pap-secrets file.
 #
diff --git a/share/examples/pppd/ppp.deny.sample b/share/examples/pppd/ppp.deny.sample
index 948e11527cd4..c5ff1ed89d81 100644
--- a/share/examples/pppd/ppp.deny.sample
+++ b/share/examples/pppd/ppp.deny.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.13 2005/06/07 03:41:20 maxim Exp $
 #
 # list of users disallowed any pppd access via 'system
 # password login'.
diff --git a/share/examples/pppd/ppp.shells.sample b/share/examples/pppd/ppp.shells.sample
index 93b68406c216..e211574c4f3e 100644
--- a/share/examples/pppd/ppp.shells.sample
+++ b/share/examples/pppd/ppp.shells.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ppp.shells.sample,v 1.5 2002/01/29 00:23:33 cjc Exp $
 #
 # List of acceptable shells for pppd(8).
 # Pppd will not accept a system password login
diff --git a/share/examples/printing/README b/share/examples/printing/README
index f83eaa9c236a..cc598f82f91b 100644
--- a/share/examples/printing/README
+++ b/share/examples/printing/README
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/share/examples/printing/README,v 1.6 1999/08/28 00:19:34 peter Exp $ 
 #
 # The files in this directory are generated automatically
 # from doc/handbook/printing.sgml, do not edit it here!
diff --git a/share/examples/scsi_target/Makefile b/share/examples/scsi_target/Makefile
index bab70b2f5d03..31a8c3b50e35 100644
--- a/share/examples/scsi_target/Makefile
+++ b/share/examples/scsi_target/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/scsi_target/Makefile,v 1.5 2004/02/04 10:15:26 ru Exp $
 
 PROG=	scsi_target
 SRCS=	scsi_target.h scsi_target.c scsi_cmds.c
diff --git a/share/examples/scsi_target/scsi_cmds.c b/share/examples/scsi_target/scsi_cmds.c
index 3e152aabe422..b5ebbe9a001b 100644
--- a/share/examples/scsi_target/scsi_cmds.c
+++ b/share/examples/scsi_target/scsi_cmds.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/scsi_target/scsi_cmds.c,v 1.6 2004/01/09 19:33:21 njl Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/scsi_target/scsi_target.8 b/share/examples/scsi_target/scsi_target.8
index 677e2b4ae6fa..48e870e29370 100644
--- a/share/examples/scsi_target/scsi_target.8
+++ b/share/examples/scsi_target/scsi_target.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/scsi_target/scsi_target.8,v 1.5 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd November 15, 2002
 .Dt SCSI_TARGET 8
diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c
index ef4fd976c85f..f509897e31d3 100644
--- a/share/examples/scsi_target/scsi_target.c
+++ b/share/examples/scsi_target/scsi_target.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/scsi_target/scsi_target.c,v 1.16 2003/10/18 04:54:08 simokawa Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/scsi_target/scsi_target.h b/share/examples/scsi_target/scsi_target.h
index 4ae80e5bee14..f001c9b29cf4 100644
--- a/share/examples/scsi_target/scsi_target.h
+++ b/share/examples/scsi_target/scsi_target.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/scsi_target/scsi_target.h,v 1.3 2004/01/09 19:26:30 njl Exp $
  */
 
 #ifndef _SCSI_TARGET_H
diff --git a/share/examples/ses/Makefile b/share/examples/ses/Makefile
index 2a332d5b8716..6c564e516eee 100644
--- a/share/examples/ses/Makefile
+++ b/share/examples/ses/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: $
 # $OpenBSD: $
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/Makefile,v 1.2 2000/02/29 05:44:06 mjacob Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/Makefile.inc b/share/examples/ses/Makefile.inc
index abea2c8c4339..e226b8b5d679 100644
--- a/share/examples/ses/Makefile.inc
+++ b/share/examples/ses/Makefile.inc
@@ -1,6 +1,6 @@
 # $NetBSD: $
 # $OpenBSD: $
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/Makefile.inc,v 1.2 2004/08/13 14:19:12 ru Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/getencstat/Makefile b/share/examples/ses/getencstat/Makefile
index 076cbc31f8e8..9c1642144cd6 100644
--- a/share/examples/ses/getencstat/Makefile
+++ b/share/examples/ses/getencstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/getencstat/Makefile,v 1.2 2002/07/29 04:43:09 mjacob Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/getencstat/getencstat.0 b/share/examples/ses/getencstat/getencstat.0
index 45a949818d55..a2029b846d4f 100644
--- a/share/examples/ses/getencstat/getencstat.0
+++ b/share/examples/ses/getencstat/getencstat.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/getencstat/getencstat.0,v 1.5 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt GETENCSTAT 8
diff --git a/share/examples/ses/sesd/Makefile b/share/examples/ses/sesd/Makefile
index 0e44ce30e501..a7e591ab9439 100644
--- a/share/examples/ses/sesd/Makefile
+++ b/share/examples/ses/sesd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/sesd/Makefile,v 1.2 2002/07/29 04:43:09 mjacob Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/sesd/sesd.0 b/share/examples/ses/sesd/sesd.0
index 29c0084daa26..83ebfdc35606 100644
--- a/share/examples/ses/sesd/sesd.0
+++ b/share/examples/ses/sesd/sesd.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/sesd/sesd.0,v 1.5 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt SESD 8
diff --git a/share/examples/ses/setencstat/Makefile b/share/examples/ses/setencstat/Makefile
index ece20145d03f..e5469941fa34 100644
--- a/share/examples/ses/setencstat/Makefile
+++ b/share/examples/ses/setencstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/setencstat/Makefile,v 1.2 2002/07/29 04:43:09 mjacob Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/setencstat/setencstat.0 b/share/examples/ses/setencstat/setencstat.0
index 5c51757432a3..961af619d670 100644
--- a/share/examples/ses/setencstat/setencstat.0
+++ b/share/examples/ses/setencstat/setencstat.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/setencstat/setencstat.0,v 1.4 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt SETENCSTAT 8
diff --git a/share/examples/ses/setobjstat/Makefile b/share/examples/ses/setobjstat/Makefile
index a54b4fc18ed7..dd25f0c63d25 100644
--- a/share/examples/ses/setobjstat/Makefile
+++ b/share/examples/ses/setobjstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/setobjstat/Makefile,v 1.2 2002/07/29 04:43:10 mjacob Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/setobjstat/setobjstat.0 b/share/examples/ses/setobjstat/setobjstat.0
index f4e21d8d3f86..7e793ecd37d4 100644
--- a/share/examples/ses/setobjstat/setobjstat.0
+++ b/share/examples/ses/setobjstat/setobjstat.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/setobjstat/setobjstat.0,v 1.5 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt SETOBJSTAT 8
diff --git a/share/examples/ses/srcs/chpmon.c b/share/examples/ses/srcs/chpmon.c
index 1b537c7ba11e..25ff09040f5d 100644
--- a/share/examples/ses/srcs/chpmon.c
+++ b/share/examples/ses/srcs/chpmon.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.1 2000/02/29 05:44:16 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/eltsub.c b/share/examples/ses/srcs/eltsub.c
index 5fae6653d41f..4532c60626e6 100644
--- a/share/examples/ses/srcs/eltsub.c
+++ b/share/examples/ses/srcs/eltsub.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/eltsub.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getencstat.c b/share/examples/ses/srcs/getencstat.c
index bf45e576fb72..ed8b1c3ea80a 100644
--- a/share/examples/ses/srcs/getencstat.c
+++ b/share/examples/ses/srcs/getencstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getencstat.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getnobj.c b/share/examples/ses/srcs/getnobj.c
index 680a6cdbc173..73e5247bf0f4 100644
--- a/share/examples/ses/srcs/getnobj.c
+++ b/share/examples/ses/srcs/getnobj.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getnobj.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getobjmap.c b/share/examples/ses/srcs/getobjmap.c
index 7f4d1b783745..8e8025297962 100644
--- a/share/examples/ses/srcs/getobjmap.c
+++ b/share/examples/ses/srcs/getobjmap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getobjmap.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getobjstat.c b/share/examples/ses/srcs/getobjstat.c
index bf703cf47ff4..106247635a9a 100644
--- a/share/examples/ses/srcs/getobjstat.c
+++ b/share/examples/ses/srcs/getobjstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getobjstat.c,v 1.1 2000/02/29 05:44:18 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/inienc.c b/share/examples/ses/srcs/inienc.c
index d6fb262ef7ee..130924f75e65 100644
--- a/share/examples/ses/srcs/inienc.c
+++ b/share/examples/ses/srcs/inienc.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/inienc.c,v 1.1 2000/02/29 05:44:18 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/sesd.c b/share/examples/ses/srcs/sesd.c
index 5262b639bfd4..9b00a8c56311 100644
--- a/share/examples/ses/srcs/sesd.c
+++ b/share/examples/ses/srcs/sesd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/sesd.c,v 1.1 2000/02/29 05:44:18 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/setencstat.c b/share/examples/ses/srcs/setencstat.c
index 58e0dafc1879..c7b5cc7e612b 100644
--- a/share/examples/ses/srcs/setencstat.c
+++ b/share/examples/ses/srcs/setencstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/setencstat.c,v 1.1 2000/02/29 05:44:19 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/setobjstat.c b/share/examples/ses/srcs/setobjstat.c
index 34e8ea65d97a..eb39b808a04d 100644
--- a/share/examples/ses/srcs/setobjstat.c
+++ b/share/examples/ses/srcs/setobjstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/setobjstat.c,v 1.1 2000/02/29 05:44:19 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile
index 9e5b99ac56cf..c4eb628892de 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/smbfs/Makefile,v 1.5 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 BINDIR=	/usr/share/examples/smbfs
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index eb66815488b9..0bf7d04a23e6 100644
--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/smbfs/print/Makefile,v 1.4 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 BINDIR=	/usr/share/examples/smbfs/print
diff --git a/share/examples/startslip/slip.sh b/share/examples/startslip/slip.sh
index 2b4254e88f60..1e3f29831301 100755
--- a/share/examples/startslip/slip.sh
+++ b/share/examples/startslip/slip.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/share/examples/startslip/slip.sh,v 1.3 2004/11/19 03:48:17 obrien Exp $
 startslip -b 57600 -U ./slup.sh -D ./sldown.sh \
 	-s atd<phone1> -s atd<phone2> -s atd<phone3> \
 	-h -t 60 -w 2 -W 20 /dev/cuad1 <login> <password>
diff --git a/share/examples/sunrpc/msg/msg_proc.c b/share/examples/sunrpc/msg/msg_proc.c
index ed088839e52a..75d37bf82fcd 100644
--- a/share/examples/sunrpc/msg/msg_proc.c
+++ b/share/examples/sunrpc/msg/msg_proc.c
@@ -1,5 +1,5 @@
 /* @(#)msg_proc.c	2.1 88/08/11 4.0 RPCSRC */
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/sunrpc/msg/msg_proc.c,v 1.3 2000/12/09 09:35:40 obrien Exp $ */
 /*
  * msg_proc.c: implementation of the remote procedure "printmessage"
  */
diff --git a/share/examples/sunrpc/msg/printmsg.c b/share/examples/sunrpc/msg/printmsg.c
index 681007c4b1fe..debcd87078aa 100644
--- a/share/examples/sunrpc/msg/printmsg.c
+++ b/share/examples/sunrpc/msg/printmsg.c
@@ -1,5 +1,5 @@
 /* @(#)printmsg.c	2.1 88/08/11 4.0 RPCSRC */
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/sunrpc/msg/printmsg.c,v 1.3 2000/12/09 09:35:40 obrien Exp $ */
 /*
  * printmsg.c: print a message on the console
  */
diff --git a/share/info/Makefile b/share/info/Makefile
index 0110e02ca151..4442e049e0ea 100644
--- a/share/info/Makefile
+++ b/share/info/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile    8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/info/Makefile,v 1.14 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 
diff --git a/share/isdn/0.al.uu b/share/isdn/0.al.uu
index 84ed15f65e0f..c8289174b5cb 100644
--- a/share/isdn/0.al.uu
+++ b/share/isdn/0.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/0.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 0.al
 M5=75U=?7UM?4U=;3U-37U55555545%15U=7555175U965U15U=34U-?7U];6
 MT=?555175%555575U=75U=55U=37U]?7U]37U]34U5555=55555455145516
diff --git a/share/isdn/1.al.uu b/share/isdn/1.al.uu
index 60e59ca0cdce..188769a8b616 100644
--- a/share/isdn/1.al.uu
+++ b/share/isdn/1.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/1.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 1.al
 M55=75%755=545U1455145575U-37UM'6U];6UM155%175U975U74U-35U-77
 MU]75U=75U=565=;5U-'1U]345%=75U15U=75U]?7U]545E975%75U]?55555
diff --git a/share/isdn/2.al.uu b/share/isdn/2.al.uu
index 2fdae7d24143..7f05ff19cf64 100644
--- a/share/isdn/2.al.uu
+++ b/share/isdn/2.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/2.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 2.al
 MU]?455175U14U=375U;55U145%175U75U]'0T]/0T=?4U5545%175E%15U15
 MU=?6UM564U-045=75E34UM#2W=W=TM#6U-555=5555=65U15U=55U=555U%1
diff --git a/share/isdn/3.al.uu b/share/isdn/3.al.uu
index 5b8b56cfc39e..670430c5fac2 100644
--- a/share/isdn/3.al.uu
+++ b/share/isdn/3.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/3.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 3.al
 MU=755537UE1555=75E=75%145%75U-?1UM;1UM;7U-555%=75U=75575U=?7
 MU]?7U]355%545%155%15U-?7UM;1T=?4U-5555175E965E=45=?0T]?4UM55
diff --git a/share/isdn/4.al.uu b/share/isdn/4.al.uu
index c08e17e1288a..fef11e4671dd 100644
--- a/share/isdn/4.al.uu
+++ b/share/isdn/4.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/4.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 4.al
 M5-77UM'0T]/0U]31UE975U=45U=45%165E=75%155575U-?7U-34U=?6UM35
 MU=37U55555175E=75%75U-?4U-;1T-;1T=34U=555%545555U]?4U]?45514
diff --git a/share/isdn/5.al.uu b/share/isdn/5.al.uu
index b818efdd94a0..4eb823e87e5b 100644
--- a/share/isdn/5.al.uu
+++ b/share/isdn/5.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/5.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 5.al
 MU];7U-35U=75U=75U=?4U];6UM355%=555=5U5145%145=37UM?7U-34U=55
 M55175%15U]?6T='6UM35U5145U=64594U=55U-?6U]34U5545%755=75U-?6
diff --git a/share/isdn/6.al.uu b/share/isdn/6.al.uu
index fad3d5cc5443..395e7ad9c2ed 100644
--- a/share/isdn/6.al.uu
+++ b/share/isdn/6.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/6.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 6.al
 MU=74U-74U=755U965U=65U=45575U-?6T=;6U-34U-155=75U-1555545U=4
 M5%155555U=75U=37U%755=55U=56UM#2W=/0UM955=74U-36UM1555545U!3
diff --git a/share/isdn/7.al.uu b/share/isdn/7.al.uu
index 697ae296b52c..58829a662fbb 100644
--- a/share/isdn/7.al.uu
+++ b/share/isdn/7.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/7.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 7.al
 MUU565E!05E=145=45=36T=;6U]3555755-74U];1T-/0UM155U9145%15E=4
 M5U14U=75U-74U-34U]?4U-34UM;555555U14U=?4U555U%565U55U-35U=37
diff --git a/share/isdn/8.al.uu b/share/isdn/8.al.uu
index d7c69bab185a..2ca255e34cce 100644
--- a/share/isdn/8.al.uu
+++ b/share/isdn/8.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/8.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 8.al
 MT]945E=14%975%145%145%15U=75U=555=74U];7U]'1T=?4U-545%=65E97
 M5U=45%155-75U-?6UM34U]34U-?7U]?1UM?7U-355%=145%375!14574U];0
diff --git a/share/isdn/9.al.uu b/share/isdn/9.al.uu
index fd206143eeb2..fbb98f5b5463 100644
--- a/share/isdn/9.al.uu
+++ b/share/isdn/9.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/9.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 9.al
 M5U145-75U=75U574U-145E=5U-?1T-35UU55U5=5U-;6U5165E75U]355U%6
 M5U15U5555U;6W]1<4U545=31W=[?W=#4T=#1U]545U=04U-15U1455545U14
diff --git a/share/isdn/Makefile b/share/isdn/Makefile
index 0999d7792807..56d414c63204 100644
--- a/share/isdn/Makefile
+++ b/share/isdn/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/Makefile,v 1.4 2001/12/17 13:59:30 ru Exp $
 
 FILES=	0.al 1.al 2.al 3.al 4.al 5.al 6.al 7.al 8.al 9.al beep.al msg.al
 
diff --git a/share/isdn/beep.al.uu b/share/isdn/beep.al.uu
index 57324004dbfd..1e1839c335ab 100644
--- a/share/isdn/beep.al.uu
+++ b/share/isdn/beep.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/beep.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 beep.al
 MO)PU,P+EEA$*#)^YI;%F."<QX[>(XFZ5M+"!#"<F-H&[OHQK!%.:Z`\[.`>Q
 MI[N-`CPT>I_$`P[`LJ6]ZC(F/FFUMH5E48RQCATZ(3SCN;JTU@`3EY(9/3L+
diff --git a/share/isdn/msg.al.uu b/share/isdn/msg.al.uu
index 8375ab43a3e2..1dbc470155ba 100644
--- a/share/isdn/msg.al.uu
+++ b/share/isdn/msg.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/msg.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 msg.al
 MT]'0T-=7U==45=35551755555%1555545U145=37T-#3TM/0U]355=75U557
 M45%15U=75U=75-74U-75U-;3TM/0UM;7U-75U=34U%575E%15E905-'4U=35
diff --git a/share/man/Makefile b/share/man/Makefile
index e0686354ca6c..e56782a1034d 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/16/94
-# $FreeBSD$
+# $FreeBSD: src/share/man/Makefile,v 1.18 2004/12/21 10:16:01 ru Exp $
 
 # XXX MISSING:	man3f
 SUBDIR=	man1 man3 man4 man5 man6 man7 man8 man9
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 89534c96c72f..a1ef0c4bb6db 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man1/Makefile,v 1.17 2004/01/20 10:27:22 ru Exp $
 
 MAN=	builtin.1 intro.1
 
diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index 338aa7db3115..5881e584b5a4 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.24.2.1 2005/09/17 15:27:27 garys Exp $
 .\"
 .Dd February 23, 2005
 .Dt BUILTIN 1
diff --git a/share/man/man1/intro.1 b/share/man/man1/intro.1
index f0102198ef76..3c76071c0f38 100644
--- a/share/man/man1/intro.1
+++ b/share/man/man1/intro.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man1/intro.1,v 1.16 2001/10/23 00:46:13 dd Exp $
 .\"
 .Dd October 21, 2001
 .Dt INTRO 1
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index c3b928784f2f..16c1270c176d 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man3/Makefile,v 1.36 2005/05/18 16:23:11 keramida Exp $
 
 MAN=		assert.3 \
 		bitstring.3 \
diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3
index 88805357b929..0bf6cf74b8c3 100644
--- a/share/man/man3/assert.3
+++ b/share/man/man3/assert.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)assert.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/assert.3,v 1.15 2002/12/04 18:57:46 ru Exp $
 .\"
 .Dd January 26, 1999
 .Dt ASSERT 3
diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index ed7b0f3dfd0c..659cba926087 100644
--- a/share/man/man3/bitstring.3
+++ b/share/man/man3/bitstring.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bitstring.3	8.1 (Berkeley) 7/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/bitstring.3,v 1.11 2001/10/01 16:09:20 ru Exp $
 .\"
 .Dd July 19, 1993
 .Dt BITSTRING 3
diff --git a/share/man/man3/end.3 b/share/man/man3/end.3
index 42e73fe586a4..afe277bf9b8e 100644
--- a/share/man/man3/end.3
+++ b/share/man/man3/end.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)end.3	6.4 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/end.3,v 1.7 2001/01/12 15:46:56 ru Exp $
 .\"
 .Dd August 28, 2000
 .Dt END 3
diff --git a/share/man/man3/fpgetround.3 b/share/man/man3/fpgetround.3
index 33c94b7eb638..be2c5bf765a3 100644
--- a/share/man/man3/fpgetround.3
+++ b/share/man/man3/fpgetround.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fpgetround.3	1.0 (Berkeley) 9/23/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/fpgetround.3,v 1.14.8.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd August 23, 1993
 .Dt FPGETROUND 3
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index 5645ad94f996..4098d5c08b54 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.3	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/intro.3,v 1.15 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt INTRO 3
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index 5ebb88d9a6aa..4ac346048383 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.28 2005/05/18 16:23:11 keramida Exp $
 .\"
 .Dd January 15, 2004
 .Dt PTHREAD 3
diff --git a/share/man/man3/pthread_atfork.3 b/share/man/man3/pthread_atfork.3
index 125bb430316e..04200f072d6a 100644
--- a/share/man/man3/pthread_atfork.3
+++ b/share/man/man3/pthread_atfork.3
@@ -32,7 +32,7 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_atfork.3,v 1.3 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd June 21, 2004
 .Dt PTHREAD_ATFORK 3
diff --git a/share/man/man3/pthread_attr.3 b/share/man/man3/pthread_attr.3
index a09e79039521..ebac8e400c5c 100644
--- a/share/man/man3/pthread_attr.3
+++ b/share/man/man3/pthread_attr.3
@@ -25,7 +25,7 @@
 .\" 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/share/man/man3/pthread_attr.3,v 1.16 2004/01/15 15:59:00 ru Exp $
 .Dd April 28, 2000
 .Dt PTHREAD_ATTR 3
 .Os
diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3
index 479fa429c1c5..fdbd8974eb44 100644
--- a/share/man/man3/pthread_attr_get_np.3
+++ b/share/man/man3/pthread_attr_get_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_attr_get_np.3,v 1.12 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd January 31, 2003
 .Dt PTHREAD_ATTR_GET_NP 3
diff --git a/share/man/man3/pthread_attr_setcreatesuspend_np.3 b/share/man/man3/pthread_attr_setcreatesuspend_np.3
index 9adcb5505ec7..a0ed4aed5732 100644
--- a/share/man/man3/pthread_attr_setcreatesuspend_np.3
+++ b/share/man/man3/pthread_attr_setcreatesuspend_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_attr_setcreatesuspend_np.3,v 1.5 2004/06/21 14:54:43 mpp Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_ATTR_SETCREATESUSPEND_NP 3
diff --git a/share/man/man3/pthread_barrier_destroy.3 b/share/man/man3/pthread_barrier_destroy.3
index 6786ba393989..8fa7ca8090f9 100644
--- a/share/man/man3/pthread_barrier_destroy.3
+++ b/share/man/man3/pthread_barrier_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_barrier_destroy.3,v 1.4 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd February 19, 2004
 .Dt PTHREAD_BARRIER 3
diff --git a/share/man/man3/pthread_barrierattr.3 b/share/man/man3/pthread_barrierattr.3
index cb9e6e29223f..fb56da125416 100644
--- a/share/man/man3/pthread_barrierattr.3
+++ b/share/man/man3/pthread_barrierattr.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_barrierattr.3,v 1.2 2004/06/17 17:51:17 ru Exp $
 .\"
 .Dd February 19, 2004
 .Dt PTHREAD_BARRIERATTR 3
diff --git a/share/man/man3/pthread_cancel.3 b/share/man/man3/pthread_cancel.3
index 36748134daba..6a1e69622ac6 100644
--- a/share/man/man3/pthread_cancel.3
+++ b/share/man/man3/pthread_cancel.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cancel.3,v 1.11 2005/06/30 13:13:49 hmp Exp $
 .Dd January 17, 1999
 .Dt PTHREAD_CANCEL 3
 .Os
diff --git a/share/man/man3/pthread_cleanup_pop.3 b/share/man/man3/pthread_cleanup_pop.3
index 92b67306de55..d7bb7abe3078 100644
--- a/share/man/man3/pthread_cleanup_pop.3
+++ b/share/man/man3/pthread_cleanup_pop.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cleanup_pop.3,v 1.12 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_POP 3
diff --git a/share/man/man3/pthread_cleanup_push.3 b/share/man/man3/pthread_cleanup_push.3
index b61f58d4dc69..2225e209d858 100644
--- a/share/man/man3/pthread_cleanup_push.3
+++ b/share/man/man3/pthread_cleanup_push.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cleanup_push.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_PUSH 3
diff --git a/share/man/man3/pthread_cond_broadcast.3 b/share/man/man3/pthread_cond_broadcast.3
index 16c7888dd905..cd1679213a3a 100644
--- a/share/man/man3/pthread_cond_broadcast.3
+++ b/share/man/man3/pthread_cond_broadcast.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_broadcast.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_BROADCAST 3
diff --git a/share/man/man3/pthread_cond_destroy.3 b/share/man/man3/pthread_cond_destroy.3
index ed6758f95f5a..1995bd58379b 100644
--- a/share/man/man3/pthread_cond_destroy.3
+++ b/share/man/man3/pthread_cond_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_destroy.3,v 1.14 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_DESTROY 3
diff --git a/share/man/man3/pthread_cond_init.3 b/share/man/man3/pthread_cond_init.3
index 835f22f3e602..289a0470416c 100644
--- a/share/man/man3/pthread_cond_init.3
+++ b/share/man/man3/pthread_cond_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.15 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_INIT 3
diff --git a/share/man/man3/pthread_cond_signal.3 b/share/man/man3/pthread_cond_signal.3
index f58f783d4470..20eb8913c6fb 100644
--- a/share/man/man3/pthread_cond_signal.3
+++ b/share/man/man3/pthread_cond_signal.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_signal.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_SIGNAL 3
diff --git a/share/man/man3/pthread_cond_timedwait.3 b/share/man/man3/pthread_cond_timedwait.3
index 68a25e45ec03..953e03def0df 100644
--- a/share/man/man3/pthread_cond_timedwait.3
+++ b/share/man/man3/pthread_cond_timedwait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_timedwait.3,v 1.18 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_TIMEDWAIT 3
diff --git a/share/man/man3/pthread_cond_wait.3 b/share/man/man3/pthread_cond_wait.3
index e3c83404153c..e4653db11860 100644
--- a/share/man/man3/pthread_cond_wait.3
+++ b/share/man/man3/pthread_cond_wait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_wait.3,v 1.18 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_WAIT 3
diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3
index 443a58bf4f45..e669ad7d0d9f 100644
--- a/share/man/man3/pthread_condattr.3
+++ b/share/man/man3/pthread_condattr.3
@@ -25,7 +25,7 @@
 .\" 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/share/man/man3/pthread_condattr.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .Dd April 28, 2000
 .Dt PTHREAD_CONDATTR 3
 .Os
diff --git a/share/man/man3/pthread_create.3 b/share/man/man3/pthread_create.3
index 9c331eedfa82..557e172bc25c 100644
--- a/share/man/man3/pthread_create.3
+++ b/share/man/man3/pthread_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.19 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_CREATE 3
diff --git a/share/man/man3/pthread_detach.3 b/share/man/man3/pthread_detach.3
index 5893934fac4e..400c7f249236 100644
--- a/share/man/man3/pthread_detach.3
+++ b/share/man/man3/pthread_detach.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_detach.3,v 1.16 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_DETACH 3
diff --git a/share/man/man3/pthread_equal.3 b/share/man/man3/pthread_equal.3
index b48190d5d4b6..3a755bb130e0 100644
--- a/share/man/man3/pthread_equal.3
+++ b/share/man/man3/pthread_equal.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_equal.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EQUAL 3
diff --git a/share/man/man3/pthread_exit.3 b/share/man/man3/pthread_exit.3
index dbc451efda93..246661f20544 100644
--- a/share/man/man3/pthread_exit.3
+++ b/share/man/man3/pthread_exit.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_exit.3,v 1.19 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EXIT 3
diff --git a/share/man/man3/pthread_getconcurrency.3 b/share/man/man3/pthread_getconcurrency.3
index 94fdb71c88fa..dfdc8a7ef008 100644
--- a/share/man/man3/pthread_getconcurrency.3
+++ b/share/man/man3/pthread_getconcurrency.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_getconcurrency.3,v 1.4 2004/01/15 15:59:00 ru Exp $
 .Dd April 11, 2003
 .Dt PTHREAD_GETCONCURRENCY 3
 .Os
diff --git a/share/man/man3/pthread_getspecific.3 b/share/man/man3/pthread_getspecific.3
index 7d577e25805f..da726c9318b0 100644
--- a/share/man/man3/pthread_getspecific.3
+++ b/share/man/man3/pthread_getspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_getspecific.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_GETSPECIFIC 3
diff --git a/share/man/man3/pthread_join.3 b/share/man/man3/pthread_join.3
index dfeffb9267b9..7d7ecf6a2a91 100644
--- a/share/man/man3/pthread_join.3
+++ b/share/man/man3/pthread_join.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_join.3,v 1.16 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_JOIN 3
diff --git a/share/man/man3/pthread_key_create.3 b/share/man/man3/pthread_key_create.3
index 7d1902117cfb..29dcbd268690 100644
--- a/share/man/man3/pthread_key_create.3
+++ b/share/man/man3/pthread_key_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_key_create.3,v 1.14 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_CREATE 3
diff --git a/share/man/man3/pthread_key_delete.3 b/share/man/man3/pthread_key_delete.3
index f26db3ae8dc5..1cb1a49fefb4 100644
--- a/share/man/man3/pthread_key_delete.3
+++ b/share/man/man3/pthread_key_delete.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_key_delete.3,v 1.14 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_DELETE 3
diff --git a/share/man/man3/pthread_kill.3 b/share/man/man3/pthread_kill.3
index 3368cc977322..d9ba03cb8d2b 100644
--- a/share/man/man3/pthread_kill.3
+++ b/share/man/man3/pthread_kill.3
@@ -25,7 +25,7 @@
 .\" 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/share/man/man3/pthread_kill.3,v 1.11 2004/01/15 15:59:00 ru Exp $
 .Dd April 27, 2000
 .Dt PTHREAD_KILL 3
 .Os
diff --git a/share/man/man3/pthread_main_np.3 b/share/man/man3/pthread_main_np.3
index df879b877a17..bc0a3888178b 100644
--- a/share/man/man3/pthread_main_np.3
+++ b/share/man/man3/pthread_main_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_main_np.3,v 1.4 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_MAIN_NP 3
diff --git a/share/man/man3/pthread_multi_np.3 b/share/man/man3/pthread_multi_np.3
index f3b8f3e25db5..a2a110c34fd8 100644
--- a/share/man/man3/pthread_multi_np.3
+++ b/share/man/man3/pthread_multi_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_multi_np.3,v 1.4 2004/01/15 16:12:11 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_MULTI_NP 3
diff --git a/share/man/man3/pthread_mutex_destroy.3 b/share/man/man3/pthread_mutex_destroy.3
index 6be911de5486..6fad06405267 100644
--- a/share/man/man3/pthread_mutex_destroy.3
+++ b/share/man/man3/pthread_mutex_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_destroy.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_DESTROY 3
diff --git a/share/man/man3/pthread_mutex_init.3 b/share/man/man3/pthread_mutex_init.3
index 641e7f155a68..a0cc564ad05c 100644
--- a/share/man/man3/pthread_mutex_init.3
+++ b/share/man/man3/pthread_mutex_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.15 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_INIT 3
diff --git a/share/man/man3/pthread_mutex_lock.3 b/share/man/man3/pthread_mutex_lock.3
index 51df4af2751f..0a6ce106a94f 100644
--- a/share/man/man3/pthread_mutex_lock.3
+++ b/share/man/man3/pthread_mutex_lock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_lock.3,v 1.14 2005/02/08 20:16:59 trhodes Exp $
 .\"
 .Dd February 8, 2005
 .Dt PTHREAD_MUTEX_LOCK 3
diff --git a/share/man/man3/pthread_mutex_timedlock.3 b/share/man/man3/pthread_mutex_timedlock.3
index a42b15858754..4fe30cb2b42e 100644
--- a/share/man/man3/pthread_mutex_timedlock.3
+++ b/share/man/man3/pthread_mutex_timedlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_timedlock.3,v 1.5 2004/01/15 16:13:49 ru Exp $
 .\"
 .Dd December 30, 2003
 .Dt PTHREAD_MUTEX_TIMEDLOCK 3
diff --git a/share/man/man3/pthread_mutex_trylock.3 b/share/man/man3/pthread_mutex_trylock.3
index 5fc4590c2c8f..d450da7d632f 100644
--- a/share/man/man3/pthread_mutex_trylock.3
+++ b/share/man/man3/pthread_mutex_trylock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_trylock.3,v 1.13 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_TRYLOCK 3
diff --git a/share/man/man3/pthread_mutex_unlock.3 b/share/man/man3/pthread_mutex_unlock.3
index 6842997713f3..5587fb4bb884 100644
--- a/share/man/man3/pthread_mutex_unlock.3
+++ b/share/man/man3/pthread_mutex_unlock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_unlock.3,v 1.14 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_UNLOCK 3
diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3
index 700f1d2783f9..79d76b16209d 100644
--- a/share/man/man3/pthread_mutexattr.3
+++ b/share/man/man3/pthread_mutexattr.3
@@ -25,7 +25,7 @@
 .\" 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/share/man/man3/pthread_mutexattr.3,v 1.11 2004/01/15 15:59:00 ru Exp $
 .Dd May 1, 2000
 .Dt PTHREAD_MUTEXATTR 3
 .Os
diff --git a/share/man/man3/pthread_mutexattr_getkind_np.3 b/share/man/man3/pthread_mutexattr_getkind_np.3
index 57c19b852890..c28741d48065 100644
--- a/share/man/man3/pthread_mutexattr_getkind_np.3
+++ b/share/man/man3/pthread_mutexattr_getkind_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutexattr_getkind_np.3,v 1.5 2005/01/21 10:33:02 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_MUTEXATTR_GETKIND_NP 3
diff --git a/share/man/man3/pthread_once.3 b/share/man/man3/pthread_once.3
index 3e471827957e..eb643679aef5 100644
--- a/share/man/man3/pthread_once.3
+++ b/share/man/man3/pthread_once.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_once.3,v 1.19 2004/12/29 00:11:34 trhodes Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_ONCE 3
diff --git a/share/man/man3/pthread_resume_all_np.3 b/share/man/man3/pthread_resume_all_np.3
index 9e3513a7915c..9de8e38e89ec 100644
--- a/share/man/man3/pthread_resume_all_np.3
+++ b/share/man/man3/pthread_resume_all_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_resume_all_np.3,v 1.4 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_RESUME_ALL_NP 3
diff --git a/share/man/man3/pthread_resume_np.3 b/share/man/man3/pthread_resume_np.3
index dcfe184b482d..734a6cdada0b 100644
--- a/share/man/man3/pthread_resume_np.3
+++ b/share/man/man3/pthread_resume_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_resume_np.3,v 1.4 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_RESUME_NP 3
diff --git a/share/man/man3/pthread_rwlock_destroy.3 b/share/man/man3/pthread_rwlock_destroy.3
index 5d7eafaa42a4..d5226086bc84 100644
--- a/share/man/man3/pthread_rwlock_destroy.3
+++ b/share/man/man3/pthread_rwlock_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_destroy.3,v 1.10 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_DESTROY 3
diff --git a/share/man/man3/pthread_rwlock_init.3 b/share/man/man3/pthread_rwlock_init.3
index b4f8f7f44ab0..edc726f1938a 100644
--- a/share/man/man3/pthread_rwlock_init.3
+++ b/share/man/man3/pthread_rwlock_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_init.3,v 1.9 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_INIT 3
diff --git a/share/man/man3/pthread_rwlock_rdlock.3 b/share/man/man3/pthread_rwlock_rdlock.3
index e4c0b735eecd..c95ab39fa000 100644
--- a/share/man/man3/pthread_rwlock_rdlock.3
+++ b/share/man/man3/pthread_rwlock_rdlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_rdlock.3,v 1.8 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_RDLOCK 3
diff --git a/share/man/man3/pthread_rwlock_timedrdlock.3 b/share/man/man3/pthread_rwlock_timedrdlock.3
index 752c7754de5a..7a0c495c8754 100644
--- a/share/man/man3/pthread_rwlock_timedrdlock.3
+++ b/share/man/man3/pthread_rwlock_timedrdlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedrdlock.3,v 1.2 2004/06/17 17:49:30 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt PTHREAD_RWLOCK_TIMEDRDLOCK 3
diff --git a/share/man/man3/pthread_rwlock_timedwrlock.3 b/share/man/man3/pthread_rwlock_timedwrlock.3
index ff0e167a7dd5..908508eb6695 100644
--- a/share/man/man3/pthread_rwlock_timedwrlock.3
+++ b/share/man/man3/pthread_rwlock_timedwrlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedwrlock.3,v 1.2 2004/06/17 17:49:30 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt PTHREAD_RWLOCK_TIMEDWRLOCK 3
diff --git a/share/man/man3/pthread_rwlock_unlock.3 b/share/man/man3/pthread_rwlock_unlock.3
index 652ad2271015..f349cc7c8c90 100644
--- a/share/man/man3/pthread_rwlock_unlock.3
+++ b/share/man/man3/pthread_rwlock_unlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_unlock.3,v 1.8 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_UNLOCK 3
diff --git a/share/man/man3/pthread_rwlock_wrlock.3 b/share/man/man3/pthread_rwlock_wrlock.3
index c4fa42230dc6..e2fef181c712 100644
--- a/share/man/man3/pthread_rwlock_wrlock.3
+++ b/share/man/man3/pthread_rwlock_wrlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_wrlock.3,v 1.9 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_WRLOCK 3
diff --git a/share/man/man3/pthread_rwlockattr_destroy.3 b/share/man/man3/pthread_rwlockattr_destroy.3
index f798939b6f0a..3ff578cea2a3 100644
--- a/share/man/man3/pthread_rwlockattr_destroy.3
+++ b/share/man/man3/pthread_rwlockattr_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_destroy.3,v 1.11 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_DESTROY 3
diff --git a/share/man/man3/pthread_rwlockattr_getpshared.3 b/share/man/man3/pthread_rwlockattr_getpshared.3
index f23406c4d622..13ab28c5fa1d 100644
--- a/share/man/man3/pthread_rwlockattr_getpshared.3
+++ b/share/man/man3/pthread_rwlockattr_getpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_getpshared.3,v 1.13 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd March 22, 1999
 .Dt PTHREAD_RWLOCKATTR_GETPSHARED 3
diff --git a/share/man/man3/pthread_rwlockattr_init.3 b/share/man/man3/pthread_rwlockattr_init.3
index 8869993ed21f..678b40c515b0 100644
--- a/share/man/man3/pthread_rwlockattr_init.3
+++ b/share/man/man3/pthread_rwlockattr_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_init.3,v 1.11 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_INIT 3
diff --git a/share/man/man3/pthread_rwlockattr_setpshared.3 b/share/man/man3/pthread_rwlockattr_setpshared.3
index a8e99b3a184a..0a48e4dc7636 100644
--- a/share/man/man3/pthread_rwlockattr_setpshared.3
+++ b/share/man/man3/pthread_rwlockattr_setpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_setpshared.3,v 1.13 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
diff --git a/share/man/man3/pthread_schedparam.3 b/share/man/man3/pthread_schedparam.3
index 5bf0ddf0cfd5..7e7ff274946b 100644
--- a/share/man/man3/pthread_schedparam.3
+++ b/share/man/man3/pthread_schedparam.3
@@ -25,7 +25,7 @@
 .\" 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/share/man/man3/pthread_schedparam.3,v 1.9 2004/01/15 15:59:00 ru Exp $
 .Dd May 1, 2000
 .Dt PTHREAD_SCHEDPARAM 3
 .Os
diff --git a/share/man/man3/pthread_self.3 b/share/man/man3/pthread_self.3
index f404c9deae71..7a27a471cb7b 100644
--- a/share/man/man3/pthread_self.3
+++ b/share/man/man3/pthread_self.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_self.3,v 1.12 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SELF 3
diff --git a/share/man/man3/pthread_set_name_np.3 b/share/man/man3/pthread_set_name_np.3
index e69d4eb2471a..41354a2de39e 100644
--- a/share/man/man3/pthread_set_name_np.3
+++ b/share/man/man3/pthread_set_name_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_set_name_np.3,v 1.4 2004/01/15 15:59:00 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SET_NAME_NP 3
diff --git a/share/man/man3/pthread_setspecific.3 b/share/man/man3/pthread_setspecific.3
index 40a0502c71e6..efb0bbea6402 100644
--- a/share/man/man3/pthread_setspecific.3
+++ b/share/man/man3/pthread_setspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_setspecific.3,v 1.15 2004/12/29 00:11:34 trhodes Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SETSPECIFIC 3
diff --git a/share/man/man3/pthread_sigmask.3 b/share/man/man3/pthread_sigmask.3
index 282bd07e7dec..bcef7650e639 100644
--- a/share/man/man3/pthread_sigmask.3
+++ b/share/man/man3/pthread_sigmask.3
@@ -25,7 +25,7 @@
 .\" 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/share/man/man3/pthread_sigmask.3,v 1.12 2004/01/15 15:59:00 ru Exp $
 .Dd April 27, 2000
 .Dt PTHREAD_SIGMASK 3
 .Os
diff --git a/share/man/man3/pthread_spin_init.3 b/share/man/man3/pthread_spin_init.3
index 884753dc96aa..77a16c36ed48 100644
--- a/share/man/man3/pthread_spin_init.3
+++ b/share/man/man3/pthread_spin_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_spin_init.3,v 1.2 2004/06/17 17:51:17 ru Exp $
 .\"
 .Dd January 22, 2004
 .Dt PTHREAD_SPIN_INIT 3
diff --git a/share/man/man3/pthread_spin_lock.3 b/share/man/man3/pthread_spin_lock.3
index 0f8c5c2b8c4f..b9399d5ab2c4 100644
--- a/share/man/man3/pthread_spin_lock.3
+++ b/share/man/man3/pthread_spin_lock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_spin_lock.3,v 1.3 2004/07/07 17:36:31 ru Exp $
 .\"
 .Dd January 22, 2004
 .Dt PTHREAD_SPIN_LOCK 3
diff --git a/share/man/man3/pthread_suspend_all_np.3 b/share/man/man3/pthread_suspend_all_np.3
index 98e8983daebc..16b4e870c4ca 100644
--- a/share/man/man3/pthread_suspend_all_np.3
+++ b/share/man/man3/pthread_suspend_all_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_suspend_all_np.3,v 1.5 2004/01/15 16:07:52 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SUSPEND_ALL_NP 3
diff --git a/share/man/man3/pthread_suspend_np.3 b/share/man/man3/pthread_suspend_np.3
index 2d6b72bce3b4..a35ac5300843 100644
--- a/share/man/man3/pthread_suspend_np.3
+++ b/share/man/man3/pthread_suspend_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_suspend_np.3,v 1.5 2004/01/15 16:07:52 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SUSPEND_NP 3
diff --git a/share/man/man3/pthread_switch_add_np.3 b/share/man/man3/pthread_switch_add_np.3
index 6a120d7e3f3d..412b06624ac5 100644
--- a/share/man/man3/pthread_switch_add_np.3
+++ b/share/man/man3/pthread_switch_add_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_switch_add_np.3,v 1.3 2004/07/02 19:07:32 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SWITCH_ADD_NP 3
diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3
index 307488fde36c..96b8454def92 100644
--- a/share/man/man3/pthread_testcancel.3
+++ b/share/man/man3/pthread_testcancel.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_testcancel.3,v 1.13 2005/06/30 13:13:49 hmp Exp $
 .Dd January 17, 1999
 .Dt PTHREAD_TESTCANCEL 3
 .Os
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index 52c840ac58a2..e2cd67377495 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)queue.3	8.2 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/queue.3,v 1.35 2004/12/29 00:11:34 trhodes Exp $
 .\"
 .Dd January 24, 1994
 .Dt QUEUE 3
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index 92a26f7c6d48..775d18641b11 100644
--- a/share/man/man3/stdarg.3
+++ b/share/man/man3/stdarg.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)stdarg.3	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/stdarg.3,v 1.15 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd October 25, 2002
 .Dt STDARG 3
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index b7c006a1390a..ed615873ded3 100644
--- a/share/man/man3/sysexits.3
+++ b/share/man/man3/sysexits.3
@@ -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/share/man/man3/sysexits.3,v 1.16 2005/06/30 13:13:49 hmp Exp $
 .\"
 .\" "
 .Dd March 31, 1996
diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3
index 3e2a8ff68a38..f38eabe12ec6 100644
--- a/share/man/man3/tgmath.3
+++ b/share/man/man3/tgmath.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.2 2005/01/13 11:22:29 ru Exp $
 .\"
 .Dd August 14, 2004
 .Os
diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3
index 7b6293f0dbfb..6e08a4d37cf8 100644
--- a/share/man/man3/timeradd.3
+++ b/share/man/man3/timeradd.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/timeradd.3,v 1.3 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd August 11, 1999
 .Dt TIMERADD 3
diff --git a/share/man/man3/tree.3 b/share/man/man3/tree.3
index c01aa8accf47..8aa5215197e2 100644
--- a/share/man/man3/tree.3
+++ b/share/man/man3/tree.3
@@ -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/share/man/man3/tree.3,v 1.4 2004/06/21 14:54:43 mpp Exp $
 .\"
 .Dd February 24, 2002
 .Dt TREE 3
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 7199483804c9..302def326d7a 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/Makefile,v 1.320.2.4 2005/09/20 04:48:30 brueffer Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index af6b174a03c1..f669f6ab86c5 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/aac.4,v 1.31 2005/03/10 08:07:59 brueffer Exp $
 .Dd January 4, 2005
 .Dt AAC 4
 .Os
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index edcc7d0db489..1464cbdc7ea6 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.52.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd February 13, 2005
 .Dt ACPI 4
diff --git a/share/man/man4/acpi_thermal.4 b/share/man/man4/acpi_thermal.4
index d4e0aaecce80..f8dd255d4a7c 100644
--- a/share/man/man4/acpi_thermal.4
+++ b/share/man/man4/acpi_thermal.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/acpi_thermal.4,v 1.6.8.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd December 27, 2003
 .Dt ACPI_THERMAL 4
diff --git a/share/man/man4/acpi_video.4 b/share/man/man4/acpi_video.4
index c28678479e71..0e57ea8f8a36 100644
--- a/share/man/man4/acpi_video.4
+++ b/share/man/man4/acpi_video.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/acpi_video.4,v 1.3.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd November 8, 2004
 .Dt ACPI_VIDEO 4
diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index cb043a0ff0ee..1cf2cbea215b 100644
--- a/share/man/man4/adv.4
+++ b/share/man/man4/adv.4
@@ -21,7 +21,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/share/man/man4/adv.4,v 1.21 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd August 8, 2004
 .Dt ADV 4
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index ca136619db1a..671fe4d1193e 100644
--- a/share/man/man4/adw.4
+++ b/share/man/man4/adw.4
@@ -21,7 +21,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/share/man/man4/adw.4,v 1.18 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd July 14, 2004
 .Dt ADW 4
diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4
index 1793356a7809..be4e00f7b5bf 100644
--- a/share/man/man4/agp.4
+++ b/share/man/man4/agp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/agp.4,v 1.6.10.1 2005/07/17 15:03:34 brueffer Exp $
 .\"
 .Dd October 5, 2001
 .Dt AGP 4
diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4
index e260707bc972..f8daefec4559 100644
--- a/share/man/man4/aha.4
+++ b/share/man/man4/aha.4
@@ -24,7 +24,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/share/man/man4/aha.4,v 1.26 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHA 4
diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4
index b08e318d0d0e..3290e5a17d9f 100644
--- a/share/man/man4/ahb.4
+++ b/share/man/man4/ahb.4
@@ -24,7 +24,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/share/man/man4/ahb.4,v 1.23 2004/07/04 14:17:41 simon Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHB 4
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 6453c80c4525..827bc83c9848 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -24,7 +24,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/share/man/man4/ahc.4,v 1.38 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHC 4
diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4
index 260036b692ea..c419378ae41c 100644
--- a/share/man/man4/ahd.4
+++ b/share/man/man4/ahd.4
@@ -26,7 +26,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/share/man/man4/ahd.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHD 4
diff --git a/share/man/man4/aio.4 b/share/man/man4/aio.4
index 3ea71b05d77c..261328fb6aa8 100644
--- a/share/man/man4/aio.4
+++ b/share/man/man4/aio.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/aio.4,v 1.4 2003/01/14 03:42:16 tjr Exp $
 .\"
 .Dd October 24, 2002
 .Dt AIO 4
diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4
index 550a0fdf2c86..c2206d6eb402 100644
--- a/share/man/man4/altq.4
+++ b/share/man/man4/altq.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/altq.4,v 1.13 2005/07/08 13:05:58 mlaier Exp $
 .\"
 .Dd July 07, 2005
 .Dt ALTQ 4
diff --git a/share/man/man4/amd.4 b/share/man/man4/amd.4
index 758676011acf..a459cdf0dbac 100644
--- a/share/man/man4/amd.4
+++ b/share/man/man4/amd.4
@@ -21,7 +21,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/share/man/man4/amd.4,v 1.8 2004/08/08 22:27:02 simon Exp $
 .\"
 .Dd August 8, 2004
 .Dt AMD 4
diff --git a/share/man/man4/amr.4 b/share/man/man4/amr.4
index 57f94e507477..94eaf059099f 100644
--- a/share/man/man4/amr.4
+++ b/share/man/man4/amr.4
@@ -21,7 +21,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/share/man/man4/amr.4,v 1.32 2005/05/30 12:26:12 brueffer Exp $
 .\"
 .Dd May 30, 2005
 .Dt AMR 4
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 91f44690b6e6..59773ae0b40a 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/an.4,v 1.21.10.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt AN 4
diff --git a/share/man/man4/arcmsr.4 b/share/man/man4/arcmsr.4
index 4f305e1d5458..17a73b68e647 100644
--- a/share/man/man4/arcmsr.4
+++ b/share/man/man4/arcmsr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/arcmsr.4,v 1.3 2005/04/01 10:36:09 brueffer Exp $
 .\"
 .Dd March 31, 2005
 .Dt ARCMSR 4
diff --git a/share/man/man4/asr.4 b/share/man/man4/asr.4
index 955eb0f3655a..777836a3434f 100644
--- a/share/man/man4/asr.4
+++ b/share/man/man4/asr.4
@@ -4,7 +4,7 @@
 .\"
 .\" Manpage cleanup by: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/asr.4,v 1.24 2004/08/02 23:33:15 marius Exp $
 .\"
 .Dd July 14, 2004
 .Dt ASR 4
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index e5b63aa73a3e..89b96fbed027 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -25,7 +25,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/share/man/man4/ata.4,v 1.52.2.2.2.1 2005/10/27 20:47:03 joel Exp $
 .\"
 .Dd October 13, 2005
 .Dt ATA 4
diff --git a/share/man/man4/atapicam.4 b/share/man/man4/atapicam.4
index 1c226f2539dc..726bd81adfa4 100644
--- a/share/man/man4/atapicam.4
+++ b/share/man/man4/atapicam.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/atapicam.4,v 1.5 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd October 23, 2002
 .Dt ATAPICAM 4
diff --git a/share/man/man4/ataraid.4 b/share/man/man4/ataraid.4
index c61f961231ff..9b8164c56ccf 100644
--- a/share/man/man4/ataraid.4
+++ b/share/man/man4/ataraid.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ataraid.4,v 1.3 2005/06/06 19:08:12 brueffer Exp $
 .\"
 .Dd May 6, 2005
 .Dt ATARAID 4
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 74757f43020e..d557451a9ede 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ath.4,v 1.31 2005/04/29 15:07:44 brooks Exp $
 .\"/
 .Dd December 29, 2004
 .Dt ATH 4
diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4
index fa6018129c4f..801cc3991483 100644
--- a/share/man/man4/ath_hal.4
+++ b/share/man/man4/ath_hal.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.11 2005/01/15 12:49:11 ru Exp $
 .\"/
 .Dd August 26, 2004
 .Dt ATH_HAL 4
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 59f585b0794e..87d3982df7a1 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -24,7 +24,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/share/man/man4/atkbd.4,v 1.25 2004/12/15 23:01:45 jhb Exp $
 .\"
 .Dd May 21, 1999
 .Dt ATKBD 4
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 46d30c1ec24e..18c7877c722b 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -24,7 +24,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/share/man/man4/atkbdc.4,v 1.18 2005/04/07 23:59:37 sobomax Exp $
 .\"
 .Dd February 9, 1999
 .Dt ATKBDC 4
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index 0acd181f2f3e..e8e2ed459fe4 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/aue.4,v 1.21.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt AUE 4
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 4dc43949761b..3d741b917d0c 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -1,5 +1,5 @@
 .\"     $NetBSD: awi.4,v 1.6 2000/03/22 11:24:33 onoe Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/awi.4,v 1.18.2.2 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt AWI 4
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index 20d301a58e2d..cfa6a6199758 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/axe.4,v 1.9.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt AXE 4
diff --git a/share/man/man4/bfe.4 b/share/man/man4/bfe.4
index cb5621750dca..a66fdf5ae158 100644
--- a/share/man/man4/bfe.4
+++ b/share/man/man4/bfe.4
@@ -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/share/man/man4/bfe.4,v 1.3.8.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt BFE 4
diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4
index ad8c3320279e..9a7e47c4e355 100644
--- a/share/man/man4/bge.4
+++ b/share/man/man4/bge.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bge.4,v 1.18.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt BGE 4
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index ddb2fd37d974..19d43b4a459b 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bktr.4,v 1.29 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd January 2, 2005
 .Dt BKTR 4
diff --git a/share/man/man4/blackhole.4 b/share/man/man4/blackhole.4
index 7b86682cc11b..c92b18c54ec1 100644
--- a/share/man/man4/blackhole.4
+++ b/share/man/man4/blackhole.4
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/blackhole.4,v 1.12 2005/01/21 08:36:37 ru Exp $
 .Dd August 17, 1999
 .Dt BLACKHOLE 4
 .Os
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index d9cb0cef289c..f768d69563c3 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -20,7 +20,7 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.45 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd January 16, 1996
 .Dt BPF 4
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index 442df24d35f4..09b631f3e2d8 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bridge.4,v 1.24.2.1 2005/09/27 18:51:02 mlaier Exp $
 .\"
 .Dd September 27, 2005
 .Dt BRIDGE 4
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index 295837b02e6b..c5b53acc9115 100644
--- a/share/man/man4/bt.4
+++ b/share/man/man4/bt.4
@@ -24,7 +24,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/share/man/man4/bt.4,v 1.24 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 8, 2004
 .Dt BT 4
diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4
index b1b810fabe9d..18acbab4f082 100644
--- a/share/man/man4/cardbus.4
+++ b/share/man/man4/cardbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cardbus.4,v 1.4 2002/12/13 09:06:44 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt CARDBUS 4
diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4
index 3cfcede7e47f..38307168da6f 100644
--- a/share/man/man4/carp.4
+++ b/share/man/man4/carp.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/carp.4,v 1.8.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd May 15, 2005
 .Dt CARP 4
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 4ff400254a9d..9cd1e5cde29a 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ccd.4,v 1.30 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 9, 1995
 .Dt CCD 4
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 19113b78f28d..905d9e4df960 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cd.4,v 1.37 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt CD 4
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index 6edcc558bf98..1f15710bcb8e 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -26,7 +26,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cdce.4,v 1.3.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd September 17, 2005
 .Dt CDCE 4
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 0db548c81e60..0ade1ffa4ee7 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ch.4,v 1.35 2005/01/21 20:51:09 ru Exp $
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4
index 7d6c74fc0452..b225611cd4b6 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ciss.4,v 1.11 2005/01/12 10:14:42 ru Exp $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man4/cm.4 b/share/man/man4/cm.4
index b6260988f3cb..d22e43dd2396 100644
--- a/share/man/man4/cm.4
+++ b/share/man/man4/cm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cm.4,v 1.6.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16,2005
 .Dt CM 4
diff --git a/share/man/man4/cnw.4 b/share/man/man4/cnw.4
index c15312bf2282..7009ded0f9f2 100644
--- a/share/man/man4/cnw.4
+++ b/share/man/man4/cnw.4
@@ -35,7 +35,7 @@
 .\"
 .\"	PAO2 Id: cnw.4,v 1.1.1.1 1997/12/11 14:46:23 itojun Exp
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cnw.4,v 1.2 2005/01/13 16:37:26 ru Exp $
 .\"
 .Dd September 5, 2004
 .Dt CNW 4
diff --git a/share/man/man4/cpufreq.4 b/share/man/man4/cpufreq.4
index 05b35d7e9fe2..25dabc2ec850 100644
--- a/share/man/man4/cpufreq.4
+++ b/share/man/man4/cpufreq.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cpufreq.4,v 1.10.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd April 10, 2005
 .Dt CPUFREQ 4
diff --git a/share/man/man4/crypto.4 b/share/man/man4/crypto.4
index 3cf8a50e3824..62f76f647eb3 100644
--- a/share/man/man4/crypto.4
+++ b/share/man/man4/crypto.4
@@ -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/share/man/man4/crypto.4,v 1.5 2004/01/16 17:21:02 sam Exp $
 .\"
 .Dd January 16, 2004
 .Dt CRYPTO 4
diff --git a/share/man/man4/cue.4 b/share/man/man4/cue.4
index 7dbeac7ff82d..739847dc79ce 100644
--- a/share/man/man4/cue.4
+++ b/share/man/man4/cue.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cue.4,v 1.19.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt CUE 4
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index 07974734864e..a53da6d3f249 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cy.4,v 1.24 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd May 24, 2004
 .Dt CY 4
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index b3d382295eb6..60e29ab7b73f 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/da.4,v 1.46 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt DA 4
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index 486e30bf17b7..41daa7b2bd7e 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dc.4,v 1.35.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt DC 4
diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4
index 7cebf27300af..a1dc5dbdc992 100644
--- a/share/man/man4/dcons.4
+++ b/share/man/man4/dcons.4
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dcons.4,v 1.7 2005/01/21 10:28:45 ru Exp $
 .\"
 .Dd February 11, 2003
 .Dt DCONS 4
diff --git a/share/man/man4/dcons_crom.4 b/share/man/man4/dcons_crom.4
index b9c5ca09deb1..ccfbe6ce0922 100644
--- a/share/man/man4/dcons_crom.4
+++ b/share/man/man4/dcons_crom.4
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dcons_crom.4,v 1.4 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd June 16, 2003
 .Dt DCONS_CROM 4
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index f6b05669fd57..05b574c60227 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -57,7 +57,7 @@
 .\" 	Created.
 .\" 	[90/08/30            dbg]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.28 2005/02/13 23:45:49 ru Exp $
 .Dd January 16, 1996
 .Dt DDB 4
 .Os
diff --git a/share/man/man4/de.4 b/share/man/man4/de.4
index d070ea0910e2..07810b6dbbf2 100644
--- a/share/man/man4/de.4
+++ b/share/man/man4/de.4
@@ -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/share/man/man4/de.4,v 1.19.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt DE 4
diff --git a/share/man/man4/devctl.4 b/share/man/man4/devctl.4
index e4eb5ef9c1c0..d48d379926cc 100644
--- a/share/man/man4/devctl.4
+++ b/share/man/man4/devctl.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/devctl.4,v 1.3 2003/02/24 22:53:22 ru Exp $
 .\"
 .Dd February 11, 2003
 .Dt DEVCTL 4
diff --git a/share/man/man4/digi.4 b/share/man/man4/digi.4
index e33e365cecf1..859b4f136181 100644
--- a/share/man/man4/digi.4
+++ b/share/man/man4/digi.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.15 1994/12/06 20:14:30 bde Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/digi.4,v 1.4 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd December 7, 2003
 .Dt DIGI 4
diff --git a/share/man/man4/disc.4 b/share/man/man4/disc.4
index 300e712272fc..a90f611160e8 100644
--- a/share/man/man4/disc.4
+++ b/share/man/man4/disc.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/disc.4,v 1.2 2002/05/30 12:23:21 ru Exp $
 .\"
 .Dd May 25, 2002
 .Dt DISC 4
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index e1586f2c7215..bd0a81144899 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/divert.4,v 1.37 2005/02/13 23:45:49 ru Exp $
 .\"
 .Dd December 17, 2004
 .Dt DIVERT 4
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index c5f1d18d04f2..fd63015ea130 100644
--- a/share/man/man4/dpt.4
+++ b/share/man/man4/dpt.4
@@ -21,7 +21,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/share/man/man4/dpt.4,v 1.18 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd July 4, 2004
 .Dt DPT 4
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index 50811f80383f..c0b0e4185ace 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dummynet.4,v 1.21 2005/06/10 01:25:22 thompsa Exp $
 .\"
 .Dd October 28, 2002
 .Dt DUMMYNET 4
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 5e91ae649e4c..b0fc7b92f39b 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ed.4,v 1.45.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt ED 4
diff --git a/share/man/man4/ef.4 b/share/man/man4/ef.4
index c93d5f12022b..1baac32737a1 100644
--- a/share/man/man4/ef.4
+++ b/share/man/man4/ef.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ef.4,v 1.11 2004/12/21 01:09:34 brueffer Exp $
 .\"
 .Dd June 20, 1999
 .Dt EF 4
diff --git a/share/man/man4/ehci.4 b/share/man/man4/ehci.4
index 57d47db4633b..897d6645a6b9 100644
--- a/share/man/man4/ehci.4
+++ b/share/man/man4/ehci.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ehci.4,v 1.2 2005/03/20 17:13:43 iedowse Exp $
 .\"
 .Dd March 20, 2005
 .Dt EHCI 4
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index 547a24a2cd82..ffb6ec8b9f2c 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/em.4,v 1.20.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt EM 4
diff --git a/share/man/man4/en.4 b/share/man/man4/en.4
index ef26f3a1ddc2..83a3e196b55f 100644
--- a/share/man/man4/en.4
+++ b/share/man/man4/en.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/en.4,v 1.19.8.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt EN 4
diff --git a/share/man/man4/esp.4 b/share/man/man4/esp.4
index 5a51e0cf3d21..532ab2beecbc 100644
--- a/share/man/man4/esp.4
+++ b/share/man/man4/esp.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/esp.4,v 1.4.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd September 18, 2005
 .Dt ESP 4
diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4
index 90b13307fdd3..3b827b7ced91 100644
--- a/share/man/man4/exca.4
+++ b/share/man/man4/exca.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/exca.4,v 1.4 2003/08/20 06:49:57 imp Exp $
 .\"
 .Dd February 23, 2003
 .Dt EXCA 4
diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
index 3f13cd662554..d4633dd2427a 100644
--- a/share/man/man4/faith.4
+++ b/share/man/man4/faith.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/faith.4,v 1.14 2005/04/21 13:27:13 suz Exp $
 .\"
 .Dd April 10, 1999
 .Dt FAITH 4
diff --git a/share/man/man4/fast_ipsec.4 b/share/man/man4/fast_ipsec.4
index 503ef60c2942..70fff4b269de 100644
--- a/share/man/man4/fast_ipsec.4
+++ b/share/man/man4/fast_ipsec.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fast_ipsec.4,v 1.3 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd January 20, 2003
 .Dt FAST_IPSEC 4
diff --git a/share/man/man4/fatm.4 b/share/man/man4/fatm.4
index 51dc6fc0eb79..84ea84b97ee5 100644
--- a/share/man/man4/fatm.4
+++ b/share/man/man4/fatm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fatm.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .\" fatm(4) man page
 .\"
diff --git a/share/man/man4/fd.4 b/share/man/man4/fd.4
index 99a05317c4fb..3ae22a19a9ee 100644
--- a/share/man/man4/fd.4
+++ b/share/man/man4/fd.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fd.4	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fd.4,v 1.7 2004/10/24 19:44:23 rwatson Exp $
 .\"
 .Dd June 9, 1993
 .Dt FD 4
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 976885dfda4e..98e90af6837f 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -25,7 +25,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/share/man/man4/fdc.4,v 1.34 2004/07/15 16:47:31 njl Exp $
 .\"
 .Dd July 15, 2004
 .Dt FDC 4
diff --git a/share/man/man4/firewire.4 b/share/man/man4/firewire.4
index 6134870e4a10..2ca1326fe3a8 100644
--- a/share/man/man4/firewire.4
+++ b/share/man/man4/firewire.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/firewire.4,v 1.11 2004/12/14 19:53:30 brueffer Exp $
 .\"
 .Dd December 14, 2004
 .Dt FIREWIRE 4
diff --git a/share/man/man4/fla.4 b/share/man/man4/fla.4
index 1a02deb9912a..163c8edc9345 100644
--- a/share/man/man4/fla.4
+++ b/share/man/man4/fla.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fla.4,v 1.2 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd July 13, 2003
 .Dt FLA 4
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index b751e296d0da..1cd6c75e93c4 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -2,7 +2,7 @@
 .\" Copyright (c) 1995, Matt Thomas
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fpa.4,v 1.22 2003/12/17 10:23:14 brueffer Exp $
 .\"
 .Dd March 13, 1995
 .Dt FPA 4
diff --git a/share/man/man4/fwe.4 b/share/man/man4/fwe.4
index 6469ef4d2b7a..a97e072d7c26 100644
--- a/share/man/man4/fwe.4
+++ b/share/man/man4/fwe.4
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fwe.4,v 1.7.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .\"
 .Dd July 16, 2005
diff --git a/share/man/man4/fwip.4 b/share/man/man4/fwip.4
index 0c32fe9a0c36..52774b7bd19b 100644
--- a/share/man/man4/fwip.4
+++ b/share/man/man4/fwip.4
@@ -23,7 +23,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fwip.4,v 1.5.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt FWIP 4
diff --git a/share/man/man4/fwohci.4 b/share/man/man4/fwohci.4
index 11a41ef3ee7b..5099f3ef2a63 100644
--- a/share/man/man4/fwohci.4
+++ b/share/man/man4/fwohci.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fwohci.4,v 1.14 2005/06/23 14:12:19 ru Exp $
 .\"
 .\"
 .Dd June 23, 2005
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index c383a64c274a..e9377c57ffad 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -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/share/man/man4/fxp.4,v 1.34.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt FXP 4
diff --git a/share/man/man4/gbde.4 b/share/man/man4/gbde.4
index c337744201a0..1f48415a06a2 100644
--- a/share/man/man4/gbde.4
+++ b/share/man/man4/gbde.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gbde.4,v 1.10 2003/03/07 09:36:14 phk Exp $
 .\"
 .Dd October 19, 2002
 .Os
diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4
index b92958b209b2..3bfd73439ad0 100644
--- a/share/man/man4/gdb.4
+++ b/share/man/man4/gdb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gdb.4,v 1.14 2005/02/13 23:45:49 ru Exp $
 .\"
 .Dd February 8, 2005
 .Dt GDB 4
diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4
index 62c0094c4624..f20f05f791a5 100644
--- a/share/man/man4/gem.4
+++ b/share/man/man4/gem.4
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gem.4,v 1.4 2004/08/15 18:13:08 simon Exp $
 .\"
 .Dd August 15, 2004
 .Dt GEM 4
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index 78c5584b7946..c3203d7dc523 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/geom.4,v 1.13 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd March 27, 2002
 .Os
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index 936898f46008..d0826ac76e7d 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gif.4,v 1.25.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd April 10, 1999
 .Dt GIF 4
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index 88064c7a477f..3f7e50cb530b 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gre.4,v 1.5 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd June 9, 2002
 .Dt GRE 4
diff --git a/share/man/man4/harp.4 b/share/man/man4/harp.4
index 6f4d9410233f..9aa04065c00d 100644
--- a/share/man/man4/harp.4
+++ b/share/man/man4/harp.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/harp.4,v 1.3 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt HARP 4
diff --git a/share/man/man4/hatm.4 b/share/man/man4/hatm.4
index f9b7e705bde0..f5e95c4f3339 100644
--- a/share/man/man4/hatm.4
+++ b/share/man/man4/hatm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hatm.4,v 1.9 2005/01/21 08:36:37 ru Exp $
 .\"
 .\" hatm(4) man page
 .\"
diff --git a/share/man/man4/hfa.4 b/share/man/man4/hfa.4
index 1c254bfeb5a3..eeffb8a4b9c7 100644
--- a/share/man/man4/hfa.4
+++ b/share/man/man4/hfa.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hfa.4,v 1.6 2005/02/23 19:31:12 brueffer Exp $
 .\"
 .Dd August 6, 2004
 .Dt HFA 4
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index 0f7ee9554026..c998df8da0b1 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -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/share/man/man4/hifn.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd September 12, 2004
 .Dt HIFN 4
diff --git a/share/man/man4/hme.4 b/share/man/man4/hme.4
index 87d9080789ac..85786accf189 100644
--- a/share/man/man4/hme.4
+++ b/share/man/man4/hme.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hme.4,v 1.4.8.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt HME 4
diff --git a/share/man/man4/hptmv.4 b/share/man/man4/hptmv.4
index 956e3bee48c7..fcf9404fcc03 100644
--- a/share/man/man4/hptmv.4
+++ b/share/man/man4/hptmv.4
@@ -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/share/man/man4/hptmv.4,v 1.4 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd November 19, 2004
 .Dt HPTMV 4
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index 67dc923c902e..75aefd36e3db 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hwpmc.4,v 1.6.2.3 2005/10/01 15:52:13 jkoshy Exp $
 .\"
 .Dd September 28, 2005
 .Dt HWPMC 4
diff --git a/share/man/man4/ichsmb.4 b/share/man/man4/ichsmb.4
index 92ca6cdb1500..2291c5d89bc4 100644
--- a/share/man/man4/ichsmb.4
+++ b/share/man/man4/ichsmb.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ichsmb.4,v 1.7 2005/05/05 12:00:43 wilko Exp $
 .\"
 .Dd October 5, 2000
 .Dt ICHSMB 4
diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4
index af5c1df1103b..0d65d07124cc 100644
--- a/share/man/man4/icmp.4
+++ b/share/man/man4/icmp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)icmp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/icmp.4,v 1.16 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd March 21, 2003
 .Dt ICMP 4
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 83aff0ebe791..8d0c201ecc65 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/icmp6.4,v 1.18 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd December 20, 2004
 .Dt ICMP6 4
diff --git a/share/man/man4/ida.4 b/share/man/man4/ida.4
index 5b9150691ba4..67022cf1d46c 100644
--- a/share/man/man4/ida.4
+++ b/share/man/man4/ida.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ida.4,v 1.6 2005/01/12 10:14:42 ru Exp $
 .\" Written by Tom Rhodes
 .\" This file is public domain
 .\"
diff --git a/share/man/man4/idt.4 b/share/man/man4/idt.4
index adf1cf79c028..cff394fa3cfa 100644
--- a/share/man/man4/idt.4
+++ b/share/man/man4/idt.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/idt.4,v 1.2 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd June 3, 2003
 .Dt IDT 4
diff --git a/share/man/man4/ieee80211.4 b/share/man/man4/ieee80211.4
index ef20979a0842..9c266806d255 100644
--- a/share/man/man4/ieee80211.4
+++ b/share/man/man4/ieee80211.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ieee80211.4,v 1.9 2005/02/13 23:45:49 ru Exp $
 .\"
 .Dd February 23, 2001
 .Dt IEEE80211 4
diff --git a/share/man/man4/if_bridge.4 b/share/man/man4/if_bridge.4
index 545e514a1fc1..616b47f0a2ed 100644
--- a/share/man/man4/if_bridge.4
+++ b/share/man/man4/if_bridge.4
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.5.2.2 2005/09/09 08:47:26 thompsa Exp $
 .\"
 .Dd June 10, 2005
 .Dt IF_BRIDGE 4
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index 3cffbeab1816..db4f6496bd4e 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ifmib.4,v 1.21 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd November 15, 1996
 .Dt IFMIB 4
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index 45d669c6d3ca..eee78d7fcba7 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iic.4,v 1.11 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd October 25, 1998
 .Dt IIC 4
diff --git a/share/man/man4/iicbb.4 b/share/man/man4/iicbb.4
index e048c5d9bc75..f4ccf2d2f743 100644
--- a/share/man/man4/iicbb.4
+++ b/share/man/man4/iicbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicbb.4,v 1.9 2001/07/10 15:30:37 ru Exp $
 .\"
 .Dd October 25, 1998
 .Dt IICBB 4
diff --git a/share/man/man4/iicbus.4 b/share/man/man4/iicbus.4
index f9e5c58d467a..97d157f2eabe 100644
--- a/share/man/man4/iicbus.4
+++ b/share/man/man4/iicbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicbus.4,v 1.12 2005/02/13 23:45:49 ru Exp $
 .\"
 .Dd August 6, 1998
 .Dt IICBUS 4
diff --git a/share/man/man4/iicsmb.4 b/share/man/man4/iicsmb.4
index 4fdf6d497b8c..45103479adc3 100644
--- a/share/man/man4/iicsmb.4
+++ b/share/man/man4/iicsmb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicsmb.4,v 1.9 2001/07/10 15:30:37 ru Exp $
 .\"
 .Dd August 10, 1998
 .Dt IICSMB 4
diff --git a/share/man/man4/iir.4 b/share/man/man4/iir.4
index dbce281ba128..34bb0bb72892 100644
--- a/share/man/man4/iir.4
+++ b/share/man/man4/iir.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iir.4,v 1.8 2004/08/08 22:27:02 simon Exp $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 74e5cfe35402..763fbb125125 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/inet.4,v 1.36.2.2 2005/08/29 09:10:22 glebius Exp $
 .\"
 .Dd April 9, 2005
 .Dt INET 4
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 27b08763cdd9..f920fe4acd73 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/inet6.4,v 1.19.2.1 2005/08/29 09:10:22 glebius Exp $
 .\"
 .Dd January 29, 1999
 .Dt INET6 4
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 5e015a8f371d..cd5f9186daf7 100644
--- a/share/man/man4/intpm.4
+++ b/share/man/man4/intpm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/intpm.4,v 1.15 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd January 8, 1999
 .Dt INTPM 4
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index 93a9ab59d25d..326d1f2d85f5 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -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/share/man/man4/intro.4,v 1.29 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 20, 1996
 .Dt INTRO 4
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index d5da6e1e6f65..cfdc51ec69f2 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ip.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ip.4,v 1.43.2.2 2005/10/02 15:45:47 andre Exp $
 .\"
 .Dd September 26, 2005
 .Dt IP 4
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 174e45fb370d..086036fd9ea6 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.20 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd December 29, 2004
 .Dt IP6 4
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index 578a42a8f603..ff2e81b75176 100644
--- a/share/man/man4/ipfirewall.4
+++ b/share/man/man4/ipfirewall.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipfirewall.4,v 1.31 2004/08/27 15:16:20 andre Exp $
 .\"
 .Dd October 28, 2002
 .Dt IPFW 4
diff --git a/share/man/man4/ips.4 b/share/man/man4/ips.4
index 25ee2a4712e8..4fe5c6a9aaeb 100644
--- a/share/man/man4/ips.4
+++ b/share/man/man4/ips.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ips.4,v 1.5 2004/08/08 22:27:02 simon Exp $
 .\"
 .Dd August 8, 2004
 .Dt IPS 4
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 1593a21a19c2..677281475022 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.16 2005/02/13 23:45:49 ru Exp $
 .\"
 .Dd January 11, 2005
 .Dt IPSEC 4
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index 0903cbbebcfa..e627c3be1757 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.3.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Os
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index f28c1ba1ed9e..97a3ee89c98d 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -25,7 +25,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/share/man/man4/isp.4,v 1.20 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd February 14, 2000
 .Dt ISP 4
diff --git a/share/man/man4/ispfw.4 b/share/man/man4/ispfw.4
index 5eb4e62babe9..9cd4788140c3 100644
--- a/share/man/man4/ispfw.4
+++ b/share/man/man4/ispfw.4
@@ -20,7 +20,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/share/man/man4/ispfw.4,v 1.6 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd July 20, 2000
 .Dt ISPFW 4
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 75afd7578e1d..f6e3e72afa8a 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.4.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Os
diff --git a/share/man/man4/ixgb.4 b/share/man/man4/ixgb.4
index 0b1ed8d21a24..7fc92cedc681 100644
--- a/share/man/man4/ixgb.4
+++ b/share/man/man4/ixgb.4
@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.9 2005/01/02 18:26:13 krion Exp $
 .\"
 .Dd November 24, 2004
 .Dt IXGB 4
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index cee2daeadcd6..a14c40f0161d 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/joy.4,v 1.26 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd January 23, 1995
 .Dt JOY 4
diff --git a/share/man/man4/kame.4 b/share/man/man4/kame.4
index 9d80243dc46e..a513f0b3e8bb 100644
--- a/share/man/man4/kame.4
+++ b/share/man/man4/kame.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: kame.4,v 1.4 1999/10/07 04:01:15 itojun Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/kame.4,v 1.14 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd April 13, 1999
 .Dt KAME 4
diff --git a/share/man/man4/kbdmux.4 b/share/man/man4/kbdmux.4
index ee15a625589d..333f0e374333 100644
--- a/share/man/man4/kbdmux.4
+++ b/share/man/man4/kbdmux.4
@@ -1,5 +1,5 @@
 .\" $Id: kbdmux.4,v 1.1 2005/07/14 20:32:10 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.1.2.2 2005/08/06 14:41:55 markus Exp $
 .\"
 .Dd July 12, 2005
 .Os
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index e1a5ac28d41a..cbabe4c98e15 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/keyboard.4,v 1.27 2005/02/23 04:22:17 trhodes Exp $
 .\"
 .Dd January 8, 1995
 .Dt KEYBOARD 4
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index 58b08d5f69fb..5e9d3677d019 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -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/share/man/man4/kld.4,v 1.20 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd November 8, 1998
 .Dt KLD 4
diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4
index 820fd8cebe54..6c70962c8bfe 100644
--- a/share/man/man4/ktr.4
+++ b/share/man/man4/ktr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ktr.4,v 1.11 2005/01/26 06:46:00 ssouhlal Exp $
 .\"
 .Dd January 25, 2005
 .Dt KTR 4
diff --git a/share/man/man4/kue.4 b/share/man/man4/kue.4
index c943926f15a0..70654f5723f2 100644
--- a/share/man/man4/kue.4
+++ b/share/man/man4/kue.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/kue.4,v 1.20.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt KUE 4
diff --git a/share/man/man4/led.4 b/share/man/man4/led.4
index c9c6ef9d159e..309b3c181136 100644
--- a/share/man/man4/led.4
+++ b/share/man/man4/led.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/led.4,v 1.11 2005/05/29 21:23:50 simon Exp $
 .\"
 .Dd May 29, 2005
 .Dt LED 4
diff --git a/share/man/man4/lge.4 b/share/man/man4/lge.4
index dd95e892637d..28743299e2e5 100644
--- a/share/man/man4/lge.4
+++ b/share/man/man4/lge.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lge.4,v 1.9.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt LGE 4
diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4
index 86dd47eb597a..b1ba9f3d9cfc 100644
--- a/share/man/man4/lo.4
+++ b/share/man/man4/lo.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lo.4,v 1.9 2001/07/10 15:30:38 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt LO 4
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index f58a653e4cb3..cdefe4f1a2c5 100644
--- a/share/man/man4/lp.4
+++ b/share/man/man4/lp.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	Id: man4.i386/lp.4,v 1.9 1999/02/14 12:06:16 nsouch Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lp.4,v 1.13 2004/12/21 01:09:34 brueffer Exp $
 .\"
 .Dd March 4, 1996
 .Os
diff --git a/share/man/man4/lpbb.4 b/share/man/man4/lpbb.4
index 77e70c57b118..b9c601b9676e 100644
--- a/share/man/man4/lpbb.4
+++ b/share/man/man4/lpbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lpbb.4,v 1.12 2001/07/14 19:40:47 schweikh Exp $
 .\"
 .Dd October 25, 1998
 .Dt LPBB 4
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
index 8b3dd578fa3c..e40e833419ff 100644
--- a/share/man/man4/lpt.4
+++ b/share/man/man4/lpt.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lpt.4,v 1.16 2005/02/15 09:26:59 ru Exp $
 .\"
 .Dd February 14, 1999
 .Dt LPT 4
diff --git a/share/man/man4/mac.4 b/share/man/man4/mac.4
index 38b060d9c371..e6af97f00ca8 100644
--- a/share/man/man4/mac.4
+++ b/share/man/man4/mac.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac.4,v 1.12 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 8, 2003
 .Os
diff --git a/share/man/man4/mac_biba.4 b/share/man/man4/mac_biba.4
index 20a66615e5f2..56d90ebe1506 100644
--- a/share/man/man4/mac_biba.4
+++ b/share/man/man4/mac_biba.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.19 2005/02/05 13:52:21 brueffer Exp $
 .\"
 .Dd November 18, 2002
 .Os
diff --git a/share/man/man4/mac_bsdextended.4 b/share/man/man4/mac_bsdextended.4
index 899990c34a18..8def081a2a16 100644
--- a/share/man/man4/mac_bsdextended.4
+++ b/share/man/man4/mac_bsdextended.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.16 2005/05/21 17:22:12 trhodes Exp $
 .\"
 .Dd May 21, 2005
 .Os
diff --git a/share/man/man4/mac_ifoff.4 b/share/man/man4/mac_ifoff.4
index ede13b0fac5c..60d70e47ec04 100644
--- a/share/man/man4/mac_ifoff.4
+++ b/share/man/man4/mac_ifoff.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_ifoff.4,v 1.9 2005/02/05 13:52:21 brueffer Exp $
 .\"
 .Dd December 10, 2002
 .Os
diff --git a/share/man/man4/mac_lomac.4 b/share/man/man4/mac_lomac.4
index 8133ad8a8333..6764cadd55c1 100644
--- a/share/man/man4/mac_lomac.4
+++ b/share/man/man4/mac_lomac.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_lomac.4,v 1.9 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 11, 2002
 .Os
diff --git a/share/man/man4/mac_mls.4 b/share/man/man4/mac_mls.4
index 95e66be18c55..a967beb5da7d 100644
--- a/share/man/man4/mac_mls.4
+++ b/share/man/man4/mac_mls.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.19 2005/01/12 10:14:42 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_none.4 b/share/man/man4/mac_none.4
index 159151e53388..1f70f2882eec 100644
--- a/share/man/man4/mac_none.4
+++ b/share/man/man4/mac_none.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_none.4,v 1.12 2005/01/21 20:50:39 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_partition.4 b/share/man/man4/mac_partition.4
index 54abee5ae7bf..0f046dac10e9 100644
--- a/share/man/man4/mac_partition.4
+++ b/share/man/man4/mac_partition.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_partition.4,v 1.11 2005/02/05 13:52:21 brueffer Exp $
 .\"
 .Dd December 9, 2002
 .Os
diff --git a/share/man/man4/mac_portacl.4 b/share/man/man4/mac_portacl.4
index 698852d579ef..992c823efcf2 100644
--- a/share/man/man4/mac_portacl.4
+++ b/share/man/man4/mac_portacl.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.11 2005/01/15 12:24:26 ru Exp $
 .\"
 .Dd December 9, 2004
 .Dt MAC_PORTACL 4
diff --git a/share/man/man4/mac_seeotheruids.4 b/share/man/man4/mac_seeotheruids.4
index 0c0bb707b0f1..5240234b3e2b 100644
--- a/share/man/man4/mac_seeotheruids.4
+++ b/share/man/man4/mac_seeotheruids.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_seeotheruids.4,v 1.10 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 8, 2002
 .Os
diff --git a/share/man/man4/mac_stub.4 b/share/man/man4/mac_stub.4
index ded95e2c0818..f02ddcf2fe7b 100644
--- a/share/man/man4/mac_stub.4
+++ b/share/man/man4/mac_stub.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_stub.4,v 1.13 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_test.4 b/share/man/man4/mac_test.4
index dde744589a22..e57d1e52b9ea 100644
--- a/share/man/man4/mac_test.4
+++ b/share/man/man4/mac_test.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_test.4,v 1.10 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/man4.alpha/Makefile b/share/man/man4/man4.alpha/Makefile
index a9beac5e7899..bd3b74c65a93 100644
--- a/share/man/man4/man4.alpha/Makefile
+++ b/share/man/man4/man4.alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.alpha/Makefile,v 1.4 2001/03/27 13:48:21 ru Exp $
 
 MAN=	linux.4 osf1.4
 
diff --git a/share/man/man4/man4.alpha/linux.4 b/share/man/man4/man4.alpha/linux.4
index 9ff8a0d2f377..c6d2562d9f4c 100644
--- a/share/man/man4/man4.alpha/linux.4
+++ b/share/man/man4/man4.alpha/linux.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.alpha/linux.4,v 1.5 2002/12/12 17:25:56 ru Exp $
 .Dd August 17, 2000
 .Dt LINUX 4 Alpha
 .Os
diff --git a/share/man/man4/man4.alpha/osf1.4 b/share/man/man4/man4.alpha/osf1.4
index 38a75cf1c11f..1ecd775775ce 100644
--- a/share/man/man4/man4.alpha/osf1.4
+++ b/share/man/man4/man4.alpha/osf1.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.alpha/osf1.4,v 1.6 2005/01/21 08:36:38 ru Exp $
 .\"
 .Dd November 13, 2000
 .Dt OSF/1 4 Alpha
diff --git a/share/man/man4/man4.i386/CPU_ELAN.4 b/share/man/man4/man4.i386/CPU_ELAN.4
index 7fe774170384..1974b1409bc0 100644
--- a/share/man/man4/man4.i386/CPU_ELAN.4
+++ b/share/man/man4/man4.i386/CPU_ELAN.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/CPU_ELAN.4,v 1.2 2003/11/30 12:42:01 simon Exp $
 .\"
 .Dd November 23, 2003
 .Dt CPU_ELAN 4 i386
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index e4fca4f1d43a..b81ec48138fd 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.178.2.1 2005/09/19 16:51:10 brueffer Exp $
 
 MAN=	acpi_asus.4 \
 	acpi_fujitsu.4 \
diff --git a/share/man/man4/man4.i386/acpi_asus.4 b/share/man/man4/man4.i386/acpi_asus.4
index 4b230c94b7ef..d98b196fcbf1 100644
--- a/share/man/man4/man4.i386/acpi_asus.4
+++ b/share/man/man4/man4.i386/acpi_asus.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_asus.4,v 1.9.2.1 2005/07/30 09:34:58 hrs Exp $
 .\"
 .Dd May 9, 2005
 .Dt ACPI_ASUS 4 i386
diff --git a/share/man/man4/man4.i386/acpi_fujitsu.4 b/share/man/man4/man4.i386/acpi_fujitsu.4
index c160622d7061..628f7a6ac6f3 100644
--- a/share/man/man4/man4.i386/acpi_fujitsu.4
+++ b/share/man/man4/man4.i386/acpi_fujitsu.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_fujitsu.4,v 1.2.2.1 2005/07/30 09:34:58 hrs Exp $
 .\"
 .Dd March 20, 2005
 .Dt ACPI_FUJITSU 4 i386
diff --git a/share/man/man4/man4.i386/acpi_ibm.4 b/share/man/man4/man4.i386/acpi_ibm.4
index d2ef59cba1e8..a513f877254c 100644
--- a/share/man/man4/man4.i386/acpi_ibm.4
+++ b/share/man/man4/man4.i386/acpi_ibm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_ibm.4,v 1.2.2.3 2005/08/27 22:51:25 markus Exp $
 .\"
 .Dd August 23, 2005
 .Dt ACPI_IBM 4 i386
diff --git a/share/man/man4/man4.i386/acpi_panasonic.4 b/share/man/man4/man4.i386/acpi_panasonic.4
index a3b9e56e07f0..5f4b8fd25b8d 100644
--- a/share/man/man4/man4.i386/acpi_panasonic.4
+++ b/share/man/man4/man4.i386/acpi_panasonic.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_panasonic.4,v 1.4.2.2 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd July 11, 2004
 .Dt ACPI_PANASONIC 4 i386
diff --git a/share/man/man4/man4.i386/acpi_sony.4 b/share/man/man4/man4.i386/acpi_sony.4
index 5c3c72d9b958..9e386af71468 100644
--- a/share/man/man4/man4.i386/acpi_sony.4
+++ b/share/man/man4/man4.i386/acpi_sony.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_sony.4,v 1.1.2.1 2005/09/19 16:51:10 brueffer Exp $
 .\"
 .Dd September 14, 2005
 .Dt ACPI_SONY 4 i386
diff --git a/share/man/man4/man4.i386/acpi_toshiba.4 b/share/man/man4/man4.i386/acpi_toshiba.4
index 413e8e4f5494..4d78b0678ce6 100644
--- a/share/man/man4/man4.i386/acpi_toshiba.4
+++ b/share/man/man4/man4.i386/acpi_toshiba.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_toshiba.4,v 1.5.8.1 2005/07/30 09:34:58 hrs Exp $
 .\"
 .Dd February 19, 2004
 .Dt ACPI_TOSHIBA 4 i386
diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/man4.i386/aic.4
index 991a0c50be99..41041634e60a 100644
--- a/share/man/man4/man4.i386/aic.4
+++ b/share/man/man4/man4.i386/aic.4
@@ -21,7 +21,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/share/man/man4/man4.i386/aic.4,v 1.16 2005/01/21 08:36:38 ru Exp $
 .\"
 .Dd November 8, 2003
 .Dt AIC 4 i386
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/man4.i386/alpm.4
index f288b72c42f9..c213baed45c5 100644
--- a/share/man/man4/man4.i386/alpm.4
+++ b/share/man/man4/man4.i386/alpm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/alpm.4,v 1.16 2002/03/23 15:26:20 nsouch Exp $
 .\"
 .Dd February 13, 1999
 .Dt ALPM 4 i386
diff --git a/share/man/man4/man4.i386/amdpm.4 b/share/man/man4/man4.i386/amdpm.4
index df513f056453..59b88b4444c4 100644
--- a/share/man/man4/man4.i386/amdpm.4
+++ b/share/man/man4/man4.i386/amdpm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/amdpm.4,v 1.4 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd September 16, 2001
 .Dt AMDPM 4 i386
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index e5e5c6a91632..75df24746faf 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -9,7 +9,7 @@
 .\" the author assume any responsibility for damages incurred with its
 .\" use.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/apm.4,v 1.24 2005/02/13 22:25:18 ru Exp $
 .\"
 .Dd November 1, 1994
 .Dt APM 4 i386
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index 5a925dfcd46e..4a2086178208 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ar.4,v 1.28 2005/01/21 08:36:38 ru Exp $
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
diff --git a/share/man/man4/man4.i386/arl.4 b/share/man/man4/man4.i386/arl.4
index 7cbe5d0616b1..c517c2350208 100644
--- a/share/man/man4/man4.i386/arl.4
+++ b/share/man/man4/man4.i386/arl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/arl.4,v 1.6.8.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt ARL 4 i386
diff --git a/share/man/man4/man4.i386/cp.4 b/share/man/man4/man4.i386/cp.4
index d5ac69e50fb6..d90dcf7cb95a 100644
--- a/share/man/man4/man4.i386/cp.4
+++ b/share/man/man4/man4.i386/cp.4
@@ -11,7 +11,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: cp.4,v 1.1.2.5 2004/06/21 17:47:40 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cp.4,v 1.8.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt CP 4 i386
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index baf2c2fc0bf6..f0b700e60315 100644
--- a/share/man/man4/man4.i386/cs.4
+++ b/share/man/man4/man4.i386/cs.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cs.4,v 1.16.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt CS 4 i386
diff --git a/share/man/man4/man4.i386/ct.4 b/share/man/man4/man4.i386/ct.4
index ac8d6c2ae1e8..75bc121d554b 100644
--- a/share/man/man4/man4.i386/ct.4
+++ b/share/man/man4/man4.i386/ct.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ct.4,v 1.9 2004/08/01 19:08:04 simon Exp $
 .\"
 .Dd November 18, 2003
 .Dt CT 4 i386
diff --git a/share/man/man4/man4.i386/ctau.4 b/share/man/man4/man4.i386/ctau.4
index e18dc347ad32..794d5d6e1719 100644
--- a/share/man/man4/man4.i386/ctau.4
+++ b/share/man/man4/man4.i386/ctau.4
@@ -11,7 +11,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: ct.4,v 1.1.2.6 2004/06/21 17:56:40 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ctau.4,v 1.5 2004/09/05 22:09:53 simon Exp $
 .\"
 .Dd September 6, 2004
 .Dt CTAU 4 i386
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index 46cbc42734c9..bea99b19a20b 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -11,7 +11,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: cx.4,v 1.1.2.6 2004/06/21 17:56:40 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.25.8.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt CX 4 i386
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/man4.i386/el.4
index 03293235ead4..f233ccd19ced 100644
--- a/share/man/man4/man4.i386/el.4
+++ b/share/man/man4/man4.i386/el.4
@@ -21,7 +21,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/share/man/man4/man4.i386/el.4,v 1.19.4.1 2005/10/31 20:17:14 jhb Exp $
 .\"
 .Dd September 5, 2004
 .Dt EL 4 i386
diff --git a/share/man/man4/man4.i386/ep.4 b/share/man/man4/man4.i386/ep.4
index ba977484ce33..441e0b9c4cb5 100644
--- a/share/man/man4/man4.i386/ep.4
+++ b/share/man/man4/man4.i386/ep.4
@@ -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/share/man/man4/man4.i386/ep.4,v 1.37.2.2 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt EP 4 i386
diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4
index 714fc64f8748..25e288124c73 100644
--- a/share/man/man4/man4.i386/ex.4
+++ b/share/man/man4/man4.i386/ex.4
@@ -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/share/man/man4/man4.i386/ex.4,v 1.21.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt EX 4 i386
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 0c99ad70f411..2b33a3a643ec 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -21,7 +21,7 @@
 .\" Contributed by M. Sekiguchi <seki@sysrap.cs.fujitsu.co.jp>.
 .\" for fe driver.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.33.2.2 2005/10/08 19:01:21 keramida Exp $
 .Dd July 16, 2005
 .Dt FE 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/ichwd.4 b/share/man/man4/man4.i386/ichwd.4
index a6583cce012b..5b0d873da790 100644
--- a/share/man/man4/man4.i386/ichwd.4
+++ b/share/man/man4/man4.i386/ichwd.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ichwd.4,v 1.3 2004/08/29 11:19:35 des Exp $
 .\"
 .Dd May 11, 2004
 .Dt ICHWD 4 i386
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index 0d82e3056250..3d544af5ff02 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ie.4,v 1.21.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt IE 4 i386
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 15c0c4d4170c..b2b885ba2b50 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/man4.i386/io.4
@@ -25,7 +25,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/share/man/man4/man4.i386/io.4,v 1.13 2004/10/03 13:14:20 simon Exp $
 .\"
 .Dd October 3, 2004
 .Dt IO 4 i386
diff --git a/share/man/man4/man4.i386/linux.4 b/share/man/man4/man4.i386/linux.4
index 926b4ab4dbb5..ea3f8162270b 100644
--- a/share/man/man4/man4.i386/linux.4
+++ b/share/man/man4/man4.i386/linux.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/linux.4,v 1.6 2002/12/12 17:25:57 ru Exp $
 .Dd August 17, 2000
 .Dt LINUX 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/lnc.4 b/share/man/man4/man4.i386/lnc.4
index e89361bfdc6a..982cf3cbdf2d 100644
--- a/share/man/man4/man4.i386/lnc.4
+++ b/share/man/man4/man4.i386/lnc.4
@@ -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/share/man/man4/man4.i386/lnc.4,v 1.25.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt LNC 4 i386
diff --git a/share/man/man4/man4.i386/longrun.4 b/share/man/man4/man4.i386/longrun.4
index b9bfc66c5e21..8e9fd72f626b 100644
--- a/share/man/man4/man4.i386/longrun.4
+++ b/share/man/man4/man4.i386/longrun.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/longrun.4,v 1.7 2005/01/21 08:36:39 ru Exp $
 .Dd June 30, 2001
 .Dt LONGRUN 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index a4a93ddb5d4a..0a4e79117c3a 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -24,7 +24,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/share/man/man4/man4.i386/mcd.4,v 1.24 2005/06/16 22:05:32 brueffer Exp $
 .\"
 .Dd December 8, 1994
 .Dt MCD 4 i386
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 7f83dcc87a97..536550346188 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -10,7 +10,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/mse.4,v 1.19.2.1 2005/07/30 09:34:58 hrs Exp $
 .\"
 .Dd December 3, 1997
 .Dt MSE 4 i386
diff --git a/share/man/man4/man4.i386/ndis.4 b/share/man/man4/man4.i386/ndis.4
index a45a63f4ebd8..25b0dd295085 100644
--- a/share/man/man4/man4.i386/ndis.4
+++ b/share/man/man4/man4.i386/ndis.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ndis.4,v 1.9 2004/12/21 01:09:34 brueffer Exp $
 .\"
 .Dd December 10, 2003
 .Dt NDIS 4 i386
diff --git a/share/man/man4/man4.i386/npx.4 b/share/man/man4/man4.i386/npx.4
index 7eea3723a47e..2786216daf0f 100644
--- a/share/man/man4/man4.i386/npx.4
+++ b/share/man/man4/man4.i386/npx.4
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$Id: npx.4,v 1.1 1993/08/06 10:58:03 cgd Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/npx.4,v 1.17 2003/07/22 08:15:29 peter Exp $
 .\"
 .Dd August 28, 1993
 .Dt NPX 4 i386
diff --git a/share/man/man4/man4.i386/oltr.4 b/share/man/man4/man4.i386/oltr.4
index 4869b0be7e5b..e95c1dcf8747 100644
--- a/share/man/man4/man4.i386/oltr.4
+++ b/share/man/man4/man4.i386/oltr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/oltr.4,v 1.2 2005/02/12 00:42:14 brueffer Exp $
 .\"
 .Dd February 4, 2005
 .Dt OLTR 4 i386
diff --git a/share/man/man4/man4.i386/pae.4 b/share/man/man4/man4.i386/pae.4
index 718e2b2e20c2..e363c5e064ff 100644
--- a/share/man/man4/man4.i386/pae.4
+++ b/share/man/man4/man4.i386/pae.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pae.4,v 1.8 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd April 8, 2003
 .Dt PAE 4 i386
diff --git a/share/man/man4/man4.i386/pbio.4 b/share/man/man4/man4.i386/pbio.4
index f4fbf3b4652e..177ab03d9f54 100644
--- a/share/man/man4/man4.i386/pbio.4
+++ b/share/man/man4/man4.i386/pbio.4
@@ -24,7 +24,7 @@
 .\" 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/share/man/man4/man4.i386/pbio.4,v 1.5.2.1 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd January 14, 2005
 .Dt PBIO 4 i386
diff --git a/share/man/man4/man4.i386/pcf.4 b/share/man/man4/man4.i386/pcf.4
index f5e9088454c5..76d79580bc8b 100644
--- a/share/man/man4/man4.i386/pcf.4
+++ b/share/man/man4/man4.i386/pcf.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pcf.4,v 1.14 2001/10/13 09:08:37 yokota Exp $
 .\"
 .Dd August 6, 1998
 .Dt PCF 4 i386
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index f39ed07bae6b..fd77f7a744d9 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/perfmon.4,v 1.15 2004/07/03 18:29:22 ru Exp $
 .Dd March 26, 1996
 .Dt PERFMON 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index 3b0ae3ae170e..ab024e237793 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -25,7 +25,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/share/man/man4/man4.i386/pnp.4,v 1.16.2.1 2005/07/30 09:34:58 hrs Exp $
 .\"
 .Dd September 20, 2001
 .Dt PNP 4 i386
diff --git a/share/man/man4/man4.i386/pnpbios.4 b/share/man/man4/man4.i386/pnpbios.4
index d8e7609f878f..c8bfb38446da 100644
--- a/share/man/man4/man4.i386/pnpbios.4
+++ b/share/man/man4/man4.i386/pnpbios.4
@@ -24,7 +24,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/share/man/man4/man4.i386/pnpbios.4,v 1.2.14.1 2005/07/30 09:34:58 hrs Exp $
 .Dd September 20, 2001
 .Dt PNPBIOS 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/ray.4 b/share/man/man4/man4.i386/ray.4
index 99a570bd996a..27fe35f66b5a 100644
--- a/share/man/man4/man4.i386/ray.4
+++ b/share/man/man4/man4.i386/ray.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ray.4,v 1.13.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt RAY 4 i386
diff --git a/share/man/man4/man4.i386/sbni.4 b/share/man/man4/man4.i386/sbni.4
index 31cf610b0095..463129e04fa5 100644
--- a/share/man/man4/man4.i386/sbni.4
+++ b/share/man/man4/man4.i386/sbni.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/sbni.4,v 1.2 2003/05/29 21:28:36 ru Exp $
 .\"
 .Dd January 8, 2002
 .Dt SBNI 4 i386
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index 68960c78c3ff..605a1f823869 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -24,7 +24,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/share/man/man4/man4.i386/scd.4,v 1.22 2005/03/16 02:03:15 brueffer Exp $
 .\"
 .Dd March 16, 2005
 .Dt SCD 4 i386
diff --git a/share/man/man4/man4.i386/smapi.4 b/share/man/man4/man4.i386/smapi.4
index 8af17fa0a826..def176787525 100644
--- a/share/man/man4/man4.i386/smapi.4
+++ b/share/man/man4/man4.i386/smapi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/smapi.4,v 1.2 2005/06/16 08:06:37 brueffer Exp $
 .\"
 .Dd April 1, 2003
 .Dt SMAPI 4 i386
diff --git a/share/man/man4/man4.i386/snc.4 b/share/man/man4/man4.i386/snc.4
index 49f42c9940b5..2c8017c6e12a 100644
--- a/share/man/man4/man4.i386/snc.4
+++ b/share/man/man4/man4.i386/snc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.4.2.1 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd September 4, 2004
 .Dt SNC 4 i386
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index fc0ed99bb613..a70ddb2ce257 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/spkr.4,v 1.24 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd November 7, 1993
 .Dt SPKR 4 i386
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index cf9ce8b3a457..1909b7096402 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/sr.4,v 1.28 2005/03/18 02:49:43 brueffer Exp $
 .\"
 .Dd March 18, 2005
 .Dt SR 4 i386
diff --git a/share/man/man4/man4.i386/streams.4 b/share/man/man4/man4.i386/streams.4
index 90d680036e5e..b01bb3c9e225 100644
--- a/share/man/man4/man4.i386/streams.4
+++ b/share/man/man4/man4.i386/streams.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/streams.4,v 1.7 2005/01/21 08:36:39 ru Exp $
 .Dd November 6, 2000
 .Dt STREAMS 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/svr4.4 b/share/man/man4/man4.i386/svr4.4
index 9059284bfa8b..487a0638acbd 100644
--- a/share/man/man4/man4.i386/svr4.4
+++ b/share/man/man4/man4.i386/svr4.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/svr4.4,v 1.12 2005/02/13 23:45:49 ru Exp $
 .Dd October 28, 2003
 .Dt SVR4 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/viapm.4 b/share/man/man4/man4.i386/viapm.4
index 7457952950f1..67fecc6fc268 100644
--- a/share/man/man4/man4.i386/viapm.4
+++ b/share/man/man4/man4.i386/viapm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/viapm.4,v 1.4 2002/09/15 20:33:05 ceri Exp $
 .\"
 .Dd April 20, 2002
 .Dt VIAPM 4 i386
diff --git a/share/man/man4/man4.i386/vpd.4 b/share/man/man4/man4.i386/vpd.4
index 222925e12729..8eba91d50927 100644
--- a/share/man/man4/man4.i386/vpd.4
+++ b/share/man/man4/man4.i386/vpd.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/vpd.4,v 1.3 2004/09/19 05:42:04 ru Exp $
 .\"
 .Dd August 31, 2004
 .Dt VPD 4 i386
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index b9bb87e122fe..e560a4c84287 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/vx.4,v 1.20.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt VX 4 i386
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index b0d1331ce066..39120877aacb 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/wl.4,v 1.20 2004/12/21 01:09:34 brueffer Exp $
 .Dd July 7, 1997
 .Dt WL 4 i386
 .Os
diff --git a/share/man/man4/man4.sparc64/Makefile b/share/man/man4/man4.sparc64/Makefile
index 06d99c00a293..ffac1a1550af 100644
--- a/share/man/man4/man4.sparc64/Makefile
+++ b/share/man/man4/man4.sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.sparc64/Makefile,v 1.3 2005/06/22 15:35:14 ru Exp $
 
 MAN=	auxio.4 \
 	central.4 \
diff --git a/share/man/man4/man4.sparc64/auxio.4 b/share/man/man4/man4.sparc64/auxio.4
index fb3cdbdf2028..3b9f2ef83d71 100644
--- a/share/man/man4/man4.sparc64/auxio.4
+++ b/share/man/man4/man4.sparc64/auxio.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/auxio.4,v 1.4 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt AUXIO 4 sparc64
diff --git a/share/man/man4/man4.sparc64/central.4 b/share/man/man4/man4.sparc64/central.4
index 3fa09bdca0fc..3152a793c9d6 100644
--- a/share/man/man4/man4.sparc64/central.4
+++ b/share/man/man4/man4.sparc64/central.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: central.4,v 1.3 2004/09/24 07:03:47 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/central.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt CENTRAL 4 sparc64
diff --git a/share/man/man4/man4.sparc64/clkbrd.4 b/share/man/man4/man4.sparc64/clkbrd.4
index b6c0bb381d02..524825c95993 100644
--- a/share/man/man4/man4.sparc64/clkbrd.4
+++ b/share/man/man4/man4.sparc64/clkbrd.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: clkbrd.4,v 1.2 2005/02/21 11:29:36 jmc Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/clkbrd.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt CLKBRD 4 sparc64
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index 5f6ab2334b00..c1a0a6e919ac 100644
--- a/share/man/man4/man4.sparc64/creator.4
+++ b/share/man/man4/man4.sparc64/creator.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: creator.4,v 1.20 2005/03/05 01:48:59 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/creator.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt CREATOR 4 sparc64
diff --git a/share/man/man4/man4.sparc64/ebus.4 b/share/man/man4/man4.sparc64/ebus.4
index e88f73b320e7..0b11d5634ee9 100644
--- a/share/man/man4/man4.sparc64/ebus.4
+++ b/share/man/man4/man4.sparc64/ebus.4
@@ -27,7 +27,7 @@
 .\"
 .\"	from: OpenBSD: ebus.4,v 1.6 2004/09/23 18:28:51 jason Exp
 .\"	from: NetBSD: ebus.4,v 1.3 2002/03/13 21:42:20 wiz Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/ebus.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt EBUS 4 sparc64
diff --git a/share/man/man4/man4.sparc64/eeprom.4 b/share/man/man4/man4.sparc64/eeprom.4
index 436641b6851f..26a1c3802505 100644
--- a/share/man/man4/man4.sparc64/eeprom.4
+++ b/share/man/man4/man4.sparc64/eeprom.4
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: clock.4,v 1.3 2004/09/24 07:04:15 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/eeprom.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt EEPROM 4 sparc64
diff --git a/share/man/man4/man4.sparc64/fhc.4 b/share/man/man4/man4.sparc64/fhc.4
index 378737060f38..717f3f1fd4e8 100644
--- a/share/man/man4/man4.sparc64/fhc.4
+++ b/share/man/man4/man4.sparc64/fhc.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: fhc.4,v 1.5 2004/09/28 21:42:59 jmc Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/fhc.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt FHC 4 sparc64
diff --git a/share/man/man4/man4.sparc64/machfb.4 b/share/man/man4/man4.sparc64/machfb.4
index 3155385c5b62..e328806a9fd9 100644
--- a/share/man/man4/man4.sparc64/machfb.4
+++ b/share/man/man4/man4.sparc64/machfb.4
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: creator.4,v 1.20 2005/03/05 01:48:59 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/machfb.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt MACHFB 4 sparc64
diff --git a/share/man/man4/man4.sparc64/ofw_console.4 b/share/man/man4/man4.sparc64/ofw_console.4
index d5da547d03d8..9d1287d0413f 100644
--- a/share/man/man4/man4.sparc64/ofw_console.4
+++ b/share/man/man4/man4.sparc64/ofw_console.4
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: pcons.4,v 1.4 2003/06/02 16:16:26 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/ofw_console.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt OFW_CONSOLE 4 sparc64
diff --git a/share/man/man4/man4.sparc64/openfirm.4 b/share/man/man4/man4.sparc64/openfirm.4
index 9ccee39d0920..62b95db9a260 100644
--- a/share/man/man4/man4.sparc64/openfirm.4
+++ b/share/man/man4/man4.sparc64/openfirm.4
@@ -58,7 +58,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/share/man/man4/man4.sparc64/openfirm.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt OPENFIRM 4 sparc64
diff --git a/share/man/man4/man4.sparc64/openprom.4 b/share/man/man4/man4.sparc64/openprom.4
index e66a8d8581d5..4d8d69d6193f 100644
--- a/share/man/man4/man4.sparc64/openprom.4
+++ b/share/man/man4/man4.sparc64/openprom.4
@@ -58,7 +58,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/share/man/man4/man4.sparc64/openprom.4,v 1.1.2.1 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd June 18, 2005
 .Dt OPENPROM 4 sparc64
diff --git a/share/man/man4/man4.sparc64/rtc.4 b/share/man/man4/man4.sparc64/rtc.4
index 9117bf325b7c..cfd479b8c03f 100644
--- a/share/man/man4/man4.sparc64/rtc.4
+++ b/share/man/man4/man4.sparc64/rtc.4
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: clock.4,v 1.3 2004/09/24 07:04:15 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/rtc.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt RTC 4 sparc64
diff --git a/share/man/man4/man4.sparc64/sbus.4 b/share/man/man4/man4.sparc64/sbus.4
index 2f713c6686db..31bed98732c8 100644
--- a/share/man/man4/man4.sparc64/sbus.4
+++ b/share/man/man4/man4.sparc64/sbus.4
@@ -35,7 +35,7 @@
 .\"
 .\"	from: OpenBSD: sbus.4,v 1.27 2005/03/05 01:44:48 miod Exp
 .\"	from: NetBSD: sbus.4,v 1.5 2002/01/21 17:54:10 wiz Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/sbus.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt SBUS 4 sparc64
diff --git a/share/man/man4/man4.sparc64/snd_audiocs.4 b/share/man/man4/man4.sparc64/snd_audiocs.4
index ae431cda59b3..97509155f8a2 100644
--- a/share/man/man4/man4.sparc64/snd_audiocs.4
+++ b/share/man/man4/man4.sparc64/snd_audiocs.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/snd_audiocs.4,v 1.3.2.1 2005/08/18 15:01:23 keramida Exp $
 .\"
 .Dd June 18, 2005
 .Dt SND_AUDIOCS 4 sparc64
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index 71ed28f2b7c1..1fd9d94ae9e8 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/md.4,v 1.11 2003/04/27 01:46:56 dougb Exp $
 .\"
 .Dd March 9, 2001
 .Dt MD 4
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 5dd2cb98f1ec..0c8b1cc420d7 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mem.4	5.3 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mem.4,v 1.21 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd October 3, 2004
 .Dt MEM 4
diff --git a/share/man/man4/meteor.4 b/share/man/man4/meteor.4
index 62ff6e99f6cb..814174a8768a 100644
--- a/share/man/man4/meteor.4
+++ b/share/man/man4/meteor.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/meteor.4,v 1.7 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 15, 1995
 .Dt METEOR 4
diff --git a/share/man/man4/miibus.4 b/share/man/man4/miibus.4
index 85df67a4702c..9175ab66de79 100644
--- a/share/man/man4/miibus.4
+++ b/share/man/man4/miibus.4
@@ -6,7 +6,7 @@
 .\" Originally this file looked much like the NetBSD mii(4) manual page, but
 .\" I doubt you would ever notice due to large differences.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.15 2005/05/20 01:19:02 brueffer Exp $
 .\"
 .Dd May 20, 2005
 .Dt MIIBUS 4
diff --git a/share/man/man4/mlx.4 b/share/man/man4/mlx.4
index 2c26ade227b3..36ea15befffc 100644
--- a/share/man/man4/mlx.4
+++ b/share/man/man4/mlx.4
@@ -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/share/man/man4/mlx.4,v 1.18 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLX 4
diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4
index a57c603729e8..68f50c222140 100644
--- a/share/man/man4/mly.4
+++ b/share/man/man4/mly.4
@@ -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/share/man/man4/mly.4,v 1.9 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLY 4
diff --git a/share/man/man4/mn.4 b/share/man/man4/mn.4
index 0b88f2fb9267..be8257dad006 100644
--- a/share/man/man4/mn.4
+++ b/share/man/man4/mn.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mn.4,v 1.1 2005/05/10 16:48:03 brueffer Exp $
 .\"
 .Dd May 10, 2005
 .Dt MN 4
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index f50fc0120072..279b699e395e 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -24,7 +24,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/share/man/man4/mouse.4,v 1.14 2004/11/12 23:59:24 philip Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSE 4
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index ddc7869133cf..60697b02bd1d 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.8 2005/01/12 10:14:42 ru Exp $
 .\"
 .Dd August 15, 2004
 .Dt MPT 4
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 735da6358357..cc12d101b415 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mtio.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mtio.4,v 1.22 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd February 11, 1996
 .Dt MTIO 4
diff --git a/share/man/man4/multicast.4 b/share/man/man4/multicast.4
index 0c7830f1d800..21e24b254bfd 100644
--- a/share/man/man4/multicast.4
+++ b/share/man/man4/multicast.4
@@ -23,7 +23,7 @@
 .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 .\" DEALINGS IN THE SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.4 2004/07/09 09:22:36 ru Exp $
 .\"
 .Dd September 4, 2003
 .Dt MULTICAST 4
diff --git a/share/man/man4/my.4 b/share/man/man4/my.4
index c8e12e8cf9c4..f76044c82ce8 100644
--- a/share/man/man4/my.4
+++ b/share/man/man4/my.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/my.4,v 1.4.8.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt MY 4
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index 33bd2b19e8e2..3e3cb3e9db9e 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/natm.4,v 1.17.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd December 29, 1997
 .Dt NATM 4
diff --git a/share/man/man4/natmip.4 b/share/man/man4/natmip.4
index 154e97da6681..47fb2851f873 100644
--- a/share/man/man4/natmip.4
+++ b/share/man/man4/natmip.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.9 2004/07/08 10:31:12 ru Exp $
 .\"
 .Dd August 11, 2003
 .Dt NATMIP 4
diff --git a/share/man/man4/ncr.4 b/share/man/man4/ncr.4
index c7c8563b15e1..1cedb34674a5 100644
--- a/share/man/man4/ncr.4
+++ b/share/man/man4/ncr.4
@@ -21,7 +21,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/share/man/man4/ncr.4,v 1.15 2004/08/19 21:24:45 simon Exp $
 .\"
 .Dd August 19, 2004
 .Dt NCR 4
diff --git a/share/man/man4/ncv.4 b/share/man/man4/ncv.4
index 753075c568ba..cc9bfd8f5a56 100644
--- a/share/man/man4/ncv.4
+++ b/share/man/man4/ncv.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ncv.4,v 1.6 2004/08/10 22:17:01 simon Exp $
 .\"
 .Dd August 10, 2004
 .Dt NCV 4
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 030b20cb9c6a..cdc1b1b897b4 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -34,7 +34,7 @@
 .\"          Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.50 2005/01/12 10:22:58 ru Exp $
 .\"
 .Dd July 1, 2004
 .Dt NETGRAPH 4
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index f5d479bc18cf..962432c8a4b1 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netintro.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/netintro.4,v 1.25 2004/06/21 05:13:22 yar Exp $
 .\"
 .Dd June 18, 2004
 .Dt NETINTRO 4
diff --git a/share/man/man4/ng_UI.4 b/share/man/man4/ng_UI.4
index 0f48d4b7a9b7..61eed7ad9c0f 100644
--- a/share/man/man4/ng_UI.4
+++ b/share/man/man4/ng_UI.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_UI.4,v 1.10 2004/07/03 18:29:20 ru Exp $
 .\" $Whistle: ng_UI.8,v 1.4 1999/01/25 02:37:56 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4
index 4f7a2e1eb1c7..9b61386699db 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_async.4,v 1.14 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_async.8,v 1.6 1999/01/25 23:46:25 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_atm.4 b/share/man/man4/ng_atm.4
index df4c2e341ef9..c70edac6d410 100644
--- a/share/man/man4/ng_atm.4
+++ b/share/man/man4/ng_atm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_atm.4,v 1.11 2005/02/05 11:31:31 ru Exp $
 .\"
 .\" ng_atm(4) man page
 .\"
diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4
index 81768b54da7c..9938c9d61098 100644
--- a/share/man/man4/ng_atmllc.4
+++ b/share/man/man4/ng_atmllc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_atmllc.4,v 1.3 2004/07/09 07:26:15 ru Exp $
 .\"
 .Dd March 8, 2004
 .Dt NG_ATMLLC 4
diff --git a/share/man/man4/ng_atmpif.4 b/share/man/man4/ng_atmpif.4
index 3405347d61c6..bb42692a10d9 100644
--- a/share/man/man4/ng_atmpif.4
+++ b/share/man/man4/ng_atmpif.4
@@ -28,7 +28,7 @@
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\" Author: Vincent Jardin <vjardin@free.fr>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_atmpif.4,v 1.10 2005/02/05 11:31:31 ru Exp $
 .\"
 .\" ng_atmpif(4) man page
 .\"
diff --git a/share/man/man4/ng_bluetooth.4 b/share/man/man4/ng_bluetooth.4
index 2214172b1ada..67c9d4035f2f 100644
--- a/share/man/man4/ng_bluetooth.4
+++ b/share/man/man4/ng_bluetooth.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_bluetooth.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bluetooth.4,v 1.9 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd November 9, 2002
 .Dt NG_BLUETOOTH 4
diff --git a/share/man/man4/ng_bpf.4 b/share/man/man4/ng_bpf.4
index f56c9092850c..12ef98e5e679 100644
--- a/share/man/man4/ng_bpf.4
+++ b/share/man/man4/ng_bpf.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bpf.4,v 1.21 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_bpf.8,v 1.2 1999/12/03 01:57:12 archie Exp $
 .\"
 .Dd December 2, 1999
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index b9a04dbfd525..05f64aef6f9d 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.10 2004/04/17 12:42:17 ru Exp $
 .\"
 .Dd August 31, 2000
 .Dt NG_BRIDGE 4
diff --git a/share/man/man4/ng_bt3c.4 b/share/man/man4/ng_bt3c.4
index 9e4673658657..897eff1a477c 100644
--- a/share/man/man4/ng_bt3c.4
+++ b/share/man/man4/ng_bt3c.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_bt3c.4,v 1.3 2003/09/14 23:28:51 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bt3c.4,v 1.10 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd December 17, 2004
 .Dt NG_BT3C 4
diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4
index 5146d1507ea1..f7ce567aedb7 100644
--- a/share/man/man4/ng_btsocket.4
+++ b/share/man/man4/ng_btsocket.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_btsocket.4,v 1.7 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_btsocket.4,v 1.9 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd July 8, 2002
 .Dt NG_BTSOCKET 4
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
index 923b06df2521..614a02a4b835 100644
--- a/share/man/man4/ng_ccatm.4
+++ b/share/man/man4/ng_ccatm.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ccatm.4,v 1.3.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd March 10, 2005
 .Dt NG_CCATM 4
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index 2cccb76fddeb..6e3d56fd2ffd 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_cisco.4,v 1.14 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_cisco.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_device.4 b/share/man/man4/ng_device.4
index a03a03b6b0c2..dfb36fd98fe0 100644
--- a/share/man/man4/ng_device.4
+++ b/share/man/man4/ng_device.4
@@ -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/share/man/man4/ng_device.4,v 1.4 2005/01/12 10:14:43 ru Exp $
 .\"
 .Dd October 19, 2004
 .Dt NG_DEVICE 4
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index f502c621ac00..e60bfda2227b 100644
--- a/share/man/man4/ng_echo.4
+++ b/share/man/man4/ng_echo.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_echo.4,v 1.10 2001/10/01 16:09:21 ru Exp $
 .\" $Whistle: ng_echo.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_eiface.4 b/share/man/man4/ng_eiface.4
index 66991533c352..ebb260889ed3 100644
--- a/share/man/man4/ng_eiface.4
+++ b/share/man/man4/ng_eiface.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_eiface.4,v 1.3 2005/02/03 11:52:41 ru Exp $
 .\"
 .Dd February 3, 2005
 .Dt NG_EIFACE 4
diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4
index fb9dcffab8a5..ad6ae63df5a1 100644
--- a/share/man/man4/ng_etf.4
+++ b/share/man/man4/ng_etf.4
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.7 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd February 28, 2001
 .Dt NG_ETF 4
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 274499279c6a..804de9a46888 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ether.4,v 1.26 2005/02/14 18:49:19 glebius Exp $
 .\"
 .Dd February 14, 2005
 .Dt NG_ETHER 4
diff --git a/share/man/man4/ng_fec.4 b/share/man/man4/ng_fec.4
index 6ec93454a008..ec5421c492df 100644
--- a/share/man/man4/ng_fec.4
+++ b/share/man/man4/ng_fec.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_fec.4,v 1.2 2004/06/22 09:23:31 ru Exp $
 .\"
 .Dd July 22, 2004
 .Dt NG_FEC 4
diff --git a/share/man/man4/ng_frame_relay.4 b/share/man/man4/ng_frame_relay.4
index 79e18e6e2675..e56c69d48257 100644
--- a/share/man/man4/ng_frame_relay.4
+++ b/share/man/man4/ng_frame_relay.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_frame_relay.4,v 1.13 2005/01/21 08:36:37 ru Exp $
 .\" $Whistle: ng_frame_relay.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_gif.4 b/share/man/man4/ng_gif.4
index 28a058897c95..f19d96e00d0f 100644
--- a/share/man/man4/ng_gif.4
+++ b/share/man/man4/ng_gif.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Brooks Davis <brooks@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_gif.4,v 1.3 2001/11/22 11:25:02 ru Exp $
 .\"
 .Dd September 18, 2001
 .Dt NG_GIF 4
diff --git a/share/man/man4/ng_gif_demux.4 b/share/man/man4/ng_gif_demux.4
index e549728c4cd5..71a9371d49d9 100644
--- a/share/man/man4/ng_gif_demux.4
+++ b/share/man/man4/ng_gif_demux.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Brooks Davis <brooks@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_gif_demux.4,v 1.3 2001/11/22 11:32:27 ru Exp $
 .\"
 .Dd September 18, 2001
 .Dt NG_GIF_DEMUX 4
diff --git a/share/man/man4/ng_h4.4 b/share/man/man4/ng_h4.4
index cda15e409069..bbf93e34536a 100644
--- a/share/man/man4/ng_h4.4
+++ b/share/man/man4/ng_h4.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_h4.4,v 1.2 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_h4.4,v 1.7 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd June 14, 2002
 .Dt NG_H4 4
diff --git a/share/man/man4/ng_hci.4 b/share/man/man4/ng_hci.4
index 28de180c2426..d1db9bfc79c4 100644
--- a/share/man/man4/ng_hci.4
+++ b/share/man/man4/ng_hci.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_hci.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_hci.4,v 1.11 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd June 25, 2002
 .Dt NG_HCI 4
diff --git a/share/man/man4/ng_hole.4 b/share/man/man4/ng_hole.4
index 8089f541d651..d36bf36cf785 100644
--- a/share/man/man4/ng_hole.4
+++ b/share/man/man4/ng_hole.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_hole.4,v 1.12 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_hole.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd May 19, 2004
diff --git a/share/man/man4/ng_hub.4 b/share/man/man4/ng_hub.4
index a1ad0680171c..1d5fec55bf9e 100644
--- a/share/man/man4/ng_hub.4
+++ b/share/man/man4/ng_hub.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_hub.4,v 1.1 2004/04/17 12:42:17 ru Exp $
 .\"
 .Dd April 17, 2004
 .Dt NG_HUB 4
diff --git a/share/man/man4/ng_iface.4 b/share/man/man4/ng_iface.4
index a35ba6d72c4b..edb1fffe3f99 100644
--- a/share/man/man4/ng_iface.4
+++ b/share/man/man4/ng_iface.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_iface.4,v 1.16 2005/02/03 13:33:34 ru Exp $
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd February 3, 2005
diff --git a/share/man/man4/ng_ip_input.4 b/share/man/man4/ng_ip_input.4
index 430f43c6eaa1..9091d20e7b2a 100644
--- a/share/man/man4/ng_ip_input.4
+++ b/share/man/man4/ng_ip_input.4
@@ -59,7 +59,7 @@
 .\" Author:		Brooks Davis <brooks@FreeBSD.org>
 .\" Derived from:	ng_hole.4
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ip_input.4,v 1.2 2001/11/22 11:36:29 ru Exp $
 .\"
 .Dd September 27, 2001
 .Dt NG_IP_INPUT 4
diff --git a/share/man/man4/ng_ipfw.4 b/share/man/man4/ng_ipfw.4
index ee7d9b0b52fa..2327f7ccf6fb 100644
--- a/share/man/man4/ng_ipfw.4
+++ b/share/man/man4/ng_ipfw.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ipfw.4,v 1.2 2005/02/07 08:17:51 glebius Exp $
 .\"
 .Dd February 5, 2005
 .Dt NG_IPFW 4
diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4
index 600a3888625d..0dc8dfcad390 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ksocket.4,v 1.20 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd June 8, 2004
 .Dt NG_KSOCKET 4
diff --git a/share/man/man4/ng_l2cap.4 b/share/man/man4/ng_l2cap.4
index bd050fc13c73..1ffe288dfe8e 100644
--- a/share/man/man4/ng_l2cap.4
+++ b/share/man/man4/ng_l2cap.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_l2cap.4,v 1.4 2003/09/14 23:37:52 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_l2cap.4,v 1.10 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd July 4, 2002
 .Dt NG_L2CAP 4
diff --git a/share/man/man4/ng_l2tp.4 b/share/man/man4/ng_l2tp.4
index 49fedf1bea4b..7ce2df04f66c 100644
--- a/share/man/man4/ng_l2tp.4
+++ b/share/man/man4/ng_l2tp.4
@@ -35,7 +35,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_l2tp.4,v 1.6 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd August 2, 2004
 .Dt NG_L2TP 4
diff --git a/share/man/man4/ng_lmi.4 b/share/man/man4/ng_lmi.4
index 4dc7fdf6062b..d9f3821a077d 100644
--- a/share/man/man4/ng_lmi.4
+++ b/share/man/man4/ng_lmi.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_lmi.4,v 1.13 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_lmi.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index a146228a743b..bd02f173ef6a 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $Whistle: ng_mppc.8,v 1.1 1999/12/08 20:20:39 archie Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_mppc.4,v 1.14 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd December 8, 1999
 .Dt NG_MPPC 4
diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4
index 3d6d04fdde33..3d7a7e630141 100644
--- a/share/man/man4/ng_nat.4
+++ b/share/man/man4/ng_nat.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_nat.4,v 1.2 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd May 6, 2005
 .Dt NG_NAT 4
diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4
index a21b341ccc60..6e7f2b169648 100644
--- a/share/man/man4/ng_netflow.4
+++ b/share/man/man4/ng_netflow.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_netflow.4,v 1.11 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd May 11, 2005
 .Os
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index 1753649f065a..d0b071f6a1bb 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_one2many.4,v 1.23 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd November 23, 2004
 .Dt NG_ONE2MANY 4
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index 6796f3f3d80d..a95bbb2568aa 100644
--- a/share/man/man4/ng_ppp.4
+++ b/share/man/man4/ng_ppp.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ppp.4,v 1.24 2005/02/13 23:45:49 ru Exp $
 .\" $Whistle: ng_ppp.8,v 1.3 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd August 2, 2004
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index 01d2d75762db..4d0e3e670f2a 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.31 2005/07/05 17:51:02 glebius Exp $
 .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd July 5, 2005
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index 55ff2e975559..d6b7af9570c6 100644
--- a/share/man/man4/ng_pptpgre.4
+++ b/share/man/man4/ng_pptpgre.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_pptpgre.4,v 1.21 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
 .\"
 .Dd December 7, 2001
diff --git a/share/man/man4/ng_rfc1490.4 b/share/man/man4/ng_rfc1490.4
index 54b327ec04af..3df5dfbca582 100644
--- a/share/man/man4/ng_rfc1490.4
+++ b/share/man/man4/ng_rfc1490.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_rfc1490.4,v 1.15 2005/01/21 08:36:37 ru Exp $
 .\" $Whistle: ng_rfc1490.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index 22c6638a0acf..d2ff70552d2e 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_socket.4,v 1.18 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_socket.8,v 1.5 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_source.4 b/share/man/man4/ng_source.4
index fee90004cf7f..2c8ae680a055 100644
--- a/share/man/man4/ng_source.4
+++ b/share/man/man4/ng_source.4
@@ -30,7 +30,7 @@
 .\" DAMAGE.
 .\"
 .\" Author: Dave Chapeskie <dchapeskie@sandvine.com>
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_source.4,v 1.10 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd April 5, 2005
 .Dt NG_SOURCE 4
diff --git a/share/man/man4/ng_split.4 b/share/man/man4/ng_split.4
index 9b74863a6641..8a5eacadd456 100644
--- a/share/man/man4/ng_split.4
+++ b/share/man/man4/ng_split.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Julian Elischer <julian@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_split.4,v 1.6 2002/01/21 12:09:13 mpp Exp $
 .\"
 .Dd February 19, 2001
 .Dt NG_SPLIT 4
diff --git a/share/man/man4/ng_sppp.4 b/share/man/man4/ng_sppp.4
index 49f8a4c27ae9..7a84984cef12 100644
--- a/share/man/man4/ng_sppp.4
+++ b/share/man/man4/ng_sppp.4
@@ -10,7 +10,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: ng_sppp.4,v 1.1.2.3 2004/03/30 14:28:34 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_sppp.4,v 1.7 2005/02/03 13:33:34 ru Exp $
 .\"
 .Dd February 3, 2005
 .Dt NG_SPPP 4
diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4
index 0679d5805621..4b9b8cc5033d 100644
--- a/share/man/man4/ng_sscfu.4
+++ b/share/man/man4/ng_sscfu.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_sscfu.4,v 1.7 2004/07/09 07:26:15 ru Exp $
 .\"
 .\" ng_sscfu(4) man page
 .\"
diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4
index 0c6f0d4564b9..dc4347ea1507 100644
--- a/share/man/man4/ng_sscop.4
+++ b/share/man/man4/ng_sscop.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_sscop.4,v 1.8 2005/01/21 10:40:04 ru Exp $
 .\"
 .\" ng_sscop(4) man page
 .\"
diff --git a/share/man/man4/ng_tcpmss.4 b/share/man/man4/ng_tcpmss.4
index fc610b6d6695..5f5059f62a74 100644
--- a/share/man/man4/ng_tcpmss.4
+++ b/share/man/man4/ng_tcpmss.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_tcpmss.4,v 1.2 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd June 9, 2005
 .Dt NG_TCPMSS 4
diff --git a/share/man/man4/ng_tee.4 b/share/man/man4/ng_tee.4
index a914ab54f796..44472b480f19 100644
--- a/share/man/man4/ng_tee.4
+++ b/share/man/man4/ng_tee.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_tee.4,v 1.14 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_tee.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd May 28, 2004
diff --git a/share/man/man4/ng_tty.4 b/share/man/man4/ng_tty.4
index 242065f1a1d4..c561bd3f778a 100644
--- a/share/man/man4/ng_tty.4
+++ b/share/man/man4/ng_tty.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.17 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_ubt.4 b/share/man/man4/ng_ubt.4
index ebb454d92a37..5ff0e2022400 100644
--- a/share/man/man4/ng_ubt.4
+++ b/share/man/man4/ng_ubt.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.11 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd September 13, 2004
 .Dt NG_UBT 4
diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4
index f6eb05fdbe50..f19f823a1cec 100644
--- a/share/man/man4/ng_uni.4
+++ b/share/man/man4/ng_uni.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_uni.4,v 1.10 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd October 6, 2003
 .Dt NG_UNI 4
diff --git a/share/man/man4/ng_vjc.4 b/share/man/man4/ng_vjc.4
index da0c37b13064..8bb7fa9bc036 100644
--- a/share/man/man4/ng_vjc.4
+++ b/share/man/man4/ng_vjc.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_vjc.4,v 1.22 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_vjc.8,v 1.4 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_vlan.4 b/share/man/man4/ng_vlan.4
index bf673cf3bd7f..1ed1d968551a 100644
--- a/share/man/man4/ng_vlan.4
+++ b/share/man/man4/ng_vlan.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_vlan.4,v 1.3 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd March 1, 2004
 .Dt NG_VLAN 4
diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4
index abee6d8762b0..30ade7931344 100644
--- a/share/man/man4/ngatmbase.4
+++ b/share/man/man4/ngatmbase.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ngatmbase.4,v 1.3 2005/01/13 16:46:49 ru Exp $
 .\"
 .\" ngatmbase(4) man page
 .\"
diff --git a/share/man/man4/nge.4 b/share/man/man4/nge.4
index 1b28efae1c4c..a1ed1b99eec3 100644
--- a/share/man/man4/nge.4
+++ b/share/man/man4/nge.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nge.4,v 1.15.2.2 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt NGE 4
diff --git a/share/man/man4/nmdm.4 b/share/man/man4/nmdm.4
index 7dccb00bf1bd..fc4a2e5eeee1 100644
--- a/share/man/man4/nmdm.4
+++ b/share/man/man4/nmdm.4
@@ -19,7 +19,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nmdm.4,v 1.5 2005/01/27 10:30:53 ru Exp $
 .\"
 .Dd January 27, 2005
 .Dt NMDM 4
diff --git a/share/man/man4/nsp.4 b/share/man/man4/nsp.4
index 2df5803d9b59..dd11d026254c 100644
--- a/share/man/man4/nsp.4
+++ b/share/man/man4/nsp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nsp.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 8, 2004
 .Dt NSP 4
diff --git a/share/man/man4/null.4 b/share/man/man4/null.4
index cedfaeb9c7b4..d5a9fe26992d 100644
--- a/share/man/man4/null.4
+++ b/share/man/man4/null.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)null.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/null.4,v 1.7 2004/05/14 20:07:49 simon Exp $
 .\"
 .Dd June 5, 1993
 .Dt NULL 4
diff --git a/share/man/man4/nve.4 b/share/man/man4/nve.4
index c46d777ef6b9..7b437f577f8b 100644
--- a/share/man/man4/nve.4
+++ b/share/man/man4/nve.4
@@ -24,7 +24,7 @@
 .\"
 .\" $Id: nvnet.4,v 1.1 2003/10/09 16:48:01 q Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nve.4,v 1.2.2.2 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd August 9, 2005
 .Dt NVE 4
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index 3dd71d9f3f3b..c8559bf99640 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ohci.4,v 1.19 2005/06/23 14:12:19 ru Exp $
 .\"
 .Dd June 23, 2005
 .Dt OHCI 4
diff --git a/share/man/man4/oldcard.4 b/share/man/man4/oldcard.4
index 4da469c131f6..f41fde14fd35 100644
--- a/share/man/man4/oldcard.4
+++ b/share/man/man4/oldcard.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/oldcard.4,v 1.9.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd August 25, 2001
 .Dt PCIC 4
diff --git a/share/man/man4/orm.4 b/share/man/man4/orm.4
index 2ef54a0b5d32..e7d8fda898aa 100644
--- a/share/man/man4/orm.4
+++ b/share/man/man4/orm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/orm.4,v 1.3 2001/08/08 21:00:54 sheldonh Exp $
 .\"
 .Dd December 15, 2000
 .Os
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index b96d6ba7283c..373e928474b7 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pass.4,v 1.14 2005/02/15 09:26:59 ru Exp $
 .\"
 .Dd October 10, 1998
 .Dt PASS 4
diff --git a/share/man/man4/patm.4 b/share/man/man4/patm.4
index 3ab2f7aec553..c728429186ce 100644
--- a/share/man/man4/patm.4
+++ b/share/man/man4/patm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/patm.4,v 1.5 2004/07/08 10:31:12 ru Exp $
 .\"
 .\" patm(4) man page
 .\"
diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4
index 01c242e1a907..edd700e8afa8 100644
--- a/share/man/man4/pccard.4
+++ b/share/man/man4/pccard.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pccard.4,v 1.5 2003/08/20 06:49:57 imp Exp $
 .\"
 .Dd July 9, 2002
 .Dt PCCARD 4
diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4
index d256e9266d16..3ad6e4666872 100644
--- a/share/man/man4/pccbb.4
+++ b/share/man/man4/pccbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.6 2004/12/23 05:32:02 imp Exp $
 .\"
 .Dd July 21, 2004
 .Dt PCCBB 4
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index ccc6b94f4fda..cda6f0d5b5ca 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.17 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd October 24, 1999
 .Dt PCI 4
diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4
index 589a2ed5c9a0..9668f62c907f 100644
--- a/share/man/man4/pcic.4
+++ b/share/man/man4/pcic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcic.4,v 1.9 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt PCIC 4
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index 83f58ae451c2..6f713a68a625 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.39.2.2 2005/10/06 10:58:16 joel Exp $
 .\"
 .Dd August 17, 2005
 .Dt SOUND 4
diff --git a/share/man/man4/pcn.4 b/share/man/man4/pcn.4
index 87220e036ef4..2b012aacfb8b 100644
--- a/share/man/man4/pcn.4
+++ b/share/man/man4/pcn.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcn.4,v 1.11.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt PCN 4
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 8b44c62586df..192aba08d161 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -32,7 +32,7 @@
 .\"
 .\" Last Edit-Date: [Sun Mar 26 14:39:08 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcvt.4,v 1.45.2.1 2005/08/14 18:52:34 murray Exp $
 .\"
 .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93
 .\" by Joerg Wunsch
diff --git a/share/man/man4/pim.4 b/share/man/man4/pim.4
index f022ea7bedb4..65be51c396fd 100644
--- a/share/man/man4/pim.4
+++ b/share/man/man4/pim.4
@@ -23,7 +23,7 @@
 .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 .\" DEALINGS IN THE SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pim.4,v 1.2 2004/07/09 09:22:36 ru Exp $
 .\"
 .Dd September 4, 2003
 .Dt PIM 4
diff --git a/share/man/man4/polling.4 b/share/man/man4/polling.4
index e8298d4c4f44..e03ce33077ca 100644
--- a/share/man/man4/polling.4
+++ b/share/man/man4/polling.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/polling.4,v 1.19.2.1 2005/10/07 14:00:02 glebius Exp $
 .\"
 .Dd October 1, 2005
 .Dt POLLING 4
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index 6e18ac3a625a..db09c526a6e9 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppbus.4,v 1.23 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd March 1, 1998
 .Dt PPBUS 4
diff --git a/share/man/man4/ppc.4 b/share/man/man4/ppc.4
index 9b96625cb6ec..2c3932380d37 100644
--- a/share/man/man4/ppc.4
+++ b/share/man/man4/ppc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppc.4,v 1.19 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd March 5, 1998
 .Dt PPC 4
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index a6041d2a8fa7..147c1c8c5580 100644
--- a/share/man/man4/ppi.4
+++ b/share/man/man4/ppi.4
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppi.4,v 1.16 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 2, 1998
 .Dt PPI 4
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index 4e9ad61e19f3..afb01a5af914 100644
--- a/share/man/man4/ppp.4
+++ b/share/man/man4/ppp.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From:	@(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppp.4,v 1.8 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd August 10, 1996
 .Dt PPP 4
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 39ae333ec481..57f3024d1c2b 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -24,7 +24,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/share/man/man4/psm.4,v 1.47.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd September 29, 2004
 .Dt PSM 4
diff --git a/share/man/man4/pst.4 b/share/man/man4/pst.4
index 553f5c13b0ff..242f0ab4b2a1 100644
--- a/share/man/man4/pst.4
+++ b/share/man/man4/pst.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pst.4,v 1.4 2004/12/14 22:20:41 simon Exp $
 .\"
 .Dd December 14, 2004
 .Dt PST 4
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index 170956e7ff1d..f072157a5410 100644
--- a/share/man/man4/pt.4
+++ b/share/man/man4/pt.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pt.4,v 1.15 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd March 2, 1995
 .Dt PT 4
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index 5c6ef101f54e..13df7a718308 100644
--- a/share/man/man4/pty.4
+++ b/share/man/man4/pty.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pty.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pty.4,v 1.14 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd November 30, 1993
 .Dt PTY 4
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index 9ecc5de151ac..f04a8a239874 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/puc.4,v 1.4 2003/09/12 21:54:11 ru Exp $
 .\"
 .Dd February 7, 2002
 .Dt PUC 4
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index 06f6c5646a5e..5ef311d8a5c1 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ral.4,v 1.3.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Os
diff --git a/share/man/man4/random.4 b/share/man/man4/random.4
index a1c1d0cd581d..ec170a7acd78 100644
--- a/share/man/man4/random.4
+++ b/share/man/man4/random.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/random.4,v 1.18 2004/12/23 00:27:03 keramida Exp $
 .\"
 .Dd October 3, 2004
 .Dt RANDOM 4
diff --git a/share/man/man4/rc.4 b/share/man/man4/rc.4
index 60c4fa501f07..9b06f8db5456 100644
--- a/share/man/man4/rc.4
+++ b/share/man/man4/rc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rc.4,v 1.5 2005/03/18 02:38:03 brueffer Exp $
 .\"
 .Dd March 18, 2005
 .Dt RC 4
diff --git a/share/man/man4/re.4 b/share/man/man4/re.4
index e9a28df00fa2..8bec8438e573 100644
--- a/share/man/man4/re.4
+++ b/share/man/man4/re.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/re.4,v 1.12.2.2 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2004
 .Dt RE 4
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index 3a39b0dd500c..b7b7f04640b2 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rl.4,v 1.39.2.2 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt RL 4
diff --git a/share/man/man4/rndtest.4 b/share/man/man4/rndtest.4
index 67448d80dd91..b9ef07bc2ead 100644
--- a/share/man/man4/rndtest.4
+++ b/share/man/man4/rndtest.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rndtest.4,v 1.3 2003/12/27 15:40:47 brueffer Exp $
 .\"
 .Dd March 11, 2003
 .Dt RNDTEST 4
diff --git a/share/man/man4/route.4 b/share/man/man4/route.4
index 0e10be5af764..49773227511a 100644
--- a/share/man/man4/route.4
+++ b/share/man/man4/route.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)route.4	8.6 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/route.4,v 1.20 2004/11/04 08:29:28 bms Exp $
 .\"
 .Dd November 4, 2004
 .Dt ROUTE 4
diff --git a/share/man/man4/rp.4 b/share/man/man4/rp.4
index dbdf77ba853d..e66fb404727e 100644
--- a/share/man/man4/rp.4
+++ b/share/man/man4/rp.4
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1995 Comtrol, Inc.
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rp.4,v 1.5 2005/02/13 22:25:17 ru Exp $
 .Dd November 15, 1995
 .Os
 .Dt RP 4
diff --git a/share/man/man4/rue.4 b/share/man/man4/rue.4
index 3fc4373d3aea..c5fc0abb5a92 100644
--- a/share/man/man4/rue.4
+++ b/share/man/man4/rue.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rue.4,v 1.8.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt RUE 4
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index 0a6da7c50dcf..542776404b25 100644
--- a/share/man/man4/sa.4
+++ b/share/man/man4/sa.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sa.4,v 1.38 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd June 6, 1999
 .Dt SA 4
diff --git a/share/man/man4/sab.4 b/share/man/man4/sab.4
index aa23d1dabd86..358020b116a8 100644
--- a/share/man/man4/sab.4
+++ b/share/man/man4/sab.4
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sab.4,v 1.2 2004/07/08 12:55:24 ru Exp $
 .\"
 .Dd October 29, 2001
 .Dt SAB 4 sparc64
diff --git a/share/man/man4/safe.4 b/share/man/man4/safe.4
index 4931dfb0e253..088bded46810 100644
--- a/share/man/man4/safe.4
+++ b/share/man/man4/safe.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/safe.4,v 1.6 2004/09/12 19:39:09 simon Exp $
 .\"/
 .Dd September 12, 2004
 .Dt SAFE 4
diff --git a/share/man/man4/sbp.4 b/share/man/man4/sbp.4
index 866a9171598e..622e0d371f94 100644
--- a/share/man/man4/sbp.4
+++ b/share/man/man4/sbp.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sbp.4,v 1.11 2004/06/16 08:33:54 ru Exp $
 .\"
 .Dd May 20, 2002
 .Dt SBP 4
diff --git a/share/man/man4/sbp_targ.4 b/share/man/man4/sbp_targ.4
index 112838074831..d8aaa149f9d4 100644
--- a/share/man/man4/sbp_targ.4
+++ b/share/man/man4/sbp_targ.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sbp_targ.4,v 1.5 2004/07/08 12:27:12 ru Exp $
 .\"
 .Dd November 7, 2003
 .Dt SBP_TARG 4
diff --git a/share/man/man4/sbsh.4 b/share/man/man4/sbsh.4
index c318a8d05abd..957fa63426b5 100644
--- a/share/man/man4/sbsh.4
+++ b/share/man/man4/sbsh.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sbsh.4,v 1.3 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd April 11, 2003
 .Dt SBSH 4
diff --git a/share/man/man4/sched_4bsd.4 b/share/man/man4/sched_4bsd.4
index 5ffaa0c9ccba..f1e521954429 100644
--- a/share/man/man4/sched_4bsd.4
+++ b/share/man/man4/sched_4bsd.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sched_4bsd.4,v 1.3 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd April 7, 2005
 .Os
diff --git a/share/man/man4/sched_ule.4 b/share/man/man4/sched_ule.4
index b73e9560a8b5..a6ad019b5c76 100644
--- a/share/man/man4/sched_ule.4
+++ b/share/man/man4/sched_ule.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sched_ule.4,v 1.2 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd April 7, 2005
 .Os
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index 2f76f5937541..87c31dcd68c5 100644
--- a/share/man/man4/screen.4
+++ b/share/man/man4/screen.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/screen.4,v 1.27 2004/06/04 15:20:12 roam Exp $
 .\"
 .Dd October 6, 2000
 .Dt SCREEN 4
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 484932260e14..36fbd9d7d01e 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/scsi.4,v 1.32 2005/02/17 16:01:20 brueffer Exp $
 .Dd October 15, 1998
 .Dt SCSI 4
 .Os
diff --git a/share/man/man4/sem.4 b/share/man/man4/sem.4
index 580f4136bad9..871d29f64c25 100644
--- a/share/man/man4/sem.4
+++ b/share/man/man4/sem.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sem.4,v 1.2 2003/06/02 11:19:23 ru Exp $
 .\"
 .Dd January 14, 2003
 .Dt SEM 4
diff --git a/share/man/man4/ses.4 b/share/man/man4/ses.4
index 4070c89d753e..d4dbd9201e06 100644
--- a/share/man/man4/ses.4
+++ b/share/man/man4/ses.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ses.4,v 1.10 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd January 29, 2000
 .Dt SES 4
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index a7f7af1f17c8..34f9822ce196 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sf.4,v 1.20.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt SF 4
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 65176bdb78ba..aca430ad13f0 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/si.4,v 1.29 2004/07/03 18:29:20 ru Exp $
 .Dd September 16, 1995
 .Os
 .Dt SI 4
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index d9f4f9169811..e29986c9fd41 100644
--- a/share/man/man4/sio.4
+++ b/share/man/man4/sio.4
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sio.4,v 1.55 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd October 17, 2004
 .Dt SIO 4
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index e52f02cbfe8b..684b5ed3f537 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sis.4,v 1.18.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt SIS 4
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index 1b25360be0df..60d83a20d317 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sk.4,v 1.26.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt SK 4
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index a861b4e3c660..205ef0649625 100644
--- a/share/man/man4/sl.4
+++ b/share/man/man4/sl.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From:	@(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sl.4,v 1.11 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd August 10, 1996
 .Dt SL 4
diff --git a/share/man/man4/smb.4 b/share/man/man4/smb.4
index 3aa93ad99183..df9ffbdb61dd 100644
--- a/share/man/man4/smb.4
+++ b/share/man/man4/smb.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smb.4,v 1.12 2005/01/21 20:50:39 ru Exp $
 .\"
 .Dd October 25, 1998
 .Dt SMB 4
diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4
index 9dda4646b743..8841356b4679 100644
--- a/share/man/man4/smbus.4
+++ b/share/man/man4/smbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smbus.4,v 1.14 2004/05/13 19:31:31 joerg Exp $
 .\"
 .Dd August 10, 1998
 .Dt SMBUS 4
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 198ac7ee3662..6728e31402d9 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smp.4,v 1.21 2004/12/18 01:13:37 jkoshy Exp $
 .\"
 .Dd December 17, 2004
 .Dt SMP 4
diff --git a/share/man/man4/sn.4 b/share/man/man4/sn.4
index db855d3224e4..d6406947771f 100644
--- a/share/man/man4/sn.4
+++ b/share/man/man4/sn.4
@@ -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/share/man/man4/sn.4,v 1.8.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt SN 4
diff --git a/share/man/man4/snd_ad1816.4 b/share/man/man4/snd_ad1816.4
index f11fe9f42c6d..32beb77e4a63 100644
--- a/share/man/man4/snd_ad1816.4
+++ b/share/man/man4/snd_ad1816.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ad1816.4,v 1.4 2005/05/22 16:14:55 brueffer Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_AD1816 4
diff --git a/share/man/man4/snd_als4000.4 b/share/man/man4/snd_als4000.4
index 9c3bc594bcf7..e67c476db24e 100644
--- a/share/man/man4/snd_als4000.4
+++ b/share/man/man4/snd_als4000.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_als4000.4,v 1.4 2005/05/22 16:14:55 brueffer Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_ALS4000 4
diff --git a/share/man/man4/snd_cmi.4 b/share/man/man4/snd_cmi.4
index b329c88cc823..f6adb0da2544 100644
--- a/share/man/man4/snd_cmi.4
+++ b/share/man/man4/snd_cmi.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_cmi.4,v 1.4.2.1 2005/10/06 10:58:16 joel Exp $
 .\"
 .Dd August 17, 2005
 .Dt SND_CMI 4
diff --git a/share/man/man4/snd_cs4281.4 b/share/man/man4/snd_cs4281.4
index 0f81fbfef5e1..cc544981400e 100644
--- a/share/man/man4/snd_cs4281.4
+++ b/share/man/man4/snd_cs4281.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_cs4281.4,v 1.4 2005/05/22 16:14:55 brueffer Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_CS4281 4
diff --git a/share/man/man4/snd_csa.4 b/share/man/man4/snd_csa.4
index 4184c717c711..0f1bfb4f297c 100644
--- a/share/man/man4/snd_csa.4
+++ b/share/man/man4/snd_csa.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_csa.4,v 1.13.2.1 2005/10/06 10:58:16 joel Exp $
 .\"
 .Dd August 18, 2005
 .Dt SND_CSA 4
diff --git a/share/man/man4/snd_ds1.4 b/share/man/man4/snd_ds1.4
index e27d68b09513..8be2ae259d60 100644
--- a/share/man/man4/snd_ds1.4
+++ b/share/man/man4/snd_ds1.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ds1.4,v 1.4 2005/05/22 16:14:55 brueffer Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_DS1 4
diff --git a/share/man/man4/snd_emu10k1.4 b/share/man/man4/snd_emu10k1.4
index fecd810f8992..74488ed23d60 100644
--- a/share/man/man4/snd_emu10k1.4
+++ b/share/man/man4/snd_emu10k1.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_emu10k1.4,v 1.5.2.1 2005/10/06 10:58:16 joel Exp $
 .\"
 .Dd August 18, 2005
 .Dt SND_EMU10K1 4
diff --git a/share/man/man4/snd_es137x.4 b/share/man/man4/snd_es137x.4
index 0dfa72304bae..fb30200e1ede 100644
--- a/share/man/man4/snd_es137x.4
+++ b/share/man/man4/snd_es137x.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_es137x.4,v 1.4.2.1 2005/10/06 10:58:16 joel Exp $
 .\"
 .Dd August 18, 2005
 .Dt SND_ES137X 4
diff --git a/share/man/man4/snd_ess.4 b/share/man/man4/snd_ess.4
index cd5293f9fc4b..d2fddbca2311 100644
--- a/share/man/man4/snd_ess.4
+++ b/share/man/man4/snd_ess.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ess.4,v 1.4.2.1 2005/07/26 18:33:19 brueffer Exp $
 .\"
 .Dd July 16, 2004
 .Dt SND_ESS 4
diff --git a/share/man/man4/snd_fm801.4 b/share/man/man4/snd_fm801.4
index 182dfcd755d0..6843e1e03322 100644
--- a/share/man/man4/snd_fm801.4
+++ b/share/man/man4/snd_fm801.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_fm801.4,v 1.1 2005/03/01 05:58:16 trhodes Exp $
 .\"
 .Dd March 1, 2005
 .Dt SND_FM801 4
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 5cf42d5e9998..bc66068ec3b6 100644
--- a/share/man/man4/snd_gusc.4
+++ b/share/man/man4/snd_gusc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_gusc.4,v 1.12 2005/05/22 16:14:55 brueffer Exp $
 .\"
 .Dd August 28, 2004
 .Dt SND_GUSC 4
diff --git a/share/man/man4/snd_ich.4 b/share/man/man4/snd_ich.4
index 38bbed09ee69..22aa823e7c45 100644
--- a/share/man/man4/snd_ich.4
+++ b/share/man/man4/snd_ich.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ich.4,v 1.6 2005/03/19 08:57:00 simon Exp $
 .\"
 .Dd March 19, 2005
 .Dt SND_ICH 4
diff --git a/share/man/man4/snd_maestro.4 b/share/man/man4/snd_maestro.4
index cf016896617a..c6f31a7d7691 100644
--- a/share/man/man4/snd_maestro.4
+++ b/share/man/man4/snd_maestro.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_maestro.4,v 1.2 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd December 14, 2004
 .Dt SND_MAESTRO 4
diff --git a/share/man/man4/snd_maestro3.4 b/share/man/man4/snd_maestro3.4
index 272eee7b56ce..435574edb658 100644
--- a/share/man/man4/snd_maestro3.4
+++ b/share/man/man4/snd_maestro3.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_maestro3.4,v 1.7 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd December 14, 2004
 .Dt SND_MAESTRO3 4
diff --git a/share/man/man4/snd_neomagic.4 b/share/man/man4/snd_neomagic.4
index 10cf654b095d..488b09098376 100644
--- a/share/man/man4/snd_neomagic.4
+++ b/share/man/man4/snd_neomagic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_neomagic.4,v 1.3 2005/02/26 23:19:11 simon Exp $
 .\"
 .Dd February 26, 2005
 .Dt SND_NEOMAGIC 4
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 210cd7862ce6..a47c797c389c 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_sbc.4,v 1.14.2.1 2005/10/06 10:58:16 joel Exp $
 .\"
 .Dd August 17, 2005
 .Dt SND_SBC 4
diff --git a/share/man/man4/snd_solo.4 b/share/man/man4/snd_solo.4
index 56d4d04879ff..05df6a51a552 100644
--- a/share/man/man4/snd_solo.4
+++ b/share/man/man4/snd_solo.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_solo.4,v 1.4 2005/05/22 16:14:55 brueffer Exp $
 .\"
 .Dd August 27, 2004
 .Dt SND_SOLO 4
diff --git a/share/man/man4/snd_t4dwave.4 b/share/man/man4/snd_t4dwave.4
index cff8fc438019..ff5f74f149a7 100644
--- a/share/man/man4/snd_t4dwave.4
+++ b/share/man/man4/snd_t4dwave.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_t4dwave.4,v 1.1.2.1 2005/09/20 04:48:30 brueffer Exp $
 .\"
 .Dd August 15, 2005
 .Dt SND_T4DWAVE 4
diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4
index bf84b04ac338..05d1c5acae2d 100644
--- a/share/man/man4/snd_uaudio.4
+++ b/share/man/man4/snd_uaudio.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_uaudio.4,v 1.5 2004/09/08 08:28:02 ru Exp $
 .\"
 .Dd August 28, 2004
 .Dt SND_UAUDIO 4
diff --git a/share/man/man4/snd_via8233.4 b/share/man/man4/snd_via8233.4
index 09b76bc95508..1faf904f4124 100644
--- a/share/man/man4/snd_via8233.4
+++ b/share/man/man4/snd_via8233.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_via8233.4,v 1.2 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd March 2, 2005
 .Dt SND_VIA8233 4
diff --git a/share/man/man4/snd_via82c686.4 b/share/man/man4/snd_via82c686.4
index f36649fb1ab4..8d3b4ad10872 100644
--- a/share/man/man4/snd_via82c686.4
+++ b/share/man/man4/snd_via82c686.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_via82c686.4,v 1.1 2005/03/09 22:39:26 simon Exp $
 .\"
 .Dd March 9, 2005
 .Dt SND_VIA82C686 4
diff --git a/share/man/man4/snd_vibes.4 b/share/man/man4/snd_vibes.4
index 132a4d1091eb..2f1073ea9745 100644
--- a/share/man/man4/snd_vibes.4
+++ b/share/man/man4/snd_vibes.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_vibes.4,v 1.1 2005/03/09 22:31:56 simon Exp $
 .\"
 .Dd March 9, 2005
 .Dt SND_VIBES 4
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index df70cb2707ca..8799ac6ad279 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snp.4,v 1.26.2.1 2005/09/24 13:17:33 cognet Exp $
 .\"
 .Dd September 18, 2005
 .Dt SNP 4
diff --git a/share/man/man4/spic.4 b/share/man/man4/spic.4
index a398007f88ed..695db0979339 100644
--- a/share/man/man4/spic.4
+++ b/share/man/man4/spic.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/spic.4,v 1.3 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd May 20, 2002
 .Dt SPIC 4
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index cc7efc78e06b..65be3c8ea596 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -24,7 +24,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/share/man/man4/splash.4,v 1.25 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd February 9, 1999
 .Dt SPLASH 4
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 22b238aeff7f..ba311c78a1c7 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -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/share/man/man4/sppp.4,v 1.19 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd December 30, 2001
 .Dt SPPP 4
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 117b19446c6e..2799b5ed40d9 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ste.4,v 1.20.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt STE 4
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 660e33edae9b..7ce5a7d93ec6 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/stf.4,v 1.14 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd April 27, 2001
 .Dt STF 4
diff --git a/share/man/man4/stg.4 b/share/man/man4/stg.4
index 2c0afb225760..659150df1570 100644
--- a/share/man/man4/stg.4
+++ b/share/man/man4/stg.4
@@ -21,7 +21,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/share/man/man4/stg.4,v 1.7 2004/08/08 22:27:02 simon Exp $
 .\"
 .Dd August 8, 2004
 .Dt STG 4
diff --git a/share/man/man4/sym.4 b/share/man/man4/sym.4
index 6ce4e1355093..685ae97a4e23 100644
--- a/share/man/man4/sym.4
+++ b/share/man/man4/sym.4
@@ -54,7 +54,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sym.4,v 1.19 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 19, 2004
 .Dt SYM 4
diff --git a/share/man/man4/syncache.4 b/share/man/man4/syncache.4
index d5f5f7c9356c..c41206472ce5 100644
--- a/share/man/man4/syncache.4
+++ b/share/man/man4/syncache.4
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/syncache.4,v 1.1.14.1 2005/08/29 09:10:22 glebius Exp $
 .\"
 .Dd August 31, 2001
 .Dt SYNCACHE 4
diff --git a/share/man/man4/syncer.4 b/share/man/man4/syncer.4
index 30b38e40ee4a..123f45b7cae3 100644
--- a/share/man/man4/syncer.4
+++ b/share/man/man4/syncer.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/syncer.4,v 1.10 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd July 14, 2000
 .Dt SYNCER 4
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 974ca9bbd309..224a27699cd7 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -24,7 +24,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/share/man/man4/syscons.4,v 1.40 2005/02/14 21:14:00 brueffer Exp $
 .\"
 .Dd June 30, 1999
 .Dt SYSCONS 4
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index a1b2459a98f9..1775bae8fa3b 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sysmouse.4,v 1.25 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd December 3, 1997
 .Dt SYSMOUSE 4
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index c82220b2ebe8..394c05f8b794 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tap.4,v 1.17 2005/04/13 00:30:19 mdodd Exp $
 .\" Based on PR#2411
 .\"
 .Dd July 9, 2000
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index a1fa449d0f07..374a43af085a 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/targ.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd November 15, 2002
 .Dt TARG 4
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index e9bbb0403329..70ad42cf3c36 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.51.2.1 2005/08/29 09:10:22 glebius Exp $
 .\"
 .Dd August 25, 2005
 .Dt TCP 4
diff --git a/share/man/man4/tdfx.4 b/share/man/man4/tdfx.4
index 7430d934d28c..4e90c0d9b030 100644
--- a/share/man/man4/tdfx.4
+++ b/share/man/man4/tdfx.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tdfx.4,v 1.7 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd February 19, 2001
 .Dt TDFX 4
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index f6cf216bfa34..269f4ad34123 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)termios.4	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/termios.4,v 1.30 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt TERMIOS 4
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 50c49c78d8b0..ce365214b3d8 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ti.4,v 1.30.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt TI 4
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index 1b556bccf9d1..aa4c1a8d9ae3 100644
--- a/share/man/man4/tl.4
+++ b/share/man/man4/tl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tl.4,v 1.19.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt TL 4
diff --git a/share/man/man4/trm.4 b/share/man/man4/trm.4
index d56ed436fc21..002d14884c4c 100644
--- a/share/man/man4/trm.4
+++ b/share/man/man4/trm.4
@@ -25,7 +25,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/share/man/man4/trm.4,v 1.6 2004/08/15 19:48:27 simon Exp $
 .\"
 .Dd December 8, 2002
 .Dt TRM 4
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index 393b42092729..1e39e41203c6 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tty.4	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tty.4,v 1.22 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd August 14, 1992
 .Dt TTY 4
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 4754e2c8aa94..bef22637eb04 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,5 +1,5 @@
 .\" $NetBSD: tun.4,v 1.1 1996/06/25 22:17:37 pk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tun.4,v 1.21 2005/02/13 22:25:17 ru Exp $
 .\" Based on PR#2411
 .\"
 .Dd June 5, 2001
diff --git a/share/man/man4/twa.4 b/share/man/man4/twa.4
index 25288739ea38..eb557a30aa61 100755
--- a/share/man/man4/twa.4
+++ b/share/man/man4/twa.4
@@ -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/share/man/man4/twa.4,v 1.4 2005/02/27 13:14:28 brueffer Exp $
 .\"
 .Dd August 15, 2004
 .Dt TWA 4
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index a4a0ea19b7af..f351ebd1df1e 100644
--- a/share/man/man4/twe.4
+++ b/share/man/man4/twe.4
@@ -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/share/man/man4/twe.4,v 1.15.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd August 15, 2004
 .Dt TWE 4
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index 8cb3a30f1e18..8efd19194351 100644
--- a/share/man/man4/tx.4
+++ b/share/man/man4/tx.4
@@ -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/share/man/man4/tx.4,v 1.28.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt TX 4
diff --git a/share/man/man4/txp.4 b/share/man/man4/txp.4
index 366a81e7a229..55110641ff3e 100644
--- a/share/man/man4/txp.4
+++ b/share/man/man4/txp.4
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/txp.4,v 1.8.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt TXP 4
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index 68e643943d3d..d16f90eb2006 100644
--- a/share/man/man4/uart.4
+++ b/share/man/man4/uart.4
@@ -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/share/man/man4/uart.4,v 1.5 2004/06/21 17:42:49 mpp Exp $
 .\"
 .Dd August 25, 2003
 .Dt UART 4
diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4
index 8b5a2e80bd21..949e8f0db62b 100644
--- a/share/man/man4/ubsa.4
+++ b/share/man/man4/ubsa.4
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.5 2004/10/16 21:36:19 le Exp $
 .\"
 .Dd October 16, 2004
 .Dt UBSA 4
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 62995d5ff2d5..37e40d995d02 100644
--- a/share/man/man4/ubsec.4
+++ b/share/man/man4/ubsec.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubsec.4,v 1.4 2004/09/12 19:39:09 simon Exp $
 .\"
 .Dd September 12, 2004
 .Dt UBSEC 4
diff --git a/share/man/man4/ubser.4 b/share/man/man4/ubser.4
index 3e7dfa357b4d..af26ca99d3e5 100644
--- a/share/man/man4/ubser.4
+++ b/share/man/man4/ubser.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubser.4,v 1.5 2005/03/18 02:25:45 ticso Exp $
 .\"
 .Dd September 12, 2004
 .Dt UBSER 4
diff --git a/share/man/man4/ubtbcmfw.4 b/share/man/man4/ubtbcmfw.4
index afe5a1f782f2..c0ef4ad83a92 100644
--- a/share/man/man4/ubtbcmfw.4
+++ b/share/man/man4/ubtbcmfw.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ubtbcmfw.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd April 28, 2003
 .Dt UBTBCMFW 4
diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4
index e51cc4c5b21d..ef5693b0ebe9 100644
--- a/share/man/man4/ucom.4
+++ b/share/man/man4/ucom.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.6 2005/04/17 16:08:51 simon Exp $
 .\"
 .Dd November 25, 1999
 .Dt UCOM 4
diff --git a/share/man/man4/ucycom.4 b/share/man/man4/ucycom.4
index 480df2ba8174..f177b8a92159 100644
--- a/share/man/man4/ucycom.4
+++ b/share/man/man4/ucycom.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ucycom.4,v 1.3 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd September 5, 2004
 .Dt UCYCOM 4
diff --git a/share/man/man4/udav.4 b/share/man/man4/udav.4
index b057dcc4dfc8..1257220ea280 100644
--- a/share/man/man4/udav.4
+++ b/share/man/man4/udav.4
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/udav.4,v 1.3.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt UDAV 4
diff --git a/share/man/man4/udbp.4 b/share/man/man4/udbp.4
index 8ddbd37a25df..9741a5a74b27 100644
--- a/share/man/man4/udbp.4
+++ b/share/man/man4/udbp.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/udbp.4,v 1.15 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd April 30, 2000
 .Dt UDBP 4
diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4
index 03d6db2eef20..474010d005bf 100644
--- a/share/man/man4/udp.4
+++ b/share/man/man4/udp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)udp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/udp.4,v 1.17 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt UDP 4
diff --git a/share/man/man4/ufm.4 b/share/man/man4/ufm.4
index 05feed699e6a..e3016b89568d 100644
--- a/share/man/man4/ufm.4
+++ b/share/man/man4/ufm.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ufm.4,v 1.5 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd November 7, 2003
 .Dt UFM 4
diff --git a/share/man/man4/uftdi.4 b/share/man/man4/uftdi.4
index 5696cc109621..e1e2a0ae9b19 100644
--- a/share/man/man4/uftdi.4
+++ b/share/man/man4/uftdi.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.7 2005/04/08 18:12:07 brueffer Exp $
 .\"
 .Dd April 8, 2004
 .Dt UFTDI 4
diff --git a/share/man/man4/ugen.4 b/share/man/man4/ugen.4
index f16606ad7c37..f1e5f308e3b3 100644
--- a/share/man/man4/ugen.4
+++ b/share/man/man4/ugen.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ugen.4,v 1.5 2003/09/24 05:55:59 jb Exp $
 .\"
 .Dd July 12, 1998
 .Dt UGEN 4
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 089fafb79b21..98f9653b8f3f 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uhci.4,v 1.18 2005/04/20 07:33:09 simon Exp $
 .\"
 .Dd April 20, 2005
 .Dt UHCI 4
diff --git a/share/man/man4/uhid.4 b/share/man/man4/uhid.4
index 8ee5caaccd77..df065b7009b7 100644
--- a/share/man/man4/uhid.4
+++ b/share/man/man4/uhid.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.4.8.1 2005/08/07 15:49:53 brueffer Exp $
 .\"
 .Dd July 12, 1998
 .Dt UHID 4
diff --git a/share/man/man4/uhidev.4 b/share/man/man4/uhidev.4
index f469cc68098a..7dca8e399d1e 100644
--- a/share/man/man4/uhidev.4
+++ b/share/man/man4/uhidev.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uhidev.4,v 1.3 2004/06/24 05:09:15 imp Exp $
 .\"
 .Dd December 27, 2001
 .Dt UHIDEV 4
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 6eb2b6e962ce..98860d3759df 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ukbd.4,v 1.28 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd April 11, 1999
 .Dt UKBD 4
diff --git a/share/man/man4/ulpt.4 b/share/man/man4/ulpt.4
index e687a8e8c4e5..f569e8878efb 100644
--- a/share/man/man4/ulpt.4
+++ b/share/man/man4/ulpt.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.7 2004/09/26 13:38:38 simon Exp $
 .\"
 .Dd September 26, 2004
 .Dt ULPT 4
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index f8ea00e953e5..efe596f70bd0 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/umass.4,v 1.40 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd December 17, 2004
 .Dt UMASS 4
diff --git a/share/man/man4/umct.4 b/share/man/man4/umct.4
index f25c7a7f6a72..408900b3fbd9 100644
--- a/share/man/man4/umct.4
+++ b/share/man/man4/umct.4
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/umct.4,v 1.6 2005/02/23 22:50:43 brueffer Exp $
 .\"
 .Dd February 29, 2004
 .Dt UMCT 4
diff --git a/share/man/man4/umodem.4 b/share/man/man4/umodem.4
index 014435cf474d..3bac7bcf4ef0 100644
--- a/share/man/man4/umodem.4
+++ b/share/man/man4/umodem.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.5.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd August 19, 2004
 .Dt UMODEM 4
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index a1a8cc30f6b6..8f93266e2e42 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ums.4,v 1.23 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd February 5, 2005
 .Dt UMS 4
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index 8a27de23437c..b1d3abc0db48 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unix.4	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/unix.4,v 1.12 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd July 15, 2001
 .Dt UNIX 4
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index e26d1db44505..ae05a350a55d 100644
--- a/share/man/man4/uplcom.4
+++ b/share/man/man4/uplcom.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.11.2.1 2005/07/30 09:35:38 hrs Exp $
 .\"
 .Dd July 30, 2005
 .Dt UPLCOM 4
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 7cbe95cb9c85..1c6ab883ac98 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ural.4,v 1.3.2.2 2005/09/26 17:21:15 damien Exp $
 .\"
 .Dd July 16, 2005
 .Os
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index 0e2187a6322a..56cf628ebbb1 100644
--- a/share/man/man4/urio.4
+++ b/share/man/man4/urio.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/urio.4,v 1.11 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd September 26, 2004
 .Dt URIO 4
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 5ad646ba5a7f..3e19d8b89ec4 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb.4,v 1.32 2005/04/20 07:33:09 simon Exp $
 .\"
 .Dd April 20, 2005
 .Dt USB 4
diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4
index 4b7eab58da12..2f51525ad74b 100644
--- a/share/man/man4/uscanner.4
+++ b/share/man/man4/uscanner.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.18 2004/10/03 09:10:15 sanpei Exp $
 .\"
 .Dd August 19, 2004
 .Dt USCANNER 4
diff --git a/share/man/man4/utopia.4 b/share/man/man4/utopia.4
index 08f530db8d54..170381c0afe6 100644
--- a/share/man/man4/utopia.4
+++ b/share/man/man4/utopia.4
@@ -25,7 +25,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/utopia.4,v 1.10 2004/07/08 10:31:12 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt UTOPIA 4
diff --git a/share/man/man4/uvisor.4 b/share/man/man4/uvisor.4
index e6bac3f7e813..9e826ae2c578 100644
--- a/share/man/man4/uvisor.4
+++ b/share/man/man4/uvisor.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uvisor.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd September 12, 2004
 .Dt UVISOR 4
diff --git a/share/man/man4/uvscom.4 b/share/man/man4/uvscom.4
index 44a7eb6ad912..79df0544efc0 100644
--- a/share/man/man4/uvscom.4
+++ b/share/man/man4/uvscom.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uvscom.4,v 1.4 2004/09/06 22:00:50 brueffer Exp $
 .\"
 .Dd September 6, 2004
 .Dt UVSCOM 4
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index ce7d66c97683..3d9b82afd93e 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -24,7 +24,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/share/man/man4/vga.4,v 1.21 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd June 30, 1999
 .Dt VGA 4
diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4
index dc3f64a91376..6ebd04e36f53 100644
--- a/share/man/man4/vge.4
+++ b/share/man/man4/vge.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vge.4,v 1.7.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt VGE 4
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index fc99de210130..13769dcf8b2a 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -34,7 +34,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/share/man/man4/vinum.4,v 1.51 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd May 16, 2002
 .Dt VINUM 4
diff --git a/share/man/man4/vkbd.4 b/share/man/man4/vkbd.4
index da8ac6874c22..e464e8251a59 100644
--- a/share/man/man4/vkbd.4
+++ b/share/man/man4/vkbd.4
@@ -1,5 +1,5 @@
 .\" $Id: vkbd.4,v 1.4 2004/11/16 16:49:39 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vkbd.4,v 1.5.2.1 2005/07/30 09:34:57 hrs Exp $
 .\"
 .Dd August 12, 2004
 .Os
diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index 3e6b0932aeda..c2a3240199d7 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.23.2.2 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd August 28, 2005
 .Dt VLAN 4
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index bab7fc1c78c7..1f0a4b18b327 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vpo.4,v 1.22 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd December 14, 2004
 .Dt VPO 4
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index fa7238b3af17..8635a265545c 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vr.4,v 1.25.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt VR 4
diff --git a/share/man/man4/watchdog.4 b/share/man/man4/watchdog.4
index ad9a105e438a..8ee5521a116a 100644
--- a/share/man/man4/watchdog.4
+++ b/share/man/man4/watchdog.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/watchdog.4,v 1.6 2004/06/19 21:17:07 smkelly Exp $
 .\"
 .Dd June 25, 2003
 .Dt WATCHDOG 4
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 2c38352789be..d383fdcc4d93 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wb.4,v 1.18.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt WB 4
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index f1c195d79fe8..7bee8572f4d6 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wi.4,v 1.64.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"	$OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $
 .\"
 .Dd July 16, 2005
diff --git a/share/man/man4/witness.4 b/share/man/man4/witness.4
index 7aa655323689..5a840816c996 100644
--- a/share/man/man4/witness.4
+++ b/share/man/man4/witness.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/witness.4,v 1.9.2.2 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd February 18, 2001
 .Dt WITNESS 4
diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4
index 8f234206fc21..217b70596387 100644
--- a/share/man/man4/wlan.4
+++ b/share/man/man4/wlan.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.8 2005/01/12 10:22:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN 4
diff --git a/share/man/man4/wlan_acl.4 b/share/man/man4/wlan_acl.4
index 1a9544137730..87096c41f2eb 100644
--- a/share/man/man4/wlan_acl.4
+++ b/share/man/man4/wlan_acl.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_acl.4,v 1.3 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_ACL 4
diff --git a/share/man/man4/wlan_ccmp.4 b/share/man/man4/wlan_ccmp.4
index ccf7a2720635..ff4e8e584680 100644
--- a/share/man/man4/wlan_ccmp.4
+++ b/share/man/man4/wlan_ccmp.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_ccmp.4,v 1.3 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_CCMP 4
diff --git a/share/man/man4/wlan_tkip.4 b/share/man/man4/wlan_tkip.4
index 2a2a254fd329..4814c0895451 100644
--- a/share/man/man4/wlan_tkip.4
+++ b/share/man/man4/wlan_tkip.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_tkip.4,v 1.4 2005/06/15 19:29:03 wilko Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_TKIP 4
diff --git a/share/man/man4/wlan_wep.4 b/share/man/man4/wlan_wep.4
index 3bf1040d34b5..195300d7cf36 100644
--- a/share/man/man4/wlan_wep.4
+++ b/share/man/man4/wlan_wep.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_wep.4,v 1.2 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_WEP 4
diff --git a/share/man/man4/wlan_xauth.4 b/share/man/man4/wlan_xauth.4
index cf806a9ee4d0..aaedb823b624 100644
--- a/share/man/man4/wlan_xauth.4
+++ b/share/man/man4/wlan_xauth.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_xauth.4,v 1.3 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_XAUTH 4
diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4
index 67cff7994060..c945cca997ea 100644
--- a/share/man/man4/worm.4
+++ b/share/man/man4/worm.4
@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/worm.4,v 1.29 2005/02/13 22:25:17 ru Exp $
 .\" "
 .Dd October 15, 1998
 .Dt WORM 4
diff --git a/share/man/man4/xe.4 b/share/man/man4/xe.4
index e2db31629620..53c59f6e0498 100644
--- a/share/man/man4/xe.4
+++ b/share/man/man4/xe.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xe.4,v 1.9.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt XE 4
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index d7f628a27925..eca2e1df9052 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xl.4,v 1.34.2.1 2005/09/24 01:59:37 keramida Exp $
 .\"
 .Dd July 16, 2005
 .Dt XL 4
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index e670acb199c8..e4ad758f8fe7 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xpt.4,v 1.11 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd October 10, 1998
 .Dt XPT 4
diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4
index cb73a2c6549f..f651d9281baf 100644
--- a/share/man/man4/zero.4
+++ b/share/man/man4/zero.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/zero.4,v 1.4 2000/10/26 15:30:44 asmodai Exp $
 .\"
 .Dd April 7, 1996
 .Dt ZERO 4
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 3a78f9159827..ce7d9cdaad1d 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$FreeBSD: src/share/man/man5/Makefile,v 1.58.2.1 2005/08/15 20:24:07 cperciva Exp $
 
 #MISSING: dump.5 plot.5
 MAN=	acct.5 \
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index 137b2e4a4ead..29632e08f211 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/a.out.5,v 1.19 2005/06/30 13:10:37 hmp Exp $
 .\"
 .Dd June 5, 1993
 .Dt A.OUT 5
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index 8541081b4cbe..4639a3b7c51d 100644
--- a/share/man/man5/acct.5
+++ b/share/man/man5/acct.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acct.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/acct.5,v 1.10 2001/10/01 16:09:23 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt ACCT 5
diff --git a/share/man/man5/autofs.5 b/share/man/man5/autofs.5
index 2d379ce77c94..0182eaffb20a 100644
--- a/share/man/man5/autofs.5
+++ b/share/man/man5/autofs.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: autofs.5,v 1.1 2004/08/31 16:05:39 bright Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/autofs.5,v 1.3 2005/06/15 13:31:22 ru Exp $
 .Dd August 30, 2004
 .Dt AUTOFS 5
 .Os
diff --git a/share/man/man5/bluetooth.hosts.5 b/share/man/man5/bluetooth.hosts.5
index bda4d920496d..3aec7009748b 100644
--- a/share/man/man5/bluetooth.hosts.5
+++ b/share/man/man5/bluetooth.hosts.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bluetooth.hosts.5,v 1.5 2003/05/20 22:52:39 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/bluetooth.hosts.5,v 1.2 2004/07/07 13:09:37 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt BLUETOOTH.HOSTS 5
diff --git a/share/man/man5/bluetooth.protocols.5 b/share/man/man5/bluetooth.protocols.5
index 64a7dd56367b..30c081d428bf 100644
--- a/share/man/man5/bluetooth.protocols.5
+++ b/share/man/man5/bluetooth.protocols.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bluetooth.protocols.5,v 1.1 2003/05/20 22:52:39 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/bluetooth.protocols.5,v 1.2 2004/07/07 13:09:37 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt BLUETOOTH.PROTOCOLS 5
diff --git a/share/man/man5/config.5 b/share/man/man5/config.5
index 84d7cd66f3e7..17255f7ddb41 100644
--- a/share/man/man5/config.5
+++ b/share/man/man5/config.5
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/config.5,v 1.6 2005/02/10 14:26:21 des Exp $
 .\"
 .Dd May 13, 2004
 .Dt CONFIG 5
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 2a1e16bfb67f..edfc0ad385e7 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)core.5	8.3 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/core.5,v 1.18 2004/11/22 03:15:21 das Exp $
 .\"
 .Dd January 9, 2002
 .Dt CORE 5
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 173ab19d74f7..74511afddfd7 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/devfs.5,v 1.17 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd December 14, 1996
 .Dt DEVFS 5
diff --git a/share/man/man5/devfs.conf.5 b/share/man/man5/devfs.conf.5
index ae3103e1c1ca..4063d4cab038 100644
--- a/share/man/man5/devfs.conf.5
+++ b/share/man/man5/devfs.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/share/man/man5/devfs.conf.5,v 1.2.2.1 2005/08/18 15:01:24 keramida Exp $
 .\"
 .Dd May 17, 2005
 .Dt DEVFS.CONF 5
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index 075e71be6db0..e3f41760e469 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/devfs.rules.5,v 1.2 2005/06/16 18:46:17 ru Exp $
 .\"
 .Dd May 17, 2005
 .Dt DEVFS.RULES 5
diff --git a/share/man/man5/device.hints.5 b/share/man/man5/device.hints.5
index 578d278f1ce5..51d98bfe0edb 100644
--- a/share/man/man5/device.hints.5
+++ b/share/man/man5/device.hints.5
@@ -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/share/man/man5/device.hints.5,v 1.10 2003/09/19 22:27:54 jb Exp $
 .\"
 .Dd October 7, 2001
 .Dt DEVICE.HINTS 5
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index c47104344bf8..cac3cf8cfd6f 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dir.5	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/dir.5,v 1.21 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt DIR 5
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 98bd783d4c7c..88006addb3f9 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disktab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/disktab.5,v 1.14.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKTAB 5
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 82412006d1d6..40e7ba0de709 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/elf.5,v 1.31 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd July 31, 1999
 .Dt ELF 5
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index e10bf3009e3b..b42da7324204 100644
--- a/share/man/man5/ethers.5
+++ b/share/man/man5/ethers.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/ethers.5,v 1.14 2005/01/21 10:46:36 ru Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 5
diff --git a/share/man/man5/eui64.5 b/share/man/man5/eui64.5
index 4e2dda6159c7..e002e4da1a09 100644
--- a/share/man/man5/eui64.5
+++ b/share/man/man5/eui64.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/eui64.5,v 1.2 2004/07/07 20:32:33 ru Exp $
 .\"
 .Dd May 11, 2004
 .Dt EUI64 5
diff --git a/share/man/man5/fbtab.5 b/share/man/man5/fbtab.5
index 0598fd119903..cf0b7ff07980 100644
--- a/share/man/man5/fbtab.5
+++ b/share/man/man5/fbtab.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fbtab.5,v 1.12 2001/11/20 16:18:21 ru Exp $
 .\"
 .Dd August 22, 1994
 .Dt FBTAB 5
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index 27f08b0feda1..b97b08e55162 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fdescfs.5,v 1.14 2004/07/02 19:55:26 ru Exp $
 .\"
 .Dd December 14, 1996
 .Dt FDESCFS 5
diff --git a/share/man/man5/forward.5 b/share/man/man5/forward.5
index 2234ff359091..6be74188aa69 100644
--- a/share/man/man5/forward.5
+++ b/share/man/man5/forward.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/forward.5,v 1.8 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd July 2, 1996
 .Dt FORWARD 5
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index 3754d455b4d8..364ed3dbc1df 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fs.5	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fs.5,v 1.22 2005/02/13 22:25:19 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt FS 5
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 7e8f10ca85cb..f55c213cd93f 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.26 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt FSTAB 5
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index ede3a5a82e06..4a65e9f6c32d 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)group.5	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/group.5,v 1.28 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd September 29, 1994
 .Dt GROUP 5
diff --git a/share/man/man5/hesiod.conf.5 b/share/man/man5/hesiod.conf.5
index 364ea8041e6c..f437638c08b4 100644
--- a/share/man/man5/hesiod.conf.5
+++ b/share/man/man5/hesiod.conf.5
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hesiod.conf.5,v 1.3 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd November 30, 1996
 .Dt HESIOD.CONF 5
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index 218a4df37196..a37884dfab48 100644
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)hosts.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.5,v 1.10 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt HOSTS 5
diff --git a/share/man/man5/hosts.equiv.5 b/share/man/man5/hosts.equiv.5
index ce9301bf62ae..ebffe477815f 100644
--- a/share/man/man5/hosts.equiv.5
+++ b/share/man/man5/hosts.equiv.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.equiv.5,v 1.20 2005/06/30 13:10:37 hmp Exp $
 .\"
 .Dd February 11, 1996
 .Dt HOSTS.EQUIV 5
diff --git a/share/man/man5/hosts.lpd.5 b/share/man/man5/hosts.lpd.5
index 910ac66c5964..8a73e2800d4d 100644
--- a/share/man/man5/hosts.lpd.5
+++ b/share/man/man5/hosts.lpd.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.lpd.5,v 1.10 2004/06/16 08:33:55 ru Exp $
 .\"
 .Dd June 1, 1996
 .Dt HOSTS.LPD 5
diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5
index 764ba4d2ba21..f5ec5ad776a1 100644
--- a/share/man/man5/intro.5
+++ b/share/man/man5/intro.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/intro.5,v 1.7 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd February 16, 1997
 .Dt INTRO 5
diff --git a/share/man/man5/libmap.conf.5 b/share/man/man5/libmap.conf.5
index 4885df7b6712..941ce241315d 100644
--- a/share/man/man5/libmap.conf.5
+++ b/share/man/man5/libmap.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/share/man/man5/libmap.conf.5,v 1.9.4.1 2005/10/28 19:24:41 jhb Exp $
 .\"
 .Dd January 31, 2004
 .Dt LIBMAP.CONF 5
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 73f0a4555357..e1fd5efeab0b 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -26,7 +26,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/share/man/man5/link.5,v 1.28 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5
index 2be3da398a24..60281a9bda62 100644
--- a/share/man/man5/linprocfs.5
+++ b/share/man/man5/linprocfs.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/linprocfs.5,v 1.13 2005/01/21 08:36:39 ru Exp $
 .\" Written by Garrett Wollman
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man5/mailer.conf.5 b/share/man/man5/mailer.conf.5
index 58affbc6b447..a6e5532d67fd 100644
--- a/share/man/man5/mailer.conf.5
+++ b/share/man/man5/mailer.conf.5
@@ -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/share/man/man5/mailer.conf.5,v 1.11 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd December 16, 1998
 .Dt MAILER.CONF 5
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 61678231aac9..05906dbb1bc1 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.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/share/man/man5/make.conf.5,v 1.121 2005/07/08 19:26:55 sam Exp $
 .\"
 .Dd June 9, 2005
 .Dt MAKE.CONF 5
diff --git a/share/man/man5/moduli.5 b/share/man/man5/moduli.5
index 32d7989236f3..1bb718783b80 100644
--- a/share/man/man5/moduli.5
+++ b/share/man/man5/moduli.5
@@ -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/share/man/man5/moduli.5,v 1.4 2002/05/30 13:13:05 ru Exp $
 .\"
 .Dd July 28, 1997
 .Dt MODULI 5
diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5
index 2ffbc9e419bf..122f8557c224 100644
--- a/share/man/man5/motd.5
+++ b/share/man/man5/motd.5
@@ -1,7 +1,7 @@
 .\"	$NetBSD: motd.5,v 1.2 1994/12/28 18:58:53 glass Exp $
 .\"
 .\" This file is in the public domain.
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/motd.5,v 1.5 2001/07/14 19:41:09 schweikh Exp $
 .\"
 .Dd February 13, 1997
 .Dt MOTD 5
diff --git a/share/man/man5/msdosfs.5 b/share/man/man5/msdosfs.5
index 179320958b43..251d982ede37 100644
--- a/share/man/man5/msdosfs.5
+++ b/share/man/man5/msdosfs.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.4.12.1 2005/09/24 01:59:38 keramida Exp $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 386ee7dd1021..ee98ae7d420d 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)networks.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/networks.5,v 1.10 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt NETWORKS 5
diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5
index 1c439bec88b7..123169663d72 100644
--- a/share/man/man5/nsmb.conf.5
+++ b/share/man/man5/nsmb.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/nsmb.conf.5,v 1.1 2003/08/09 19:11:52 trhodes Exp $
 .\"
 .Dd June 30, 2003
 .Dt NSMB.CONF 5
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index 28a63ceb07c0..c38cc9903dbb 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -31,7 +31,7 @@
 .\" TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/nsswitch.conf.5,v 1.13 2005/04/24 20:24:59 bz Exp $
 .\"
 .Dd April 24, 2005
 .Dt NSSWITCH.CONF 5
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index fbb7817a4b92..6f83cb42665f 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/passwd.5,v 1.44.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd February 8, 2005
 .Dt PASSWD 5
diff --git a/share/man/man5/pbm.5 b/share/man/man5/pbm.5
index 55d2c5c1be39..bd7be1e958cf 100644
--- a/share/man/man5/pbm.5
+++ b/share/man/man5/pbm.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/pbm.5,v 1.8 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd September 27, 1991
 .Dt PBM 5
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 1d7e1c5ba7bc..19d9d222dabb 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.55 2005/06/30 13:10:37 hmp Exp $
 .\"
 .Dd November 24, 2004
 .Dt PERIODIC.CONF 5
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index 59b491b61eb9..f99566d5bed9 100644
--- a/share/man/man5/phones.5
+++ b/share/man/man5/phones.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)phones.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/phones.5,v 1.5 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt PHONES 5
diff --git a/share/man/man5/portsnap.conf.5 b/share/man/man5/portsnap.conf.5
index eeae1f19ec43..b806a0cd1f99 100644
--- a/share/man/man5/portsnap.conf.5
+++ b/share/man/man5/portsnap.conf.5
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/portsnap.conf.5,v 1.1.2.1 2005/08/15 20:24:07 cperciva Exp $
 .\"
 .Dd January 30, 2005
 .Dt PORTSNAP.CONF 5
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 6e740fb43ffa..364c0bbae762 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.32 2004/09/03 18:56:59 alfred Exp $
 .\" Written by Garrett Wollman
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man5/protocols.5 b/share/man/man5/protocols.5
index 37d3541daca0..2fc784ad316f 100644
--- a/share/man/man5/protocols.5
+++ b/share/man/man5/protocols.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)protocols.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/protocols.5,v 1.7 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt PROTOCOLS 5
diff --git a/share/man/man5/quota.user.5 b/share/man/man5/quota.user.5
index 6d713bbff8ae..bc4df2779eda 100644
--- a/share/man/man5/quota.user.5
+++ b/share/man/man5/quota.user.5
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/quota.user.5,v 1.3 2002/12/12 17:25:57 ru Exp $
 .\"
 .Dd February 22, 2001
 .Dt QUOTA.USER 5
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index c521304d06e0..5b60061ea4a8 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.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/share/man/man5/rc.conf.5,v 1.256.2.6 2005/10/08 03:32:54 yar Exp $
 .\"
 .Dd September 15, 2005
 .Dt RC.CONF 5
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 666608d1d6c0..36ff9cd89e8a 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)remote.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/remote.5,v 1.18 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd October 20, 2003
 .Dt REMOTE 5
diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5
index 5c196f386d7f..02c4cecd7a6f 100644
--- a/share/man/man5/resolver.5
+++ b/share/man/man5/resolver.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)resolver.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/resolver.5,v 1.12 2004/09/09 17:19:27 yar Exp $
 .\"
 .Dd September 9, 2004
 .Dt RESOLVER 5
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index 40320f9ffe89..82e0df4df32b 100644
--- a/share/man/man5/services.5
+++ b/share/man/man5/services.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)services.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/services.5,v 1.12 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt SERVICES 5
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index 585cc8385dd7..aac9caf00ca0 100644
--- a/share/man/man5/shells.5
+++ b/share/man/man5/shells.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shells.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/shells.5,v 1.5 2001/07/10 15:30:51 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt SHELLS 5
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index bbbd29208394..b9bf2084540e 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/stab.5,v 1.12 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt STAB 5
diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5
index be0f6cf4459c..5a2d1d498262 100644
--- a/share/man/man5/style.Makefile.5
+++ b/share/man/man5/style.Makefile.5
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/style.Makefile.5,v 1.15 2005/02/28 18:32:25 obrien Exp $
 .\"
 .Dd January 8, 2005
 .Dt STYLE.MAKEFILE 5
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 0e69bcc13859..fd5611fc257a 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.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/share/man/man5/sysctl.conf.5,v 1.16 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd December 30, 1999
 .Dt SYSCTL.CONF 5
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index c34204187415..776d79aecaa9 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/utmp.5,v 1.21 2003/09/08 19:57:20 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt UTMP 5
diff --git a/share/man/man6/Makefile b/share/man/man6/Makefile
index be6547e592b5..136a77a015d2 100644
--- a/share/man/man6/Makefile
+++ b/share/man/man6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man6/Makefile,v 1.3 2001/03/27 13:48:22 ru Exp $
 
 MAN=	intro.6
 
diff --git a/share/man/man6/intro.6 b/share/man/man6/intro.6
index 7403754cdcf1..0fd5105cce58 100644
--- a/share/man/man6/intro.6
+++ b/share/man/man6/intro.6
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man6/intro.6,v 1.10 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd February 16, 1997
 .Dt INTRO 6
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index 82240442bccf..c55e2f88ece7 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man7/Makefile,v 1.29 2004/01/20 10:27:23 ru Exp $
 
 #MISSING: eqnchar.7 ms.7 term.7
 MAN=	ascii.7 \
diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7
index feba23385c21..619522fddcb0 100644
--- a/share/man/man7/ascii.7
+++ b/share/man/man7/ascii.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ascii.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/ascii.7,v 1.6 2002/12/05 08:50:00 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt ASCII 7
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 2af6cacaa609..c2666d2332b1 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/build.7,v 1.30 2005/02/25 00:40:46 trhodes Exp $
 .\"
 .Dd February 23, 2005
 .Dt BUILD 7
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index af4bdd2dc7ed..d28542ea844a 100644
--- a/share/man/man7/clocks.7
+++ b/share/man/man7/clocks.7
@@ -25,7 +25,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/share/man/man7/clocks.7,v 1.24 2005/06/30 13:04:25 hmp Exp $
 .\" "
 .Dd February 24, 2005
 .Os
diff --git a/share/man/man7/development.7 b/share/man/man7/development.7
index d9563155aa5a..b13cba178dd2 100644
--- a/share/man/man7/development.7
+++ b/share/man/man7/development.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/development.7,v 1.14.2.1 2005/07/17 15:03:35 brueffer Exp $
 .\"
 .Dd December 21, 2002
 .Dt DEVELOPMENT 7
diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7
index 98f879b3aea5..af8f938b7c92 100644
--- a/share/man/man7/environ.7
+++ b/share/man/man7/environ.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)environ.7	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/environ.7,v 1.23.8.1 2005/08/26 10:25:44 keramida Exp $
 .\"
 .Dd April 12, 2003
 .Dt ENVIRON 7
diff --git a/share/man/man7/ffs.7 b/share/man/man7/ffs.7
index fc8c61a3ad24..ef2220abcff8 100644
--- a/share/man/man7/ffs.7
+++ b/share/man/man7/ffs.7
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/ffs.7,v 1.12.14.1 2005/08/06 14:47:16 markus Exp $
 .\"
 .Dd December 26, 2001
 .Dt FFS 7
diff --git a/share/man/man7/firewall.7 b/share/man/man7/firewall.7
index 9760b9f39e2f..97f5f7c92655 100644
--- a/share/man/man7/firewall.7
+++ b/share/man/man7/firewall.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/firewall.7,v 1.25.2.1 2005/07/17 15:03:35 brueffer Exp $
 .\"
 .Dd May 26, 2001
 .Dt FIREWALL 7
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 4ae243749752..6a87aa53873e 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/hier.7,v 1.115 2005/01/21 20:50:39 ru Exp $
 .\"
 .Dd January 15, 2005
 .Dt HIER 7
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 713a8b155525..49704f373cbb 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)hostname.7	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/hostname.7,v 1.7 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt HOSTNAME 7
diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7
index 1d9968c215df..b84dc07a9816 100644
--- a/share/man/man7/intro.7
+++ b/share/man/man7/intro.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/intro.7,v 1.7 2001/07/10 15:30:53 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt INTRO 7
diff --git a/share/man/man7/maclabel.7 b/share/man/man7/maclabel.7
index 05c3654aa9e7..9b0edd2a7a8b 100644
--- a/share/man/man7/maclabel.7
+++ b/share/man/man7/maclabel.7
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/maclabel.7,v 1.6 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd October 25, 2002
 .Os
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index 07370fb99b90..74f7331c2b27 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mailaddr.7	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/mailaddr.7,v 1.8 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd June 16, 1993
 .Dt MAILADDR 7
diff --git a/share/man/man7/operator.7 b/share/man/man7/operator.7
index b092befa8ea9..ed7796348003 100644
--- a/share/man/man7/operator.7
+++ b/share/man/man7/operator.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)operator.7	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/operator.7,v 1.6 2003/02/24 22:53:23 ru Exp $
 .\"
 .Dd January 22, 2003
 .Dt OPERATOR 7
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 01d50c4f3d05..71d2b0be114f 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -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/share/man/man7/ports.7,v 1.50.2.2 2005/08/10 20:43:27 jcamou Exp $
 .\"
 .Dd February 8, 2005
 .Dt PORTS 7
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 651c18cf0fb6..06df38df4573 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/release.7,v 1.54 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd May 17, 2005
 .Dt RELEASE 7
diff --git a/share/man/man7/sdoc.7 b/share/man/man7/sdoc.7
index 51f92825cdef..35d63e7dc83a 100644
--- a/share/man/man7/sdoc.7
+++ b/share/man/man7/sdoc.7
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sec-doc.7,v 1.7 2001/12/22 00:14:12 rwatson Exp$
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/sdoc.7,v 1.10 2005/06/30 13:04:25 hmp Exp $
 .\"
 .Dd October 12, 2001
 .Dt SDOC 7
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index fd988bb5918a..15ee3e144ca0 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/security.7,v 1.41.2.1 2005/07/17 15:03:35 brueffer Exp $
 .\"
 .Dd November 29, 2004
 .Dt SECURITY 7
diff --git a/share/man/man7/sprog.7 b/share/man/man7/sprog.7
index cde04b2f7cbb..e6e91c35c033 100644
--- a/share/man/man7/sprog.7
+++ b/share/man/man7/sprog.7
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/sprog.7,v 1.1 2001/06/04 15:32:44 eric Exp $
 .\"
 .Dd June 3, 2001
 .Dt SPROG 7
diff --git a/share/man/man7/stdint.7 b/share/man/man7/stdint.7
index 2f36953d9a16..734333b040f6 100644
--- a/share/man/man7/stdint.7
+++ b/share/man/man7/stdint.7
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/stdint.7,v 1.5 2003/09/08 19:57:21 ru Exp $
 .\"
 .Dd September 15, 2002
 .Dt STDINT 7
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 86c08f4079e6..9de1b973670e 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.72 2005/06/30 13:04:25 hmp Exp $
 .\"
 .Dd June 25, 2002
 .Dt TUNING 7
diff --git a/share/man/man8/MAKEDEV.8 b/share/man/man8/MAKEDEV.8
index 29f6cd2675d4..bcde20d2e289 100644
--- a/share/man/man8/MAKEDEV.8
+++ b/share/man/man8/MAKEDEV.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/MAKEDEV.8,v 1.2 2003/05/31 18:49:23 ru Exp $
 .\"
 .Dd March 25, 2003
 .Dt MAKEDEV 8
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 4c9678cd2ad7..44bdbaf33c66 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man8/Makefile,v 1.35 2004/01/20 10:27:23 ru Exp $
 
 MAN=	adding_user.8 \
 	crash.8 \
diff --git a/share/man/man8/adding_user.8 b/share/man/man8/adding_user.8
index 2f4dab108fc5..632e46caf698 100644
--- a/share/man/man8/adding_user.8
+++ b/share/man/man8/adding_user.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)adduser.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/adding_user.8,v 1.10 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt ADDING_USER 8
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index 94a0ecce0eae..bf401ae56c1d 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/crash.8,v 1.22 2005/06/30 13:01:44 hmp Exp $
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 5c8345a56622..a386a9dd2dd1 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -24,7 +24,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/share/man/man8/diskless.8,v 1.26 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd September 28, 2004
 .Dt DISKLESS 8
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 31f33a2b7496..dfb78e677662 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/intro.8,v 1.11 2003/04/16 12:11:01 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt INTRO 8
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index aba665be92fc..20fd96963720 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -1,5 +1,5 @@
 .\" -*- nroff-fill -*-
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/picobsd.8,v 1.26 2004/12/21 12:49:24 ru Exp $
 .Dd March 9, 2002
 .Os
 .Dt PICOBSD 8
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 5a6419dce945..d8fb31548876 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rc.8,v 1.29 2005/01/21 11:59:38 ru Exp $
 .\"
 .Dd November 4, 2002
 .Dt RC 8
diff --git a/share/man/man8/rc.sendmail.8 b/share/man/man8/rc.sendmail.8
index 7b05ced128d0..3fe145a3d782 100644
--- a/share/man/man8/rc.sendmail.8
+++ b/share/man/man8/rc.sendmail.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rc.sendmail.8,v 1.6 2002/11/29 11:39:20 ru Exp $
 .\"
 .Dd March 30, 2002
 .Dt RC.SENDMAIL 8
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index fa177319f160..f58326763545 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rc.subr.8,v 1.6 2004/07/09 10:08:03 ru Exp $
 .\"
 .Dd January 6, 2004
 .Dt RC.SUBR 8
diff --git a/share/man/man8/rescue.8 b/share/man/man8/rescue.8
index 878e92f3cc91..c6d4177ea62f 100644
--- a/share/man/man8/rescue.8
+++ b/share/man/man8/rescue.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rescue.8,v 1.1 2003/07/28 21:06:38 simon Exp $
 .\"
 .Dd July 23, 2003
 .Os
diff --git a/share/man/man8/sticky.8 b/share/man/man8/sticky.8
index aa94a1149b25..ae7c8ea201dc 100644
--- a/share/man/man8/sticky.8
+++ b/share/man/man8/sticky.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/sticky.8,v 1.11 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 75e3cc1403eb..b903753ab44e 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)yp.8	1.0 (deraadt) 4/26/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/yp.8,v 1.36 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd April 5, 1993
 .Dt YP 8
diff --git a/share/man/man9/BUF_LOCK.9 b/share/man/man9/BUF_LOCK.9
index ca414ecdbaa0..b85d0b92093d 100644
--- a/share/man/man9/BUF_LOCK.9
+++ b/share/man/man9/BUF_LOCK.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_LOCK.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_LOCK 9
diff --git a/share/man/man9/BUF_LOCKFREE.9 b/share/man/man9/BUF_LOCKFREE.9
index d356f0d8be46..f4f52600b879 100644
--- a/share/man/man9/BUF_LOCKFREE.9
+++ b/share/man/man9/BUF_LOCKFREE.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_LOCKFREE.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_LOCKFREE 9
diff --git a/share/man/man9/BUF_LOCKINIT.9 b/share/man/man9/BUF_LOCKINIT.9
index 286e7f8db2a0..418e4272740c 100644
--- a/share/man/man9/BUF_LOCKINIT.9
+++ b/share/man/man9/BUF_LOCKINIT.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_LOCKINIT.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt BUF_LOCKINIT 9
diff --git a/share/man/man9/BUF_REFCNT.9 b/share/man/man9/BUF_REFCNT.9
index 622c2c579986..27c74ce5d6cc 100644
--- a/share/man/man9/BUF_REFCNT.9
+++ b/share/man/man9/BUF_REFCNT.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_REFCNT.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_REFCNT 9
diff --git a/share/man/man9/BUF_TIMELOCK.9 b/share/man/man9/BUF_TIMELOCK.9
index 31ca2007c9dd..7f5e1b9490c2 100644
--- a/share/man/man9/BUF_TIMELOCK.9
+++ b/share/man/man9/BUF_TIMELOCK.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_TIMELOCK.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_TIMELOCK 9
diff --git a/share/man/man9/BUF_UNLOCK.9 b/share/man/man9/BUF_UNLOCK.9
index 0b6b0b35080f..b9dba682b6c7 100644
--- a/share/man/man9/BUF_UNLOCK.9
+++ b/share/man/man9/BUF_UNLOCK.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_UNLOCK.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_UNLOCK 9
diff --git a/share/man/man9/BUS_ADD_CHILD.9 b/share/man/man9/BUS_ADD_CHILD.9
index 8b69d5a7834e..477be3503724 100644
--- a/share/man/man9/BUS_ADD_CHILD.9
+++ b/share/man/man9/BUS_ADD_CHILD.9
@@ -26,7 +26,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/share/man/man9/BUS_ADD_CHILD.9,v 1.4 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd May 13, 2004
 .Dt BUS_ADD_CHILD 9
diff --git a/share/man/man9/BUS_CONFIG_INTR.9 b/share/man/man9/BUS_CONFIG_INTR.9
index a3b4c543c917..b81dd027e234 100644
--- a/share/man/man9/BUS_CONFIG_INTR.9
+++ b/share/man/man9/BUS_CONFIG_INTR.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_CONFIG_INTR.9,v 1.5 2005/01/06 17:08:51 keramida Exp $
 .\"
 .Dd January 6, 2005
 .Dt BUS_CONFIG_INTR 9
diff --git a/share/man/man9/BUS_PRINT_CHILD.9 b/share/man/man9/BUS_PRINT_CHILD.9
index a3709d94866b..415d30be8544 100644
--- a/share/man/man9/BUS_PRINT_CHILD.9
+++ b/share/man/man9/BUS_PRINT_CHILD.9
@@ -26,7 +26,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/share/man/man9/BUS_PRINT_CHILD.9,v 1.16 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 6, 2005
 .Dt BUS_PRINT_CHILD 9
diff --git a/share/man/man9/BUS_READ_IVAR.9 b/share/man/man9/BUS_READ_IVAR.9
index 153b324b56a4..2a95b42face6 100644
--- a/share/man/man9/BUS_READ_IVAR.9
+++ b/share/man/man9/BUS_READ_IVAR.9
@@ -26,7 +26,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/share/man/man9/BUS_READ_IVAR.9,v 1.9 2003/10/23 06:22:40 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_READ_IVAR 9
diff --git a/share/man/man9/BUS_SETUP_INTR.9 b/share/man/man9/BUS_SETUP_INTR.9
index 6aa5099f766b..eb2d57163288 100644
--- a/share/man/man9/BUS_SETUP_INTR.9
+++ b/share/man/man9/BUS_SETUP_INTR.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_SETUP_INTR.9,v 1.18 2005/01/06 17:11:56 keramida Exp $
 .\"
 .Dd January 6, 2005
 .Dt BUS_SETUP_INTR 9
diff --git a/share/man/man9/CTASSERT.9 b/share/man/man9/CTASSERT.9
index 5c9d30eb2361..c18f7f9131d8 100644
--- a/share/man/man9/CTASSERT.9
+++ b/share/man/man9/CTASSERT.9
@@ -24,7 +24,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/share/man/man9/CTASSERT.9,v 1.2 2003/05/30 21:13:32 ru Exp $
 .\"
 .Dd May 15, 2003
 .Os
diff --git a/share/man/man9/DECLARE_GEOM_CLASS.9 b/share/man/man9/DECLARE_GEOM_CLASS.9
index 8a7a33617f1a..581245b2f491 100644
--- a/share/man/man9/DECLARE_GEOM_CLASS.9
+++ b/share/man/man9/DECLARE_GEOM_CLASS.9
@@ -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/share/man/man9/DECLARE_GEOM_CLASS.9,v 1.4 2005/01/13 09:33:06 ru Exp $
 .\"
 .Dd January 6, 2005
 .Dt DECLARE_GEOM_CLASS 9
diff --git a/share/man/man9/DECLARE_MODULE.9 b/share/man/man9/DECLARE_MODULE.9
index d33c18ed6081..bd61708b7994 100644
--- a/share/man/man9/DECLARE_MODULE.9
+++ b/share/man/man9/DECLARE_MODULE.9
@@ -26,7 +26,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/share/man/man9/DECLARE_MODULE.9,v 1.9 2005/01/13 09:33:06 ru Exp $
 .\"
 .Dd January 6, 2005
 .Dt DECLARE_MODULE 9
diff --git a/share/man/man9/DELAY.9 b/share/man/man9/DELAY.9
index ac6231c2bc70..bd92b0a4d65a 100644
--- a/share/man/man9/DELAY.9
+++ b/share/man/man9/DELAY.9
@@ -25,7 +25,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/share/man/man9/DELAY.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2000
 .Os
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index ccb9f27b6930..6b55726a9e54 100644
--- a/share/man/man9/DEVICE_ATTACH.9
+++ b/share/man/man9/DEVICE_ATTACH.9
@@ -26,7 +26,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/share/man/man9/DEVICE_ATTACH.9,v 1.10 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt DEVICE_ATTACH 9
diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9
index 8b4c43c2f2d0..63fc53c9d1d4 100644
--- a/share/man/man9/DEVICE_DETACH.9
+++ b/share/man/man9/DEVICE_DETACH.9
@@ -26,7 +26,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/share/man/man9/DEVICE_DETACH.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_DETACH 9
diff --git a/share/man/man9/DEVICE_IDENTIFY.9 b/share/man/man9/DEVICE_IDENTIFY.9
index 4257407eac8b..12312d48f91f 100644
--- a/share/man/man9/DEVICE_IDENTIFY.9
+++ b/share/man/man9/DEVICE_IDENTIFY.9
@@ -26,7 +26,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/share/man/man9/DEVICE_IDENTIFY.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 13, 2004
 .Dt DEVICE_IDENTIFY 9
diff --git a/share/man/man9/DEVICE_PROBE.9 b/share/man/man9/DEVICE_PROBE.9
index b7b67f68d086..a64836a65c14 100644
--- a/share/man/man9/DEVICE_PROBE.9
+++ b/share/man/man9/DEVICE_PROBE.9
@@ -26,7 +26,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/share/man/man9/DEVICE_PROBE.9,v 1.21 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt DEVICE_PROBE 9
diff --git a/share/man/man9/DEVICE_SHUTDOWN.9 b/share/man/man9/DEVICE_SHUTDOWN.9
index 0bf6a8bc8671..1216edb6a7bb 100644
--- a/share/man/man9/DEVICE_SHUTDOWN.9
+++ b/share/man/man9/DEVICE_SHUTDOWN.9
@@ -26,7 +26,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/share/man/man9/DEVICE_SHUTDOWN.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt DEVICE_SHUTDOWN 9
diff --git a/share/man/man9/DEV_MODULE.9 b/share/man/man9/DEV_MODULE.9
index 13a81c198636..f206686de407 100644
--- a/share/man/man9/DEV_MODULE.9
+++ b/share/man/man9/DEV_MODULE.9
@@ -26,7 +26,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/share/man/man9/DEV_MODULE.9,v 1.4 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd March 11, 2001
 .Dt DEV_MODULE 9
diff --git a/share/man/man9/DRIVER_MODULE.9 b/share/man/man9/DRIVER_MODULE.9
index 346177a6aabc..85976561b35c 100644
--- a/share/man/man9/DRIVER_MODULE.9
+++ b/share/man/man9/DRIVER_MODULE.9
@@ -26,7 +26,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/share/man/man9/DRIVER_MODULE.9,v 1.10 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd May 16, 2000
 .Dt DRIVER_MODULE 9
diff --git a/share/man/man9/EVENTHANDLER.9 b/share/man/man9/EVENTHANDLER.9
index 4b847addd8b7..3caa48e7abfe 100644
--- a/share/man/man9/EVENTHANDLER.9
+++ b/share/man/man9/EVENTHANDLER.9
@@ -21,7 +21,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/EVENTHANDLER.9,v 1.3 2005/01/07 19:41:00 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Dt EVENTHANDLER 9
diff --git a/share/man/man9/KASSERT.9 b/share/man/man9/KASSERT.9
index e53e9b605a8e..f78d5bf94959 100644
--- a/share/man/man9/KASSERT.9
+++ b/share/man/man9/KASSERT.9
@@ -26,7 +26,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/share/man/man9/KASSERT.9,v 1.12 2003/05/16 19:54:20 hmp Exp $
 .\"
 .Dd January 14, 2000
 .Os
diff --git a/share/man/man9/MD5.9 b/share/man/man9/MD5.9
index d51a9fc231fc..fe2eb8b08b2e 100644
--- a/share/man/man9/MD5.9
+++ b/share/man/man9/MD5.9
@@ -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/share/man/man9/MD5.9,v 1.10 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd April 17, 1996
 .Dt MD5 9
diff --git a/share/man/man9/MODULE_DEPEND.9 b/share/man/man9/MODULE_DEPEND.9
index c0a8fdd44c94..e3eaddd4990c 100644
--- a/share/man/man9/MODULE_DEPEND.9
+++ b/share/man/man9/MODULE_DEPEND.9
@@ -26,7 +26,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/share/man/man9/MODULE_DEPEND.9,v 1.7 2005/01/11 20:56:03 simon Exp $
 .\"
 .Dd January 11, 2005
 .Dt MODULE_DEPEND 9
diff --git a/share/man/man9/MODULE_VERSION.9 b/share/man/man9/MODULE_VERSION.9
index 2f284b874b91..f7462931b1d5 100644
--- a/share/man/man9/MODULE_VERSION.9
+++ b/share/man/man9/MODULE_VERSION.9
@@ -26,7 +26,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/share/man/man9/MODULE_VERSION.9,v 1.5 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd March 11, 2001
 .Dt MODULE_VERSION 9
diff --git a/share/man/man9/MUTEX_PROFILING.9 b/share/man/man9/MUTEX_PROFILING.9
index 3538bfeccf47..ae4f4207cbaa 100644
--- a/share/man/man9/MUTEX_PROFILING.9
+++ b/share/man/man9/MUTEX_PROFILING.9
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/MUTEX_PROFILING.9,v 1.11 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd January 7, 2005
 .Dt MUTEX_PROFILING 9
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index d3f7f1cd8d30..2d6c57ffa0e2 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man9/Makefile,v 1.260.2.3.2.1 2005/10/17 18:52:50 jhb Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
diff --git a/share/man/man9/SYSCALL_MODULE.9 b/share/man/man9/SYSCALL_MODULE.9
index 8737268151ab..6f7cf97bad4d 100644
--- a/share/man/man9/SYSCALL_MODULE.9
+++ b/share/man/man9/SYSCALL_MODULE.9
@@ -26,7 +26,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/share/man/man9/SYSCALL_MODULE.9,v 1.6 2005/01/07 09:02:40 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Dt SYSCALL_MODULE 9
diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9
index 21e609e82697..6c0b88f04156 100644
--- a/share/man/man9/VFS.9
+++ b/share/man/man9/VFS.9
@@ -26,7 +26,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/share/man/man9/VFS.9,v 1.11.2.1 2005/07/27 02:11:20 scottl Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_CHECKEXP.9 b/share/man/man9/VFS_CHECKEXP.9
index a3afd2e0e455..5e42ff8a3bee 100644
--- a/share/man/man9/VFS_CHECKEXP.9
+++ b/share/man/man9/VFS_CHECKEXP.9
@@ -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/share/man/man9/VFS_CHECKEXP.9,v 1.12 2005/01/07 11:39:36 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_FHTOVP.9 b/share/man/man9/VFS_FHTOVP.9
index e17133e5ce2f..36d85c576bd1 100644
--- a/share/man/man9/VFS_FHTOVP.9
+++ b/share/man/man9/VFS_FHTOVP.9
@@ -26,7 +26,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/share/man/man9/VFS_FHTOVP.9,v 1.17 2005/01/07 11:45:59 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_LOCK_GIANT.9 b/share/man/man9/VFS_LOCK_GIANT.9
index 11aee93886d3..ff55d0de126b 100644
--- a/share/man/man9/VFS_LOCK_GIANT.9
+++ b/share/man/man9/VFS_LOCK_GIANT.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_LOCK_GIANT.9,v 1.1.2.1 2005/09/25 18:51:45 rwatson Exp $
 .\"
 .Dd September 21, 2005
 .Dt VFS_LOCK_GIANT 9
diff --git a/share/man/man9/VFS_MOUNT.9 b/share/man/man9/VFS_MOUNT.9
index 97d85faa8d71..7f015e8e05bf 100644
--- a/share/man/man9/VFS_MOUNT.9
+++ b/share/man/man9/VFS_MOUNT.9
@@ -26,7 +26,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/share/man/man9/VFS_MOUNT.9,v 1.14 2005/01/07 10:57:33 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_QUOTACTL.9 b/share/man/man9/VFS_QUOTACTL.9
index 4c3620a6e135..46c40029f5a3 100644
--- a/share/man/man9/VFS_QUOTACTL.9
+++ b/share/man/man9/VFS_QUOTACTL.9
@@ -26,7 +26,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/share/man/man9/VFS_QUOTACTL.9,v 1.10 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_ROOT.9 b/share/man/man9/VFS_ROOT.9
index 32b4f2f62147..b31ccdeffe0f 100644
--- a/share/man/man9/VFS_ROOT.9
+++ b/share/man/man9/VFS_ROOT.9
@@ -26,7 +26,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/share/man/man9/VFS_ROOT.9,v 1.10 2004/07/12 09:06:51 alfred Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_SET.9 b/share/man/man9/VFS_SET.9
index 4b55ba75021a..dab95dd24919 100644
--- a/share/man/man9/VFS_SET.9
+++ b/share/man/man9/VFS_SET.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_SET.9,v 1.9 2005/01/18 20:37:11 ru Exp $
 .\"
 .Dd December 2, 2001
 .Dt VFS_SET 9
diff --git a/share/man/man9/VFS_STATFS.9 b/share/man/man9/VFS_STATFS.9
index dd8dcc7c52f3..7bbac86f1c8f 100644
--- a/share/man/man9/VFS_STATFS.9
+++ b/share/man/man9/VFS_STATFS.9
@@ -26,7 +26,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/share/man/man9/VFS_STATFS.9,v 1.12 2005/01/13 09:33:06 ru Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_SYNC.9 b/share/man/man9/VFS_SYNC.9
index fc77f80a1f25..45b5ad0fa5c9 100644
--- a/share/man/man9/VFS_SYNC.9
+++ b/share/man/man9/VFS_SYNC.9
@@ -26,7 +26,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/share/man/man9/VFS_SYNC.9,v 1.15 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_UNMOUNT.9 b/share/man/man9/VFS_UNMOUNT.9
index 1face4913e1b..a410acb27469 100644
--- a/share/man/man9/VFS_UNMOUNT.9
+++ b/share/man/man9/VFS_UNMOUNT.9
@@ -26,7 +26,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/share/man/man9/VFS_UNMOUNT.9,v 1.11 2005/01/07 11:45:11 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_VGET.9 b/share/man/man9/VFS_VGET.9
index 02b55364127d..71b9bfba9c59 100644
--- a/share/man/man9/VFS_VGET.9
+++ b/share/man/man9/VFS_VGET.9
@@ -26,7 +26,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/share/man/man9/VFS_VGET.9,v 1.18 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_VPTOFH.9 b/share/man/man9/VFS_VPTOFH.9
index 4fa891614768..d8d08c257db4 100644
--- a/share/man/man9/VFS_VPTOFH.9
+++ b/share/man/man9/VFS_VPTOFH.9
@@ -26,7 +26,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/share/man/man9/VFS_VPTOFH.9,v 1.9 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index 55a9302d5fea..8893eb7c2dc5 100644
--- a/share/man/man9/VOP_ACCESS.9
+++ b/share/man/man9/VOP_ACCESS.9
@@ -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/share/man/man9/VOP_ACCESS.9,v 1.21 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ACLCHECK.9 b/share/man/man9/VOP_ACLCHECK.9
index 62102281ce7b..82fa82bd55b7 100644
--- a/share/man/man9/VOP_ACLCHECK.9
+++ b/share/man/man9/VOP_ACLCHECK.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ACLCHECK.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_ADVLOCK.9 b/share/man/man9/VOP_ADVLOCK.9
index bdb00b7070e7..b5657e9fbe9b 100644
--- a/share/man/man9/VOP_ADVLOCK.9
+++ b/share/man/man9/VOP_ADVLOCK.9
@@ -26,7 +26,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/share/man/man9/VOP_ADVLOCK.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 30, 1999
 .Os
diff --git a/share/man/man9/VOP_ATTRIB.9 b/share/man/man9/VOP_ATTRIB.9
index 0ea3ee6692d5..7983a2c434a2 100644
--- a/share/man/man9/VOP_ATTRIB.9
+++ b/share/man/man9/VOP_ATTRIB.9
@@ -26,7 +26,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/share/man/man9/VOP_ATTRIB.9,v 1.25 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_BWRITE.9 b/share/man/man9/VOP_BWRITE.9
index 0b8f7e0e1c66..a7fcfcb43bd7 100644
--- a/share/man/man9/VOP_BWRITE.9
+++ b/share/man/man9/VOP_BWRITE.9
@@ -26,7 +26,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/share/man/man9/VOP_BWRITE.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_CREATE.9 b/share/man/man9/VOP_CREATE.9
index 691c93bee134..ffef2d8a81e1 100644
--- a/share/man/man9/VOP_CREATE.9
+++ b/share/man/man9/VOP_CREATE.9
@@ -26,7 +26,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/share/man/man9/VOP_CREATE.9,v 1.18 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index a84726515e57..5f8f41fa8949 100644
--- a/share/man/man9/VOP_FSYNC.9
+++ b/share/man/man9/VOP_FSYNC.9
@@ -26,7 +26,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/share/man/man9/VOP_FSYNC.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_GETACL.9 b/share/man/man9/VOP_GETACL.9
index ba819085bb75..45ff9b3ed03e 100644
--- a/share/man/man9/VOP_GETACL.9
+++ b/share/man/man9/VOP_GETACL.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_GETACL.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_GETEXTATTR.9 b/share/man/man9/VOP_GETEXTATTR.9
index 0971c27a2951..47a97a670f92 100644
--- a/share/man/man9/VOP_GETEXTATTR.9
+++ b/share/man/man9/VOP_GETEXTATTR.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.22 2005/01/28 10:43:05 ru Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_GETPAGES.9 b/share/man/man9/VOP_GETPAGES.9
index ffac609de133..78048d7c52d9 100644
--- a/share/man/man9/VOP_GETPAGES.9
+++ b/share/man/man9/VOP_GETPAGES.9
@@ -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/share/man/man9/VOP_GETPAGES.9,v 1.12 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd September 27, 2003
 .Os
diff --git a/share/man/man9/VOP_GETVOBJECT.9 b/share/man/man9/VOP_GETVOBJECT.9
index e2e0ba471a85..21e2291ce5f4 100644
--- a/share/man/man9/VOP_GETVOBJECT.9
+++ b/share/man/man9/VOP_GETVOBJECT.9
@@ -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/share/man/man9/VOP_GETVOBJECT.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd September 10, 2000
 .Os
diff --git a/share/man/man9/VOP_INACTIVE.9 b/share/man/man9/VOP_INACTIVE.9
index f74b020c4a85..61195aef917a 100644
--- a/share/man/man9/VOP_INACTIVE.9
+++ b/share/man/man9/VOP_INACTIVE.9
@@ -26,7 +26,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/share/man/man9/VOP_INACTIVE.9,v 1.16 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_IOCTL.9 b/share/man/man9/VOP_IOCTL.9
index 6b2f94a9156f..9d7d3ab37371 100644
--- a/share/man/man9/VOP_IOCTL.9
+++ b/share/man/man9/VOP_IOCTL.9
@@ -26,7 +26,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/share/man/man9/VOP_IOCTL.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LEASE.9 b/share/man/man9/VOP_LEASE.9
index becf68b543c3..547362218ef6 100644
--- a/share/man/man9/VOP_LEASE.9
+++ b/share/man/man9/VOP_LEASE.9
@@ -26,7 +26,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/share/man/man9/VOP_LEASE.9,v 1.10 2003/10/23 03:14:21 hmp Exp $
 .\"
 .Dd September 24, 1999
 .Os
diff --git a/share/man/man9/VOP_LINK.9 b/share/man/man9/VOP_LINK.9
index 559526cf4417..2675e6796038 100644
--- a/share/man/man9/VOP_LINK.9
+++ b/share/man/man9/VOP_LINK.9
@@ -26,7 +26,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/share/man/man9/VOP_LINK.9,v 1.23 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LISTEXTATTR.9 b/share/man/man9/VOP_LISTEXTATTR.9
index 4c8b744efcfa..2faa035cb383 100644
--- a/share/man/man9/VOP_LISTEXTATTR.9
+++ b/share/man/man9/VOP_LISTEXTATTR.9
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LISTEXTATTR.9,v 1.6.2.1 2005/08/31 00:27:35 rodrigc Exp $
 .\"
 .Dd August 19, 2005
 .Os
diff --git a/share/man/man9/VOP_LOCK.9 b/share/man/man9/VOP_LOCK.9
index 57d8f72112e2..8ab8afe145fc 100644
--- a/share/man/man9/VOP_LOCK.9
+++ b/share/man/man9/VOP_LOCK.9
@@ -26,7 +26,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/share/man/man9/VOP_LOCK.9,v 1.17 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index 270f83fa71c9..0f26b24c0d48 100644
--- a/share/man/man9/VOP_LOOKUP.9
+++ b/share/man/man9/VOP_LOOKUP.9
@@ -26,7 +26,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/share/man/man9/VOP_LOOKUP.9,v 1.24 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 24, 1997
 .Os
diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9
index d6f8d5dee35d..eb7a55dd750e 100644
--- a/share/man/man9/VOP_OPENCLOSE.9
+++ b/share/man/man9/VOP_OPENCLOSE.9
@@ -26,7 +26,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/share/man/man9/VOP_OPENCLOSE.9,v 1.18 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PATHCONF.9 b/share/man/man9/VOP_PATHCONF.9
index 056f6479a839..f313d0480bd3 100644
--- a/share/man/man9/VOP_PATHCONF.9
+++ b/share/man/man9/VOP_PATHCONF.9
@@ -26,7 +26,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/share/man/man9/VOP_PATHCONF.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PRINT.9 b/share/man/man9/VOP_PRINT.9
index 2da85f9a9d7b..71035dba5390 100644
--- a/share/man/man9/VOP_PRINT.9
+++ b/share/man/man9/VOP_PRINT.9
@@ -26,7 +26,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/share/man/man9/VOP_PRINT.9,v 1.10 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RDWR.9 b/share/man/man9/VOP_RDWR.9
index 28f495f2dde0..1032f637eac9 100644
--- a/share/man/man9/VOP_RDWR.9
+++ b/share/man/man9/VOP_RDWR.9
@@ -26,7 +26,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/share/man/man9/VOP_RDWR.9,v 1.19 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READDIR.9 b/share/man/man9/VOP_READDIR.9
index bf4c6b2431df..e04d47fe40cd 100644
--- a/share/man/man9/VOP_READDIR.9
+++ b/share/man/man9/VOP_READDIR.9
@@ -26,7 +26,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/share/man/man9/VOP_READDIR.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READLINK.9 b/share/man/man9/VOP_READLINK.9
index 0fb5e4762319..7f48d8136d5c 100644
--- a/share/man/man9/VOP_READLINK.9
+++ b/share/man/man9/VOP_READLINK.9
@@ -26,7 +26,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/share/man/man9/VOP_READLINK.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REALLOCBLKS.9 b/share/man/man9/VOP_REALLOCBLKS.9
index 9209844eb8dd..4e649e7bdd66 100644
--- a/share/man/man9/VOP_REALLOCBLKS.9
+++ b/share/man/man9/VOP_REALLOCBLKS.9
@@ -26,7 +26,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/share/man/man9/VOP_REALLOCBLKS.9,v 1.11 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REMOVE.9 b/share/man/man9/VOP_REMOVE.9
index 260de4083384..a532c64e2cfe 100644
--- a/share/man/man9/VOP_REMOVE.9
+++ b/share/man/man9/VOP_REMOVE.9
@@ -26,7 +26,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/share/man/man9/VOP_REMOVE.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RENAME.9 b/share/man/man9/VOP_RENAME.9
index 2d8b4508bc85..0c37ceb5d283 100644
--- a/share/man/man9/VOP_RENAME.9
+++ b/share/man/man9/VOP_RENAME.9
@@ -26,7 +26,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/share/man/man9/VOP_RENAME.9,v 1.21 2005/01/28 10:43:05 ru Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REVOKE.9 b/share/man/man9/VOP_REVOKE.9
index 6e0401435348..fe06ca0df6d0 100644
--- a/share/man/man9/VOP_REVOKE.9
+++ b/share/man/man9/VOP_REVOKE.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_REVOKE.9,v 1.6 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd February 5, 2002
 .Os
diff --git a/share/man/man9/VOP_SETACL.9 b/share/man/man9/VOP_SETACL.9
index b6a7003a86b6..7da88d6eed0e 100644
--- a/share/man/man9/VOP_SETACL.9
+++ b/share/man/man9/VOP_SETACL.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_SETACL.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_SETEXTATTR.9 b/share/man/man9/VOP_SETEXTATTR.9
index ccb8aaad0fb6..275fbfbab49e 100644
--- a/share/man/man9/VOP_SETEXTATTR.9
+++ b/share/man/man9/VOP_SETEXTATTR.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.20 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_STRATEGY.9 b/share/man/man9/VOP_STRATEGY.9
index 709a929921b5..22f7f35e232d 100644
--- a/share/man/man9/VOP_STRATEGY.9
+++ b/share/man/man9/VOP_STRATEGY.9
@@ -26,7 +26,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/share/man/man9/VOP_STRATEGY.9,v 1.17 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/accept_filter.9 b/share/man/man9/accept_filter.9
index af9e888a52f1..ca9971996f98 100644
--- a/share/man/man9/accept_filter.9
+++ b/share/man/man9/accept_filter.9
@@ -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/share/man/man9/accept_filter.9,v 1.13 2004/06/16 08:33:57 ru Exp $
 .\" "
 .Dd June 25, 2000
 .Os
diff --git a/share/man/man9/accf_data.9 b/share/man/man9/accf_data.9
index 7eba8654a75c..ed49fac19a97 100644
--- a/share/man/man9/accf_data.9
+++ b/share/man/man9/accf_data.9
@@ -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/share/man/man9/accf_data.9,v 1.8 2005/01/18 20:52:51 ru Exp $
 .\" "
 .Dd November 15, 2000
 .Os
diff --git a/share/man/man9/accf_http.9 b/share/man/man9/accf_http.9
index a75321c9b1b2..fa4f7a811bcf 100644
--- a/share/man/man9/accf_http.9
+++ b/share/man/man9/accf_http.9
@@ -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/share/man/man9/accf_http.9,v 1.11 2005/01/18 20:52:51 ru Exp $
 .\" "
 .Dd November 15, 2000
 .Os
diff --git a/share/man/man9/acl.9 b/share/man/man9/acl.9
index f54da34d072d..baddcaf0fa01 100644
--- a/share/man/man9/acl.9
+++ b/share/man/man9/acl.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/acl.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/alloc_unr.9 b/share/man/man9/alloc_unr.9
index 9d8145385a7c..8b6024439a8d 100644
--- a/share/man/man9/alloc_unr.9
+++ b/share/man/man9/alloc_unr.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/alloc_unr.9,v 1.2 2005/06/16 18:46:17 ru Exp $
 .\"
 .Dd March 23, 2005
 .Dt ALLOC_UNR 9
diff --git a/share/man/man9/alq.9 b/share/man/man9/alq.9
index ec6ef2688c3a..60cff9424a88 100644
--- a/share/man/man9/alq.9
+++ b/share/man/man9/alq.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/alq.9,v 1.6 2005/04/16 12:12:27 rwatson Exp $
 .\"
 .Dd May 16, 2003
 .Dt ALQ 9
diff --git a/share/man/man9/altq.9 b/share/man/man9/altq.9
index 6ed338bdabde..c272731e8c59 100644
--- a/share/man/man9/altq.9
+++ b/share/man/man9/altq.9
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/altq.9,v 1.5 2004/10/07 12:10:25 mlaier Exp $
 .\"
 .Dd August 25, 2004
 .Dt ALTQ 9
diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9
index 49334325946c..df406b13b66a 100644
--- a/share/man/man9/atomic.9
+++ b/share/man/man9/atomic.9
@@ -21,7 +21,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/share/man/man9/atomic.9,v 1.11.10.1 2005/10/06 18:12:04 jhb Exp $
 .\"
 .Dd October 27, 2000
 .Os
diff --git a/share/man/man9/bios.9 b/share/man/man9/bios.9
index d64fc7d6cb65..9d5293c911a3 100644
--- a/share/man/man9/bios.9
+++ b/share/man/man9/bios.9
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bios.9,v 1.13.10.1 2005/08/14 18:48:54 murray Exp $
 .\"
 .\" Copyright (c) 1997 Michael Smith
 .\" All rights reserved.
diff --git a/share/man/man9/boot.9 b/share/man/man9/boot.9
index cbd0099e4e18..a0370b22dea8 100644
--- a/share/man/man9/boot.9
+++ b/share/man/man9/boot.9
@@ -32,7 +32,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/share/man/man9/boot.9,v 1.10 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd February 14, 1997
 .Dt BOOT 9
diff --git a/share/man/man9/bpf.9 b/share/man/man9/bpf.9
index c7c4b1d6c3cb..5b189a317952 100644
--- a/share/man/man9/bpf.9
+++ b/share/man/man9/bpf.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bpf.9,v 1.6 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 19, 2004
 .Dt BPF 9
diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9
index 5ee05f3de880..ff56bfd85081 100644
--- a/share/man/man9/buf.9
+++ b/share/man/man9/buf.9
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/buf.9,v 1.17 2005/02/15 09:27:00 ru Exp $
 .\"
 .Dd December 22, 1998
 .Dt BUF 9
diff --git a/share/man/man9/bus_activate_resource.9 b/share/man/man9/bus_activate_resource.9
index eb5b3e824e79..5055919e8384 100644
--- a/share/man/man9/bus_activate_resource.9
+++ b/share/man/man9/bus_activate_resource.9
@@ -26,7 +26,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/share/man/man9/bus_activate_resource.9,v 1.3 2003/05/30 21:13:32 ru Exp $
 .\"
 .Dd March 28, 2003
 .Dt BUS_ACTIVATE_RESOURCE 9
diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9
index 6a5443afacb8..fc0c58547040 100644
--- a/share/man/man9/bus_alloc_resource.9
+++ b/share/man/man9/bus_alloc_resource.9
@@ -26,7 +26,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/share/man/man9/bus_alloc_resource.9,v 1.21 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 18, 2000
 .Dt BUS_ALLOC_RESOURCE 9
diff --git a/share/man/man9/bus_child_present.9 b/share/man/man9/bus_child_present.9
index 12577ad3d54b..157310405838 100644
--- a/share/man/man9/bus_child_present.9
+++ b/share/man/man9/bus_child_present.9
@@ -26,7 +26,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/share/man/man9/bus_child_present.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 27, 2003
 .Dt BUS_CHILD_PRESENT 9
diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9
index ceab45456067..11311db4bbfb 100644
--- a/share/man/man9/bus_dma.9
+++ b/share/man/man9/bus_dma.9
@@ -57,7 +57,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_dma.9,v 1.25 2005/06/15 13:31:23 ru Exp $
 .\" $NetBSD: bus_dma.9,v 1.25 2002/10/14 13:43:16 wiz Exp $
 .\"
 .Dd May 28, 2003
diff --git a/share/man/man9/bus_generic_attach.9 b/share/man/man9/bus_generic_attach.9
index e53bd5d080f3..425bc310ae05 100644
--- a/share/man/man9/bus_generic_attach.9
+++ b/share/man/man9/bus_generic_attach.9
@@ -26,7 +26,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/share/man/man9/bus_generic_attach.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_ATTACH 9
diff --git a/share/man/man9/bus_generic_detach.9 b/share/man/man9/bus_generic_detach.9
index 9a2a6f8bb8ae..c8e27a0f496e 100644
--- a/share/man/man9/bus_generic_detach.9
+++ b/share/man/man9/bus_generic_detach.9
@@ -26,7 +26,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/share/man/man9/bus_generic_detach.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_DETACH 9
diff --git a/share/man/man9/bus_generic_print_child.9 b/share/man/man9/bus_generic_print_child.9
index 80a04ff3d506..a25145de9561 100644
--- a/share/man/man9/bus_generic_print_child.9
+++ b/share/man/man9/bus_generic_print_child.9
@@ -26,7 +26,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/share/man/man9/bus_generic_print_child.9,v 1.11 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_PRINT_CHILD 9
diff --git a/share/man/man9/bus_generic_read_ivar.9 b/share/man/man9/bus_generic_read_ivar.9
index 5474b436901c..c00f5e7da5e2 100644
--- a/share/man/man9/bus_generic_read_ivar.9
+++ b/share/man/man9/bus_generic_read_ivar.9
@@ -26,7 +26,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/share/man/man9/bus_generic_read_ivar.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_READ_IVAR 9
diff --git a/share/man/man9/bus_generic_shutdown.9 b/share/man/man9/bus_generic_shutdown.9
index 215d8594275e..52577f80f502 100644
--- a/share/man/man9/bus_generic_shutdown.9
+++ b/share/man/man9/bus_generic_shutdown.9
@@ -26,7 +26,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/share/man/man9/bus_generic_shutdown.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_SHUTDOWN 9
diff --git a/share/man/man9/bus_release_resource.9 b/share/man/man9/bus_release_resource.9
index 68187ccc7872..da83f0be02c5 100644
--- a/share/man/man9/bus_release_resource.9
+++ b/share/man/man9/bus_release_resource.9
@@ -26,7 +26,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/share/man/man9/bus_release_resource.9,v 1.11 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 18, 2000
 .Dt BUS_RELEASE_RESOURCE 9
diff --git a/share/man/man9/bus_set_resource.9 b/share/man/man9/bus_set_resource.9
index cda47b62b682..904b961752dc 100644
--- a/share/man/man9/bus_set_resource.9
+++ b/share/man/man9/bus_set_resource.9
@@ -26,7 +26,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/share/man/man9/bus_set_resource.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 29, 2003
 .Dt BUS_SET_RESOURCE 9
diff --git a/share/man/man9/bus_space.9 b/share/man/man9/bus_space.9
index c51a6f8700d1..30eb4b431107 100644
--- a/share/man/man9/bus_space.9
+++ b/share/man/man9/bus_space.9
@@ -56,7 +56,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_space.9,v 1.2 2005/06/25 08:59:05 ru Exp $
 .\"
 .Dd June 13, 2005
 .Dt BUS_SPACE 9
diff --git a/share/man/man9/byteorder.9 b/share/man/man9/byteorder.9
index f47f609758d3..3ba6943e455e 100644
--- a/share/man/man9/byteorder.9
+++ b/share/man/man9/byteorder.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/byteorder.9,v 1.6 2003/05/21 17:32:55 ru Exp $
 .\"
 .Dd April 29, 2002
 .Dt BYTEORDER 9
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 59f796dc3d24..0abde9c60e8b 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/cd.9,v 1.23 2005/02/13 22:25:19 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt CD 9
diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9
index a21d5100b5f5..2b755c76d21c 100644
--- a/share/man/man9/condvar.9
+++ b/share/man/man9/condvar.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/condvar.9,v 1.11 2004/11/08 18:15:11 jhb Exp $
 .\"
 .Dd December 11, 2000
 .Dt CONDVAR 9
diff --git a/share/man/man9/contigmalloc.9 b/share/man/man9/contigmalloc.9
index 361e44ea24be..e69910ebf671 100644
--- a/share/man/man9/contigmalloc.9
+++ b/share/man/man9/contigmalloc.9
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/contigmalloc.9,v 1.6 2005/02/22 17:20:20 brueffer Exp $
 .\"
 .Dd August 10, 2004
 .Dt CONTIGMALLOC 9
diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9
index b6b975f82840..e2a4071d1dda 100644
--- a/share/man/man9/copy.9
+++ b/share/man/man9/copy.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/copy.9,v 1.15 2004/06/16 08:33:57 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt COPY 9
diff --git a/share/man/man9/cr_seeothergids.9 b/share/man/man9/cr_seeothergids.9
index 1f5f4ee05dba..c6af67adf64e 100644
--- a/share/man/man9/cr_seeothergids.9
+++ b/share/man/man9/cr_seeothergids.9
@@ -25,7 +25,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/share/man/man9/cr_seeothergids.9,v 1.3 2004/07/06 07:26:23 ru Exp $
 .\"
 .Dd November 11, 2003
 .Os
diff --git a/share/man/man9/cr_seeotheruids.9 b/share/man/man9/cr_seeotheruids.9
index e79363f225eb..0aabbdf02844 100644
--- a/share/man/man9/cr_seeotheruids.9
+++ b/share/man/man9/cr_seeotheruids.9
@@ -25,7 +25,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/share/man/man9/cr_seeotheruids.9,v 1.3 2004/07/06 07:26:23 ru Exp $
 .\"
 .Dd November 11, 2003
 .Os
diff --git a/share/man/man9/critical_enter.9 b/share/man/man9/critical_enter.9
index a1d63fccd1bb..80cdae54be36 100644
--- a/share/man/man9/critical_enter.9
+++ b/share/man/man9/critical_enter.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/critical_enter.9,v 1.7.16.1 2005/10/17 18:52:50 jhb Exp $
 .\"
 .Dd October 5, 2005
 .Dt CRITICAL_ENTER 9
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index ccafa23e8e61..e6ebb185f043 100644
--- a/share/man/man9/crypto.9
+++ b/share/man/man9/crypto.9
@@ -15,7 +15,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/crypto.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd October 14, 2002
 .Dt CRYPTO 9
diff --git a/share/man/man9/devclass.9 b/share/man/man9/devclass.9
index d3e848e8d904..16ce5fdb13bc 100644
--- a/share/man/man9/devclass.9
+++ b/share/man/man9/devclass.9
@@ -26,7 +26,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/share/man/man9/devclass.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS 9
diff --git a/share/man/man9/devclass_add_driver.9 b/share/man/man9/devclass_add_driver.9
index 8ac632af7b96..f0c1ead9f5bd 100644
--- a/share/man/man9/devclass_add_driver.9
+++ b/share/man/man9/devclass_add_driver.9
@@ -26,7 +26,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/share/man/man9/devclass_add_driver.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_ADD_DRIVER 9
diff --git a/share/man/man9/devclass_find.9 b/share/man/man9/devclass_find.9
index 2a2c88d45e20..2155782e6826 100644
--- a/share/man/man9/devclass_find.9
+++ b/share/man/man9/devclass_find.9
@@ -26,7 +26,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/share/man/man9/devclass_find.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_FIND 9
diff --git a/share/man/man9/devclass_get_count.9 b/share/man/man9/devclass_get_count.9
index f645a49454f2..6596e047715b 100644
--- a/share/man/man9/devclass_get_count.9
+++ b/share/man/man9/devclass_get_count.9
@@ -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/share/man/man9/devclass_get_count.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 5, 2004
 .Dt DEVCLASS_GET_COUNT 9
diff --git a/share/man/man9/devclass_get_device.9 b/share/man/man9/devclass_get_device.9
index 242785e1931a..cae091f814c5 100644
--- a/share/man/man9/devclass_get_device.9
+++ b/share/man/man9/devclass_get_device.9
@@ -26,7 +26,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/share/man/man9/devclass_get_device.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_DEVICE 9
diff --git a/share/man/man9/devclass_get_devices.9 b/share/man/man9/devclass_get_devices.9
index e6f8a15b6978..2f960aae06a9 100644
--- a/share/man/man9/devclass_get_devices.9
+++ b/share/man/man9/devclass_get_devices.9
@@ -26,7 +26,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/share/man/man9/devclass_get_devices.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 19, 2005
 .Dt DEVCLASS_GET_DEVICES 9
diff --git a/share/man/man9/devclass_get_drivers.9 b/share/man/man9/devclass_get_drivers.9
index f2ba1481436c..7ad4e47e5bdb 100644
--- a/share/man/man9/devclass_get_drivers.9
+++ b/share/man/man9/devclass_get_drivers.9
@@ -26,7 +26,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/share/man/man9/devclass_get_drivers.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 19, 2005
 .Dt DEVCLASS_GET_DRIVERS 9
diff --git a/share/man/man9/devclass_get_maxunit.9 b/share/man/man9/devclass_get_maxunit.9
index c1fa694cbf87..21dfa1efd071 100644
--- a/share/man/man9/devclass_get_maxunit.9
+++ b/share/man/man9/devclass_get_maxunit.9
@@ -26,7 +26,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/share/man/man9/devclass_get_maxunit.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd April 3, 2005
 .Dt DEVCLASS_GET_MAXUNIT 9
diff --git a/share/man/man9/devclass_get_name.9 b/share/man/man9/devclass_get_name.9
index 5978dc16d944..0b15ab6ee542 100644
--- a/share/man/man9/devclass_get_name.9
+++ b/share/man/man9/devclass_get_name.9
@@ -26,7 +26,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/share/man/man9/devclass_get_name.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_NAME 9
diff --git a/share/man/man9/devclass_get_softc.9 b/share/man/man9/devclass_get_softc.9
index e4c55334fad4..35515fb7bd6d 100644
--- a/share/man/man9/devclass_get_softc.9
+++ b/share/man/man9/devclass_get_softc.9
@@ -26,7 +26,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/share/man/man9/devclass_get_softc.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_SOFTC 9
diff --git a/share/man/man9/device.9 b/share/man/man9/device.9
index 3cc3462c8977..c9b81c76e275 100644
--- a/share/man/man9/device.9
+++ b/share/man/man9/device.9
@@ -26,7 +26,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/share/man/man9/device.9,v 1.16 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE 9
diff --git a/share/man/man9/device_add_child.9 b/share/man/man9/device_add_child.9
index eedc8cca5204..2ac9bef98ce2 100644
--- a/share/man/man9/device_add_child.9
+++ b/share/man/man9/device_add_child.9
@@ -26,7 +26,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/share/man/man9/device_add_child.9,v 1.19 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd May 13, 2004
 .Dt DEVICE_ADD_CHILD 9
diff --git a/share/man/man9/device_delete_child.9 b/share/man/man9/device_delete_child.9
index df56c599e9b9..ec023915fb73 100644
--- a/share/man/man9/device_delete_child.9
+++ b/share/man/man9/device_delete_child.9
@@ -26,7 +26,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/share/man/man9/device_delete_child.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_DELETE_CHILD 9
diff --git a/share/man/man9/device_enable.9 b/share/man/man9/device_enable.9
index 85b4f6ea5e6c..0b278b71d9b7 100644
--- a/share/man/man9/device_enable.9
+++ b/share/man/man9/device_enable.9
@@ -26,7 +26,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/share/man/man9/device_enable.9,v 1.10 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ENABLE 9
diff --git a/share/man/man9/device_find_child.9 b/share/man/man9/device_find_child.9
index a23b2b2a145a..d03d2710f9de 100644
--- a/share/man/man9/device_find_child.9
+++ b/share/man/man9/device_find_child.9
@@ -26,7 +26,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/share/man/man9/device_find_child.9,v 1.10 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd February 8, 2005
 .Dt DEVICE_FIND_CHILD 9
diff --git a/share/man/man9/device_get_children.9 b/share/man/man9/device_get_children.9
index bad2fdd6d2d7..2c30ef0032d8 100644
--- a/share/man/man9/device_get_children.9
+++ b/share/man/man9/device_get_children.9
@@ -26,7 +26,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/share/man/man9/device_get_children.9,v 1.5 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd December 1, 1999
 .Dt DEVICE_GET_CHILDREN 9
diff --git a/share/man/man9/device_get_devclass.9 b/share/man/man9/device_get_devclass.9
index fcf869565aeb..287bba33af08 100644
--- a/share/man/man9/device_get_devclass.9
+++ b/share/man/man9/device_get_devclass.9
@@ -26,7 +26,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/share/man/man9/device_get_devclass.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_DEVCLASS 9
diff --git a/share/man/man9/device_get_driver.9 b/share/man/man9/device_get_driver.9
index d764768b11f6..c0f6bcb96d53 100644
--- a/share/man/man9/device_get_driver.9
+++ b/share/man/man9/device_get_driver.9
@@ -26,7 +26,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/share/man/man9/device_get_driver.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_DRIVER 9
diff --git a/share/man/man9/device_get_ivars.9 b/share/man/man9/device_get_ivars.9
index dd1450c32f93..a48e9b367fdc 100644
--- a/share/man/man9/device_get_ivars.9
+++ b/share/man/man9/device_get_ivars.9
@@ -26,7 +26,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/share/man/man9/device_get_ivars.9,v 1.9 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_IVARS 9
diff --git a/share/man/man9/device_get_name.9 b/share/man/man9/device_get_name.9
index 3149f8c6c9cf..b27ccf7ab6f2 100644
--- a/share/man/man9/device_get_name.9
+++ b/share/man/man9/device_get_name.9
@@ -26,7 +26,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/share/man/man9/device_get_name.9,v 1.4 2003/11/06 15:54:32 des Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_GET_NAME 9
diff --git a/share/man/man9/device_get_parent.9 b/share/man/man9/device_get_parent.9
index 63669d33a16e..be22a081d162 100644
--- a/share/man/man9/device_get_parent.9
+++ b/share/man/man9/device_get_parent.9
@@ -26,7 +26,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/share/man/man9/device_get_parent.9,v 1.3 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_GET_PARENT 9
diff --git a/share/man/man9/device_get_softc.9 b/share/man/man9/device_get_softc.9
index e21811588dd8..baa055c1e9bb 100644
--- a/share/man/man9/device_get_softc.9
+++ b/share/man/man9/device_get_softc.9
@@ -26,7 +26,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/share/man/man9/device_get_softc.9,v 1.10.10.1 2005/08/06 07:26:42 brueffer Exp $
 .\"
 .Dd August 2, 2005
 .Dt DEVICE_GET_SOFTC 9
diff --git a/share/man/man9/device_get_state.9 b/share/man/man9/device_get_state.9
index 384395a30288..cb419e7593c2 100644
--- a/share/man/man9/device_get_state.9
+++ b/share/man/man9/device_get_state.9
@@ -26,7 +26,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/share/man/man9/device_get_state.9,v 1.12 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_STATE 9
diff --git a/share/man/man9/device_get_unit.9 b/share/man/man9/device_get_unit.9
index 0b222e96dd6d..31c467bf4b4d 100644
--- a/share/man/man9/device_get_unit.9
+++ b/share/man/man9/device_get_unit.9
@@ -26,7 +26,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/share/man/man9/device_get_unit.9,v 1.7 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_UNIT 9
diff --git a/share/man/man9/device_ids.9 b/share/man/man9/device_ids.9
index fc7c9fd36c75..12484434383a 100644
--- a/share/man/man9/device_ids.9
+++ b/share/man/man9/device_ids.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_ids.9,v 1.3 2004/06/22 20:18:15 le Exp $
 .\"
 .Dd June 22, 2004
 .Dt DEVICE_IDS 9
diff --git a/share/man/man9/device_printf.9 b/share/man/man9/device_printf.9
index 297cce731a15..f0262b130955 100644
--- a/share/man/man9/device_printf.9
+++ b/share/man/man9/device_printf.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_printf.9,v 1.2 2003/05/30 21:13:32 ru Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_PRINTF 9
diff --git a/share/man/man9/device_probe_and_attach.9 b/share/man/man9/device_probe_and_attach.9
index 8f8c4af18d22..b02a5b4cb291 100644
--- a/share/man/man9/device_probe_and_attach.9
+++ b/share/man/man9/device_probe_and_attach.9
@@ -26,7 +26,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/share/man/man9/device_probe_and_attach.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_PROBE_AND_ATTACH 9
diff --git a/share/man/man9/device_quiet.9 b/share/man/man9/device_quiet.9
index 0e5526d689aa..bd163ab3443b 100644
--- a/share/man/man9/device_quiet.9
+++ b/share/man/man9/device_quiet.9
@@ -26,7 +26,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/share/man/man9/device_quiet.9,v 1.11 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 21, 1999
 .Dt DEVICE_QUIET 9
diff --git a/share/man/man9/device_set_desc.9 b/share/man/man9/device_set_desc.9
index ae29010450b1..1645898a905d 100644
--- a/share/man/man9/device_set_desc.9
+++ b/share/man/man9/device_set_desc.9
@@ -26,7 +26,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/share/man/man9/device_set_desc.9,v 1.11 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_SET_DESC 9
diff --git a/share/man/man9/device_set_driver.9 b/share/man/man9/device_set_driver.9
index 56d4bb928c68..267fef89b06a 100644
--- a/share/man/man9/device_set_driver.9
+++ b/share/man/man9/device_set_driver.9
@@ -26,7 +26,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/share/man/man9/device_set_driver.9,v 1.3 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_SET_DRIVER 9
diff --git a/share/man/man9/device_set_flags.9 b/share/man/man9/device_set_flags.9
index aed306950e16..0bffd80dc244 100644
--- a/share/man/man9/device_set_flags.9
+++ b/share/man/man9/device_set_flags.9
@@ -26,7 +26,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/share/man/man9/device_set_flags.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd September 6, 1999
 .Dt DEVICE_GET_FLAGS 9
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 45e17b7bb0a5..8796c0da55a1 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devstat.9,v 1.22 2005/02/13 22:25:19 ru Exp $
 .\"
 .Dd May 22, 1998
 .Dt DEVSTAT 9
diff --git a/share/man/man9/devsw.9 b/share/man/man9/devsw.9
index 070eceac988d..271b5f0ff50e 100644
--- a/share/man/man9/devsw.9
+++ b/share/man/man9/devsw.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devsw.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt DEVSW 9
diff --git a/share/man/man9/devtoname.9 b/share/man/man9/devtoname.9
index 9a62a5ededb6..cf38aacb9550 100644
--- a/share/man/man9/devtoname.9
+++ b/share/man/man9/devtoname.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devtoname.9,v 1.8 2003/10/23 01:54:06 hmp Exp $
 .\"
 .Dd September 25, 1999
 .Os
diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9
index d8d446baf44a..02eaccbaebc1 100644
--- a/share/man/man9/disk.9
+++ b/share/man/man9/disk.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/disk.9,v 1.7 2004/06/21 14:11:45 mpp Exp $
 .\"
 .Dd February 18, 2004
 .Dt DISK 9
diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9
index 4b7b83e4b9c1..69b938aa20d2 100644
--- a/share/man/man9/domain.9
+++ b/share/man/man9/domain.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/domain.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 7, 2001
 .Dt DOMAIN 9
diff --git a/share/man/man9/driver.9 b/share/man/man9/driver.9
index bc2f7195abda..17b65a537e92 100644
--- a/share/man/man9/driver.9
+++ b/share/man/man9/driver.9
@@ -26,7 +26,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/share/man/man9/driver.9,v 1.11 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DRIVER 9
diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9
index 9c74a60bf9bc..91fb637543d7 100644
--- a/share/man/man9/extattr.9
+++ b/share/man/man9/extattr.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/extattr.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/fetch.9 b/share/man/man9/fetch.9
index 7de3ff7fbb99..eec328c5f8e7 100644
--- a/share/man/man9/fetch.9
+++ b/share/man/man9/fetch.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/fetch.9,v 1.10 2001/10/01 16:09:24 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt FETCH 9
diff --git a/share/man/man9/g_access.9 b/share/man/man9/g_access.9
index 95ad1da91a32..ef660aa9f19f 100644
--- a/share/man/man9/g_access.9
+++ b/share/man/man9/g_access.9
@@ -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/share/man/man9/g_access.9,v 1.9 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_ACCESS 9
diff --git a/share/man/man9/g_attach.9 b/share/man/man9/g_attach.9
index 4bf7d9c51493..c138d55d55f5 100644
--- a/share/man/man9/g_attach.9
+++ b/share/man/man9/g_attach.9
@@ -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/share/man/man9/g_attach.9,v 1.9 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_ATTACH 9
diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9
index c839b31f5885..cd498341f627 100644
--- a/share/man/man9/g_bio.9
+++ b/share/man/man9/g_bio.9
@@ -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/share/man/man9/g_bio.9,v 1.9 2004/08/04 21:35:05 pjd Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_BIO 9
diff --git a/share/man/man9/g_consumer.9 b/share/man/man9/g_consumer.9
index aa1e33a02856..38e95730ab3c 100644
--- a/share/man/man9/g_consumer.9
+++ b/share/man/man9/g_consumer.9
@@ -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/share/man/man9/g_consumer.9,v 1.7 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_CONSUMER 9
diff --git a/share/man/man9/g_data.9 b/share/man/man9/g_data.9
index f5cd6961a04a..e5fe8cb865c2 100644
--- a/share/man/man9/g_data.9
+++ b/share/man/man9/g_data.9
@@ -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/share/man/man9/g_data.9,v 1.8 2005/02/16 22:24:15 pjd Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_DATA 9
diff --git a/share/man/man9/g_event.9 b/share/man/man9/g_event.9
index 380caa82a0b8..438745fe4350 100644
--- a/share/man/man9/g_event.9
+++ b/share/man/man9/g_event.9
@@ -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/share/man/man9/g_event.9,v 1.7 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_EVENT 9
diff --git a/share/man/man9/g_geom.9 b/share/man/man9/g_geom.9
index 19c491098018..f5f84446effe 100644
--- a/share/man/man9/g_geom.9
+++ b/share/man/man9/g_geom.9
@@ -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/share/man/man9/g_geom.9,v 1.7 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_GEOM 9
diff --git a/share/man/man9/g_provider.9 b/share/man/man9/g_provider.9
index 05e4addabf36..8bf8f0eda146 100644
--- a/share/man/man9/g_provider.9
+++ b/share/man/man9/g_provider.9
@@ -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/share/man/man9/g_provider.9,v 1.8 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_PROVIDER 9
diff --git a/share/man/man9/g_provider_by_name.9 b/share/man/man9/g_provider_by_name.9
index 58da421a243d..b57a03e6472f 100644
--- a/share/man/man9/g_provider_by_name.9
+++ b/share/man/man9/g_provider_by_name.9
@@ -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/share/man/man9/g_provider_by_name.9,v 1.5 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_PROVIDER_BY_NAME 9
diff --git a/share/man/man9/g_wither_geom.9 b/share/man/man9/g_wither_geom.9
index 2c4b10eeaa34..915dca70dcba 100644
--- a/share/man/man9/g_wither_geom.9
+++ b/share/man/man9/g_wither_geom.9
@@ -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/share/man/man9/g_wither_geom.9,v 1.5 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_WITHER_GEOM 9
diff --git a/share/man/man9/get_cyclecount.9 b/share/man/man9/get_cyclecount.9
index c67311173135..595c1d6a7f88 100644
--- a/share/man/man9/get_cyclecount.9
+++ b/share/man/man9/get_cyclecount.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/get_cyclecount.9,v 1.10 2004/11/16 21:22:09 jhb Exp $
 .\"
 .Dd November 20, 2000
 .Dt GET_CYCLECOUNT 9
diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9
index 2e81212630fd..1b0f6949fbcf 100644
--- a/share/man/man9/getnewvnode.9
+++ b/share/man/man9/getnewvnode.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/getnewvnode.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt GETNEWVNODE 9
diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9
index 0d3629a1ad45..1da7c58a9529 100644
--- a/share/man/man9/groupmember.9
+++ b/share/man/man9/groupmember.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/groupmember.9,v 1.2 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt GROUPMEMBER 9
diff --git a/share/man/man9/hashinit.9 b/share/man/man9/hashinit.9
index 15fdb3bc0361..9eb5b6d9d771 100644
--- a/share/man/man9/hashinit.9
+++ b/share/man/man9/hashinit.9
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/hashinit.9,v 1.2 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd October 10, 2004
 .Dt HASHINIT 9
diff --git a/share/man/man9/hexdump.9 b/share/man/man9/hexdump.9
index 656299cd5611..a289ac975596 100644
--- a/share/man/man9/hexdump.9
+++ b/share/man/man9/hexdump.9
@@ -26,7 +26,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/share/man/man9/hexdump.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 7, 2003
 .Os
diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9
index 827daece94d5..387d0e800877 100644
--- a/share/man/man9/ieee80211.9
+++ b/share/man/man9/ieee80211.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211.9,v 1.5 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_crypto.9 b/share/man/man9/ieee80211_crypto.9
index bf4bb6049178..03b0b9445e53 100644
--- a/share/man/man9/ieee80211_crypto.9
+++ b/share/man/man9/ieee80211_crypto.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_crypto.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_crypto.9,v 1.3 2004/03/04 10:42:56 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_input.9 b/share/man/man9/ieee80211_input.9
index 21c9f253c2ef..7bc6d1b54b64 100644
--- a/share/man/man9/ieee80211_input.9
+++ b/share/man/man9/ieee80211_input.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_input.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_input.9,v 1.6 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_ioctl.9 b/share/man/man9/ieee80211_ioctl.9
index cb6c87d5c4b4..6c9095e2f899 100644
--- a/share/man/man9/ieee80211_ioctl.9
+++ b/share/man/man9/ieee80211_ioctl.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_ioctl.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_ioctl.9,v 1.5 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9
index c9d142a31a3c..3c3180010f0b 100644
--- a/share/man/man9/ieee80211_node.9
+++ b/share/man/man9/ieee80211_node.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_node.9,v 1.6 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd July 4, 2004
diff --git a/share/man/man9/ieee80211_output.9 b/share/man/man9/ieee80211_output.9
index f553c4f3783b..2a7a6b2b62c5 100644
--- a/share/man/man9/ieee80211_output.9
+++ b/share/man/man9/ieee80211_output.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_output.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_output.9,v 1.5 2004/03/04 12:31:18 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_proto.9 b/share/man/man9/ieee80211_proto.9
index 0de486451d39..1f9d8c71ba09 100644
--- a/share/man/man9/ieee80211_proto.9
+++ b/share/man/man9/ieee80211_proto.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_proto.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_proto.9,v 1.5 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_radiotap.9 b/share/man/man9/ieee80211_radiotap.9
index 3749826a9352..7ce247f061d9 100644
--- a/share/man/man9/ieee80211_radiotap.9
+++ b/share/man/man9/ieee80211_radiotap.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_radiotap.9,v 1.3 2004/07/07 12:59:39 ru Exp $
 .\" $Id: ieee80211_radiotap.9,v 1.3 2004/03/04 11:38:52 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 037e6816596f..7c9747f18391 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.50.2.1 2005/08/18 15:01:24 keramida Exp $
 .\"
 .Dd June 10, 2005
 .Os
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 61524f206296..56a8ae626488 100644
--- a/share/man/man9/inittodr.9
+++ b/share/man/man9/inittodr.9
@@ -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/share/man/man9/inittodr.9,v 1.11 2003/10/23 02:33:03 hmp Exp $
 .\"
 .Dd March 22, 1997
 .Dt INITTODR 9
diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9
index 0e0fe8188d7a..87ef63aaefc8 100644
--- a/share/man/man9/intro.9
+++ b/share/man/man9/intro.9
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/intro.9,v 1.16 2005/02/13 22:25:19 ru Exp $
 .\"
 .Dd December 13, 1995
 .Dt INTRO 9
diff --git a/share/man/man9/ithread.9 b/share/man/man9/ithread.9
index 9ad0dff54e99..c7bbc40f4622 100644
--- a/share/man/man9/ithread.9
+++ b/share/man/man9/ithread.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ithread.9,v 1.11 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd February 10, 2001
 .Dt ITHREAD 9
diff --git a/share/man/man9/kernacc.9 b/share/man/man9/kernacc.9
index 8a28b080c238..00b06e020f7e 100644
--- a/share/man/man9/kernacc.9
+++ b/share/man/man9/kernacc.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/kernacc.9,v 1.13 2003/01/21 11:34:57 alfred Exp $
 .\"
 .Dd June 16, 1996
 .Dt KERNACC 9
diff --git a/share/man/man9/kernel_mount.9 b/share/man/man9/kernel_mount.9
index f34e759016ad..d276a30c933f 100644
--- a/share/man/man9/kernel_mount.9
+++ b/share/man/man9/kernel_mount.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/kernel_mount.9,v 1.2 2004/12/14 18:07:46 trhodes Exp $
 .\"
 .Dd December 13, 2004
 .Dt KERNEL_MOUNT 9
diff --git a/share/man/man9/kobj.9 b/share/man/man9/kobj.9
index c47d590cb626..db852fe2c16c 100644
--- a/share/man/man9/kobj.9
+++ b/share/man/man9/kobj.9
@@ -26,7 +26,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/share/man/man9/kobj.9,v 1.16 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd April 4, 2000
 .Dt KOBJ 9
diff --git a/share/man/man9/kthread.9 b/share/man/man9/kthread.9
index 0dd77053f401..33c5ed871738 100644
--- a/share/man/man9/kthread.9
+++ b/share/man/man9/kthread.9
@@ -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/share/man/man9/kthread.9,v 1.14 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd September 24, 2004
 .Dt KTHREAD 9
diff --git a/share/man/man9/ktr.9 b/share/man/man9/ktr.9
index 43b58ae8f5fc..04e1bad1a560 100644
--- a/share/man/man9/ktr.9
+++ b/share/man/man9/ktr.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ktr.9,v 1.9 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd February 15, 2001
 .Dt KTR 9
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index 9784e93f4186..590757d73e82 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt LOCK 9
diff --git a/share/man/man9/mac.9 b/share/man/man9/mac.9
index a333e4dc1adb..d9b575bca31c 100644
--- a/share/man/man9/mac.9
+++ b/share/man/man9/mac.9
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mac.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd February 16, 2002
 .Dt MAC 9
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index 940979614c34..c05d295b3160 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.17 2005/03/28 10:28:57 brueffer Exp $
 .\"
 .Dd March 28, 2005
 .Os
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 430845266fc8..f097d28b9954 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -34,7 +34,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.42 2005/02/22 17:20:20 brueffer Exp $
 .\"
 .Dd June 12, 2003
 .Dt MALLOC 9
diff --git a/share/man/man9/mbchain.9 b/share/man/man9/mbchain.9
index 7eb27462f80e..4823f3a17222 100644
--- a/share/man/man9/mbchain.9
+++ b/share/man/man9/mbchain.9
@@ -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/share/man/man9/mbchain.9,v 1.6 2005/01/28 10:48:52 ru Exp $
 .\"
 .Dd February 20, 2001
 .Dt MBCHAIN 9
diff --git a/share/man/man9/mbpool.9 b/share/man/man9/mbpool.9
index b042973ac84d..0d74be6239ae 100644
--- a/share/man/man9/mbpool.9
+++ b/share/man/man9/mbpool.9
@@ -25,7 +25,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbpool.9,v 1.5 2004/07/07 07:56:58 ru Exp $
 .\"
 .Dd July 15, 2003
 .Dt MBPOOL 9
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 95d27552d9f3..e85b5bf8b56b 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.58.2.1 2005/08/10 17:02:29 sam Exp $
 .\"
 .Dd August 7, 2005
 .Dt MBUF 9
diff --git a/share/man/man9/mbuf_tags.9 b/share/man/man9/mbuf_tags.9
index 7ce192c4fdd1..e83fd4b27e49 100644
--- a/share/man/man9/mbuf_tags.9
+++ b/share/man/man9/mbuf_tags.9
@@ -18,7 +18,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbuf_tags.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 18, 2004
 .Dt MBUF_TAGS 9
diff --git a/share/man/man9/mdchain.9 b/share/man/man9/mdchain.9
index 57291c70f6ed..015cd533a791 100644
--- a/share/man/man9/mdchain.9
+++ b/share/man/man9/mdchain.9
@@ -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/share/man/man9/mdchain.9,v 1.8 2005/01/28 10:48:52 ru Exp $
 .\"
 .Dd February 28, 2001
 .Dt MDCHAIN 9
diff --git a/share/man/man9/memguard.9 b/share/man/man9/memguard.9
index d8a7c9dbe45b..8198b79da107 100644
--- a/share/man/man9/memguard.9
+++ b/share/man/man9/memguard.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/memguard.9,v 1.1 2005/02/22 17:18:27 brueffer Exp $
 .\"
 .Dd February 22, 2005
 .Dt MEMGUARD 9
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index a60293670701..c9bc3ecb04a2 100644
--- a/share/man/man9/mi_switch.9
+++ b/share/man/man9/mi_switch.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mi_switch.9,v 1.19 2005/01/29 20:05:07 ru Exp $
 .\"
 .Dd November 24, 1996
 .Dt MI_SWITCH 9
diff --git a/share/man/man9/microseq.9 b/share/man/man9/microseq.9
index 041e2be28fe9..9e30097bd9e6 100644
--- a/share/man/man9/microseq.9
+++ b/share/man/man9/microseq.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/microseq.9,v 1.19 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd June 6, 1998
 .Dt MICROSEQ 9
diff --git a/share/man/man9/microtime.9 b/share/man/man9/microtime.9
index 65d627c48a1e..c32bfdeb485e 100644
--- a/share/man/man9/microtime.9
+++ b/share/man/man9/microtime.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/microtime.9,v 1.10 2005/02/09 18:07:17 ru Exp $
 .\"
 .Dd September 16, 2004
 .Dt MICROTIME 9
diff --git a/share/man/man9/microuptime.9 b/share/man/man9/microuptime.9
index 8f9985f72aa9..6974a84d3e8a 100644
--- a/share/man/man9/microuptime.9
+++ b/share/man/man9/microuptime.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/microuptime.9,v 1.7 2005/01/12 21:48:25 ru Exp $
 .\"
 .Dd September 16, 2004
 .Dt MICROUPTIME 9
diff --git a/share/man/man9/module.9 b/share/man/man9/module.9
index 977d44f66e5e..b1308880ed17 100644
--- a/share/man/man9/module.9
+++ b/share/man/man9/module.9
@@ -26,7 +26,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/share/man/man9/module.9,v 1.10 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 1, 2001
 .Dt MODULE 9
diff --git a/share/man/man9/mtx_pool.9 b/share/man/man9/mtx_pool.9
index 660dbd1454c1..98c7fd101d02 100644
--- a/share/man/man9/mtx_pool.9
+++ b/share/man/man9/mtx_pool.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mtx_pool.9,v 1.5 2003/09/14 13:41:59 ru Exp $
 .\"
 .Dd March 25, 2002
 .Dt MTX_POOL 9
diff --git a/share/man/man9/mutex.9 b/share/man/man9/mutex.9
index 57bbddc23969..b4c20e408c9d 100644
--- a/share/man/man9/mutex.9
+++ b/share/man/man9/mutex.9
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from BSDI $Id: mutex.4,v 1.1.2.3 1998/04/27 22:53:13 ewv Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mutex.9,v 1.47.2.1 2005/09/21 21:09:36 jhb Exp $
 .\"
 .Dd February 16, 2005
 .Dt MUTEX 9
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index 7429a2790b78..807418d0b160 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -31,7 +31,7 @@
 .\" If you integrate this manpage in another OS, I'd appreciate a note
 .\"	- eivind@FreeBSD.org
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/namei.9,v 1.26.2.1 2005/09/25 18:51:45 rwatson Exp $
 .\"
 .Dd May 27, 2003
 .Os
diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9
index a24a6886dfd7..9c16307fbe45 100644
--- a/share/man/man9/p_candebug.9
+++ b/share/man/man9/p_candebug.9
@@ -25,7 +25,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/share/man/man9/p_candebug.9,v 1.3 2004/07/06 07:26:23 ru Exp $
 .\"
 .Dd November 11, 2003
 .Os
diff --git a/share/man/man9/panic.9 b/share/man/man9/panic.9
index 44439dd913b0..9668444c6d71 100644
--- a/share/man/man9/panic.9
+++ b/share/man/man9/panic.9
@@ -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/share/man/man9/panic.9,v 1.9 2003/10/17 06:25:37 bde Exp $
 .\"
 .Dd August 11, 1995
 .Dt PANIC 9
diff --git a/share/man/man9/pbuf.9 b/share/man/man9/pbuf.9
index 4329ac9c84fe..4ff281ec80a5 100644
--- a/share/man/man9/pbuf.9
+++ b/share/man/man9/pbuf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pbuf.9,v 1.3 2003/09/10 19:24:35 ru Exp $
 .\"
 .Dd July 9, 2001
 .Dt PBUF 9
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index 781614cbcb12..7f3b06790160 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 22, 2005
 .Dt PCI 9
diff --git a/share/man/man9/pfil.9 b/share/man/man9/pfil.9
index b54449ecd174..16d81458f440 100644
--- a/share/man/man9/pfil.9
+++ b/share/man/man9/pfil.9
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pfil.9,v 1.20 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd September 29, 2004
 .Dt PFIL 9
diff --git a/share/man/man9/pfind.9 b/share/man/man9/pfind.9
index 58adab3fad32..6a3d05a13ee1 100644
--- a/share/man/man9/pfind.9
+++ b/share/man/man9/pfind.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pfind.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 11, 2001
 .Os
diff --git a/share/man/man9/pgfind.9 b/share/man/man9/pgfind.9
index 96abd0ae5214..8d079f720272 100644
--- a/share/man/man9/pgfind.9
+++ b/share/man/man9/pgfind.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pgfind.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 8, 2001
 .Os
diff --git a/share/man/man9/physio.9 b/share/man/man9/physio.9
index c4f24a880905..2110be0d6eed 100644
--- a/share/man/man9/physio.9
+++ b/share/man/man9/physio.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/physio.9,v 1.17 2005/01/12 21:48:25 ru Exp $
 .\"
 .Dd July 8, 2004
 .Dt PHYSIO 9
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index 05445a205027..921357a251e6 100644
--- a/share/man/man9/pmap.9
+++ b/share/man/man9/pmap.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap.9,v 1.10 2005/06/15 00:21:02 hmp Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP 9
diff --git a/share/man/man9/pmap_activate.9 b/share/man/man9/pmap_activate.9
index 840d8a19c270..78d900b95933 100644
--- a/share/man/man9/pmap_activate.9
+++ b/share/man/man9/pmap_activate.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_activate.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ACTIVATE 9
diff --git a/share/man/man9/pmap_addr_hint.9 b/share/man/man9/pmap_addr_hint.9
index 5313b2660c7d..b84b8158a703 100644
--- a/share/man/man9/pmap_addr_hint.9
+++ b/share/man/man9/pmap_addr_hint.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_addr_hint.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ADDR_HINT 9
diff --git a/share/man/man9/pmap_change_wiring.9 b/share/man/man9/pmap_change_wiring.9
index f3952f89b6cf..c97b645b42d3 100644
--- a/share/man/man9/pmap_change_wiring.9
+++ b/share/man/man9/pmap_change_wiring.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_change_wiring.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_CHANGE_WIRING 9
diff --git a/share/man/man9/pmap_clear_modify.9 b/share/man/man9/pmap_clear_modify.9
index 002300b5625e..3a099984bb2e 100644
--- a/share/man/man9/pmap_clear_modify.9
+++ b/share/man/man9/pmap_clear_modify.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_clear_modify.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_CLEAR_MODIFY 9
diff --git a/share/man/man9/pmap_copy.9 b/share/man/man9/pmap_copy.9
index 1541fa5e09b1..0456caa3f997 100644
--- a/share/man/man9/pmap_copy.9
+++ b/share/man/man9/pmap_copy.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_copy.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_COPY 9
diff --git a/share/man/man9/pmap_enter.9 b/share/man/man9/pmap_enter.9
index 2e524532b117..a5ab26e49348 100644
--- a/share/man/man9/pmap_enter.9
+++ b/share/man/man9/pmap_enter.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_enter.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ENTER 9
diff --git a/share/man/man9/pmap_extract.9 b/share/man/man9/pmap_extract.9
index 07e2ad740ad6..c6a2f74df3f1 100644
--- a/share/man/man9/pmap_extract.9
+++ b/share/man/man9/pmap_extract.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_extract.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_EXTRACT 9
diff --git a/share/man/man9/pmap_growkernel.9 b/share/man/man9/pmap_growkernel.9
index f038fb53d93b..33c025df3c00 100644
--- a/share/man/man9/pmap_growkernel.9
+++ b/share/man/man9/pmap_growkernel.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_growkernel.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_GROWKERNEL 9
diff --git a/share/man/man9/pmap_init.9 b/share/man/man9/pmap_init.9
index 1a8d74c94a03..842e8fb65927 100644
--- a/share/man/man9/pmap_init.9
+++ b/share/man/man9/pmap_init.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_init.9,v 1.3 2005/06/10 17:19:27 hmp Exp $
 .\"
 .Dd June 10, 2005
 .Dt PMAP_INIT 9
diff --git a/share/man/man9/pmap_is_modified.9 b/share/man/man9/pmap_is_modified.9
index 591a98539400..3c19437e2b17 100644
--- a/share/man/man9/pmap_is_modified.9
+++ b/share/man/man9/pmap_is_modified.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_is_modified.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_IS_MODIFIED 9
diff --git a/share/man/man9/pmap_is_prefaultable.9 b/share/man/man9/pmap_is_prefaultable.9
index c6f28709b666..3e84d470e5d7 100644
--- a/share/man/man9/pmap_is_prefaultable.9
+++ b/share/man/man9/pmap_is_prefaultable.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_is_prefaultable.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_IS_PREFAULTABLE 9
diff --git a/share/man/man9/pmap_map.9 b/share/man/man9/pmap_map.9
index 2c472fe97b49..b4eafb19da72 100644
--- a/share/man/man9/pmap_map.9
+++ b/share/man/man9/pmap_map.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_map.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_MAP 9
diff --git a/share/man/man9/pmap_mincore.9 b/share/man/man9/pmap_mincore.9
index d0e45ea5db3a..5b8018d6ead8 100644
--- a/share/man/man9/pmap_mincore.9
+++ b/share/man/man9/pmap_mincore.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_mincore.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_MINCORE 9
diff --git a/share/man/man9/pmap_object_init_pt.9 b/share/man/man9/pmap_object_init_pt.9
index 90ae75f44621..83d63c82003f 100644
--- a/share/man/man9/pmap_object_init_pt.9
+++ b/share/man/man9/pmap_object_init_pt.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_object_init_pt.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_OBJECT_INIT_PT 9
diff --git a/share/man/man9/pmap_page_exists_quick.9 b/share/man/man9/pmap_page_exists_quick.9
index 8db258014405..1b43ed42cf4a 100644
--- a/share/man/man9/pmap_page_exists_quick.9
+++ b/share/man/man9/pmap_page_exists_quick.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_page_exists_quick.9,v 1.3 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_PAGE_EXISTS_QUICK 9
diff --git a/share/man/man9/pmap_page_init.9 b/share/man/man9/pmap_page_init.9
index 65f72ec850e5..dd98dac8fac2 100644
--- a/share/man/man9/pmap_page_init.9
+++ b/share/man/man9/pmap_page_init.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_page_init.9,v 1.1 2005/06/10 17:16:16 hmp Exp $
 .\"
 .Dd June 10, 2005
 .Dt PMAP_PAGE_INIT 9
diff --git a/share/man/man9/pmap_page_protect.9 b/share/man/man9/pmap_page_protect.9
index f77d57def77e..832466af1531 100644
--- a/share/man/man9/pmap_page_protect.9
+++ b/share/man/man9/pmap_page_protect.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_page_protect.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_PROTECT 9
diff --git a/share/man/man9/pmap_pinit.9 b/share/man/man9/pmap_pinit.9
index d52172934c3a..fa332905e1df 100644
--- a/share/man/man9/pmap_pinit.9
+++ b/share/man/man9/pmap_pinit.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_pinit.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_PINIT 9
diff --git a/share/man/man9/pmap_qenter.9 b/share/man/man9/pmap_qenter.9
index b148b69f694a..8d08a17624aa 100644
--- a/share/man/man9/pmap_qenter.9
+++ b/share/man/man9/pmap_qenter.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_qenter.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_QENTER 9
diff --git a/share/man/man9/pmap_release.9 b/share/man/man9/pmap_release.9
index ef2964161802..52fc73ec9bd5 100644
--- a/share/man/man9/pmap_release.9
+++ b/share/man/man9/pmap_release.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_release.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_RELEASE 9
diff --git a/share/man/man9/pmap_remove.9 b/share/man/man9/pmap_remove.9
index 1c377dc839f0..f020fc19540e 100644
--- a/share/man/man9/pmap_remove.9
+++ b/share/man/man9/pmap_remove.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_remove.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_REMOVE 9
diff --git a/share/man/man9/pmap_resident_count.9 b/share/man/man9/pmap_resident_count.9
index bf39548cea09..9569eae79a9e 100644
--- a/share/man/man9/pmap_resident_count.9
+++ b/share/man/man9/pmap_resident_count.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_resident_count.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_RESIDENT_COUNT 9
diff --git a/share/man/man9/pmap_zero_page.9 b/share/man/man9/pmap_zero_page.9
index 541eef06104b..928796674434 100644
--- a/share/man/man9/pmap_zero_page.9
+++ b/share/man/man9/pmap_zero_page.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_zero_page.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ZERO 9
diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9
index 7dfd69f5c336..904f39dc0be2 100644
--- a/share/man/man9/printf.9
+++ b/share/man/man9/printf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/printf.9,v 1.6.2.1 2005/08/18 15:01:24 keramida Exp $
 .\"
 .Dd August 10, 2004
 .Dt PRINTF 9
diff --git a/share/man/man9/prison_check.9 b/share/man/man9/prison_check.9
index a8ba040131aa..eb40b2a2f0ed 100644
--- a/share/man/man9/prison_check.9
+++ b/share/man/man9/prison_check.9
@@ -25,7 +25,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/share/man/man9/prison_check.9,v 1.2 2004/07/06 07:26:23 ru Exp $
 .\"
 .Dd December 11, 2003
 .Os
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index 6230b14ff0f5..21233637641a 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pseudofs.9,v 1.5 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd September 30, 2001
 .Dt PSEUDOFS 9
diff --git a/share/man/man9/psignal.9 b/share/man/man9/psignal.9
index 16575f143d9f..df42e461afde 100644
--- a/share/man/man9/psignal.9
+++ b/share/man/man9/psignal.9
@@ -33,7 +33,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$NetBSD: psignal.9,v 1.1 1996/06/22 22:57:35 pk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/psignal.9,v 1.10 2004/11/18 02:06:17 jkoshy Exp $
 .\"
 .Dd June 22, 1996
 .Dt PSIGNAL 9
diff --git a/share/man/man9/random.9 b/share/man/man9/random.9
index 426774e9083f..f65097539d29 100644
--- a/share/man/man9/random.9
+++ b/share/man/man9/random.9
@@ -24,7 +24,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/share/man/man9/random.9,v 1.10 2004/07/03 18:29:24 ru Exp $
 .\" "
 .Dd September 25, 2000
 .Os
diff --git a/share/man/man9/random_harvest.9 b/share/man/man9/random_harvest.9
index 7b72f3e996da..37ff8aff3b2e 100644
--- a/share/man/man9/random_harvest.9
+++ b/share/man/man9/random_harvest.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/random_harvest.9,v 1.3 2002/04/12 05:22:24 davidc Exp $
 .\"
 .Dd February 6, 2002
 .Dt RANDOM_HARVEST 9
diff --git a/share/man/man9/resettodr.9 b/share/man/man9/resettodr.9
index 9818c8fd435b..4f62e31ccecd 100644
--- a/share/man/man9/resettodr.9
+++ b/share/man/man9/resettodr.9
@@ -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/share/man/man9/resettodr.9,v 1.7 2003/10/23 02:33:03 hmp Exp $
 .\"
 .Dd November 13, 1995
 .Dt RESETTODR 9
diff --git a/share/man/man9/resource_int_value.9 b/share/man/man9/resource_int_value.9
index e82853513c19..09a4043a0ae2 100644
--- a/share/man/man9/resource_int_value.9
+++ b/share/man/man9/resource_int_value.9
@@ -26,7 +26,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/share/man/man9/resource_int_value.9,v 1.7 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd March 1, 2001
 .Dt RESOURCE_INT_VALUE 9
diff --git a/share/man/man9/rijndael.9 b/share/man/man9/rijndael.9
index 5ee423971de1..484cfff18ea5 100644
--- a/share/man/man9/rijndael.9
+++ b/share/man/man9/rijndael.9
@@ -24,7 +24,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/share/man/man9/rijndael.9,v 1.5 2003/10/22 10:00:09 hmp Exp $
 .\" "
 .Dd February 6, 2002
 .Os
diff --git a/share/man/man9/rman.9 b/share/man/man9/rman.9
index e0d6507917fa..bb4dc87c7d71 100644
--- a/share/man/man9/rman.9
+++ b/share/man/man9/rman.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rman.9,v 1.6 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 15, 2005
 .Dt RMAN 9
diff --git a/share/man/man9/rtalloc.9 b/share/man/man9/rtalloc.9
index 4e7f8181d29b..f2fbc137bd64 100644
--- a/share/man/man9/rtalloc.9
+++ b/share/man/man9/rtalloc.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rtalloc.9,v 1.19 2004/10/11 20:48:36 glebius Exp $
 .Dd October 11, 2004
 .Os
 .Dt RTALLOC 9
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index 6b70994fbe8f..004f8890d254 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rtentry.9,v 1.24 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd October 7, 2004
 .Os
diff --git a/share/man/man9/runqueue.9 b/share/man/man9/runqueue.9
index 09b46d4a10b9..45ed423dd84a 100644
--- a/share/man/man9/runqueue.9
+++ b/share/man/man9/runqueue.9
@@ -21,7 +21,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/share/man/man9/runqueue.9,v 1.6 2004/07/07 07:56:36 ru Exp $
 .\"
 .Dd November 3, 2000
 .Dt RUNQUEUE 9
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index 5fdb7aaa7bff..4d5d5d2cb383 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sbuf.9,v 1.24 2004/07/09 11:44:49 des Exp $
 .\"
 .Dd July 9, 2004
 .Dt SBUF 9
diff --git a/share/man/man9/scheduler.9 b/share/man/man9/scheduler.9
index c56fd0b6c653..f0f53a5c27b4 100644
--- a/share/man/man9/scheduler.9
+++ b/share/man/man9/scheduler.9
@@ -21,7 +21,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/share/man/man9/scheduler.9,v 1.7 2002/12/30 21:18:05 schweikh Exp $
 .\"
 .Dd November 3, 2000
 .Dt SCHEDULER 9
diff --git a/share/man/man9/securelevel_gt.9 b/share/man/man9/securelevel_gt.9
index bcf9975d3338..311047eda85b 100644
--- a/share/man/man9/securelevel_gt.9
+++ b/share/man/man9/securelevel_gt.9
@@ -24,7 +24,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/securelevel_gt.9,v 1.1 2004/03/07 15:22:08 josef Exp $
 .\"
 .Dd March 6, 2004
 .Dt SECURELEVEL_GT 9
diff --git a/share/man/man9/selrecord.9 b/share/man/man9/selrecord.9
index 993dc4256c93..810e0714f320 100644
--- a/share/man/man9/selrecord.9
+++ b/share/man/man9/selrecord.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/selrecord.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 20, 2002
 .Dt SELRECORD 9
diff --git a/share/man/man9/sema.9 b/share/man/man9/sema.9
index 020790085381..8917c0235d59 100644
--- a/share/man/man9/sema.9
+++ b/share/man/man9/sema.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sema.9,v 1.9 2004/07/07 19:57:15 ru Exp $
 .\"
 .Dd June 14, 2004
 .Dt SEMA 9
diff --git a/share/man/man9/signal.9 b/share/man/man9/signal.9
index 6f377eeb346b..1b5e89b81756 100644
--- a/share/man/man9/signal.9
+++ b/share/man/man9/signal.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/signal.9,v 1.10 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 20, 2004
 .Dt SIGNAL 9
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index 514f72c80a8a..e1e5e4a787d2 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -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/share/man/man9/sleep.9,v 1.45 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 17, 1998
 .Os
diff --git a/share/man/man9/sleepqueue.9 b/share/man/man9/sleepqueue.9
index 5d28b6634e94..ed8566f1dbfa 100644
--- a/share/man/man9/sleepqueue.9
+++ b/share/man/man9/sleepqueue.9
@@ -21,7 +21,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/share/man/man9/sleepqueue.9,v 1.12 2005/04/19 16:30:25 jkoshy Exp $
 .\"
 .Dd March 10, 2004
 .Dt SLEEPQUEUE 9
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index 6a295e8178ec..9a5264bb01ec 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -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/share/man/man9/spl.9,v 1.20 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 21, 1996
 .Os
diff --git a/share/man/man9/store.9 b/share/man/man9/store.9
index 4438d84ca5aa..c8d30835c69c 100644
--- a/share/man/man9/store.9
+++ b/share/man/man9/store.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/store.9,v 1.11 2001/10/01 16:09:25 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt STORE 9
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index a87ca3c5481d..ceacf3cc3bf0 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/style.9,v 1.121 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd February 10, 2005
 .Dt STYLE 9
@@ -46,7 +46,7 @@ is silent on an issue.
  * Style guide for FreeBSD.  Based on the CSRG's KNF (Kernel Normal Form).
  *
  *	@(#)style	1.14 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/share/man/man9/style.9,v 1.121 2005/06/28 20:15:18 hmp Exp $
  */
 
 /*
@@ -110,7 +110,7 @@ static char sccsid[] = "@(#)style	1.14 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.121 2005/06/28 20:15:18 hmp Exp $");
 .Ed
 .Pp
 Leave another blank line before the header files.
diff --git a/share/man/man9/suser.9 b/share/man/man9/suser.9
index 2c62007ffcef..1a4563e37f1c 100644
--- a/share/man/man9/suser.9
+++ b/share/man/man9/suser.9
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/suser.9,v 1.28 2005/01/12 21:48:25 ru Exp $
 .\"
 .Dd April 2, 2002
 .Dt SUSER 9
diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9
index ea0b32b033a2..1f4c9443484a 100644
--- a/share/man/man9/swi.9
+++ b/share/man/man9/swi.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/swi.9,v 1.14 2004/12/29 04:29:06 jkoshy Exp $
 .\"
 .Dd October 30, 2000
 .Dt SWI 9
diff --git a/share/man/man9/sx.9 b/share/man/man9/sx.9
index e0781b722bce..0f52fd99b702 100644
--- a/share/man/man9/sx.9
+++ b/share/man/man9/sx.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sx.9,v 1.31 2005/01/12 21:48:25 ru Exp $
 .\"
 .Dd January 5, 2005
 .Dt SX 9
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index cb16d263ff19..ddff2dc71d94 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sysctl_add_oid.9,v 1.20 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd July 15, 2000
 .Dt SYSCTL_ADD_OID 9
diff --git a/share/man/man9/sysctl_ctx_init.9 b/share/man/man9/sysctl_ctx_init.9
index 44d34ae93edf..f8ba3211db44 100644
--- a/share/man/man9/sysctl_ctx_init.9
+++ b/share/man/man9/sysctl_ctx_init.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sysctl_ctx_init.9,v 1.12 2004/07/03 18:29:24 ru Exp $
 .\"
 .Dd July 15, 2000
 .Dt SYSCTL_CTX_INIT 9
diff --git a/share/man/man9/taskqueue.9 b/share/man/man9/taskqueue.9
index ced9e8be77a5..7442a560c828 100644
--- a/share/man/man9/taskqueue.9
+++ b/share/man/man9/taskqueue.9
@@ -26,7 +26,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/share/man/man9/taskqueue.9,v 1.20 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 19, 2005
 .Dt TASKQUEUE 9
diff --git a/share/man/man9/thread_exit.9 b/share/man/man9/thread_exit.9
index 9dc8acb1b3cc..14d21a4dfcda 100644
--- a/share/man/man9/thread_exit.9
+++ b/share/man/man9/thread_exit.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/thread_exit.9,v 1.2 2002/12/09 14:29:34 ru Exp $
 .\"
 .Dd July 5, 2002
 .Dt THREAD_EXIT 9
diff --git a/share/man/man9/time.9 b/share/man/man9/time.9
index 90271fed56ec..fa5dbbafa704 100644
--- a/share/man/man9/time.9
+++ b/share/man/man9/time.9
@@ -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/share/man/man9/time.9,v 1.16 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd September 17, 2004
 .Dt TIME 9
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index d683e32f69af..5d50224d593e 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/timeout.9,v 1.28.2.1 2005/09/12 13:43:34 glebius Exp $
 .\"
 .Dd September 8, 2005
 .Dt TIMEOUT 9
diff --git a/share/man/man9/tvtohz.9 b/share/man/man9/tvtohz.9
index 672aaf9dbbe7..5c37b0dbfde8 100644
--- a/share/man/man9/tvtohz.9
+++ b/share/man/man9/tvtohz.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/tvtohz.9,v 1.4 2005/02/09 18:07:17 ru Exp $
 .\"
 .Dd January 3, 2000
 .Dt TVTOHZ 9
diff --git a/share/man/man9/ucred.9 b/share/man/man9/ucred.9
index bd16fe36303b..85712e6255b6 100644
--- a/share/man/man9/ucred.9
+++ b/share/man/man9/ucred.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ucred.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 3, 2002
 .Dt UCRED 9
diff --git a/share/man/man9/uidinfo.9 b/share/man/man9/uidinfo.9
index 8a3d708bc466..b7e52c90ade1 100644
--- a/share/man/man9/uidinfo.9
+++ b/share/man/man9/uidinfo.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/uidinfo.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 10, 2001
 .Dt UIDINFO 9
diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index 8cc09c27ee8d..52acea363353 100644
--- a/share/man/man9/uio.9
+++ b/share/man/man9/uio.9
@@ -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/share/man/man9/uio.9,v 1.19 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd February 2, 1997
 .Os
diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9
index 61334ad20116..5cb683bb6d52 100644
--- a/share/man/man9/utopia.9
+++ b/share/man/man9/utopia.9
@@ -25,7 +25,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/utopia.9,v 1.7 2004/07/07 07:56:58 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt UTOPIA 9
diff --git a/share/man/man9/vaccess.9 b/share/man/man9/vaccess.9
index f5d6664c643a..71c737f773ba 100644
--- a/share/man/man9/vaccess.9
+++ b/share/man/man9/vaccess.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 22, 2001
 .Os
diff --git a/share/man/man9/vaccess_acl_posix1e.9 b/share/man/man9/vaccess_acl_posix1e.9
index 24193d4c8fab..02ae05738177 100644
--- a/share/man/man9/vaccess_acl_posix1e.9
+++ b/share/man/man9/vaccess_acl_posix1e.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 22, 2001
 .Os
diff --git a/share/man/man9/vcount.9 b/share/man/man9/vcount.9
index 610891b6a8dd..fb0c70e31f44 100644
--- a/share/man/man9/vcount.9
+++ b/share/man/man9/vcount.9
@@ -30,7 +30,7 @@
 .\" FreeBSD) I would love to hear about it.
 .\"     Andrew <andrew@ugh.net.au>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vcount.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd February 6, 2001
 .Os
diff --git a/share/man/man9/vflush.9 b/share/man/man9/vflush.9
index 79f462681eaa..aff0e7c7c5fc 100644
--- a/share/man/man9/vflush.9
+++ b/share/man/man9/vflush.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vflush.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFLUSH 9
diff --git a/share/man/man9/vfs_busy.9 b/share/man/man9/vfs_busy.9
index 4021e124c891..557e3dbbb3f7 100644
--- a/share/man/man9/vfs_busy.9
+++ b/share/man/man9/vfs_busy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_busy.9,v 1.7 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd July 8, 2001
 .Dt VFS_BUSY 9
diff --git a/share/man/man9/vfs_getnewfsid.9 b/share/man/man9/vfs_getnewfsid.9
index b6f12382fe13..bde877389570 100644
--- a/share/man/man9/vfs_getnewfsid.9
+++ b/share/man/man9/vfs_getnewfsid.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_getnewfsid.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_GETNEWFSID 9
diff --git a/share/man/man9/vfs_getvfs.9 b/share/man/man9/vfs_getvfs.9
index c563adcddca3..ddbbc89181b3 100644
--- a/share/man/man9/vfs_getvfs.9
+++ b/share/man/man9/vfs_getvfs.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_getvfs.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_GETVFS 9
diff --git a/share/man/man9/vfs_mount.9 b/share/man/man9/vfs_mount.9
index b64698c119c7..4e4caab361eb 100644
--- a/share/man/man9/vfs_mount.9
+++ b/share/man/man9/vfs_mount.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.12 2004/11/29 09:56:12 ru Exp $
 .\"
 .Dd November 26, 2004
 .Dt VFS_MOUNT 9
diff --git a/share/man/man9/vfs_mountedon.9 b/share/man/man9/vfs_mountedon.9
index 8ffdbbed314b..b672744ad18a 100644
--- a/share/man/man9/vfs_mountedon.9
+++ b/share/man/man9/vfs_mountedon.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_mountedon.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_MOUNTEDON 9
diff --git a/share/man/man9/vfs_rootmountalloc.9 b/share/man/man9/vfs_rootmountalloc.9
index ecad73e3af20..b7c8a8686f72 100644
--- a/share/man/man9/vfs_rootmountalloc.9
+++ b/share/man/man9/vfs_rootmountalloc.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_rootmountalloc.9,v 1.3 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_ROOTMOUNTALLOC 9
diff --git a/share/man/man9/vfs_suser.9 b/share/man/man9/vfs_suser.9
index 749557af5183..cb7849d21f5c 100644
--- a/share/man/man9/vfs_suser.9
+++ b/share/man/man9/vfs_suser.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_suser.9,v 1.3 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd April 2, 2004
 .Dt VFS_SUSER 9
diff --git a/share/man/man9/vfs_timestamp.9 b/share/man/man9/vfs_timestamp.9
index 455d6f6ba427..112eb5eac45a 100644
--- a/share/man/man9/vfs_timestamp.9
+++ b/share/man/man9/vfs_timestamp.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_timestamp.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_TIMESTAMP 9
diff --git a/share/man/man9/vfs_unbusy.9 b/share/man/man9/vfs_unbusy.9
index 7a6b911d43c3..1ccb3702c034 100644
--- a/share/man/man9/vfs_unbusy.9
+++ b/share/man/man9/vfs_unbusy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_unbusy.9,v 1.9 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd July 8, 2001
 .Dt VFS_UNBUSY 9
diff --git a/share/man/man9/vfs_unmountall.9 b/share/man/man9/vfs_unmountall.9
index e20020328153..24ec8461dee7 100644
--- a/share/man/man9/vfs_unmountall.9
+++ b/share/man/man9/vfs_unmountall.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_unmountall.9,v 1.7 2005/02/09 18:07:17 ru Exp $
 .\"
 .Dd July 26, 2001
 .Dt VFS_UNMOUNTALL 9
diff --git a/share/man/man9/vfsconf.9 b/share/man/man9/vfsconf.9
index f7b160e21313..cfbca386c7fa 100644
--- a/share/man/man9/vfsconf.9
+++ b/share/man/man9/vfsconf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfsconf.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFSCONF 9
diff --git a/share/man/man9/vget.9 b/share/man/man9/vget.9
index ef8fb10dd05f..c3ffda0a81ae 100644
--- a/share/man/man9/vget.9
+++ b/share/man/man9/vget.9
@@ -26,7 +26,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/share/man/man9/vget.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vgone.9 b/share/man/man9/vgone.9
index 05a9a44460e6..2e52bebe4d68 100644
--- a/share/man/man9/vgone.9
+++ b/share/man/man9/vgone.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vgone.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VGONE 9
diff --git a/share/man/man9/vhold.9 b/share/man/man9/vhold.9
index e2f985cfe7e8..32e8de414185 100644
--- a/share/man/man9/vhold.9
+++ b/share/man/man9/vhold.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vhold.9,v 1.3.2.1 2005/09/24 01:59:38 keramida Exp $
 .\"
 .Dd November 21, 2001
 .Dt VHOLD 9
diff --git a/share/man/man9/vinvalbuf.9 b/share/man/man9/vinvalbuf.9
index 9ed361b71417..9dfe9b9a78bf 100644
--- a/share/man/man9/vinvalbuf.9
+++ b/share/man/man9/vinvalbuf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vinvalbuf.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 7, 2001
 .Dt VINVALBUF 9
diff --git a/share/man/man9/vm_fault_prefault.9 b/share/man/man9/vm_fault_prefault.9
index dcc7e7abfa37..6ce956b0bb7d 100644
--- a/share/man/man9/vm_fault_prefault.9
+++ b/share/man/man9/vm_fault_prefault.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_fault_prefault.9,v 1.4 2004/07/06 07:12:34 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt VM_FAULT_PREFAULT 9
diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9
index 231252937c7b..250ce3b87f53 100644
--- a/share/man/man9/vm_map.9
+++ b/share/man/man9/vm_map.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map.9,v 1.9 2005/01/15 12:28:00 ru Exp $
 .\"
 .Dd September 26, 2004
 .Dt VM_MAP 9
diff --git a/share/man/man9/vm_map_check_protection.9 b/share/man/man9/vm_map_check_protection.9
index abaf6d0301e6..344e0c10599e 100644
--- a/share/man/man9/vm_map_check_protection.9
+++ b/share/man/man9/vm_map_check_protection.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_check_protection.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_CHECK_PROTECTION 9
diff --git a/share/man/man9/vm_map_clean.9 b/share/man/man9/vm_map_clean.9
index eeea5bc741bb..2e4625608837 100644
--- a/share/man/man9/vm_map_clean.9
+++ b/share/man/man9/vm_map_clean.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_clean.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_CLEAN 9
diff --git a/share/man/man9/vm_map_create.9 b/share/man/man9/vm_map_create.9
index 0574f396f82b..2419bf1f9904 100644
--- a/share/man/man9/vm_map_create.9
+++ b/share/man/man9/vm_map_create.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_create.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_CREATE 9
diff --git a/share/man/man9/vm_map_delete.9 b/share/man/man9/vm_map_delete.9
index e884f366aaaf..622b5487b1ff 100644
--- a/share/man/man9/vm_map_delete.9
+++ b/share/man/man9/vm_map_delete.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_delete.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_DELETE 9
diff --git a/share/man/man9/vm_map_entry_resize_free.9 b/share/man/man9/vm_map_entry_resize_free.9
index b037bcb45621..a9512fcffdd4 100644
--- a/share/man/man9/vm_map_entry_resize_free.9
+++ b/share/man/man9/vm_map_entry_resize_free.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_entry_resize_free.9,v 1.3 2005/01/14 17:22:51 ru Exp $
 .\"
 .Dd August 17, 2004
 .Os
diff --git a/share/man/man9/vm_map_find.9 b/share/man/man9/vm_map_find.9
index e1e8f4030d40..3b5d3740fd95 100644
--- a/share/man/man9/vm_map_find.9
+++ b/share/man/man9/vm_map_find.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_find.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_FIND 9
diff --git a/share/man/man9/vm_map_findspace.9 b/share/man/man9/vm_map_findspace.9
index a12e78961574..4561842e0dbb 100644
--- a/share/man/man9/vm_map_findspace.9
+++ b/share/man/man9/vm_map_findspace.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_findspace.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_FINDSPACE 9
diff --git a/share/man/man9/vm_map_inherit.9 b/share/man/man9/vm_map_inherit.9
index fb5a9d5ff37b..c3782c7995f9 100644
--- a/share/man/man9/vm_map_inherit.9
+++ b/share/man/man9/vm_map_inherit.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_inherit.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_INHERIT 9
diff --git a/share/man/man9/vm_map_init.9 b/share/man/man9/vm_map_init.9
index c65f611fbb8d..7729434fbaa7 100644
--- a/share/man/man9/vm_map_init.9
+++ b/share/man/man9/vm_map_init.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_init.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_INIT 9
diff --git a/share/man/man9/vm_map_insert.9 b/share/man/man9/vm_map_insert.9
index 3a6a51fd0784..4e0ba3a06d03 100644
--- a/share/man/man9/vm_map_insert.9
+++ b/share/man/man9/vm_map_insert.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_insert.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_INSERT 9
diff --git a/share/man/man9/vm_map_lock.9 b/share/man/man9/vm_map_lock.9
index 619f8c766927..3ff6ec44c1ee 100644
--- a/share/man/man9/vm_map_lock.9
+++ b/share/man/man9/vm_map_lock.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_lock.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_LOCK 9
diff --git a/share/man/man9/vm_map_lookup.9 b/share/man/man9/vm_map_lookup.9
index 759b5f6673fd..562d2f7baa13 100644
--- a/share/man/man9/vm_map_lookup.9
+++ b/share/man/man9/vm_map_lookup.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_lookup.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_LOOKUP 9
diff --git a/share/man/man9/vm_map_madvise.9 b/share/man/man9/vm_map_madvise.9
index 97ba6040de8d..5ae2f1b486d7 100644
--- a/share/man/man9/vm_map_madvise.9
+++ b/share/man/man9/vm_map_madvise.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_madvise.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_MADVISE 9
diff --git a/share/man/man9/vm_map_max.9 b/share/man/man9/vm_map_max.9
index e694983ba6aa..a2966427b889 100644
--- a/share/man/man9/vm_map_max.9
+++ b/share/man/man9/vm_map_max.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_max.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_MAX 9
diff --git a/share/man/man9/vm_map_protect.9 b/share/man/man9/vm_map_protect.9
index 8976781297e5..bded895b20b4 100644
--- a/share/man/man9/vm_map_protect.9
+++ b/share/man/man9/vm_map_protect.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_protect.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_PROTECT 9
diff --git a/share/man/man9/vm_map_remove.9 b/share/man/man9/vm_map_remove.9
index 53da53349bb2..1460829fb148 100644
--- a/share/man/man9/vm_map_remove.9
+++ b/share/man/man9/vm_map_remove.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_remove.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_REMOVE 9
diff --git a/share/man/man9/vm_map_simplify_entry.9 b/share/man/man9/vm_map_simplify_entry.9
index 8bb5484b4cb7..c6e35683e55e 100644
--- a/share/man/man9/vm_map_simplify_entry.9
+++ b/share/man/man9/vm_map_simplify_entry.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_simplify_entry.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_SIMPLIFY_ENTRY 9
diff --git a/share/man/man9/vm_map_stack.9 b/share/man/man9/vm_map_stack.9
index 22b79205fb7d..7bed55abc64e 100644
--- a/share/man/man9/vm_map_stack.9
+++ b/share/man/man9/vm_map_stack.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_stack.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_STACK 9
diff --git a/share/man/man9/vm_map_submap.9 b/share/man/man9/vm_map_submap.9
index 704151aa5fc7..dfa7804ac653 100644
--- a/share/man/man9/vm_map_submap.9
+++ b/share/man/man9/vm_map_submap.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_submap.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_SUBMAP 9
diff --git a/share/man/man9/vm_map_wire.9 b/share/man/man9/vm_map_wire.9
index 12bb3f675aed..52f33b764465 100644
--- a/share/man/man9/vm_map_wire.9
+++ b/share/man/man9/vm_map_wire.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_wire.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_WIRE 9
diff --git a/share/man/man9/vm_page_alloc.9 b/share/man/man9/vm_page_alloc.9
index 02e2b939b486..50c33276d8db 100644
--- a/share/man/man9/vm_page_alloc.9
+++ b/share/man/man9/vm_page_alloc.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_alloc.9,v 1.6 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_ALLOC 9
diff --git a/share/man/man9/vm_page_bits.9 b/share/man/man9/vm_page_bits.9
index 991c7637e53b..23dbef677d06 100644
--- a/share/man/man9/vm_page_bits.9
+++ b/share/man/man9/vm_page_bits.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_bits.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 1, 2001
 .Dt VM_PAGE_BITS 9
diff --git a/share/man/man9/vm_page_cache.9 b/share/man/man9/vm_page_cache.9
index 0379e8c7a9c1..d0cbb42458ea 100644
--- a/share/man/man9/vm_page_cache.9
+++ b/share/man/man9/vm_page_cache.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_cache.9,v 1.1 2001/07/30 22:14:23 alfred Exp $
 .\"
 .Dd July 24, 2001
 .Dt VM_PAGE_CACHE 9
diff --git a/share/man/man9/vm_page_copy.9 b/share/man/man9/vm_page_copy.9
index 3cf7304883c6..246dbe0181ee 100644
--- a/share/man/man9/vm_page_copy.9
+++ b/share/man/man9/vm_page_copy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_copy.9,v 1.2 2001/07/30 22:14:23 alfred Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_COPY 9
diff --git a/share/man/man9/vm_page_deactivate.9 b/share/man/man9/vm_page_deactivate.9
index c94b7f705c54..5748959f955e 100644
--- a/share/man/man9/vm_page_deactivate.9
+++ b/share/man/man9/vm_page_deactivate.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_deactivate.9,v 1.2 2001/08/08 10:04:08 ru Exp $
 .\"
 .Dd July 24, 2001
 .Dt VM_PAGE_DEACTIVATE 9
diff --git a/share/man/man9/vm_page_dontneed.9 b/share/man/man9/vm_page_dontneed.9
index 99baa330816d..ed9194a4a850 100644
--- a/share/man/man9/vm_page_dontneed.9
+++ b/share/man/man9/vm_page_dontneed.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_dontneed.9,v 1.2 2001/12/14 09:11:13 ru Exp $
 .\"
 .Dd July 30, 2001
 .Dt VM_PAGE_DONTNEED 9
diff --git a/share/man/man9/vm_page_flag.9 b/share/man/man9/vm_page_flag.9
index 5a1d75fbd472..3e9122c45d68 100644
--- a/share/man/man9/vm_page_flag.9
+++ b/share/man/man9/vm_page_flag.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_flag.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 14, 2001
 .Dt VM_PAGE_FLAG 9
diff --git a/share/man/man9/vm_page_free.9 b/share/man/man9/vm_page_free.9
index a78e577adbd4..acdc68a68349 100644
--- a/share/man/man9/vm_page_free.9
+++ b/share/man/man9/vm_page_free.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_free.9,v 1.2 2001/08/08 10:04:08 ru Exp $
 .\"
 .Dd July 24, 2001
 .Dt VM_PAGE_FREE 9
diff --git a/share/man/man9/vm_page_grab.9 b/share/man/man9/vm_page_grab.9
index d0d3a321be5a..c4bc56ac0a2c 100644
--- a/share/man/man9/vm_page_grab.9
+++ b/share/man/man9/vm_page_grab.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_grab.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 7, 2001
 .Dt VM_PAGE_GRAB 9
diff --git a/share/man/man9/vm_page_hold.9 b/share/man/man9/vm_page_hold.9
index 183fa4020d56..48c44c2ad345 100644
--- a/share/man/man9/vm_page_hold.9
+++ b/share/man/man9/vm_page_hold.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_hold.9,v 1.4 2002/04/05 08:05:11 davidc Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_HOLD 9
diff --git a/share/man/man9/vm_page_insert.9 b/share/man/man9/vm_page_insert.9
index 53f1eba82933..203f05c0953b 100644
--- a/share/man/man9/vm_page_insert.9
+++ b/share/man/man9/vm_page_insert.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_insert.9,v 1.3 2001/08/08 10:04:08 ru Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_INSERT 9
diff --git a/share/man/man9/vm_page_io.9 b/share/man/man9/vm_page_io.9
index 396cb1903bb5..8a0b11cf7af2 100644
--- a/share/man/man9/vm_page_io.9
+++ b/share/man/man9/vm_page_io.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_io.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_IO_START 9
diff --git a/share/man/man9/vm_page_lookup.9 b/share/man/man9/vm_page_lookup.9
index 7f8cd5e1dd77..815022330438 100644
--- a/share/man/man9/vm_page_lookup.9
+++ b/share/man/man9/vm_page_lookup.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_lookup.9,v 1.2 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_LOOKUP 9
diff --git a/share/man/man9/vm_page_protect.9 b/share/man/man9/vm_page_protect.9
index 8b4911d50607..94a641739a6e 100644
--- a/share/man/man9/vm_page_protect.9
+++ b/share/man/man9/vm_page_protect.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_protect.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 14, 2001
 .Dt VM_PAGE_PROTECT 9
diff --git a/share/man/man9/vm_page_rename.9 b/share/man/man9/vm_page_rename.9
index bb8591fae3ab..8b6e0365e904 100644
--- a/share/man/man9/vm_page_rename.9
+++ b/share/man/man9/vm_page_rename.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_rename.9,v 1.2 2001/08/08 10:04:08 ru Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_RENAME 9
diff --git a/share/man/man9/vm_page_sleep_busy.9 b/share/man/man9/vm_page_sleep_busy.9
index 45aa97761c98..983512a1fb31 100644
--- a/share/man/man9/vm_page_sleep_busy.9
+++ b/share/man/man9/vm_page_sleep_busy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_sleep_busy.9,v 1.2 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_SLEEP_BUSY 9
diff --git a/share/man/man9/vm_page_unmanage.9 b/share/man/man9/vm_page_unmanage.9
index c75dcceb03c3..9980f683d2e7 100644
--- a/share/man/man9/vm_page_unmanage.9
+++ b/share/man/man9/vm_page_unmanage.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_unmanage.9,v 1.3 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_UNMANAGE 9
diff --git a/share/man/man9/vm_page_wakeup.9 b/share/man/man9/vm_page_wakeup.9
index 3d2b1e1cecef..f78ca2e701fb 100644
--- a/share/man/man9/vm_page_wakeup.9
+++ b/share/man/man9/vm_page_wakeup.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_wakeup.9,v 1.2 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 14, 2001
 .Dt VM_PAGE_BUSY 9
diff --git a/share/man/man9/vm_page_wire.9 b/share/man/man9/vm_page_wire.9
index f988dd96e467..3a6d6f21fa23 100644
--- a/share/man/man9/vm_page_wire.9
+++ b/share/man/man9/vm_page_wire.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_wire.9,v 1.3 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_WIRE 9
diff --git a/share/man/man9/vm_page_zero_fill.9 b/share/man/man9/vm_page_zero_fill.9
index 2adb3013b32a..c1e14e2a3ad2 100644
--- a/share/man/man9/vm_page_zero_fill.9
+++ b/share/man/man9/vm_page_zero_fill.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_zero_fill.9,v 1.3 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_ZERO_FILL 9
diff --git a/share/man/man9/vm_set_page_size.9 b/share/man/man9/vm_set_page_size.9
index d37dee819f3d..225d15aa7db3 100644
--- a/share/man/man9/vm_set_page_size.9
+++ b/share/man/man9/vm_set_page_size.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_set_page_size.9,v 1.4 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_SET_PAGE_SIZE 9
diff --git a/share/man/man9/vn_fullpath.9 b/share/man/man9/vn_fullpath.9
index dd0dbe3bf9ef..cc71d7dca503 100644
--- a/share/man/man9/vn_fullpath.9
+++ b/share/man/man9/vn_fullpath.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vn_fullpath.9,v 1.4 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd January 11, 2004
 .Dt VN_FULLPATH 9
diff --git a/share/man/man9/vn_isdisk.9 b/share/man/man9/vn_isdisk.9
index 59096347526e..2e605e87641d 100644
--- a/share/man/man9/vn_isdisk.9
+++ b/share/man/man9/vn_isdisk.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vn_isdisk.9,v 1.6 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt VN_ISDISK 9
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index b55b19b650bf..00d45416e97c 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -24,7 +24,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/share/man/man9/vnode.9,v 1.29 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd May 20, 2003
 .Os
diff --git a/share/man/man9/vput.9 b/share/man/man9/vput.9
index e0697c20751e..777448828e7c 100644
--- a/share/man/man9/vput.9
+++ b/share/man/man9/vput.9
@@ -26,7 +26,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/share/man/man9/vput.9,v 1.11 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vref.9 b/share/man/man9/vref.9
index b5d11a0f88c1..d3991467e327 100644
--- a/share/man/man9/vref.9
+++ b/share/man/man9/vref.9
@@ -26,7 +26,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/share/man/man9/vref.9,v 1.13 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vrele.9 b/share/man/man9/vrele.9
index e0295c806217..b7514eb3e9cb 100644
--- a/share/man/man9/vrele.9
+++ b/share/man/man9/vrele.9
@@ -26,7 +26,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/share/man/man9/vrele.9,v 1.12 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vslock.9 b/share/man/man9/vslock.9
index fdab0eb52e8c..5a0bf7f0407d 100644
--- a/share/man/man9/vslock.9
+++ b/share/man/man9/vslock.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vslock.9,v 1.15 2004/08/16 03:12:10 green Exp $
 .\"
 .Dd August 10, 2004
 .Dt VSLOCK 9
diff --git a/share/man/man9/watchdog.9 b/share/man/man9/watchdog.9
index 4c9a365bf70a..1fa58ec8528d 100644
--- a/share/man/man9/watchdog.9
+++ b/share/man/man9/watchdog.9
@@ -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/share/man/man9/watchdog.9,v 1.3 2004/07/06 07:39:50 ru Exp $
 .\"
 .Dd February 28, 2004
 .Dt WATCHDOG 9
diff --git a/share/man/man9/zero_copy.9 b/share/man/man9/zero_copy.9
index 417c9266ae0f..1ac0e0cc49ad 100644
--- a/share/man/man9/zero_copy.9
+++ b/share/man/man9/zero_copy.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/zero_copy.9,v 1.7 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd December 5, 2004
 .Dt ZERO_COPY 9
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index d6e9d727883e..16e0faa6fc33 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/zone.9,v 1.26 2004/01/25 11:39:41 des Exp $
 .\"
 .Dd July 21, 2003
 .Dt ZONE 9
diff --git a/share/me/Makefile b/share/me/Makefile
index 6a9d6de5b33c..8d5014fbb8ee 100644
--- a/share/me/Makefile
+++ b/share/me/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/share/me/Makefile,v 1.8 2002/03/20 16:26:35 ru Exp $
 
 MELIB=	${BINDIR}/me
 TMLIB=	${BINDIR}/tmac
diff --git a/share/me/eqn.me b/share/me/eqn.me
index df2671c44295..29e53843ca85 100644
--- a/share/me/eqn.me
+++ b/share/me/eqn.me
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)eqn.me	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/me/eqn.me,v 1.2 2001/02/18 10:25:31 asmodai Exp $
 .\"
 .\"	%beginstrip%
 .\"
diff --git a/share/me/orig_me.7 b/share/me/orig_me.7
index afb7cb95b070..0df3f893bea5 100644
--- a/share/me/orig_me.7
+++ b/share/me/orig_me.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)me.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/me/orig_me.7,v 1.6 2002/03/20 16:26:35 ru Exp $
 .\"
 .hc %
 .TH ORIG_ME 7 "June 5, 1993"
diff --git a/share/me/tmac.orig_me b/share/me/tmac.orig_me
index 87c1687a3e04..491e4cf397c1 100644
--- a/share/me/tmac.orig_me
+++ b/share/me/tmac.orig_me
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)tmac.e	8.1 (Berkeley) 6/5/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/me/tmac.orig_me,v 1.3 2002/08/12 10:04:31 schweikh Exp $
 .\"
 .\"	%beginstrip%
 .\"
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 975fe76123d1..6eb0000f3788 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/misc/Makefile,v 1.23 2004/12/21 08:46:53 ru Exp $
 
 FILES=	ascii birthtoken bsd-family-tree eqnchar flowers init.ee \
 	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index ac1215ae71ea..149be89f0c4e 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -492,4 +492,4 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages.
 Copyright (c) 1997-2004 Wolfram Schneider <wosch@FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 
-$FreeBSD$
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.95.4.1 2005/11/02 00:01:08 scottl Exp $
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index 3e6b02907b26..cc0841ed39c9 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/iso3166,v 1.13 2004/06/14 02:38:55 wollman Exp $
 #
 # ISO 3166 country codes
 # This includes many places that are not legally independent countries,
diff --git a/share/misc/iso639 b/share/misc/iso639
index 57d62a0c4050..d934ab9aadb2 100644
--- a/share/misc/iso639
+++ b/share/misc/iso639
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/iso639,v 1.4 2002/02/04 17:35:33 wollman Exp $
 #
 # ISO 639-2 language codes
 #
diff --git a/share/misc/latin1 b/share/misc/latin1
index a4144e678dfc..28844bb637b4 100644
--- a/share/misc/latin1
+++ b/share/misc/latin1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/latin1,v 1.1 2002/08/18 16:57:45 schweikh Exp $
 
 |240 nbs|241  ¡ |242  ¢ |243  £ |244  ¤ |245  ¥ |246  ¦ |247  § |
 |250  ¨ |251  © |252  ª |253  « |254  ¬ |255  ­ |256  ® |257  ¯ |
diff --git a/share/misc/mdoc.template b/share/misc/mdoc.template
index 1ecacfc7909a..74ee9bf652c4 100644
--- a/share/misc/mdoc.template
+++ b/share/misc/mdoc.template
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/misc/mdoc.template,v 1.5 2005/01/16 22:26:05 ru Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd Month day, year
diff --git a/share/misc/operator b/share/misc/operator
index b293f31da9b2..bcd0abb3d8cd 100644
--- a/share/misc/operator
+++ b/share/misc/operator
@@ -16,4 +16,4 @@ Operator				Associativity
 = += -= *= /= %= <<= >>= &= ^= |=	right to left
 ,					left to right
 
-$FreeBSD$
+$FreeBSD: src/share/misc/operator,v 1.2 2003/01/22 15:19:07 fanf Exp $
diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors
index bb2c7ced019c..19715d2a7205 100644
--- a/share/misc/pci_vendors
+++ b/share/misc/pci_vendors
@@ -1,4 +1,4 @@
-; $FreeBSD$
+; $FreeBSD: src/share/misc/pci_vendors,v 1.33.2.1 2005/07/18 07:45:17 sheldonh Exp $
 ;
 ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl
 ; (with the -l option), using the following source lists:
diff --git a/share/misc/scsi_modes b/share/misc/scsi_modes
index 687bcfa93533..60b8085128f5 100644
--- a/share/misc/scsi_modes
+++ b/share/misc/scsi_modes
@@ -29,7 +29,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/misc/scsi_modes,v 1.12 2004/10/12 08:51:04 bms Exp $
 #
 # The ordering is alphabetical by page name, as it appears in the SCSI spec.
 
diff --git a/share/misc/usb_hid_usages b/share/misc/usb_hid_usages
index bb0f40cad718..d046cc39205f 100644
--- a/share/misc/usb_hid_usages
+++ b/share/misc/usb_hid_usages
@@ -1,5 +1,5 @@
 # $NetBSD: usb_hid_usages,v 1.3 1999/07/02 15:46:53 simonb Exp $
-# $FreeBSD$
+# $FreeBSD: src/share/misc/usb_hid_usages,v 1.1 2000/06/11 18:19:11 n_hibma Exp $
 #
 # USB HID usage table
 # Syntax:
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 44b0a9b08467..ba8f4b1475af 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/Makefile,v 1.46 2005/02/22 23:29:53 ru Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index d8754f1d1c4f..a1adecd705be 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,5 +1,5 @@
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.README,v 1.28 2004/12/21 08:46:54 ru Exp $
 
 This is the README file for the "include" files for the FreeBSD
 source tree.  The files are installed in /usr/share/mk, and are by
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index d7eada6743cb..98f3defbdc8e 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.compat.mk,v 1.20 2005/03/02 11:53:21 trhodes Exp $
 
 .if !defined(BURN_BRIDGES)
 .for oldnew in \
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 0ecc3beffe86..e8f1912192c6 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.48 2005/05/24 21:24:40 cognet Exp $
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index cdcadb034b44..3c6f263d30b1 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.48 2005/01/06 11:12:43 krion Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 539d4c341ddb..a3af63be520a 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.doc.mk	5.3 (Berkeley) 1/2/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.59 2004/12/21 09:33:42 ru Exp $
 #
 # The include file <bsd.doc.mk> handles installing BSD troff documents.
 #
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk
index 9cee45a0fefb..64344331978c 100644
--- a/share/mk/bsd.endian.mk
+++ b/share/mk/bsd.endian.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.endian.mk,v 1.2 2005/02/25 00:24:03 cognet Exp $
 
 .if ${MACHINE_ARCH} == "alpha" || \
     ${MACHINE_ARCH} == "amd64" || \
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 240f958f1a9b..93e6d7cf04ab 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.files.mk,v 1.4 2005/04/11 07:13:29 harti Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.files.mk cannot be included directly.
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index f3b99e3d8acd..7372630f4a5f 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.4 2005/04/11 07:13:29 harti Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.incs.mk cannot be included directly.
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 717007d9c8f8..ba01840b8926 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.info.mk,v 1.71 2005/02/27 22:02:31 obrien Exp $
 #
 # The include file <bsd.info.mk> handles installing GNU (tech)info files.
 # Texinfo is a documentation system that uses a single source
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index 72a6de0ef342..e4b3fe52f6ec 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.init.mk,v 1.5 2005/04/11 07:13:29 harti Exp $
 
 # The include file <bsd.init.mk> includes ../Makefile.inc and
 # <bsd.own.mk>; this is used at the top of all <bsd.*.mk> files
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index 8cc15b09c5c4..bd6a97b58659 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.kmod.mk,v 1.91 2004/06/21 16:12:02 bde Exp $
 
 # Search for kernel source tree in standard places.
 .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 3bddd7e4103f..206d431ab715 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.168 2005/04/11 07:13:29 harti Exp $
 #
 
 .include <bsd.init.mk>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 2b1c933c2a44..e7c33bd168b2 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.94.2.1 2005/07/24 16:17:25 rwatson Exp $
 
 # The include file <bsd.libnames.mk> define library names.
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
index 49f557a7e1fb..009095bb0cff 100644
--- a/share/mk/bsd.links.mk
+++ b/share/mk/bsd.links.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.links.mk,v 1.2 2002/07/03 12:28:03 ru Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.links.mk cannot be included directly.
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index b777e15af686..c9183d9aca32 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.man.mk,v 1.56 2005/01/06 11:12:43 krion Exp $
 #
 # The include file <bsd.man.mk> handles installing manual pages and
 # their links.
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index 237debea4efd..cdbf1779d8f8 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.13 2005/04/11 07:13:29 harti Exp $
 #
 # This include file <bsd.nls.mk> handles building and installing Native
 # Language Support (NLS) catalogs
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index bd8f2aabc218..a7ec139ce876 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.54 2005/04/11 07:13:29 harti Exp $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index ac03fda5ba18..d0dc4b635cb9 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.43 2005/04/11 07:13:29 harti Exp $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
diff --git a/share/mk/bsd.pkg.mk b/share/mk/bsd.pkg.mk
index 3d1ca42e9355..a4ccf9081651 100644
--- a/share/mk/bsd.pkg.mk
+++ b/share/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.pkg.mk,v 1.1 2004/12/20 15:46:56 paul Exp $
 
 WRKDIR=${.OBJDIR}
 .if ${.OBJDIR} == ${.CURDIR}
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 2392b8fd69ed..f4b0f598a1d7 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.mk,v 1.307 2004/07/02 20:47:18 eik Exp $
 
 PORTSDIR?=	/usr/ports
 BSDPORTMK?=	${PORTSDIR}/Mk/bsd.port.mk
diff --git a/share/mk/bsd.port.post.mk b/share/mk/bsd.port.post.mk
index d64dc1276b44..b0446d07f27c 100644
--- a/share/mk/bsd.port.post.mk
+++ b/share/mk/bsd.port.post.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.post.mk,v 1.4 2002/04/19 07:42:41 ru Exp $
 
 AFTERPORTMK=	yes
 
diff --git a/share/mk/bsd.port.pre.mk b/share/mk/bsd.port.pre.mk
index dff464ec32da..7430d9c814d3 100644
--- a/share/mk/bsd.port.pre.mk
+++ b/share/mk/bsd.port.pre.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.pre.mk,v 1.4 2002/04/19 07:42:41 ru Exp $
 
 BEFOREPORTMK=	yes
 
diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk
index 51156023efff..643b95e9e925 100644
--- a/share/mk/bsd.port.subdir.mk
+++ b/share/mk/bsd.port.subdir.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.subdir.mk,v 1.31 2004/07/02 20:47:18 eik Exp $
 
 PORTSDIR?=	/usr/ports
 BSDPORTSUBDIRMK?=	${PORTSDIR}/Mk/bsd.port.subdir.mk
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 3b4d0922674d..3fa7547efd4f 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.144 2005/04/11 07:13:29 harti Exp $
 
 .include <bsd.init.mk>
 
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 6ee952f36a5b..27593e252239 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.50 2005/05/31 07:14:51 ru Exp $
 #
 # The include file <bsd.subdir.mk> contains the default targets
 # for building subdirectories.
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 5c840cd8b4b5..4890e2f31d88 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.37 2005/01/16 21:18:16 obrien Exp $
 #
 # This file contains common settings used for building FreeBSD
 # sources.
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index c96adf26bd77..82091ebe0859 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-# $FreeBSD$
+# $FreeBSD: src/share/mk/sys.mk,v 1.86 2005/04/29 14:44:10 harti Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 .FreeBSD	?=	true
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index 477630b1b4bf..1d5869d2b7a0 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mklocale/Makefile,v 1.63 2005/03/04 14:24:29 ru Exp $
 
 LOCALES=	UTF-8 \
 		am_ET.UTF-8 \
diff --git a/share/mklocale/README.locale_name b/share/mklocale/README.locale_name
index 08faffe5e3be..cc9111ecb8fe 100644
--- a/share/mklocale/README.locale_name
+++ b/share/mklocale/README.locale_name
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/mklocale/README.locale_name,v 1.2 2001/06/10 22:13:29 ache Exp $
 
 Locale name string format must be compliant with XPG3 and
 using following format.
diff --git a/share/mklocale/UTF-8.src b/share/mklocale/UTF-8.src
index edc1617088c0..c5134766e0b0 100644
--- a/share/mklocale/UTF-8.src
+++ b/share/mklocale/UTF-8.src
@@ -3,7 +3,7 @@
  *
  * Generated by Hye-Shik Chang <perky@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
  */
 
 /*
diff --git a/share/mklocale/am_ET.UTF-8.src b/share/mklocale/am_ET.UTF-8.src
index 312a268ca999..fef5bfa864a4 100644
--- a/share/mklocale/am_ET.UTF-8.src
+++ b/share/mklocale/am_ET.UTF-8.src
@@ -4,7 +4,7 @@
  * ሚካኤ� ጥላ�ን <mtm@FreeBSD.Org>
  * Last updated Mon Aug 04 02:06:00 EST 2003
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/am_ET.UTF-8.src,v 1.2 2003/08/05 06:34:16 ache Exp $
  */
 
 ENCODING	"UTF-8"
diff --git a/share/mklocale/be_BY.CP1131.src b/share/mklocale/be_BY.CP1131.src
index 7674e1dfebc3..a018cdb83918 100644
--- a/share/mklocale/be_BY.CP1131.src
+++ b/share/mklocale/be_BY.CP1131.src
@@ -1,7 +1,7 @@
 /*
  * Belarusian language. Modern/standard (1959) grammar.
  * Prepared by Yury Tarasievich <spytar@yahoo.com>
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/be_BY.CP1131.src,v 1.2 2005/04/21 09:15:19 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/bg_BG.CP1251.src b/share/mklocale/bg_BG.CP1251.src
index 4540c47c446d..458717357da1 100644
--- a/share/mklocale/bg_BG.CP1251.src
+++ b/share/mklocale/bg_BG.CP1251.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Bulgarian Cyrillic character set (CP1251)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/bg_BG.CP1251.src,v 1.4 2002/03/28 01:13:04 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Bulgarian Cyrillic character set (CP1251) by <roam@ringlet.net>
diff --git a/share/mklocale/el_GR.ISO8859-7.src b/share/mklocale/el_GR.ISO8859-7.src
index aeaba38a30c2..28ebf7413d7f 100644
--- a/share/mklocale/el_GR.ISO8859-7.src
+++ b/share/mklocale/el_GR.ISO8859-7.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Greek/ISO8859-7 set
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/el_GR.ISO8859-7.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/hi_IN.ISCII-DEV.src b/share/mklocale/hi_IN.ISCII-DEV.src
index 59916e8c8d5f..194980e8c673 100644
--- a/share/mklocale/hi_IN.ISCII-DEV.src
+++ b/share/mklocale/hi_IN.ISCII-DEV.src
@@ -4,7 +4,7 @@
  * Arun Sharma <arun@sharma-home.net> 
  * Last updated Mon Nov 19 23:07:46 PST 2001
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/hi_IN.ISCII-DEV.src,v 1.5 2001/11/30 07:19:21 ache Exp $
  */
 
 ENCODING     "NONE"
diff --git a/share/mklocale/hy_AM.ARMSCII-8.src b/share/mklocale/hy_AM.ARMSCII-8.src
index 7ccc8d6672ab..bb1d036c1639 100644
--- a/share/mklocale/hy_AM.ARMSCII-8.src
+++ b/share/mklocale/hy_AM.ARMSCII-8.src
@@ -3,7 +3,7 @@
  * 
  * Made available by Vahe Khachikyan <vahe@khachikyan.de>
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:16 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE	Armenian ARMSCII-8 character set by <vahe@khachikyan.de>
diff --git a/share/mklocale/ja_JP.SJIS.src b/share/mklocale/ja_JP.SJIS.src
index 1d9f924fdcc4..3e633d37aa08 100644
--- a/share/mklocale/ja_JP.SJIS.src
+++ b/share/mklocale/ja_JP.SJIS.src
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ja_JP.SJIS.src,v 1.4 2002/10/14 10:44:00 tjr Exp $
  */
 
 ENCODING	"MSKanji"
diff --git a/share/mklocale/ja_JP.eucJP.src b/share/mklocale/ja_JP.eucJP.src
index d4ec767e2b51..d270a6f51dc8 100644
--- a/share/mklocale/ja_JP.eucJP.src
+++ b/share/mklocale/ja_JP.eucJP.src
@@ -3,7 +3,7 @@
 /*
  * Japanese LOCALE_CTYPE definitions using EUC of JIS character sets
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ja_JP.eucJP.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 
 ENCODING	"EUC"
diff --git a/share/mklocale/kk_KZ.PT154.src b/share/mklocale/kk_KZ.PT154.src
index 2c6ac798dd55..7a27caf3a510 100644
--- a/share/mklocale/kk_KZ.PT154.src
+++ b/share/mklocale/kk_KZ.PT154.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for PT154 character set (IANA PTCP154)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:20 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        PT154 character set by Birsh T <birsh@mail.kz>
diff --git a/share/mklocale/ko_KR.CP949.src b/share/mklocale/ko_KR.CP949.src
index cda9626164eb..2c20f0086ff1 100644
--- a/share/mklocale/ko_KR.CP949.src
+++ b/share/mklocale/ko_KR.CP949.src
@@ -9,7 +9,7 @@
  *  <0x81-0xa0><0x41-0xfe>	Hangul syllables GAGG-JWAK
  *  <0xa1-0xc6><0x41-0xa0>	Hangul syllables JWAT-HIH (ends with C652)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ko_KR.CP949.src,v 1.2 2003/08/08 14:02:20 ache Exp $
  */
 
 ENCODING        "GBK" /* CP949 isn't GBK, but they have same encoding method. */
diff --git a/share/mklocale/ko_KR.eucKR.src b/share/mklocale/ko_KR.eucKR.src
index cb91eae3d819..4b4faa4291f2 100644
--- a/share/mklocale/ko_KR.eucKR.src
+++ b/share/mklocale/ko_KR.eucKR.src
@@ -8,7 +8,7 @@
  *
  * It is based on manpage mklocale(1), euc(4), ja_JP.EUC.src.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ko_KR.eucKR.src,v 1.4 2001/11/30 01:22:01 ache Exp $
  */
 
 ENCODING     "EUC"
diff --git a/share/mklocale/la_LN.ISO8859-1.src b/share/mklocale/la_LN.ISO8859-1.src
index 0545dd119538..724eacd99aa0 100644
--- a/share/mklocale/la_LN.ISO8859-1.src
+++ b/share/mklocale/la_LN.ISO8859-1.src
@@ -1,7 +1,7 @@
 /*
  * Standard LOCALE_CTYPE for the ISO 8859-1 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-1.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        ISO 8859-1 Latin-1 character set
diff --git a/share/mklocale/la_LN.ISO8859-15.src b/share/mklocale/la_LN.ISO8859-15.src
index ac780d3ad483..cfa2ec72d119 100644
--- a/share/mklocale/la_LN.ISO8859-15.src
+++ b/share/mklocale/la_LN.ISO8859-15.src
@@ -1,7 +1,7 @@
 /*
  * Standard LOCALE_CTYPE for the ISO 8859-15 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-15.src,v 1.3 2002/06/03 21:30:28 tobez Exp $
  */
 ENCODING	"NONE"
 VARIABLE        ISO 8859-15 Latin-9 character set
diff --git a/share/mklocale/la_LN.ISO8859-2.src b/share/mklocale/la_LN.ISO8859-2.src
index 9a28807bf9df..7f7fd4fc0e8e 100644
--- a/share/mklocale/la_LN.ISO8859-2.src
+++ b/share/mklocale/la_LN.ISO8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-2.src,v 1.4 2001/11/30 05:05:53 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/la_LN.ISO8859-4.src b/share/mklocale/la_LN.ISO8859-4.src
index 2a4d8339de1e..f3922554cb72 100644
--- a/share/mklocale/la_LN.ISO8859-4.src
+++ b/share/mklocale/la_LN.ISO8859-4.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_4 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-4.src,v 1.4 2001/11/30 05:24:09 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/la_LN.US-ASCII.src b/share/mklocale/la_LN.US-ASCII.src
index 2c22f70b9364..ca7296ff0fc9 100644
--- a/share/mklocale/la_LN.US-ASCII.src
+++ b/share/mklocale/la_LN.US-ASCII.src
@@ -1,7 +1,7 @@
 /*
  * Standard LOCALE_CTYPE for the US-ASCII Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.US-ASCII.src,v 1.2 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING        "NONE"
 VARIABLE        Strict 7bit US-ASCII locale
diff --git a/share/mklocale/lt_LT.ISO8859-13.src b/share/mklocale/lt_LT.ISO8859-13.src
index ddd248f1cc1e..1777ea8324e3 100644
--- a/share/mklocale/lt_LT.ISO8859-13.src
+++ b/share/mklocale/lt_LT.ISO8859-13.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_13 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/ru_RU.CP866.src b/share/mklocale/ru_RU.CP866.src
index 081f75752b89..3b594a257011 100644
--- a/share/mklocale/ru_RU.CP866.src
+++ b/share/mklocale/ru_RU.CP866.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Russian Alternative character set (CP866)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ru_RU.CP866.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Russian Alternative code table (CP866) by <ache@nagual.pp.ru>
diff --git a/share/mklocale/ru_RU.ISO8859-5.src b/share/mklocale/ru_RU.ISO8859-5.src
index 4b6f63705106..cecc054ab638 100644
--- a/share/mklocale/ru_RU.ISO8859-5.src
+++ b/share/mklocale/ru_RU.ISO8859-5.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for ISO8859-5 set
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ru_RU.ISO8859-5.src,v 1.3 2001/12/20 20:33:30 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/ru_RU.KOI8-R.src b/share/mklocale/ru_RU.KOI8-R.src
index d9eac8f791ea..901c12d1e10b 100644
--- a/share/mklocale/ru_RU.KOI8-R.src
+++ b/share/mklocale/ru_RU.KOI8-R.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Russian koi8-r character set (RFC1489)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ru_RU.KOI8-R.src,v 1.4 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Russian KOI8-R character set by <ache@nagual.pp.ru>
diff --git a/share/mklocale/uk_UA.KOI8-U.src b/share/mklocale/uk_UA.KOI8-U.src
index 6abe203793fa..850b543c8b4e 100644
--- a/share/mklocale/uk_UA.KOI8-U.src
+++ b/share/mklocale/uk_UA.KOI8-U.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Ukrainian koi8-u character set (RFC2319)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/uk_UA.KOI8-U.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Ukrainian koi8-u character set
diff --git a/share/mklocale/zh_CN.GB18030.src b/share/mklocale/zh_CN.GB18030.src
index 9c2d8751b655..6572f038aa85 100644
--- a/share/mklocale/zh_CN.GB18030.src
+++ b/share/mklocale/zh_CN.GB18030.src
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.GB18030.src,v 1.3 2003/08/21 19:23:15 ache Exp $
  */
 
 ENCODING	"GB18030"
diff --git a/share/mklocale/zh_CN.GB2312.src b/share/mklocale/zh_CN.GB2312.src
index 8836089c8b74..147e6a8466d2 100644
--- a/share/mklocale/zh_CN.GB2312.src
+++ b/share/mklocale/zh_CN.GB2312.src
@@ -2,7 +2,7 @@
  * GB2312   first byte:   A1-FE
  *          second byte:  A1-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.GB2312.src,v 1.1 2003/11/05 22:54:54 davidxu Exp $
  */
 
 ENCODING	"GB2312"
diff --git a/share/mklocale/zh_CN.GBK.src b/share/mklocale/zh_CN.GBK.src
index f0c0e8e1fd94..1d36985ce366 100644
--- a/share/mklocale/zh_CN.GBK.src
+++ b/share/mklocale/zh_CN.GBK.src
@@ -2,7 +2,7 @@
  * GBK      first byte:   81-FE
  *          second byte:  40-7E, 80-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.GBK.src,v 1.1 2003/06/01 15:51:27 ache Exp $
  */
 
 ENCODING	"GBK"
diff --git a/share/mklocale/zh_CN.eucCN.src b/share/mklocale/zh_CN.eucCN.src
index 99d8de54e616..e5d1a607b67d 100644
--- a/share/mklocale/zh_CN.eucCN.src
+++ b/share/mklocale/zh_CN.eucCN.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.eucCN.src,v 1.4 2001/11/30 01:22:01 ache Exp $
  */
 
 ENCODING	"EUC"
diff --git a/share/mklocale/zh_HK.Big5HKSCS.src b/share/mklocale/zh_HK.Big5HKSCS.src
index aa2600e92ba9..06a2a6e1f386 100644
--- a/share/mklocale/zh_HK.Big5HKSCS.src
+++ b/share/mklocale/zh_HK.Big5HKSCS.src
@@ -2,7 +2,7 @@
  * big5hkscs   first byte:    81-FE
  *             second byte:   40-7E, A1-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_HK.Big5HKSCS.src,v 1.2 2003/12/19 12:51:40 ache Exp $
  */
 
 ENCODING        "GBK"
diff --git a/share/mklocale/zh_TW.Big5.src b/share/mklocale/zh_TW.Big5.src
index 2f170ac15f57..f42ce0bc2d0e 100644
--- a/share/mklocale/zh_TW.Big5.src
+++ b/share/mklocale/zh_TW.Big5.src
@@ -2,7 +2,7 @@
  * big5   first byte:   A1-FE
  *        second byte:   40-7E, A1-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_TW.Big5.src,v 1.4 2001/12/20 18:58:16 ache Exp $
  */
 
 ENCODING        "BIG5"
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 5908ad9539be..e42fbc822bd7 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/Makefile,v 1.62 2005/03/04 14:24:29 ru Exp $
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
diff --git a/share/monetdef/af_ZA.ISO8859-1.src b/share/monetdef/af_ZA.ISO8859-1.src
index 4a17750e0a0f..88fdd3fa5dd8 100644
--- a/share/monetdef/af_ZA.ISO8859-1.src
+++ b/share/monetdef/af_ZA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/af_ZA.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/am_ET.UTF-8.src b/share/monetdef/am_ET.UTF-8.src
index dfabaec0e553..5b4b0e985b4a 100644
--- a/share/monetdef/am_ET.UTF-8.src
+++ b/share/monetdef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/am_ET.UTF-8.src,v 1.1 2003/08/05 05:42:08 mtm Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/be_BY.CP1131.src b/share/monetdef/be_BY.CP1131.src
index a39e5f30d514..b4e2a638608c 100644
--- a/share/monetdef/be_BY.CP1131.src
+++ b/share/monetdef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/be_BY.CP1251.src b/share/monetdef/be_BY.CP1251.src
index ec4f95f63b1d..d1afd2e12c7a 100644
--- a/share/monetdef/be_BY.CP1251.src
+++ b/share/monetdef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/be_BY.ISO8859-5.src b/share/monetdef/be_BY.ISO8859-5.src
index e49691c93c3f..d64cb98f312e 100644
--- a/share/monetdef/be_BY.ISO8859-5.src
+++ b/share/monetdef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/be_BY.UTF-8.src b/share/monetdef/be_BY.UTF-8.src
index a103547f787d..ec1e2c436f2f 100644
--- a/share/monetdef/be_BY.UTF-8.src
+++ b/share/monetdef/be_BY.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/bg_BG.CP1251.src b/share/monetdef/bg_BG.CP1251.src
index 4d8efffa438d..c82f64a0db95 100644
--- a/share/monetdef/bg_BG.CP1251.src
+++ b/share/monetdef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:08:39 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/bg_BG.UTF-8.src b/share/monetdef/bg_BG.UTF-8.src
index be1d6882f18d..f0d71ddf1d04 100644
--- a/share/monetdef/bg_BG.UTF-8.src
+++ b/share/monetdef/bg_BG.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/bg_BG.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ca_ES.ISO8859-1.src b/share/monetdef/ca_ES.ISO8859-1.src
index c6b2a13345b9..a4e8624a71a5 100644
--- a/share/monetdef/ca_ES.ISO8859-1.src
+++ b/share/monetdef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:57 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/cs_CZ.ISO8859-2.src b/share/monetdef/cs_CZ.ISO8859-2.src
index 2ca0f33b8f6b..dea589faac48 100644
--- a/share/monetdef/cs_CZ.ISO8859-2.src
+++ b/share/monetdef/cs_CZ.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/cs_CZ.ISO8859-2.src,v 1.3 2001/09/09 14:49:13 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/cs_CZ.UTF-8.src b/share/monetdef/cs_CZ.UTF-8.src
index cc10a621212e..4bb71f7c719a 100644
--- a/share/monetdef/cs_CZ.UTF-8.src
+++ b/share/monetdef/cs_CZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/cs_CZ.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/da_DK.ISO8859-1.src b/share/monetdef/da_DK.ISO8859-1.src
index a18b4cb4b014..274e20b6b5bc 100644
--- a/share/monetdef/da_DK.ISO8859-1.src
+++ b/share/monetdef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/da_DK.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/de_AT.ISO8859-1.src b/share/monetdef/de_AT.ISO8859-1.src
index 63f77740326f..d48b310710b8 100644
--- a/share/monetdef/de_AT.ISO8859-1.src
+++ b/share/monetdef/de_AT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/de_AT.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/de_CH.ISO8859-1.src b/share/monetdef/de_CH.ISO8859-1.src
index 9bb3e8e23cd4..23e680b948fe 100644
--- a/share/monetdef/de_CH.ISO8859-1.src
+++ b/share/monetdef/de_CH.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/de_CH.ISO8859-1.src,v 1.1 2001/12/25 18:50:48 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/de_DE.ISO8859-1.src b/share/monetdef/de_DE.ISO8859-1.src
index c95cd1e9612f..911abc0f2cc7 100644
--- a/share/monetdef/de_DE.ISO8859-1.src
+++ b/share/monetdef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/de_DE.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/el_GR.ISO8859-7.src b/share/monetdef/el_GR.ISO8859-7.src
index 8b1a9a503a5a..3e38c0186ddb 100644
--- a/share/monetdef/el_GR.ISO8859-7.src
+++ b/share/monetdef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/el_GR.ISO8859-7.src,v 1.3 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_AU.ISO8859-1.src b/share/monetdef/en_AU.ISO8859-1.src
index 32c429836410..4022454c973b 100644
--- a/share/monetdef/en_AU.ISO8859-1.src
+++ b/share/monetdef/en_AU.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_AU.ISO8859-1.src,v 1.7 2002/10/09 09:25:11 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_CA.ISO8859-1.src b/share/monetdef/en_CA.ISO8859-1.src
index 75e31f60cc5d..2fd5c2f7c81c 100644
--- a/share/monetdef/en_CA.ISO8859-1.src
+++ b/share/monetdef/en_CA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_CA.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_GB.ISO8859-1.src b/share/monetdef/en_GB.ISO8859-1.src
index a0472d307968..8e6dd9da4660 100644
--- a/share/monetdef/en_GB.ISO8859-1.src
+++ b/share/monetdef/en_GB.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_GB.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_GB.UTF-8.src b/share/monetdef/en_GB.UTF-8.src
index e187d8c0cee3..32ccffc86aa4 100644
--- a/share/monetdef/en_GB.UTF-8.src
+++ b/share/monetdef/en_GB.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_GB.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_IE.UTF-8.src b/share/monetdef/en_IE.UTF-8.src
index 1ddcc5ccaf68..74943b627205 100644
--- a/share/monetdef/en_IE.UTF-8.src
+++ b/share/monetdef/en_IE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_IE.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_NZ.ISO8859-1.src b/share/monetdef/en_NZ.ISO8859-1.src
index 1cb82617599f..592410bedc13 100644
--- a/share/monetdef/en_NZ.ISO8859-1.src
+++ b/share/monetdef/en_NZ.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_NZ.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_US.ISO8859-1.src b/share/monetdef/en_US.ISO8859-1.src
index faf42e5ae780..16bf488be979 100644
--- a/share/monetdef/en_US.ISO8859-1.src
+++ b/share/monetdef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_US.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/es_ES.ISO8859-1.src b/share/monetdef/es_ES.ISO8859-1.src
index 81d7a600a037..64a11078bb84 100644
--- a/share/monetdef/es_ES.ISO8859-1.src
+++ b/share/monetdef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/es_ES.ISO8859-1.src,v 1.3 2004/09/24 07:48:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/et_EE.ISO8859-15.src b/share/monetdef/et_EE.ISO8859-15.src
index a03ad1a2afbf..7dd29cc1bcff 100644
--- a/share/monetdef/et_EE.ISO8859-15.src
+++ b/share/monetdef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/et_EE.ISO8859-15.src,v 1.1 2001/03/16 12:27:20 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fi_FI.ISO8859-1.src b/share/monetdef/fi_FI.ISO8859-1.src
index 372e77b3facd..51928d5f5ad4 100644
--- a/share/monetdef/fi_FI.ISO8859-1.src
+++ b/share/monetdef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fi_FI.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fr_BE.ISO8859-1.src b/share/monetdef/fr_BE.ISO8859-1.src
index 23c0fcdfded6..c0f0c752c827 100644
--- a/share/monetdef/fr_BE.ISO8859-1.src
+++ b/share/monetdef/fr_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fr_BE.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fr_CA.ISO8859-1.src b/share/monetdef/fr_CA.ISO8859-1.src
index 64ff444dae09..e41d7c072bc1 100644
--- a/share/monetdef/fr_CA.ISO8859-1.src
+++ b/share/monetdef/fr_CA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fr_CA.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fr_FR.ISO8859-1.src b/share/monetdef/fr_FR.ISO8859-1.src
index 8211d1449dc7..b56aeae2ee45 100644
--- a/share/monetdef/fr_FR.ISO8859-1.src
+++ b/share/monetdef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fr_FR.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/he_IL.UTF-8.src b/share/monetdef/he_IL.UTF-8.src
index b0bf2dc4cb5a..4a4f5b24d92e 100644
--- a/share/monetdef/he_IL.UTF-8.src
+++ b/share/monetdef/he_IL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/he_IL.UTF-8.src,v 1.1 2004/04/21 15:28:22 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hi_IN.ISCII-DEV.src b/share/monetdef/hi_IN.ISCII-DEV.src
index cc6de7446dfe..29359dd06f12 100644
--- a/share/monetdef/hi_IN.ISCII-DEV.src
+++ b/share/monetdef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:08 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hr_HR.ISO8859-2.src b/share/monetdef/hr_HR.ISO8859-2.src
index ea1cc94f0829..48e44e2cac84 100644
--- a/share/monetdef/hr_HR.ISO8859-2.src
+++ b/share/monetdef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hr_HR.ISO8859-2.src,v 1.1 2001/04/28 15:13:20 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hu_HU.ISO8859-2.src b/share/monetdef/hu_HU.ISO8859-2.src
index 183f155d2c3e..45795b9f4e57 100644
--- a/share/monetdef/hu_HU.ISO8859-2.src
+++ b/share/monetdef/hu_HU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hu_HU.ISO8859-2.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hy_AM.ARMSCII-8.src b/share/monetdef/hy_AM.ARMSCII-8.src
index 5d8ed16090c9..b3e8c614aa44 100644
--- a/share/monetdef/hy_AM.ARMSCII-8.src
+++ b/share/monetdef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # LC_MONETARY source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/monetdef/hy_AM.UTF-8.src b/share/monetdef/hy_AM.UTF-8.src
index 80396b1e982d..6f79911ff7ec 100644
--- a/share/monetdef/hy_AM.UTF-8.src
+++ b/share/monetdef/hy_AM.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hy_AM.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # LC_MONETARY source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/monetdef/is_IS.ISO8859-1.src b/share/monetdef/is_IS.ISO8859-1.src
index 66a80374e449..d85f75e1075a 100644
--- a/share/monetdef/is_IS.ISO8859-1.src
+++ b/share/monetdef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/is_IS.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/it_IT.ISO8859-1.src b/share/monetdef/it_IT.ISO8859-1.src
index c6b2a13345b9..c1aefbc2ddd9 100644
--- a/share/monetdef/it_IT.ISO8859-1.src
+++ b/share/monetdef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/it_IT.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ja_JP.UTF-8.src b/share/monetdef/ja_JP.UTF-8.src
index fce3288abd00..8680cf3e87e3 100644
--- a/share/monetdef/ja_JP.UTF-8.src
+++ b/share/monetdef/ja_JP.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ja_JP.UTF-8.src,v 1.1 2004/03/29 01:29:13 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ja_JP.eucJP.src b/share/monetdef/ja_JP.eucJP.src
index 462a88dc286c..53f6c4d46cfe 100644
--- a/share/monetdef/ja_JP.eucJP.src
+++ b/share/monetdef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ja_JP.eucJP.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/kk_KZ.PT154.src b/share/monetdef/kk_KZ.PT154.src
index 8b61e8097330..443ceccea47f 100644
--- a/share/monetdef/kk_KZ.PT154.src
+++ b/share/monetdef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:20 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/kk_KZ.UTF-8.src b/share/monetdef/kk_KZ.UTF-8.src
index ddf0353e8239..e96895f0b422 100644
--- a/share/monetdef/kk_KZ.UTF-8.src
+++ b/share/monetdef/kk_KZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/kk_KZ.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ko_KR.UTF-8.src b/share/monetdef/ko_KR.UTF-8.src
index 5d69ac5fdc7e..1f253f50aa0b 100644
--- a/share/monetdef/ko_KR.UTF-8.src
+++ b/share/monetdef/ko_KR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ko_KR.UTF-8.src,v 1.1 2004/03/29 01:53:31 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ko_KR.eucKR.src b/share/monetdef/ko_KR.eucKR.src
index 0723dfa24596..17b492d31829 100644
--- a/share/monetdef/ko_KR.eucKR.src
+++ b/share/monetdef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ko_KR.eucKR.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/lt_LT.ISO8859-13.src b/share/monetdef/lt_LT.ISO8859-13.src
index 790e0c9a41c3..a65209388fc8 100644
--- a/share/monetdef/lt_LT.ISO8859-13.src
+++ b/share/monetdef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/nl_BE.ISO8859-1.src b/share/monetdef/nl_BE.ISO8859-1.src
index 23c0fcdfded6..2b53c0d5ce8f 100644
--- a/share/monetdef/nl_BE.ISO8859-1.src
+++ b/share/monetdef/nl_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/nl_BE.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/nl_NL.ISO8859-1.src b/share/monetdef/nl_NL.ISO8859-1.src
index b5a0992b36c9..0503e0934506 100644
--- a/share/monetdef/nl_NL.ISO8859-1.src
+++ b/share/monetdef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/nl_NL.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/no_NO.ISO8859-1.src b/share/monetdef/no_NO.ISO8859-1.src
index 181953389aa1..079bb457a175 100644
--- a/share/monetdef/no_NO.ISO8859-1.src
+++ b/share/monetdef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/no_NO.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pl_PL.ISO8859-2.src b/share/monetdef/pl_PL.ISO8859-2.src
index b749031e9960..550ed7bb1134 100644
--- a/share/monetdef/pl_PL.ISO8859-2.src
+++ b/share/monetdef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pl_PL.ISO8859-2.src,v 1.3 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pl_PL.UTF-8.src b/share/monetdef/pl_PL.UTF-8.src
index 5138186d82dd..7faf038a8656 100644
--- a/share/monetdef/pl_PL.UTF-8.src
+++ b/share/monetdef/pl_PL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pl_PL.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pt_BR.ISO8859-1.src b/share/monetdef/pt_BR.ISO8859-1.src
index 0614e9fcba24..ef1dfa7b3608 100644
--- a/share/monetdef/pt_BR.ISO8859-1.src
+++ b/share/monetdef/pt_BR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pt_BR.ISO8859-1.src,v 1.1 2002/04/05 15:03:12 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pt_PT.ISO8859-1.src b/share/monetdef/pt_PT.ISO8859-1.src
index e729d54eb004..dd737c57608a 100644
--- a/share/monetdef/pt_PT.ISO8859-1.src
+++ b/share/monetdef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pt_PT.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ro_RO.ISO8859-2.src b/share/monetdef/ro_RO.ISO8859-2.src
index 4f543c4a2ad3..4571d681fb0e 100644
--- a/share/monetdef/ro_RO.ISO8859-2.src
+++ b/share/monetdef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ro_RO.ISO8859-2.src,v 1.1 2002/01/08 15:20:12 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.CP1251.src b/share/monetdef/ru_RU.CP1251.src
index bd3de23b499c..0ac42939459c 100644
--- a/share/monetdef/ru_RU.CP1251.src
+++ b/share/monetdef/ru_RU.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.CP1251.src,v 1.1 2003/06/07 00:28:58 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.CP866.src b/share/monetdef/ru_RU.CP866.src
index cae485aa7d8f..21bbcb047926 100644
--- a/share/monetdef/ru_RU.CP866.src
+++ b/share/monetdef/ru_RU.CP866.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.CP866.src,v 1.1 2001/02/19 20:05:22 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.ISO8859-5.src b/share/monetdef/ru_RU.ISO8859-5.src
index 0f14f0e8ba0d..374a4d62d1bb 100644
--- a/share/monetdef/ru_RU.ISO8859-5.src
+++ b/share/monetdef/ru_RU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.ISO8859-5.src,v 1.1 2001/02/19 20:05:22 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.KOI8-R.src b/share/monetdef/ru_RU.KOI8-R.src
index e4064bc19693..01835982604c 100644
--- a/share/monetdef/ru_RU.KOI8-R.src
+++ b/share/monetdef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.KOI8-R.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.UTF-8.src b/share/monetdef/ru_RU.UTF-8.src
index cab01daeea75..e1f7362ae808 100644
--- a/share/monetdef/ru_RU.UTF-8.src
+++ b/share/monetdef/ru_RU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sk_SK.ISO8859-2.src b/share/monetdef/sk_SK.ISO8859-2.src
index dc2ac34f5564..217c6b9e34b5 100644
--- a/share/monetdef/sk_SK.ISO8859-2.src
+++ b/share/monetdef/sk_SK.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sk_SK.ISO8859-2.src,v 1.1 2001/05/18 13:53:21 ache Exp $
 #
 # Slovak monetary definition by Juraj Bednar <juraj@bednar.sk>
 #
diff --git a/share/monetdef/sl_SI.ISO8859-2.src b/share/monetdef/sl_SI.ISO8859-2.src
index 2448e452bc53..c7f36e7634a2 100644
--- a/share/monetdef/sl_SI.ISO8859-2.src
+++ b/share/monetdef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sl_SI.ISO8859-2.src,v 1.1 2001/04/28 15:13:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sr_YU.ISO8859-2.src b/share/monetdef/sr_YU.ISO8859-2.src
index b706e29154e0..46b082059dbe 100644
--- a/share/monetdef/sr_YU.ISO8859-2.src
+++ b/share/monetdef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sr_YU.ISO8859-5.src b/share/monetdef/sr_YU.ISO8859-5.src
index e5e9f4c967ae..66fcebc66667 100644
--- a/share/monetdef/sr_YU.ISO8859-5.src
+++ b/share/monetdef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sr_YU.UTF-8.src b/share/monetdef/sr_YU.UTF-8.src
index 6e8b013707e2..3fcb35806f63 100644
--- a/share/monetdef/sr_YU.UTF-8.src
+++ b/share/monetdef/sr_YU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sr_YU.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sv_SE.ISO8859-1.src b/share/monetdef/sv_SE.ISO8859-1.src
index a835567ef9be..23a673473cfe 100644
--- a/share/monetdef/sv_SE.ISO8859-1.src
+++ b/share/monetdef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sv_SE.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/tr_TR.ISO8859-9.src b/share/monetdef/tr_TR.ISO8859-9.src
index 41d45477cd93..b83e6d1c1850 100644
--- a/share/monetdef/tr_TR.ISO8859-9.src
+++ b/share/monetdef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/tr_TR.ISO8859-9.src,v 1.1 2001/04/28 15:13:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.CP1251.src b/share/monetdef/uk_UA.CP1251.src
index 807dded42272..05fdeb6cae9e 100644
--- a/share/monetdef/uk_UA.CP1251.src
+++ b/share/monetdef/uk_UA.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:29 ru Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.ISO8859-5.src b/share/monetdef/uk_UA.ISO8859-5.src
index b95e3bd3be7f..b25fb3f71ed3 100644
--- a/share/monetdef/uk_UA.ISO8859-5.src
+++ b/share/monetdef/uk_UA.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.ISO8859-5.src,v 1.1 2001/12/20 20:48:31 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.KOI8-U.src b/share/monetdef/uk_UA.KOI8-U.src
index 5464d142d093..6e11244cd64f 100644
--- a/share/monetdef/uk_UA.KOI8-U.src
+++ b/share/monetdef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.KOI8-U.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.UTF-8.src b/share/monetdef/uk_UA.UTF-8.src
index 842c02f176a1..5c2aae59f3f4 100644
--- a/share/monetdef/uk_UA.UTF-8.src
+++ b/share/monetdef/uk_UA.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.GB18030.src b/share/monetdef/zh_CN.GB18030.src
index e1c0ef28d3e0..3e37216b9ef9 100644
--- a/share/monetdef/zh_CN.GB18030.src
+++ b/share/monetdef/zh_CN.GB18030.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.GB18030.src,v 1.1 2003/07/29 16:12:56 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.GB2312.src b/share/monetdef/zh_CN.GB2312.src
index e1c0ef28d3e0..7cec677b7e0a 100644
--- a/share/monetdef/zh_CN.GB2312.src
+++ b/share/monetdef/zh_CN.GB2312.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.GB2312.src,v 1.1 2003/11/05 22:59:02 davidxu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.UTF-8.src b/share/monetdef/zh_CN.UTF-8.src
index 136d66cddd02..a97c6c70ac14 100644
--- a/share/monetdef/zh_CN.UTF-8.src
+++ b/share/monetdef/zh_CN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.eucCN.src b/share/monetdef/zh_CN.eucCN.src
index 3f5fc2409c1e..7720e17d3fa1 100644
--- a/share/monetdef/zh_CN.eucCN.src
+++ b/share/monetdef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.eucCN.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_HK.UTF-8.src b/share/monetdef/zh_HK.UTF-8.src
index 64921a9e56dc..a356d801f9c7 100644
--- a/share/monetdef/zh_HK.UTF-8.src
+++ b/share/monetdef/zh_HK.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_HK.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_TW.Big5.src b/share/monetdef/zh_TW.Big5.src
index 1e86417df204..077fa98baedf 100644
--- a/share/monetdef/zh_TW.Big5.src
+++ b/share/monetdef/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_TW.Big5.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index bec0b20047f4..aa09b237a859 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/Makefile,v 1.62 2005/03/04 14:24:29 ru Exp $
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
diff --git a/share/msgdef/af_ZA.ISO8859-1.src b/share/msgdef/af_ZA.ISO8859-1.src
index a87da07feee2..383ff8b151f1 100644
--- a/share/msgdef/af_ZA.ISO8859-1.src
+++ b/share/msgdef/af_ZA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/af_ZA.ISO8859-1.src,v 1.1 2001/02/09 12:39:27 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/am_ET.UTF-8.src b/share/msgdef/am_ET.UTF-8.src
index 6e68080193a9..058dd01a9511 100644
--- a/share/msgdef/am_ET.UTF-8.src
+++ b/share/msgdef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/am_ET.UTF-8.src,v 1.1 2003/08/05 05:42:08 mtm Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/be_BY.CP1131.src b/share/msgdef/be_BY.CP1131.src
index ed0a05eea079..4a16b0e175fb 100644
--- a/share/msgdef/be_BY.CP1131.src
+++ b/share/msgdef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/be_BY.CP1251.src b/share/msgdef/be_BY.CP1251.src
index a401228e58b2..2da6d1b9d564 100644
--- a/share/msgdef/be_BY.CP1251.src
+++ b/share/msgdef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/be_BY.ISO8859-5.src b/share/msgdef/be_BY.ISO8859-5.src
index a36e12673ee1..2470ebaf4d68 100644
--- a/share/msgdef/be_BY.ISO8859-5.src
+++ b/share/msgdef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/be_BY.UTF-8.src b/share/msgdef/be_BY.UTF-8.src
index 8d23237784f7..193c05e18189 100644
--- a/share/msgdef/be_BY.UTF-8.src
+++ b/share/msgdef/be_BY.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/bg_BG.CP1251.src b/share/msgdef/bg_BG.CP1251.src
index e52d30d64cf3..a8a64a691902 100644
--- a/share/msgdef/bg_BG.CP1251.src
+++ b/share/msgdef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:13:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/bg_BG.UTF-8.src b/share/msgdef/bg_BG.UTF-8.src
index 72dca12b49a9..219141f05e5d 100644
--- a/share/msgdef/bg_BG.UTF-8.src
+++ b/share/msgdef/bg_BG.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/bg_BG.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ca_ES.ISO8859-1.src b/share/msgdef/ca_ES.ISO8859-1.src
index e839a0a217ba..a69e430f1586 100644
--- a/share/msgdef/ca_ES.ISO8859-1.src
+++ b/share/msgdef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:58 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/cs_CZ.ISO8859-2.src b/share/msgdef/cs_CZ.ISO8859-2.src
index a6fc83634397..7767ba0663a1 100644
--- a/share/msgdef/cs_CZ.ISO8859-2.src
+++ b/share/msgdef/cs_CZ.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/cs_CZ.ISO8859-2.src,v 1.2 2001/02/14 12:17:10 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/da_DK.ISO8859-1.src b/share/msgdef/da_DK.ISO8859-1.src
index a87da07feee2..4d3ae18bc199 100644
--- a/share/msgdef/da_DK.ISO8859-1.src
+++ b/share/msgdef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/da_DK.ISO8859-1.src,v 1.1 2001/02/09 12:08:11 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/de_DE.ISO8859-1.src b/share/msgdef/de_DE.ISO8859-1.src
index a87da07feee2..620f81bdbdf6 100644
--- a/share/msgdef/de_DE.ISO8859-1.src
+++ b/share/msgdef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/de_DE.ISO8859-1.src,v 1.1 2001/02/09 12:21:16 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/el_GR.ISO8859-7.src b/share/msgdef/el_GR.ISO8859-7.src
index 85d433e990cf..8de0021570ba 100644
--- a/share/msgdef/el_GR.ISO8859-7.src
+++ b/share/msgdef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/el_GR.ISO8859-7.src,v 1.2 2001/02/14 23:34:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/el_GR.UTF-8.src b/share/msgdef/el_GR.UTF-8.src
index 560675e005c0..0f515973f288 100644
--- a/share/msgdef/el_GR.UTF-8.src
+++ b/share/msgdef/el_GR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/el_GR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/en_CA.ISO8859-1.src b/share/msgdef/en_CA.ISO8859-1.src
index 7a66f558ef57..6fd62d5a92c0 100644
--- a/share/msgdef/en_CA.ISO8859-1.src
+++ b/share/msgdef/en_CA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/en_CA.ISO8859-1.src,v 1.1 2001/04/28 15:13:24 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/en_GB.ISO8859-1.src b/share/msgdef/en_GB.ISO8859-1.src
index f80c8facd17b..7d3695787b57 100644
--- a/share/msgdef/en_GB.ISO8859-1.src
+++ b/share/msgdef/en_GB.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/en_GB.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/en_US.ISO8859-1.src b/share/msgdef/en_US.ISO8859-1.src
index bc2594ded3df..d2b351bd8a06 100644
--- a/share/msgdef/en_US.ISO8859-1.src
+++ b/share/msgdef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/en_US.ISO8859-1.src,v 1.2 2001/02/08 22:45:44 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/es_ES.ISO8859-1.src b/share/msgdef/es_ES.ISO8859-1.src
index e839a0a217ba..3ca4c7452482 100644
--- a/share/msgdef/es_ES.ISO8859-1.src
+++ b/share/msgdef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/es_ES.ISO8859-1.src,v 1.1 2001/04/29 00:38:26 jmas Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/et_EE.ISO8859-15.src b/share/msgdef/et_EE.ISO8859-15.src
index 0d31afd0a2ec..86ede7cb083e 100644
--- a/share/msgdef/et_EE.ISO8859-15.src
+++ b/share/msgdef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/et_EE.ISO8859-15.src,v 1.1 2001/03/16 12:16:42 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/eu_ES.ISO8859-1.src b/share/msgdef/eu_ES.ISO8859-1.src
index 8eaba389694b..7c9a4b5f0f79 100644
--- a/share/msgdef/eu_ES.ISO8859-1.src
+++ b/share/msgdef/eu_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/eu_ES.ISO8859-1.src,v 1.1 2004/08/28 12:52:31 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fi_FI.ISO8859-1.src b/share/msgdef/fi_FI.ISO8859-1.src
index ac0092a84b3f..790b56aed208 100644
--- a/share/msgdef/fi_FI.ISO8859-1.src
+++ b/share/msgdef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fi_FI.ISO8859-1.src,v 1.1 2001/02/09 13:35:49 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fr_BE.ISO8859-1.src b/share/msgdef/fr_BE.ISO8859-1.src
index 14f8e236ee4a..2f6db327e782 100644
--- a/share/msgdef/fr_BE.ISO8859-1.src
+++ b/share/msgdef/fr_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fr_BE.ISO8859-1.src,v 1.1 2002/02/12 18:23:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fr_CH.ISO8859-1.src b/share/msgdef/fr_CH.ISO8859-1.src
index 4af763873c0d..3af8b42bd1c2 100644
--- a/share/msgdef/fr_CH.ISO8859-1.src
+++ b/share/msgdef/fr_CH.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fr_CH.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fr_FR.ISO8859-1.src b/share/msgdef/fr_FR.ISO8859-1.src
index 80d0218e78e6..ea0f663bdabd 100644
--- a/share/msgdef/fr_FR.ISO8859-1.src
+++ b/share/msgdef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fr_FR.ISO8859-1.src,v 1.1 2001/02/09 12:30:52 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/he_IL.UTF-8.src b/share/msgdef/he_IL.UTF-8.src
index ef87399e0769..ba4a90cfa2ce 100644
--- a/share/msgdef/he_IL.UTF-8.src
+++ b/share/msgdef/he_IL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/he_IL.UTF-8.src,v 1.1 2004/04/21 15:28:22 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hi_IN.ISCII-DEV.src b/share/msgdef/hi_IN.ISCII-DEV.src
index f9ec934117f4..65012913da8e 100644
--- a/share/msgdef/hi_IN.ISCII-DEV.src
+++ b/share/msgdef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:08 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hr_HR.ISO8859-2.src b/share/msgdef/hr_HR.ISO8859-2.src
index a711ff76db9d..547c250641f2 100644
--- a/share/msgdef/hr_HR.ISO8859-2.src
+++ b/share/msgdef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hr_HR.ISO8859-2.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hu_HU.ISO8859-2.src b/share/msgdef/hu_HU.ISO8859-2.src
index 4f009c700567..6d0e8602253f 100644
--- a/share/msgdef/hu_HU.ISO8859-2.src
+++ b/share/msgdef/hu_HU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hu_HU.ISO8859-2.src,v 1.1 2001/02/18 06:47:43 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hy_AM.ARMSCII-8.src b/share/msgdef/hy_AM.ARMSCII-8.src
index c11b38e51caf..677f81f4fa60 100644
--- a/share/msgdef/hy_AM.ARMSCII-8.src
+++ b/share/msgdef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # msgdef source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/msgdef/hy_AM.UTF-8.src b/share/msgdef/hy_AM.UTF-8.src
index 749637de33c3..2893b34196c2 100644
--- a/share/msgdef/hy_AM.UTF-8.src
+++ b/share/msgdef/hy_AM.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hy_AM.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # msgdef source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/msgdef/is_IS.ISO8859-1.src b/share/msgdef/is_IS.ISO8859-1.src
index a87da07feee2..0d1222f699ce 100644
--- a/share/msgdef/is_IS.ISO8859-1.src
+++ b/share/msgdef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/is_IS.ISO8859-1.src,v 1.1 2001/02/09 14:08:51 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/it_IT.ISO8859-1.src b/share/msgdef/it_IT.ISO8859-1.src
index e839a0a217ba..59b3b3a1b99e 100644
--- a/share/msgdef/it_IT.ISO8859-1.src
+++ b/share/msgdef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/it_IT.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ja_JP.SJIS.src b/share/msgdef/ja_JP.SJIS.src
index 8a209e5b8526..e3ccfb58b1cd 100644
--- a/share/msgdef/ja_JP.SJIS.src
+++ b/share/msgdef/ja_JP.SJIS.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ja_JP.SJIS.src,v 1.1 2002/04/05 15:39:15 phantom Exp $
 #
 # XXX: ja_JP.SJIS contains english messages only. Someone familiar with
 # this locale is wanted to complete it!
diff --git a/share/msgdef/ja_JP.UTF-8.src b/share/msgdef/ja_JP.UTF-8.src
index 476ef44b3d62..2fc9a45a0459 100644
--- a/share/msgdef/ja_JP.UTF-8.src
+++ b/share/msgdef/ja_JP.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ja_JP.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ja_JP.eucJP.src b/share/msgdef/ja_JP.eucJP.src
index 2f06e015abae..3d8630b679d1 100644
--- a/share/msgdef/ja_JP.eucJP.src
+++ b/share/msgdef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ja_JP.eucJP.src,v 1.1 2001/02/11 16:19:42 knu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/kk_KZ.PT154.src b/share/msgdef/kk_KZ.PT154.src
index 583096f3ef5e..808a71a0ccd8 100644
--- a/share/msgdef/kk_KZ.PT154.src
+++ b/share/msgdef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:21 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/kk_KZ.UTF-8.src b/share/msgdef/kk_KZ.UTF-8.src
index 23cd9cbb88a7..f31009257d6b 100644
--- a/share/msgdef/kk_KZ.UTF-8.src
+++ b/share/msgdef/kk_KZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/kk_KZ.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ko_KR.eucKR.src b/share/msgdef/ko_KR.eucKR.src
index e839a0a217ba..4d33e216d739 100644
--- a/share/msgdef/ko_KR.eucKR.src
+++ b/share/msgdef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ko_KR.eucKR.src,v 1.1 2001/02/11 15:39:59 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/lt_LT.ISO8859-13.src b/share/msgdef/lt_LT.ISO8859-13.src
index 296f1584c1b0..a0743bc4fb1b 100644
--- a/share/msgdef/lt_LT.ISO8859-13.src
+++ b/share/msgdef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/nl_NL.ISO8859-1.src b/share/msgdef/nl_NL.ISO8859-1.src
index a87da07feee2..0dad08b7ceb5 100644
--- a/share/msgdef/nl_NL.ISO8859-1.src
+++ b/share/msgdef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/nl_NL.ISO8859-1.src,v 1.1 2001/02/08 23:06:09 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/no_NO.ISO8859-1.src b/share/msgdef/no_NO.ISO8859-1.src
index a87da07feee2..566201569dc5 100644
--- a/share/msgdef/no_NO.ISO8859-1.src
+++ b/share/msgdef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/no_NO.ISO8859-1.src,v 1.1 2001/02/09 11:53:53 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/pl_PL.ISO8859-2.src b/share/msgdef/pl_PL.ISO8859-2.src
index a7acd2adf1f0..ce1e0b75a3f4 100644
--- a/share/msgdef/pl_PL.ISO8859-2.src
+++ b/share/msgdef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/pl_PL.ISO8859-2.src,v 1.2 2001/02/18 11:17:41 abial Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/pt_PT.ISO8859-1.src b/share/msgdef/pt_PT.ISO8859-1.src
index e839a0a217ba..e3734a69117a 100644
--- a/share/msgdef/pt_PT.ISO8859-1.src
+++ b/share/msgdef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/pt_PT.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ro_RO.ISO8859-2.src b/share/msgdef/ro_RO.ISO8859-2.src
index c14e034a7e28..723a8b720a85 100644
--- a/share/msgdef/ro_RO.ISO8859-2.src
+++ b/share/msgdef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ro_RO.ISO8859-2.src,v 1.1 2002/01/08 15:20:12 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.CP1251.src b/share/msgdef/ru_RU.CP1251.src
index 5774d94f6f54..4069f34075f5 100644
--- a/share/msgdef/ru_RU.CP1251.src
+++ b/share/msgdef/ru_RU.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.CP1251.src,v 1.1 2003/06/07 00:26:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.CP866.src b/share/msgdef/ru_RU.CP866.src
index df2b035bb4b6..1dfc6a7818a7 100644
--- a/share/msgdef/ru_RU.CP866.src
+++ b/share/msgdef/ru_RU.CP866.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.CP866.src,v 1.1 2001/02/19 20:05:10 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.ISO8859-5.src b/share/msgdef/ru_RU.ISO8859-5.src
index 360485e980e4..8fdede3b2dfd 100644
--- a/share/msgdef/ru_RU.ISO8859-5.src
+++ b/share/msgdef/ru_RU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.ISO8859-5.src,v 1.1 2001/02/19 20:05:10 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.KOI8-R.src b/share/msgdef/ru_RU.KOI8-R.src
index 465cfa69f259..90f566d0f6d3 100644
--- a/share/msgdef/ru_RU.KOI8-R.src
+++ b/share/msgdef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.KOI8-R.src,v 1.2 2001/02/13 23:36:15 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.UTF-8.src b/share/msgdef/ru_RU.UTF-8.src
index 21882ca80b38..d95f19b907b5 100644
--- a/share/msgdef/ru_RU.UTF-8.src
+++ b/share/msgdef/ru_RU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.UTF-8.src,v 1.2 2004/08/28 10:59:03 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sl_SI.ISO8859-2.src b/share/msgdef/sl_SI.ISO8859-2.src
index 9686b4f232fc..a80b02783a7c 100644
--- a/share/msgdef/sl_SI.ISO8859-2.src
+++ b/share/msgdef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sl_SI.ISO8859-2.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sr_YU.ISO8859-2.src b/share/msgdef/sr_YU.ISO8859-2.src
index a711ff76db9d..3274b36c001c 100644
--- a/share/msgdef/sr_YU.ISO8859-2.src
+++ b/share/msgdef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sr_YU.ISO8859-5.src b/share/msgdef/sr_YU.ISO8859-5.src
index 24ec0c74090d..244265ecfc87 100644
--- a/share/msgdef/sr_YU.ISO8859-5.src
+++ b/share/msgdef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sr_YU.UTF-8.src b/share/msgdef/sr_YU.UTF-8.src
index 72dca12b49a9..8ed8d731cd9e 100644
--- a/share/msgdef/sr_YU.UTF-8.src
+++ b/share/msgdef/sr_YU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sr_YU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sv_SE.ISO8859-1.src b/share/msgdef/sv_SE.ISO8859-1.src
index a87da07feee2..075fc59b2d76 100644
--- a/share/msgdef/sv_SE.ISO8859-1.src
+++ b/share/msgdef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sv_SE.ISO8859-1.src,v 1.1 2001/02/09 11:38:55 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/tr_TR.ISO8859-9.src b/share/msgdef/tr_TR.ISO8859-9.src
index 47329944b040..150f37efafce 100644
--- a/share/msgdef/tr_TR.ISO8859-9.src
+++ b/share/msgdef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/tr_TR.ISO8859-9.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.CP1251.src b/share/msgdef/uk_UA.CP1251.src
index f3fd7765ad95..37d7cb64ee74 100644
--- a/share/msgdef/uk_UA.CP1251.src
+++ b/share/msgdef/uk_UA.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:29 ru Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.ISO8859-5.src b/share/msgdef/uk_UA.ISO8859-5.src
index cc508146e827..aefec88dd86a 100644
--- a/share/msgdef/uk_UA.ISO8859-5.src
+++ b/share/msgdef/uk_UA.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.ISO8859-5.src,v 1.1 2001/12/20 20:48:30 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.KOI8-U.src b/share/msgdef/uk_UA.KOI8-U.src
index 5eec97264d5d..66ab25b996bb 100644
--- a/share/msgdef/uk_UA.KOI8-U.src
+++ b/share/msgdef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.KOI8-U.src,v 1.1 2001/02/17 08:31:31 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.UTF-8.src b/share/msgdef/uk_UA.UTF-8.src
index cfc5a2e64bc0..71052e676c26 100644
--- a/share/msgdef/uk_UA.UTF-8.src
+++ b/share/msgdef/uk_UA.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.GB18030.src b/share/msgdef/zh_CN.GB18030.src
index 6e9cd83e04e3..3d15aa19344d 100644
--- a/share/msgdef/zh_CN.GB18030.src
+++ b/share/msgdef/zh_CN.GB18030.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.GB18030.src,v 1.1 2003/07/29 16:12:56 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.GB2312.src b/share/msgdef/zh_CN.GB2312.src
index 6e9cd83e04e3..f7aad9e00acb 100644
--- a/share/msgdef/zh_CN.GB2312.src
+++ b/share/msgdef/zh_CN.GB2312.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.GB2312.src,v 1.1 2003/11/05 22:59:02 davidxu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.UTF-8.src b/share/msgdef/zh_CN.UTF-8.src
index 975134e8173e..a2420e5a364a 100644
--- a/share/msgdef/zh_CN.UTF-8.src
+++ b/share/msgdef/zh_CN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.eucCN.src b/share/msgdef/zh_CN.eucCN.src
index 6e9cd83e04e3..4152049045bc 100644
--- a/share/msgdef/zh_CN.eucCN.src
+++ b/share/msgdef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.eucCN.src,v 1.1 2001/02/17 18:45:08 keith Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_TW.Big5.src b/share/msgdef/zh_TW.Big5.src
index cc1bfce72027..74e5e05e517f 100644
--- a/share/msgdef/zh_TW.Big5.src
+++ b/share/msgdef/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_TW.Big5.src,v 1.1 2001/02/17 18:45:08 keith Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_TW.UTF-8.src b/share/msgdef/zh_TW.UTF-8.src
index 975134e8173e..0a8b96140f1e 100644
--- a/share/msgdef/zh_TW.UTF-8.src
+++ b/share/msgdef/zh_TW.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_TW.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index f87fa129b01b..2de807163a96 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/Makefile,v 1.59 2005/03/04 14:24:30 ru Exp $
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
diff --git a/share/numericdef/af_ZA.ISO8859-1.src b/share/numericdef/af_ZA.ISO8859-1.src
index 9c48fd3b1593..7a8679c529be 100644
--- a/share/numericdef/af_ZA.ISO8859-1.src
+++ b/share/numericdef/af_ZA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/af_ZA.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/am_ET.UTF-8.src b/share/numericdef/am_ET.UTF-8.src
index cd49d3608dc5..b45fc76dd8e2 100644
--- a/share/numericdef/am_ET.UTF-8.src
+++ b/share/numericdef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/am_ET.UTF-8.src,v 1.1 2003/08/05 05:42:08 mtm Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/be_BY.CP1251.src b/share/numericdef/be_BY.CP1251.src
index 0b0b623dac02..4c6ae214c387 100644
--- a/share/numericdef/be_BY.CP1251.src
+++ b/share/numericdef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/numericdef/bg_BG.CP1251.src b/share/numericdef/bg_BG.CP1251.src
index 68677812c355..88f849a44a45 100644
--- a/share/numericdef/bg_BG.CP1251.src
+++ b/share/numericdef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:17:33 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ca_ES.ISO8859-1.src b/share/numericdef/ca_ES.ISO8859-1.src
index 0036ad362aae..65f4d1eb04a6 100644
--- a/share/numericdef/ca_ES.ISO8859-1.src
+++ b/share/numericdef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:58 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/cs_CZ.ISO8859-2.src b/share/numericdef/cs_CZ.ISO8859-2.src
index 68677812c355..b8107c0c279e 100644
--- a/share/numericdef/cs_CZ.ISO8859-2.src
+++ b/share/numericdef/cs_CZ.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/cs_CZ.ISO8859-2.src,v 1.1 2001/02/10 13:31:36 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/da_DK.ISO8859-1.src b/share/numericdef/da_DK.ISO8859-1.src
index 9c48fd3b1593..f5ca876de935 100644
--- a/share/numericdef/da_DK.ISO8859-1.src
+++ b/share/numericdef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/da_DK.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/de_DE.ISO8859-1.src b/share/numericdef/de_DE.ISO8859-1.src
index 0036ad362aae..11c1749af22f 100644
--- a/share/numericdef/de_DE.ISO8859-1.src
+++ b/share/numericdef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/de_DE.ISO8859-1.src,v 1.3 2001/02/10 03:20:27 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/el_GR.ISO8859-7.src b/share/numericdef/el_GR.ISO8859-7.src
index 20911c971968..91d79477decb 100644
--- a/share/numericdef/el_GR.ISO8859-7.src
+++ b/share/numericdef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/el_GR.ISO8859-7.src,v 1.3 2004/10/13 22:12:59 keramida Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/en_US.ISO8859-1.src b/share/numericdef/en_US.ISO8859-1.src
index cd49d3608dc5..7220e4f32d03 100644
--- a/share/numericdef/en_US.ISO8859-1.src
+++ b/share/numericdef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/en_US.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/es_ES.ISO8859-1.src b/share/numericdef/es_ES.ISO8859-1.src
index 0036ad362aae..ec30db51cb53 100644
--- a/share/numericdef/es_ES.ISO8859-1.src
+++ b/share/numericdef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/es_ES.ISO8859-1.src,v 1.1 2001/04/29 00:38:26 jmas Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/et_EE.ISO8859-15.src b/share/numericdef/et_EE.ISO8859-15.src
index 4ebc899962aa..06d6a2e2d0e2 100644
--- a/share/numericdef/et_EE.ISO8859-15.src
+++ b/share/numericdef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/et_EE.ISO8859-15.src,v 1.1 2001/03/16 12:21:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/eu_ES.ISO8859-1.src b/share/numericdef/eu_ES.ISO8859-1.src
index f182a559619c..c31478ec3ba2 100644
--- a/share/numericdef/eu_ES.ISO8859-1.src
+++ b/share/numericdef/eu_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/eu_ES.ISO8859-1.src,v 1.2 2004/11/16 14:58:20 tobez Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/fi_FI.ISO8859-1.src b/share/numericdef/fi_FI.ISO8859-1.src
index 9c48fd3b1593..fee1267e780a 100644
--- a/share/numericdef/fi_FI.ISO8859-1.src
+++ b/share/numericdef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/fi_FI.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/fr_BE.ISO8859-1.src b/share/numericdef/fr_BE.ISO8859-1.src
index f182a559619c..78d69a634ad9 100644
--- a/share/numericdef/fr_BE.ISO8859-1.src
+++ b/share/numericdef/fr_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/fr_BE.ISO8859-1.src,v 1.1 2002/02/12 18:23:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/fr_FR.ISO8859-1.src b/share/numericdef/fr_FR.ISO8859-1.src
index 0036ad362aae..3d75dfb273ce 100644
--- a/share/numericdef/fr_FR.ISO8859-1.src
+++ b/share/numericdef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/fr_FR.ISO8859-1.src,v 1.3 2001/02/10 03:20:27 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hi_IN.ISCII-DEV.src b/share/numericdef/hi_IN.ISCII-DEV.src
index 99d11f681e1c..d12487b54024 100644
--- a/share/numericdef/hi_IN.ISCII-DEV.src
+++ b/share/numericdef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:10 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hr_HR.ISO8859-2.src b/share/numericdef/hr_HR.ISO8859-2.src
index 27148ff2de29..fe4828dd721d 100644
--- a/share/numericdef/hr_HR.ISO8859-2.src
+++ b/share/numericdef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hr_HR.ISO8859-2.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hu_HU.ISO8859-2.src b/share/numericdef/hu_HU.ISO8859-2.src
index 68677812c355..72b9722ecdb6 100644
--- a/share/numericdef/hu_HU.ISO8859-2.src
+++ b/share/numericdef/hu_HU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hu_HU.ISO8859-2.src,v 1.1 2001/02/18 06:44:09 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hy_AM.ARMSCII-8.src b/share/numericdef/hy_AM.ARMSCII-8.src
index 70aeb8d163b0..86ee3bba3ace 100644
--- a/share/numericdef/hy_AM.ARMSCII-8.src
+++ b/share/numericdef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # LC_NUMERIC source file for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/numericdef/is_IS.ISO8859-1.src b/share/numericdef/is_IS.ISO8859-1.src
index 4ebc899962aa..69bf543ac2af 100644
--- a/share/numericdef/is_IS.ISO8859-1.src
+++ b/share/numericdef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/is_IS.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/it_IT.ISO8859-1.src b/share/numericdef/it_IT.ISO8859-1.src
index 8e5095d653a4..8515f521a7e3 100644
--- a/share/numericdef/it_IT.ISO8859-1.src
+++ b/share/numericdef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/it_IT.ISO8859-1.src,v 1.2 2004/02/18 05:23:09 cperciva Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ja_JP.eucJP.src b/share/numericdef/ja_JP.eucJP.src
index cd49d3608dc5..4f8ae2b1c50b 100644
--- a/share/numericdef/ja_JP.eucJP.src
+++ b/share/numericdef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ja_JP.eucJP.src,v 1.1 2001/02/11 16:19:43 knu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/kk_KZ.PT154.src b/share/numericdef/kk_KZ.PT154.src
index 4ebc899962aa..d08a5504570f 100644
--- a/share/numericdef/kk_KZ.PT154.src
+++ b/share/numericdef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:21 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ko_KR.eucKR.src b/share/numericdef/ko_KR.eucKR.src
index cd49d3608dc5..2aa23b1f50f8 100644
--- a/share/numericdef/ko_KR.eucKR.src
+++ b/share/numericdef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ko_KR.eucKR.src,v 1.1 2001/02/11 15:40:01 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/lt_LT.ISO8859-13.src b/share/numericdef/lt_LT.ISO8859-13.src
index 4ebc899962aa..85ede21faa4c 100644
--- a/share/numericdef/lt_LT.ISO8859-13.src
+++ b/share/numericdef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:10 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/nl_NL.ISO8859-1.src b/share/numericdef/nl_NL.ISO8859-1.src
index 0036ad362aae..ac8d35bf8d07 100644
--- a/share/numericdef/nl_NL.ISO8859-1.src
+++ b/share/numericdef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/nl_NL.ISO8859-1.src,v 1.3 2001/02/10 03:20:27 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/no_NO.ISO8859-1.src b/share/numericdef/no_NO.ISO8859-1.src
index 9c48fd3b1593..a7efef4ec95f 100644
--- a/share/numericdef/no_NO.ISO8859-1.src
+++ b/share/numericdef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/no_NO.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/pl_PL.ISO8859-2.src b/share/numericdef/pl_PL.ISO8859-2.src
index 68677812c355..534224670c1a 100644
--- a/share/numericdef/pl_PL.ISO8859-2.src
+++ b/share/numericdef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/pl_PL.ISO8859-2.src,v 1.1 2001/02/10 22:44:31 abial Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/pt_BR.ISO8859-1.src b/share/numericdef/pt_BR.ISO8859-1.src
index 9c48fd3b1593..b95cf397ee57 100644
--- a/share/numericdef/pt_BR.ISO8859-1.src
+++ b/share/numericdef/pt_BR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/pt_BR.ISO8859-1.src,v 1.1 2002/04/05 15:03:13 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/pt_PT.ISO8859-1.src b/share/numericdef/pt_PT.ISO8859-1.src
index 27148ff2de29..258a738c6138 100644
--- a/share/numericdef/pt_PT.ISO8859-1.src
+++ b/share/numericdef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/pt_PT.ISO8859-1.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ro_RO.ISO8859-2.src b/share/numericdef/ro_RO.ISO8859-2.src
index 4ebc899962aa..6e1e046e48d3 100644
--- a/share/numericdef/ro_RO.ISO8859-2.src
+++ b/share/numericdef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ro_RO.ISO8859-2.src,v 1.1 2002/01/08 15:20:12 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ru_RU.KOI8-R.src b/share/numericdef/ru_RU.KOI8-R.src
index 4ebc899962aa..96516273b7ff 100644
--- a/share/numericdef/ru_RU.KOI8-R.src
+++ b/share/numericdef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ru_RU.KOI8-R.src,v 1.5 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sk_SK.ISO8859-2.src b/share/numericdef/sk_SK.ISO8859-2.src
index 19776246f8ca..66352426039a 100644
--- a/share/numericdef/sk_SK.ISO8859-2.src
+++ b/share/numericdef/sk_SK.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sk_SK.ISO8859-2.src,v 1.1 2001/05/18 13:55:25 ache Exp $
 #
 # Slovak numeric definition
 #
diff --git a/share/numericdef/sl_SI.ISO8859-2.src b/share/numericdef/sl_SI.ISO8859-2.src
index 900949a3652d..b1bcab8f4069 100644
--- a/share/numericdef/sl_SI.ISO8859-2.src
+++ b/share/numericdef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sl_SI.ISO8859-2.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sr_YU.ISO8859-2.src b/share/numericdef/sr_YU.ISO8859-2.src
index 27148ff2de29..3d93ebbf0a81 100644
--- a/share/numericdef/sr_YU.ISO8859-2.src
+++ b/share/numericdef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sr_YU.ISO8859-5.src b/share/numericdef/sr_YU.ISO8859-5.src
index 4ebc899962aa..f085a09b74f8 100644
--- a/share/numericdef/sr_YU.ISO8859-5.src
+++ b/share/numericdef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sv_SE.ISO8859-1.src b/share/numericdef/sv_SE.ISO8859-1.src
index 4ebc899962aa..af5f24e3e773 100644
--- a/share/numericdef/sv_SE.ISO8859-1.src
+++ b/share/numericdef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sv_SE.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/tr_TR.ISO8859-9.src b/share/numericdef/tr_TR.ISO8859-9.src
index 27148ff2de29..96c81720ab58 100644
--- a/share/numericdef/tr_TR.ISO8859-9.src
+++ b/share/numericdef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/tr_TR.ISO8859-9.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/uk_UA.KOI8-U.src b/share/numericdef/uk_UA.KOI8-U.src
index 4ebc899962aa..db1a4981e357 100644
--- a/share/numericdef/uk_UA.KOI8-U.src
+++ b/share/numericdef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/uk_UA.KOI8-U.src,v 1.1 2001/02/17 08:35:14 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/zh_CN.eucCN.src b/share/numericdef/zh_CN.eucCN.src
index cd49d3608dc5..5a1e34cf1cc2 100644
--- a/share/numericdef/zh_CN.eucCN.src
+++ b/share/numericdef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/zh_CN.eucCN.src,v 1.1 2001/02/17 18:45:08 keith Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/security/Makefile b/share/security/Makefile
index c25a52dd1e55..a0d78c8ebd3c 100644
--- a/share/security/Makefile
+++ b/share/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/security/Makefile,v 1.4 2004/12/21 08:46:54 ru Exp $
 
 FILES=	lomac-policy.contexts
 NO_OBJ=
diff --git a/share/security/lomac-policy.contexts b/share/security/lomac-policy.contexts
index e01bd2842c60..fcc6424b0c2a 100644
--- a/share/security/lomac-policy.contexts
+++ b/share/security/lomac-policy.contexts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/security/lomac-policy.contexts,v 1.1 2002/12/03 15:16:10 rwatson Exp $
 #
 # This is a sample LOMAC policy based upon the PLM defined in the
 # original FreeBSD LOMAC port.  It may be configured on a
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
index ef5fd382c31c..148f8825c0a4 100644
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/sendmail/Makefile,v 1.10 2004/12/21 08:46:54 ru Exp $
 #
 # Doing a make install builds /usr/share/sendmail/
 
diff --git a/share/skel/Makefile b/share/skel/Makefile
index ffe80152eeaf..98185c123405 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/skel/Makefile,v 1.11 2004/12/21 08:46:54 ru Exp $
 
 FILESGROUPS=	FILES1 FILES2
 FILES1=		dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index 89993eccc9f4..2505aa9833bc 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.cshrc,v 1.13 2001/01/10 17:35:28 archie Exp $
 #
 # .cshrc - csh resource script, read at beginning of execution by each shell
 #
diff --git a/share/skel/dot.login b/share/skel/dot.login
index 894021a83794..ac4f9f511eda 100644
--- a/share/skel/dot.login
+++ b/share/skel/dot.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.login,v 1.16 2001/06/25 20:40:02 nik Exp $
 #
 # .login - csh login script, read by login shell, after `.cshrc' at login.
 #
diff --git a/share/skel/dot.login_conf b/share/skel/dot.login_conf
index 3c4b025f2000..5d94fdcd03a5 100644
--- a/share/skel/dot.login_conf
+++ b/share/skel/dot.login_conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.login_conf,v 1.3 2001/06/10 17:08:53 ache Exp $
 #
 # see login.conf(5)
 #
diff --git a/share/skel/dot.mail_aliases b/share/skel/dot.mail_aliases
index e319ef8e7982..4f34ffb5ed02 100644
--- a/share/skel/dot.mail_aliases
+++ b/share/skel/dot.mail_aliases
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.mail_aliases,v 1.3 2003/09/28 16:17:30 rwatson Exp $
 #
 # .mail_aliases - private mail aliases
 #
diff --git a/share/skel/dot.mailrc b/share/skel/dot.mailrc
index 9ab6ac0c8e8c..be99f5b707df 100644
--- a/share/skel/dot.mailrc
+++ b/share/skel/dot.mailrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.mailrc,v 1.6 1999/08/28 00:21:53 peter Exp $
 #
 # .mailrc - mail resources
 #
diff --git a/share/skel/dot.profile b/share/skel/dot.profile
index 07da036b6873..fa83cc21151a 100644
--- a/share/skel/dot.profile
+++ b/share/skel/dot.profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.profile,v 1.21 2002/07/07 00:00:54 mp Exp $
 #
 # .profile - Bourne Shell startup script for login shells
 #
diff --git a/share/skel/dot.rhosts b/share/skel/dot.rhosts
index 30132d57c4be..875e9bfb0b56 100644
--- a/share/skel/dot.rhosts
+++ b/share/skel/dot.rhosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.rhosts,v 1.6 1999/08/28 00:21:53 peter Exp $
 #
 # .rhosts - trusted remote host name and user data base
 #
diff --git a/share/skel/dot.shrc b/share/skel/dot.shrc
index 73491698e8e7..c1ddfe5247ae 100644
--- a/share/skel/dot.shrc
+++ b/share/skel/dot.shrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.shrc,v 1.3 2002/07/23 12:28:16 jmallett Exp $
 #
 # .shrc - bourne shell startup file 
 #
diff --git a/share/snmp/Makefile b/share/snmp/Makefile
index 1bfc5b9b5e74..420bb62a5e21 100644
--- a/share/snmp/Makefile
+++ b/share/snmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/snmp/Makefile,v 1.1 2004/04/24 19:54:54 phk Exp $
 
 SUBDIR= mibs
 
diff --git a/share/snmp/mibs/FREEBSD-MIB.txt b/share/snmp/mibs/FREEBSD-MIB.txt
index ca96c7a99019..5ebb150073cd 100644
--- a/share/snmp/mibs/FREEBSD-MIB.txt
+++ b/share/snmp/mibs/FREEBSD-MIB.txt
@@ -3,7 +3,7 @@
 --
 -- FreeBSD SMI { enterprises 2238 }
 --
--- $FreeBSD$
+-- $FreeBSD: src/share/snmp/mibs/FREEBSD-MIB.txt,v 1.2 2004/04/28 11:44:28 phk Exp $
 --
 -- *****************************************************************
 
diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile
index 8de73c9be550..6e1bde7f8877 100644
--- a/share/snmp/mibs/Makefile
+++ b/share/snmp/mibs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/snmp/mibs/Makefile,v 1.3 2004/12/21 08:46:55 ru Exp $
 
 FILES=	FREEBSD-MIB.txt
 NO_OBJ=
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 9cbf100f13b9..452901010f13 100644
--- a/share/syscons/Makefile
+++ b/share/syscons/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/Makefile,v 1.4 1999/08/28 00:21:55 peter Exp $
 
 SUBDIR= fonts keymaps scrnmaps
 
diff --git a/share/syscons/fonts/INDEX.fonts b/share/syscons/fonts/INDEX.fonts
index b7a786cce3cc..f02eed740150 100644
--- a/share/syscons/fonts/INDEX.fonts
+++ b/share/syscons/fonts/INDEX.fonts
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/INDEX.fonts,v 1.27 2003/12/20 11:18:43 ache Exp $
 #
 # database for vidfont(8) 
 #
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index e915309fe745..7856b90390a9 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/Makefile,v 1.37 2004/12/21 08:46:55 ru Exp $
 
 FILES=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
 	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
diff --git a/share/syscons/fonts/armscii8-8x14.fnt b/share/syscons/fonts/armscii8-8x14.fnt
index edc81c96cf99..b0f019ddcb77 100644
--- a/share/syscons/fonts/armscii8-8x14.fnt
+++ b/share/syscons/fonts/armscii8-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/armscii8-8x14.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 armscii8-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/armscii8-8x16.fnt b/share/syscons/fonts/armscii8-8x16.fnt
index 2a7767fb1702..2bb3aabca103 100644
--- a/share/syscons/fonts/armscii8-8x16.fnt
+++ b/share/syscons/fonts/armscii8-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/armscii8-8x16.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 armscii8-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/armscii8-8x8.fnt b/share/syscons/fonts/armscii8-8x8.fnt
index 338e465bec37..29f8dde8398b 100644
--- a/share/syscons/fonts/armscii8-8x8.fnt
+++ b/share/syscons/fonts/armscii8-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/armscii8-8x8.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 armscii8-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp1251-8x14.fnt b/share/syscons/fonts/cp1251-8x14.fnt
index ae7075a66ec9..0b1dbaae097e 100644
--- a/share/syscons/fonts/cp1251-8x14.fnt
+++ b/share/syscons/fonts/cp1251-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp1251-8x14.fnt,v 1.2 2001/11/23 00:10:17 ache Exp $
 begin 644 cp1251-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp1251-8x16.fnt b/share/syscons/fonts/cp1251-8x16.fnt
index 184728e966dc..ccc6b401279e 100644
--- a/share/syscons/fonts/cp1251-8x16.fnt
+++ b/share/syscons/fonts/cp1251-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp1251-8x16.fnt,v 1.2 2001/11/23 00:10:17 ache Exp $
 begin 644 cp1251-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp1251-8x8.fnt b/share/syscons/fonts/cp1251-8x8.fnt
index 9cb227022127..97954c43e150 100644
--- a/share/syscons/fonts/cp1251-8x8.fnt
+++ b/share/syscons/fonts/cp1251-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp1251-8x8.fnt,v 1.2 2001/11/23 00:10:17 ache Exp $
 begin 644 cp1251-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp866u-8x14.fnt b/share/syscons/fonts/cp866u-8x14.fnt
index 9251f5e5d19e..f5147d983c66 100644
--- a/share/syscons/fonts/cp866u-8x14.fnt
+++ b/share/syscons/fonts/cp866u-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp866u-8x14.fnt,v 1.1 2001/04/17 12:51:20 sobomax Exp $
 begin 644 cp866u-8x14.fnt
 M`````````````````````'Z!I8&!I9F!?@``````?O_;___#Y_]^````````
 M;/[^_OY\.!`````````0.'S^?#@0````````&#P\Y^?G&!@\```````8/'[_
diff --git a/share/syscons/fonts/cp866u-8x16.fnt b/share/syscons/fonts/cp866u-8x16.fnt
index 78965b06aec8..67cf656f9ca8 100644
--- a/share/syscons/fonts/cp866u-8x16.fnt
+++ b/share/syscons/fonts/cp866u-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp866u-8x16.fnt,v 1.1 2001/04/17 12:51:20 sobomax Exp $
 begin 644 cp866u-8x16.fnt
 M````````````````````````?H&E@8&EF8&!?@```````'[_V___V^?__WX`
 M`````````&S^_O[^?#@0```````````0.'S^?#@0```````````8/#SGY^<8
diff --git a/share/syscons/fonts/cp866u-8x8.fnt b/share/syscons/fonts/cp866u-8x8.fnt
index f979393c3135..5183726327ac 100644
--- a/share/syscons/fonts/cp866u-8x8.fnt
+++ b/share/syscons/fonts/cp866u-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp866u-8x8.fnt,v 1.1 2001/04/17 12:51:20 sobomax Exp $
 begin 644 cp866u-8x8.fnt
 M``````````!^@:6!O9F!?G[_V__#Y_]^;/[^_GPX$``0.'S^?#@0`#A\./[^
 M?#A\$!`X?/Y\.'P``!@\/!@``/__Y\/#Y___`#QF0D)F/`#_PYF]O9G#_P\'
diff --git a/share/syscons/fonts/haik8-8x14.fnt b/share/syscons/fonts/haik8-8x14.fnt
index ce9fead1108d..db7cd683f9ea 100644
--- a/share/syscons/fonts/haik8-8x14.fnt
+++ b/share/syscons/fonts/haik8-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/haik8-8x14.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 haik8-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/haik8-8x16.fnt b/share/syscons/fonts/haik8-8x16.fnt
index 6ada66060788..d444b9266e3e 100644
--- a/share/syscons/fonts/haik8-8x16.fnt
+++ b/share/syscons/fonts/haik8-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/haik8-8x16.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 haik8-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/haik8-8x8.fnt b/share/syscons/fonts/haik8-8x8.fnt
index 84b61b5ec762..0a29a10eb49c 100644
--- a/share/syscons/fonts/haik8-8x8.fnt
+++ b/share/syscons/fonts/haik8-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/haik8-8x8.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 haik8-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-8x14.fnt b/share/syscons/fonts/iso-8x14.fnt
index 45d93a7e6d8e..c74a0d84c93b 100644
--- a/share/syscons/fonts/iso-8x14.fnt
+++ b/share/syscons/fonts/iso-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-8x16.fnt b/share/syscons/fonts/iso-8x16.fnt
index e596679f0e1a..5d90c0322acf 100644
--- a/share/syscons/fonts/iso-8x16.fnt
+++ b/share/syscons/fonts/iso-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-8x8.fnt b/share/syscons/fonts/iso-8x8.fnt
index 2a5b4bb8254c..86cb38f83fff 100644
--- a/share/syscons/fonts/iso-8x8.fnt
+++ b/share/syscons/fonts/iso-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-thin-8x16.fnt b/share/syscons/fonts/iso-thin-8x16.fnt
index 50abaca08f0b..87b17d6194b7 100644
--- a/share/syscons/fonts/iso-thin-8x16.fnt
+++ b/share/syscons/fonts/iso-thin-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-thin-8x16.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-thin-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso02-8x14.fnt b/share/syscons/fonts/iso02-8x14.fnt
index 68b9c0d1ea2c..86884b1e110b 100644
--- a/share/syscons/fonts/iso02-8x14.fnt
+++ b/share/syscons/fonts/iso02-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso02-8x14.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso02-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso02-8x16.fnt b/share/syscons/fonts/iso02-8x16.fnt
index da3fe09f6100..75efeb8dd7a0 100644
--- a/share/syscons/fonts/iso02-8x16.fnt
+++ b/share/syscons/fonts/iso02-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso02-8x16.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso02-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso02-8x8.fnt b/share/syscons/fonts/iso02-8x8.fnt
index 4246950a8c09..7596bffae75b 100644
--- a/share/syscons/fonts/iso02-8x8.fnt
+++ b/share/syscons/fonts/iso02-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso02-8x8.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso02-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-8x14.fnt b/share/syscons/fonts/iso04-8x14.fnt
index f6e1b339d250..a54c92671cf7 100644
--- a/share/syscons/fonts/iso04-8x14.fnt
+++ b/share/syscons/fonts/iso04-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-8x16.fnt b/share/syscons/fonts/iso04-8x16.fnt
index 861a6cf9ecd1..77c75cd1464a 100644
--- a/share/syscons/fonts/iso04-8x16.fnt
+++ b/share/syscons/fonts/iso04-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-8x8.fnt b/share/syscons/fonts/iso04-8x8.fnt
index 8d9fdc6bb507..c5cb55a40f31 100644
--- a/share/syscons/fonts/iso04-8x8.fnt
+++ b/share/syscons/fonts/iso04-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-8x14.fnt b/share/syscons/fonts/iso04-vga9-8x14.fnt
index 0cf883883b94..6a19c8379ce7 100644
--- a/share/syscons/fonts/iso04-vga9-8x14.fnt
+++ b/share/syscons/fonts/iso04-vga9-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-8x16.fnt b/share/syscons/fonts/iso04-vga9-8x16.fnt
index 42cf6312face..a563abfd5500 100644
--- a/share/syscons/fonts/iso04-vga9-8x16.fnt
+++ b/share/syscons/fonts/iso04-vga9-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-8x8.fnt b/share/syscons/fonts/iso04-vga9-8x8.fnt
index 53b81a285623..3520cba478f1 100644
--- a/share/syscons/fonts/iso04-vga9-8x8.fnt
+++ b/share/syscons/fonts/iso04-vga9-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-wide-8x16.fnt b/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
index 7f78bb70fa1e..2e2c3a0b3d92 100644
--- a/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
+++ b/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-wide-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-wide-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-wide-8x16.fnt b/share/syscons/fonts/iso04-wide-8x16.fnt
index e216b5b95727..cff22b9ee5c8 100644
--- a/share/syscons/fonts/iso04-wide-8x16.fnt
+++ b/share/syscons/fonts/iso04-wide-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-wide-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-wide-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso05-8x14.fnt b/share/syscons/fonts/iso05-8x14.fnt
index f1df5408830a..c7c3df7ab2dc 100644
--- a/share/syscons/fonts/iso05-8x14.fnt
+++ b/share/syscons/fonts/iso05-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso05-8x14.fnt,v 1.2 2002/01/01 07:43:45 ache Exp $
 begin 644 iso05-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso05-8x16.fnt b/share/syscons/fonts/iso05-8x16.fnt
index 3fdaa20b9afd..6449e3a44646 100644
--- a/share/syscons/fonts/iso05-8x16.fnt
+++ b/share/syscons/fonts/iso05-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso05-8x16.fnt,v 1.2 2002/01/01 07:43:45 ache Exp $
 begin 644 iso05-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso05-8x8.fnt b/share/syscons/fonts/iso05-8x8.fnt
index e34a79bd2e77..a942eb33fce7 100644
--- a/share/syscons/fonts/iso05-8x8.fnt
+++ b/share/syscons/fonts/iso05-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso05-8x8.fnt,v 1.2 2002/01/01 07:43:45 ache Exp $
 begin 644 iso05-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso07-8x14.fnt b/share/syscons/fonts/iso07-8x14.fnt
index e89426b224f3..25e8d6cb642b 100644
--- a/share/syscons/fonts/iso07-8x14.fnt
+++ b/share/syscons/fonts/iso07-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso07-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso07-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso07-8x16.fnt b/share/syscons/fonts/iso07-8x16.fnt
index 932b19eb1d53..6f30d4c023f4 100644
--- a/share/syscons/fonts/iso07-8x16.fnt
+++ b/share/syscons/fonts/iso07-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso07-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso07-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso07-8x8.fnt b/share/syscons/fonts/iso07-8x8.fnt
index 956b39948f20..d433c154dd88 100644
--- a/share/syscons/fonts/iso07-8x8.fnt
+++ b/share/syscons/fonts/iso07-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso07-8x8.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso07-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso08-8x14.fnt b/share/syscons/fonts/iso08-8x14.fnt
index 560c46c8671a..6e1aef87561d 100644
--- a/share/syscons/fonts/iso08-8x14.fnt
+++ b/share/syscons/fonts/iso08-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso08-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso08-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso08-8x16.fnt b/share/syscons/fonts/iso08-8x16.fnt
index a89d77073868..9b83154ba416 100644
--- a/share/syscons/fonts/iso08-8x16.fnt
+++ b/share/syscons/fonts/iso08-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso08-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso08-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso08-8x8.fnt b/share/syscons/fonts/iso08-8x8.fnt
index ca563fcf1e6b..e5d5040d5a17 100644
--- a/share/syscons/fonts/iso08-8x8.fnt
+++ b/share/syscons/fonts/iso08-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso08-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso08-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso09-8x16.fnt b/share/syscons/fonts/iso09-8x16.fnt
index 8eff1b795a86..f6bb1acddc59 100644
--- a/share/syscons/fonts/iso09-8x16.fnt
+++ b/share/syscons/fonts/iso09-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso09-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso09-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-8x14.fnt b/share/syscons/fonts/iso15-8x14.fnt
index 2c8adda91e0e..3e60c474ff13 100644
--- a/share/syscons/fonts/iso15-8x14.fnt
+++ b/share/syscons/fonts/iso15-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso15-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-8x16.fnt b/share/syscons/fonts/iso15-8x16.fnt
index 617f16619c7c..17f6d1f64546 100644
--- a/share/syscons/fonts/iso15-8x16.fnt
+++ b/share/syscons/fonts/iso15-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso15-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-8x8.fnt b/share/syscons/fonts/iso15-8x8.fnt
index c0e65fa41ce4..97d432b0e04e 100644
--- a/share/syscons/fonts/iso15-8x8.fnt
+++ b/share/syscons/fonts/iso15-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso15-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-thin-8x16.fnt b/share/syscons/fonts/iso15-thin-8x16.fnt
index 1cb4d678b25f..69d2029117e3 100644
--- a/share/syscons/fonts/iso15-thin-8x16.fnt
+++ b/share/syscons/fonts/iso15-thin-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-thin-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso15-thin-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-r-8x14.fnt b/share/syscons/fonts/koi8-r-8x14.fnt
index 1a137c658638..a50aa24ed60f 100644
--- a/share/syscons/fonts/koi8-r-8x14.fnt
+++ b/share/syscons/fonts/koi8-r-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-r-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-r-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-r-8x16.fnt b/share/syscons/fonts/koi8-r-8x16.fnt
index 6d088c79b161..4a3a8db669e0 100644
--- a/share/syscons/fonts/koi8-r-8x16.fnt
+++ b/share/syscons/fonts/koi8-r-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-r-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-r-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-r-8x8.fnt b/share/syscons/fonts/koi8-r-8x8.fnt
index 1c08eabdd91b..4f5c8e2d68c1 100644
--- a/share/syscons/fonts/koi8-r-8x8.fnt
+++ b/share/syscons/fonts/koi8-r-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-r-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-r-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-rb-8x16.fnt b/share/syscons/fonts/koi8-rb-8x16.fnt
index 698971962661..1e69de329193 100644
--- a/share/syscons/fonts/koi8-rb-8x16.fnt
+++ b/share/syscons/fonts/koi8-rb-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-rb-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-rb-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-rc-8x16.fnt b/share/syscons/fonts/koi8-rc-8x16.fnt
index 36ec698f1d79..eb41cfc0e04f 100644
--- a/share/syscons/fonts/koi8-rc-8x16.fnt
+++ b/share/syscons/fonts/koi8-rc-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-rc-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-rc-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-u-8x14.fnt b/share/syscons/fonts/koi8-u-8x14.fnt
index 919d0422c9f5..31bebf2a52a5 100644
--- a/share/syscons/fonts/koi8-u-8x14.fnt
+++ b/share/syscons/fonts/koi8-u-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-u-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-u-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-u-8x16.fnt b/share/syscons/fonts/koi8-u-8x16.fnt
index 5b7b880fcee1..2900f04fba73 100644
--- a/share/syscons/fonts/koi8-u-8x16.fnt
+++ b/share/syscons/fonts/koi8-u-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-u-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-u-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-u-8x8.fnt b/share/syscons/fonts/koi8-u-8x8.fnt
index a27eb8ac8219..0718e8d24f08 100644
--- a/share/syscons/fonts/koi8-u-8x8.fnt
+++ b/share/syscons/fonts/koi8-u-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-u-8x8.fnt,v 1.3 2001/12/05 16:09:10 sobomax Exp $
 begin 644 koi8-u-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/swiss-1131-8x16.fnt b/share/syscons/fonts/swiss-1131-8x16.fnt
index c5ed88754e92..58f68a32004c 100644
--- a/share/syscons/fonts/swiss-1131-8x16.fnt
+++ b/share/syscons/fonts/swiss-1131-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/swiss-1131-8x16.fnt,v 1.1 2003/12/20 11:18:43 ache Exp $
 begin 600 swiss-1131-8x16
 M`````````!``````````````/$*!YZ69@9E"/````````#Q^_YG;Y__G?CP`
 M````````;/[^_O[^?#@0```````````0.'S^?#@0`````````#@X$-;^UA`X
diff --git a/share/syscons/fonts/swiss-1251-8x16.fnt b/share/syscons/fonts/swiss-1251-8x16.fnt
index c6862069dfef..9c1de17798e9 100644
--- a/share/syscons/fonts/swiss-1251-8x16.fnt
+++ b/share/syscons/fonts/swiss-1251-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/swiss-1251-8x16.fnt,v 1.1 2003/12/20 11:18:43 ache Exp $
 begin 600 swiss-1251-8x16
 M`````````!``````````````/$*!YZ69@9E"/````````#Q^_YG;Y__G?CP`
 M````````;/[^_O[^?#@0```````````0.'S^?#@0`````````#@X$-;^UA`X
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps
index 7264466c2bbc..261ec25024b7 100644
--- a/share/syscons/keymaps/INDEX.keymaps
+++ b/share/syscons/keymaps/INDEX.keymaps
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.54 2004/01/29 16:28:22 ache Exp $
 #
 # database for kbdmap(8) 
 #
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index d803988f7f80..cc81edb432fb 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.70 2004/12/21 08:46:55 ru Exp $
 
 FILES=	INDEX.keymaps \
 	be.iso.kbd be.iso.acc.kbd \
diff --git a/share/syscons/keymaps/be.iso.acc.kbd b/share/syscons/keymaps/be.iso.acc.kbd
index 83a093c61df8..4b66deebd32c 100644
--- a/share/syscons/keymaps/be.iso.acc.kbd
+++ b/share/syscons/keymaps/be.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/be.iso.acc.kbd,v 1.5 2004/07/02 18:19:01 philip Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/be.iso.kbd b/share/syscons/keymaps/be.iso.kbd
index 8d16a81805c6..89c4488ce7c1 100644
--- a/share/syscons/keymaps/be.iso.kbd
+++ b/share/syscons/keymaps/be.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/be.iso.kbd,v 1.13 2004/07/02 18:19:01 philip Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/bg.bds.ctrlcaps.kbd b/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
index 5c76466e1a5a..0d82629c2e2c 100644
--- a/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
+++ b/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/bg.bds.ctrlcaps.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                        alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd b/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
index 20a22ad10c11..2107ba93ed06 100644
--- a/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
+++ b/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/br275.cp850.kbd b/share/syscons/keymaps/br275.cp850.kbd
index 36ab3edd3810..0342a1c2319d 100644
--- a/share/syscons/keymaps/br275.cp850.kbd
+++ b/share/syscons/keymaps/br275.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/br275.cp850.kbd,v 1.8 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/br275.iso.acc.kbd b/share/syscons/keymaps/br275.iso.acc.kbd
index 01d04f69fcd8..debf844691ca 100644
--- a/share/syscons/keymaps/br275.iso.acc.kbd
+++ b/share/syscons/keymaps/br275.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/br275.iso.acc.kbd,v 1.5 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/br275.iso.kbd b/share/syscons/keymaps/br275.iso.kbd
index cec66de355b2..71765c1e92f9 100644
--- a/share/syscons/keymaps/br275.iso.kbd
+++ b/share/syscons/keymaps/br275.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/br275.iso.kbd,v 1.7 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/by.cp1131.kbd b/share/syscons/keymaps/by.cp1131.kbd
index 1c526e6265de..71f05386a6cb 100644
--- a/share/syscons/keymaps/by.cp1131.kbd
+++ b/share/syscons/keymaps/by.cp1131.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/by.cp1131.kbd,v 1.1 2003/12/20 11:18:43 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/by.cp1251.kbd b/share/syscons/keymaps/by.cp1251.kbd
index 596507de55cd..28112fe04777 100644
--- a/share/syscons/keymaps/by.cp1251.kbd
+++ b/share/syscons/keymaps/by.cp1251.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/by.cp1251.kbd,v 1.1 2003/12/20 11:18:43 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/by.iso5.kbd b/share/syscons/keymaps/by.iso5.kbd
index bd17ec0d873e..edc3e52d7ef1 100644
--- a/share/syscons/keymaps/by.iso5.kbd
+++ b/share/syscons/keymaps/by.iso5.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/by.iso5.kbd,v 1.1 2003/12/20 11:18:43 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ce.iso2.kbd b/share/syscons/keymaps/ce.iso2.kbd
index 68d2bf84c39a..baf2b6ee8e70 100644
--- a/share/syscons/keymaps/ce.iso2.kbd
+++ b/share/syscons/keymaps/ce.iso2.kbd
@@ -3,7 +3,7 @@
 #
 # Version 1.0 - 1999-03-18
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ce.iso2.kbd,v 1.3 2001/03/11 23:41:18 ache Exp $
 #
 # This map uses the US QWERTY keyboard for its basic layout.
 # It adds a "third row" to the top of the PC keyboard. To
diff --git a/share/syscons/keymaps/cs.latin2.qwertz.kbd b/share/syscons/keymaps/cs.latin2.qwertz.kbd
index fefebe0c4e4d..21229c2ffb08 100644
--- a/share/syscons/keymaps/cs.latin2.qwertz.kbd
+++ b/share/syscons/keymaps/cs.latin2.qwertz.kbd
@@ -1,7 +1,7 @@
 # Czech Standard Typewriter QWERTZ Keyboard
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/cs.latin2.qwertz.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #
 # English/Czech keyboard lock:  (Left)Alt+Shift
 # English/Czech keyboard shift: (Right)AltGr
diff --git a/share/syscons/keymaps/cz.iso2.kbd b/share/syscons/keymaps/cz.iso2.kbd
index 50626c0091ed..0acd71887f48 100644
--- a/share/syscons/keymaps/cz.iso2.kbd
+++ b/share/syscons/keymaps/cz.iso2.kbd
@@ -3,7 +3,7 @@
 #
 # Version 1.1 - 1999-03-25
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/cz.iso2.kbd,v 1.3 2001/03/11 23:41:18 ache Exp $
 #
 # This map is derived from my Central European map
 # (ce.iso2.kbd). The description of the CE map is next.
diff --git a/share/syscons/keymaps/danish.cp865.kbd b/share/syscons/keymaps/danish.cp865.kbd
index 026af06ca06d..2c982d639441 100644
--- a/share/syscons/keymaps/danish.cp865.kbd
+++ b/share/syscons/keymaps/danish.cp865.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/danish.cp865.kbd,v 1.15 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/danish.iso.kbd b/share/syscons/keymaps/danish.iso.kbd
index 7286ba0d4a65..ae729dd1dde6 100644
--- a/share/syscons/keymaps/danish.iso.kbd
+++ b/share/syscons/keymaps/danish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/danish.iso.kbd,v 1.16 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/dutch.iso.acc.kbd b/share/syscons/keymaps/dutch.iso.acc.kbd
index 79169a9c2544..24afffdb5031 100644
--- a/share/syscons/keymaps/dutch.iso.acc.kbd
+++ b/share/syscons/keymaps/dutch.iso.acc.kbd
@@ -5,7 +5,7 @@
 # Based on the US standard keymap
 # Accent coding by M. Blapp <mb@imp.ch>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/dutch.iso.acc.kbd,v 1.1 2002/10/17 19:56:00 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/el.iso07.kbd b/share/syscons/keymaps/el.iso07.kbd
index dccf68e87df2..371e22b31354 100644
--- a/share/syscons/keymaps/el.iso07.kbd
+++ b/share/syscons/keymaps/el.iso07.kbd
@@ -1,7 +1,7 @@
 # Greek ISO 8859-7 keyboard for FreeBSD
 # by Basileios Anastasatos <B.Anastasatos@Freemail.gr>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/el.iso07.kbd,v 1.1 2001/11/20 18:48:57 ache Exp $
 #
 # English/Greek keyboard lock:  (Left)Alt+(Left|Right)Shift
 # English/Greek keyboard shift: (Right)AltGr
diff --git a/share/syscons/keymaps/estonian.cp850.kbd b/share/syscons/keymaps/estonian.cp850.kbd
index b1003ff07863..d3f3bc995598 100644
--- a/share/syscons/keymaps/estonian.cp850.kbd
+++ b/share/syscons/keymaps/estonian.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.cp850.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/estonian.iso.kbd b/share/syscons/keymaps/estonian.iso.kbd
index 94394f4023dd..ea6c67a05ff1 100644
--- a/share/syscons/keymaps/estonian.iso.kbd
+++ b/share/syscons/keymaps/estonian.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.iso.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/estonian.iso15.kbd b/share/syscons/keymaps/estonian.iso15.kbd
index 3e3c33b2ebb5..07a38136e4ca 100644
--- a/share/syscons/keymaps/estonian.iso15.kbd
+++ b/share/syscons/keymaps/estonian.iso15.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.iso15.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/finnish.cp850.kbd b/share/syscons/keymaps/finnish.cp850.kbd
index 11b42eef17da..6e411bee1515 100644
--- a/share/syscons/keymaps/finnish.cp850.kbd
+++ b/share/syscons/keymaps/finnish.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/finnish.cp850.kbd,v 1.3 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/finnish.iso.kbd b/share/syscons/keymaps/finnish.iso.kbd
index 07a448787d19..deceed0b90bb 100644
--- a/share/syscons/keymaps/finnish.iso.kbd
+++ b/share/syscons/keymaps/finnish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/finnish.iso.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.dvorak.kbd b/share/syscons/keymaps/fr.dvorak.kbd
index c473f8d12f34..635366cf6bf6 100644
--- a/share/syscons/keymaps/fr.dvorak.kbd
+++ b/share/syscons/keymaps/fr.dvorak.kbd
@@ -6,7 +6,7 @@
 #
 #   -Frédéric Praca <frederic.praca@freebsd-fr.org>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.dvorak.kbd,v 1.1 2003/05/16 03:46:53 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.iso.acc.kbd b/share/syscons/keymaps/fr.iso.acc.kbd
index 99483be56932..a74b8ccd6473 100644
--- a/share/syscons/keymaps/fr.iso.acc.kbd
+++ b/share/syscons/keymaps/fr.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.iso.acc.kbd,v 1.5 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.iso.kbd b/share/syscons/keymaps/fr.iso.kbd
index 1eb4626ccafe..37fb3cd2a8c6 100644
--- a/share/syscons/keymaps/fr.iso.kbd
+++ b/share/syscons/keymaps/fr.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.iso.kbd,v 1.14 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr_CA.iso.acc.kbd b/share/syscons/keymaps/fr_CA.iso.acc.kbd
index e758eb242cb0..63e3ccb39dfb 100644
--- a/share/syscons/keymaps/fr_CA.iso.acc.kbd
+++ b/share/syscons/keymaps/fr_CA.iso.acc.kbd
@@ -4,7 +4,7 @@
 # 
 # July 4, 1999
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr_CA.iso.acc.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
diff --git a/share/syscons/keymaps/german.cp850.kbd b/share/syscons/keymaps/german.cp850.kbd
index 64b7dc92c453..5329664c00b0 100644
--- a/share/syscons/keymaps/german.cp850.kbd
+++ b/share/syscons/keymaps/german.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/german.cp850.kbd,v 1.15 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/german.iso.acc.kbd b/share/syscons/keymaps/german.iso.acc.kbd
index 6a9223bc6321..4a518dc2288c 100644
--- a/share/syscons/keymaps/german.iso.acc.kbd
+++ b/share/syscons/keymaps/german.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/german.iso.acc.kbd,v 1.1 2003/06/19 08:34:38 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/german.iso.kbd b/share/syscons/keymaps/german.iso.kbd
index ca987c800128..4464b4947582 100644
--- a/share/syscons/keymaps/german.iso.kbd
+++ b/share/syscons/keymaps/german.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/german.iso.kbd,v 1.17 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/gr.elot.acc.kbd b/share/syscons/keymaps/gr.elot.acc.kbd
index 2abc97dc93ce..b783f03c247e 100644
--- a/share/syscons/keymaps/gr.elot.acc.kbd
+++ b/share/syscons/keymaps/gr.elot.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/gr.elot.acc.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #
 # Built on Wed  1 Apr 15:59:44 EEST 1998 by peppe@cs.uoi.gr
 #                                                         alt
diff --git a/share/syscons/keymaps/gr.us101.acc.kbd b/share/syscons/keymaps/gr.us101.acc.kbd
index a3a4f41c408c..a23e91a835f3 100644
--- a/share/syscons/keymaps/gr.us101.acc.kbd
+++ b/share/syscons/keymaps/gr.us101.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/gr.us101.acc.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #
 # Built on Wed  1 Apr 15:59:44 EEST 1998 by peppe@cs.uoi.gr
 #                                                         alt
diff --git a/share/syscons/keymaps/hr.iso.kbd b/share/syscons/keymaps/hr.iso.kbd
index 1353027c1d30..4168248d698f 100644
--- a/share/syscons/keymaps/hr.iso.kbd
+++ b/share/syscons/keymaps/hr.iso.kbd
@@ -1,6 +1,6 @@
 # Slovenian keyboard
 # Blaz Zupan <blaz@amis.net>
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hr.iso.kbd,v 1.3 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/hu.iso2.101keys.kbd b/share/syscons/keymaps/hu.iso2.101keys.kbd
index 71862585aa48..54334e8c745b 100644
--- a/share/syscons/keymaps/hu.iso2.101keys.kbd
+++ b/share/syscons/keymaps/hu.iso2.101keys.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hu.iso2.101keys.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 #
 # This is for use with a US keyboard, with only the
 # Hungarian accented characters added to it, and some tricks:
diff --git a/share/syscons/keymaps/hu.iso2.102keys.kbd b/share/syscons/keymaps/hu.iso2.102keys.kbd
index 3166a6719a13..027498c602fc 100644
--- a/share/syscons/keymaps/hu.iso2.102keys.kbd
+++ b/share/syscons/keymaps/hu.iso2.102keys.kbd
@@ -2,7 +2,7 @@
 # Hungarian keyboard standard (after M$'s W*).  There are so many PCs in
 # Hungary with that type of keyboard.
 # 
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hu.iso2.102keys.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/hy.armscii-8.kbd b/share/syscons/keymaps/hy.armscii-8.kbd
index d7e8cc921795..66e27e55c389 100644
--- a/share/syscons/keymaps/hy.armscii-8.kbd
+++ b/share/syscons/keymaps/hy.armscii-8.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hy.armscii-8.kbd,v 1.1 2003/07/05 12:38:17 ache Exp $
 #
 # FreeBSD Armenian Phonetic keyboard layout
 # by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/syscons/keymaps/icelandic.iso.acc.kbd b/share/syscons/keymaps/icelandic.iso.acc.kbd
index 3b93007317b8..74446fcd9db6 100644
--- a/share/syscons/keymaps/icelandic.iso.acc.kbd
+++ b/share/syscons/keymaps/icelandic.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/icelandic.iso.acc.kbd,v 1.6 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/icelandic.iso.kbd b/share/syscons/keymaps/icelandic.iso.kbd
index 4d4b1508132d..2ac204d5f1b7 100644
--- a/share/syscons/keymaps/icelandic.iso.kbd
+++ b/share/syscons/keymaps/icelandic.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/icelandic.iso.kbd,v 1.6 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/it.iso.kbd b/share/syscons/keymaps/it.iso.kbd
index 9097696d7422..ca89e92787ec 100644
--- a/share/syscons/keymaps/it.iso.kbd
+++ b/share/syscons/keymaps/it.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/it.iso.kbd,v 1.11 2004/01/23 16:37:51 ale Exp $
 #
 # Aggiunte ad una tastiera italiana standard :
 #
diff --git a/share/syscons/keymaps/iw.iso8.kbd b/share/syscons/keymaps/iw.iso8.kbd
index 1c047b83b893..00e1dc602dc9 100644
--- a/share/syscons/keymaps/iw.iso8.kbd
+++ b/share/syscons/keymaps/iw.iso8.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/iw.iso8.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/jp.106.kbd b/share/syscons/keymaps/jp.106.kbd
index c12fbf5f6e5f..d00077065f3d 100644
--- a/share/syscons/keymaps/jp.106.kbd
+++ b/share/syscons/keymaps/jp.106.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.106.kbd,v 1.9 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/jp.106x.kbd b/share/syscons/keymaps/jp.106x.kbd
index cca3a9ec0238..abbc94d5d117 100644
--- a/share/syscons/keymaps/jp.106x.kbd
+++ b/share/syscons/keymaps/jp.106x.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.106x.kbd,v 1.8 2001/03/11 23:41:18 ache Exp $
 #
 # (this one has capslock and control swapped)
 #                                                         alt
diff --git a/share/syscons/keymaps/jp.pc98.iso.kbd b/share/syscons/keymaps/jp.pc98.iso.kbd
index 43719f51737c..6e53334dd723 100644
--- a/share/syscons/keymaps/jp.pc98.iso.kbd
+++ b/share/syscons/keymaps/jp.pc98.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.pc98.iso.kbd,v 1.1 2001/06/17 03:10:38 nyan Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/jp.pc98.kbd b/share/syscons/keymaps/jp.pc98.kbd
index d9a5d44a36b0..00b0f8d78818 100644
--- a/share/syscons/keymaps/jp.pc98.kbd
+++ b/share/syscons/keymaps/jp.pc98.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.pc98.kbd,v 1.1 2001/06/17 03:10:38 nyan Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/kk.pt154.io.kbd b/share/syscons/keymaps/kk.pt154.io.kbd
index 1f1727a3dde9..7f371a5c860f 100644
--- a/share/syscons/keymaps/kk.pt154.io.kbd
+++ b/share/syscons/keymaps/kk.pt154.io.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/kk.pt154.io.kbd,v 1.1 2004/01/29 16:28:22 ache Exp $
 # KST KazSSR 903-90 with CYRILLIC LETTER IO
 # Birsh T <birsh@mail.kz>, 2003-12-02
 #                                                         alt
diff --git a/share/syscons/keymaps/kk.pt154.kst.kbd b/share/syscons/keymaps/kk.pt154.kst.kbd
index 6bc6ca0cd54a..5f3c13d849d9 100644
--- a/share/syscons/keymaps/kk.pt154.kst.kbd
+++ b/share/syscons/keymaps/kk.pt154.kst.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/kk.pt154.kst.kbd,v 1.1 2004/01/29 16:28:22 ache Exp $
 # KST KazSSR 903-90 keyboard implementation
 # Birsh T <birsh@mail.kz>, 2003-12-02
 #                                                         alt
diff --git a/share/syscons/keymaps/latinamerican.iso.acc.kbd b/share/syscons/keymaps/latinamerican.iso.acc.kbd
index aa4f16c987f7..cb94e704d963 100644
--- a/share/syscons/keymaps/latinamerican.iso.acc.kbd
+++ b/share/syscons/keymaps/latinamerican.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/latinamerican.iso.acc.kbd,v 1.1 2003/06/23 21:01:57 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/latinamerican.kbd b/share/syscons/keymaps/latinamerican.kbd
index 0663b69b825b..845290e48bd2 100644
--- a/share/syscons/keymaps/latinamerican.kbd
+++ b/share/syscons/keymaps/latinamerican.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/latinamerican.kbd,v 1.1 2003/06/23 21:01:57 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/lt.iso4.kbd b/share/syscons/keymaps/lt.iso4.kbd
index dbc6c36a4ad7..d8d6dbf08152 100644
--- a/share/syscons/keymaps/lt.iso4.kbd
+++ b/share/syscons/keymaps/lt.iso4.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/lt.iso4.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/norwegian.dvorak.kbd b/share/syscons/keymaps/norwegian.dvorak.kbd
index 83e8d4676512..d7a21e03d5a9 100644
--- a/share/syscons/keymaps/norwegian.dvorak.kbd
+++ b/share/syscons/keymaps/norwegian.dvorak.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/norwegian.dvorak.kbd,v 1.2 2003/05/16 03:34:23 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/norwegian.iso.kbd b/share/syscons/keymaps/norwegian.iso.kbd
index bf112e5d954e..b5ca2637c68d 100644
--- a/share/syscons/keymaps/norwegian.iso.kbd
+++ b/share/syscons/keymaps/norwegian.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/norwegian.iso.kbd,v 1.8 2003/07/06 03:09:40 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/pl_PL.ISO8859-2.kbd b/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
index ee7adaa7a157..95371ae33e1b 100644
--- a/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
+++ b/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
@@ -1,6 +1,6 @@
 # Polish ISO-8859-2 keymap by Krzysztof Mlynarski (17:46 27-04-1996 MET DST)
 #                             (krzysio@hydra.mimuw.edu.pl)
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/pl_PL.ISO8859-2.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/pt.iso.acc.kbd b/share/syscons/keymaps/pt.iso.acc.kbd
index 8d77f0b6b553..96702a78a173 100644
--- a/share/syscons/keymaps/pt.iso.acc.kbd
+++ b/share/syscons/keymaps/pt.iso.acc.kbd
@@ -1,6 +1,6 @@
 #pt.iso.acc.kbd
 #by: pm@dee.uc.pt
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/pt.iso.acc.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/pt.iso.kbd b/share/syscons/keymaps/pt.iso.kbd
index fda53334af8f..f92e29b3285b 100644
--- a/share/syscons/keymaps/pt.iso.kbd
+++ b/share/syscons/keymaps/pt.iso.kbd
@@ -1,6 +1,6 @@
 #pt.iso.kbd
 #by: pm@dee.uc.pt
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/pt.iso.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.cp866.kbd b/share/syscons/keymaps/ru.cp866.kbd
index 84fbb68be8b1..49427400eefa 100644
--- a/share/syscons/keymaps/ru.cp866.kbd
+++ b/share/syscons/keymaps/ru.cp866.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.cp866.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.iso5.kbd b/share/syscons/keymaps/ru.iso5.kbd
index fec878f106fd..6f714fa3f7e2 100644
--- a/share/syscons/keymaps/ru.iso5.kbd
+++ b/share/syscons/keymaps/ru.iso5.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.iso5.kbd,v 1.1 2002/01/01 06:51:22 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.koi8-r.kbd b/share/syscons/keymaps/ru.koi8-r.kbd
index 3f15711c8290..9db859228670 100644
--- a/share/syscons/keymaps/ru.koi8-r.kbd
+++ b/share/syscons/keymaps/ru.koi8-r.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.koi8-r.kbd,v 1.15 2001/04/09 16:36:48 sobomax Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.koi8-r.shift.kbd b/share/syscons/keymaps/ru.koi8-r.shift.kbd
index 0d67778fc0c1..3ec2eb9c6101 100644
--- a/share/syscons/keymaps/ru.koi8-r.shift.kbd
+++ b/share/syscons/keymaps/ru.koi8-r.shift.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.koi8-r.shift.kbd,v 1.14 2001/04/09 16:36:48 sobomax Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.koi8-r.win.kbd b/share/syscons/keymaps/ru.koi8-r.win.kbd
index e5c862241d55..5bdb6ad3daa7 100644
--- a/share/syscons/keymaps/ru.koi8-r.win.kbd
+++ b/share/syscons/keymaps/ru.koi8-r.win.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.koi8-r.win.kbd,v 1.1 2004/03/15 20:34:18 fjoe Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/si.iso.kbd b/share/syscons/keymaps/si.iso.kbd
index 1353027c1d30..f2139b2831cd 100644
--- a/share/syscons/keymaps/si.iso.kbd
+++ b/share/syscons/keymaps/si.iso.kbd
@@ -1,6 +1,6 @@
 # Slovenian keyboard
 # Blaz Zupan <blaz@amis.net>
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/si.iso.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/sk.iso2.kbd b/share/syscons/keymaps/sk.iso2.kbd
index 14466e80371f..4e9dec27e06d 100644
--- a/share/syscons/keymaps/sk.iso2.kbd
+++ b/share/syscons/keymaps/sk.iso2.kbd
@@ -3,7 +3,7 @@
 #
 # Version 1.1 - 1999-03-21
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/sk.iso2.kbd,v 1.3 2001/03/11 23:41:19 ache Exp $
 #
 # This map is derived from my Central European map
 # (ce.iso2.kbd). The description of the CE map is next.
diff --git a/share/syscons/keymaps/spanish.iso.acc.kbd b/share/syscons/keymaps/spanish.iso.acc.kbd
index ae1fd42cd104..a75be58421a4 100644
--- a/share/syscons/keymaps/spanish.iso.acc.kbd
+++ b/share/syscons/keymaps/spanish.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/spanish.iso.acc.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/spanish.iso.kbd b/share/syscons/keymaps/spanish.iso.kbd
index 9c08898bb1d2..c69080325c3a 100644
--- a/share/syscons/keymaps/spanish.iso.kbd
+++ b/share/syscons/keymaps/spanish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/spanish.iso.kbd,v 1.8 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/spanish.iso15.acc.kbd b/share/syscons/keymaps/spanish.iso15.acc.kbd
index e3fc3cb9b4b2..53746418ccbb 100644
--- a/share/syscons/keymaps/spanish.iso15.acc.kbd
+++ b/share/syscons/keymaps/spanish.iso15.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/spanish.iso15.acc.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/swedish.cp850.kbd b/share/syscons/keymaps/swedish.cp850.kbd
index 11b42eef17da..30569796be84 100644
--- a/share/syscons/keymaps/swedish.cp850.kbd
+++ b/share/syscons/keymaps/swedish.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swedish.cp850.kbd,v 1.14 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/swedish.iso.kbd b/share/syscons/keymaps/swedish.iso.kbd
index 07a448787d19..e424cc908998 100644
--- a/share/syscons/keymaps/swedish.iso.kbd
+++ b/share/syscons/keymaps/swedish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swedish.iso.kbd,v 1.17 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/swissfrench.cp850.kbd b/share/syscons/keymaps/swissfrench.cp850.kbd
index 8ca6d5e5cef4..feb7813de9f6 100644
--- a/share/syscons/keymaps/swissfrench.cp850.kbd
+++ b/share/syscons/keymaps/swissfrench.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.cp850.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #
 # swiss-french cp850 keymap
 # original 13.06.1998 by Francois Tamone <tamone@eig.unige.ch>
diff --git a/share/syscons/keymaps/swissfrench.iso.acc.kbd b/share/syscons/keymaps/swissfrench.iso.acc.kbd
index 212308d39352..21a7ce97007c 100644
--- a/share/syscons/keymaps/swissfrench.iso.acc.kbd
+++ b/share/syscons/keymaps/swissfrench.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.iso.acc.kbd,v 1.3 2001/03/11 23:41:19 ache Exp $
 #
 # swissfrench ISO 8859-1 keymap, accent keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissfrench.iso.kbd b/share/syscons/keymaps/swissfrench.iso.kbd
index 1241c3bd6ede..d9914ed77ffe 100644
--- a/share/syscons/keymaps/swissfrench.iso.kbd
+++ b/share/syscons/keymaps/swissfrench.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.iso.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #
 # swissfrench ISO 8859-1 keymap, no dead keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissgerman.cp850.kbd b/share/syscons/keymaps/swissgerman.cp850.kbd
index f50be73651ed..293c6a03ba9c 100644
--- a/share/syscons/keymaps/swissgerman.cp850.kbd
+++ b/share/syscons/keymaps/swissgerman.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.cp850.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #
 # swiss-german cp850 keymap
 # original 21.10.1996 by Adrian Steinmann <ast@marabu.ch>
diff --git a/share/syscons/keymaps/swissgerman.iso.acc.kbd b/share/syscons/keymaps/swissgerman.iso.acc.kbd
index 9ca34bd7318b..37c7d6a1ca52 100644
--- a/share/syscons/keymaps/swissgerman.iso.acc.kbd
+++ b/share/syscons/keymaps/swissgerman.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.iso.acc.kbd,v 1.3 2001/03/11 23:41:19 ache Exp $
 #
 # swissgerman ISO 8859-1 keymap, accent keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissgerman.iso.kbd b/share/syscons/keymaps/swissgerman.iso.kbd
index 091a6281e386..f484c744e294 100644
--- a/share/syscons/keymaps/swissgerman.iso.kbd
+++ b/share/syscons/keymaps/swissgerman.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.iso.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #
 # swissgerman ISO 8859-1 keymap, no dead keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/tr.iso9.q.kbd b/share/syscons/keymaps/tr.iso9.q.kbd
index 665171368a0c..16b2e642149c 100644
--- a/share/syscons/keymaps/tr.iso9.q.kbd
+++ b/share/syscons/keymaps/tr.iso9.q.kbd
@@ -1,6 +1,6 @@
 # Turkish ISO-8859-9 keymap by Evren Yurtesen (09-12-1999)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/tr.iso9.q.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #
 # For suggestions and corrections please contact with me.
 #
diff --git a/share/syscons/keymaps/ua.iso5.kbd b/share/syscons/keymaps/ua.iso5.kbd
index a96d89fe3cd7..4a9948f47253 100644
--- a/share/syscons/keymaps/ua.iso5.kbd
+++ b/share/syscons/keymaps/ua.iso5.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ua.iso5.kbd,v 1.1 2002/01/01 06:51:22 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ua.koi8-u.kbd b/share/syscons/keymaps/ua.koi8-u.kbd
index 112a45bf6f27..a5220a8e6986 100644
--- a/share/syscons/keymaps/ua.koi8-u.kbd
+++ b/share/syscons/keymaps/ua.koi8-u.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ua.koi8-u.kbd,v 1.5 2001/11/14 21:28:10 sobomax Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd b/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
index 82cd95f32d98..20b6506434d9 100644
--- a/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
+++ b/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd,v 1.2 2001/11/14 21:14:39 sobomax Exp $
 #
 # keyboard mapping for both Ukrainian and Russian languages, koi8-u charset.
 #   by sia@lot.cs.kiev.ua
diff --git a/share/syscons/keymaps/uk.cp850-ctrl.kbd b/share/syscons/keymaps/uk.cp850-ctrl.kbd
index a60410e5db9f..ffee31305a30 100644
--- a/share/syscons/keymaps/uk.cp850-ctrl.kbd
+++ b/share/syscons/keymaps/uk.cp850-ctrl.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.cp850-ctrl.kbd,v 1.15 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/uk.cp850.kbd b/share/syscons/keymaps/uk.cp850.kbd
index 5cbbb4f089c0..a5161d7a3391 100644
--- a/share/syscons/keymaps/uk.cp850.kbd
+++ b/share/syscons/keymaps/uk.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.cp850.kbd,v 1.14 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/uk.iso-ctrl.kbd b/share/syscons/keymaps/uk.iso-ctrl.kbd
index 986ec754c60a..f8bae4954569 100644
--- a/share/syscons/keymaps/uk.iso-ctrl.kbd
+++ b/share/syscons/keymaps/uk.iso-ctrl.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.iso-ctrl.kbd,v 1.17 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/uk.iso.kbd b/share/syscons/keymaps/uk.iso.kbd
index adaf9d068d6a..9f99c447d1f9 100644
--- a/share/syscons/keymaps/uk.iso.kbd
+++ b/share/syscons/keymaps/uk.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.iso.kbd,v 1.17 2002/04/08 19:16:01 asmodai Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorak.kbd b/share/syscons/keymaps/us.dvorak.kbd
index bc475b25d4d8..c760d431701a 100644
--- a/share/syscons/keymaps/us.dvorak.kbd
+++ b/share/syscons/keymaps/us.dvorak.kbd
@@ -7,7 +7,7 @@
 #
 #   -Satoshi
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorak.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorakl.kbd b/share/syscons/keymaps/us.dvorakl.kbd
index bc44397d3240..17ebbe23b032 100644
--- a/share/syscons/keymaps/us.dvorakl.kbd
+++ b/share/syscons/keymaps/us.dvorakl.kbd
@@ -1,6 +1,6 @@
 # A left handed Dvorak keyboard for US English
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorakl.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorakr.kbd b/share/syscons/keymaps/us.dvorakr.kbd
index 94abba89d76c..e507a5b67288 100644
--- a/share/syscons/keymaps/us.dvorakr.kbd
+++ b/share/syscons/keymaps/us.dvorakr.kbd
@@ -1,6 +1,6 @@
 # A right handed Dvorak keyboard for US English
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorakr.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorakx.kbd b/share/syscons/keymaps/us.dvorakx.kbd
index 18f05fe0cbfb..0f48e33098dd 100644
--- a/share/syscons/keymaps/us.dvorakx.kbd
+++ b/share/syscons/keymaps/us.dvorakx.kbd
@@ -5,7 +5,7 @@
 #
 #   -Satoshi
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorakx.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.emacs.kbd b/share/syscons/keymaps/us.emacs.kbd
index 553a617338eb..6a3d759a0788 100644
--- a/share/syscons/keymaps/us.emacs.kbd
+++ b/share/syscons/keymaps/us.emacs.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.emacs.kbd,v 1.3 2000/05/06 18:31:10 obrien Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.iso.acc.kbd b/share/syscons/keymaps/us.iso.acc.kbd
index a7faa514fc96..e57df7579491 100644
--- a/share/syscons/keymaps/us.iso.acc.kbd
+++ b/share/syscons/keymaps/us.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.iso.acc.kbd,v 1.1 2003/06/19 08:08:17 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.iso.kbd b/share/syscons/keymaps/us.iso.kbd
index e213392e6ae0..c7ac998a8626 100644
--- a/share/syscons/keymaps/us.iso.kbd
+++ b/share/syscons/keymaps/us.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.iso.kbd,v 1.16 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.pc-ctrl.kbd b/share/syscons/keymaps/us.pc-ctrl.kbd
index 58b66f3e2ee5..c128b1564d60 100644
--- a/share/syscons/keymaps/us.pc-ctrl.kbd
+++ b/share/syscons/keymaps/us.pc-ctrl.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.pc-ctrl.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.unix.kbd b/share/syscons/keymaps/us.unix.kbd
index b883eaba2169..7a2e682aa421 100644
--- a/share/syscons/keymaps/us.unix.kbd
+++ b/share/syscons/keymaps/us.unix.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.unix.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index 1c5dc88382a1..dd5bff78fd9c 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/scrnmaps/Makefile,v 1.23 2004/02/26 07:50:56 bde Exp $
 
 SCRMAPS = armscii8-2haik8.scm \
 	  iso-8859-1_to_cp437.scm iso-8859-4_for_vga9.scm \
diff --git a/share/syscons/scrnmaps/armscii8-2haik8 b/share/syscons/scrnmaps/armscii8-2haik8
index f6bc35d74701..351b0386e9e5 100644
--- a/share/syscons/scrnmaps/armscii8-2haik8
+++ b/share/syscons/scrnmaps/armscii8-2haik8
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/armscii8-2haik8,v 1.1 2003/07/05 12:38:18 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/iso-8859-1_to_cp437 b/share/syscons/scrnmaps/iso-8859-1_to_cp437
index c18e62f04667..9e337a975be9 100644
--- a/share/syscons/scrnmaps/iso-8859-1_to_cp437
+++ b/share/syscons/scrnmaps/iso-8859-1_to_cp437
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/iso-8859-1_to_cp437,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/iso-8859-4_for_vga9 b/share/syscons/scrnmaps/iso-8859-4_for_vga9
index e096bdcd771e..e06d715a68fe 100644
--- a/share/syscons/scrnmaps/iso-8859-4_for_vga9
+++ b/share/syscons/scrnmaps/iso-8859-4_for_vga9
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/iso-8859-4_for_vga9,v 1.1 2001/11/23 01:39:42 ache Exp $
  */
 
 /* exchange 0x80-0x9F and 0xC0-0xDF due to VGA hardware limitation
diff --git a/share/syscons/scrnmaps/iso-8859-7_to_cp437 b/share/syscons/scrnmaps/iso-8859-7_to_cp437
index 12c467a360f2..1d15e784906a 100644
--- a/share/syscons/scrnmaps/iso-8859-7_to_cp437
+++ b/share/syscons/scrnmaps/iso-8859-7_to_cp437
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/iso-8859-7_to_cp437,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/koi8-r2cp866 b/share/syscons/scrnmaps/koi8-r2cp866
index 15f2847fa9b3..6f39eaee7cc6 100644
--- a/share/syscons/scrnmaps/koi8-r2cp866
+++ b/share/syscons/scrnmaps/koi8-r2cp866
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/koi8-r2cp866,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/koi8-u2cp866u b/share/syscons/scrnmaps/koi8-u2cp866u
index 7fd86ad51bb7..6ea207a833e3 100644
--- a/share/syscons/scrnmaps/koi8-u2cp866u
+++ b/share/syscons/scrnmaps/koi8-u2cp866u
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/koi8-u2cp866u,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/mkscrfil.c b/share/syscons/scrnmaps/mkscrfil.c
index c981b23bf57b..9a76fc987d19 100644
--- a/share/syscons/scrnmaps/mkscrfil.c
+++ b/share/syscons/scrnmaps/mkscrfil.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/mkscrfil.c,v 1.2 2000/10/08 21:33:52 phk Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/share/syscons/scrnmaps/us-ascii_to_cp437 b/share/syscons/scrnmaps/us-ascii_to_cp437
index e1155aa137c4..12473d2f2897 100644
--- a/share/syscons/scrnmaps/us-ascii_to_cp437
+++ b/share/syscons/scrnmaps/us-ascii_to_cp437
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/us-ascii_to_cp437,v 1.2 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index 846ef461afda..ec4c3ff2a267 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/tabset/Makefile,v 1.10 2001/12/17 13:59:33 ru Exp $
 
 FILES=	3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
 	stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 9f6e7189297d..59569b1e469f 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/termcap/Makefile,v 1.18.2.1 2005/08/16 22:42:46 phk Exp $
 
 # reorder gives an editor command for most common terminals
 # (in reverse order from n'th to 1'st most commonly used)
diff --git a/share/termcap/reorder b/share/termcap/reorder
index 8fc94a755db3..61e3cd5385e0 100644
--- a/share/termcap/reorder
+++ b/share/termcap/reorder
@@ -1,4 +1,4 @@
-" $FreeBSD$
+" $FreeBSD: src/share/termcap/reorder,v 1.6 2002/09/08 12:47:22 ache Exp $
 /# << EOH -/k a
 /^adm12|/;.,/^[^	]/-m'a
 /^pcplot/;.,/^[^	]/-m'a
diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5
index bb5b5123c34e..f24a84fc17bf 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -51,7 +51,7 @@
 .\" *                                                                          *
 .\" ***************************************************************************/
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/termcap/termcap.5,v 1.25 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd April 16, 1994
 .Dt TERMCAP 5
diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index 22e4c683b36a..31aa7171af4e 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)termcap.src	8.2 (Berkeley) 11/17/93
-# $FreeBSD$
+# $FreeBSD: src/share/termcap/termcap.src,v 1.144 2004/06/05 15:35:14 murray Exp $
 
 #	Termcap source file
 #	John Kunze, Berkeley
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 6cf7107b81a5..964c977014ea 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/Makefile,v 1.48 2005/03/04 14:24:30 ru Exp $
 
 LOCALES=	am_ET.UTF-8 \
 		be_BY.CP1131 \
diff --git a/share/timedef/am_ET.UTF-8.src b/share/timedef/am_ET.UTF-8.src
index ed0e14895458..82a553e1ba76 100644
--- a/share/timedef/am_ET.UTF-8.src
+++ b/share/timedef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/am_ET.UTF-8.src,v 1.2 2003/08/20 22:35:55 mtm Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/be_BY.CP1131.src b/share/timedef/be_BY.CP1131.src
index e8907d34f037..8834d4c08e25 100644
--- a/share/timedef/be_BY.CP1131.src
+++ b/share/timedef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/be_BY.CP1251.src b/share/timedef/be_BY.CP1251.src
index 1738592fc639..cf164391eb82 100644
--- a/share/timedef/be_BY.CP1251.src
+++ b/share/timedef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/be_BY.ISO8859-5.src b/share/timedef/be_BY.ISO8859-5.src
index e8a4ad2a87a5..b44bf4074ab6 100644
--- a/share/timedef/be_BY.ISO8859-5.src
+++ b/share/timedef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/be_BY.UTF-8.src b/share/timedef/be_BY.UTF-8.src
index 33ec00a90cfe..cb1ae7ca0bae 100644
--- a/share/timedef/be_BY.UTF-8.src
+++ b/share/timedef/be_BY.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/bg_BG.CP1251.src b/share/timedef/bg_BG.CP1251.src
index eb6299a70cac..6f379e7a1e17 100644
--- a/share/timedef/bg_BG.CP1251.src
+++ b/share/timedef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:21:03 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/bg_BG.UTF-8.src b/share/timedef/bg_BG.UTF-8.src
index ded92409b277..b3769a81c4bd 100644
--- a/share/timedef/bg_BG.UTF-8.src
+++ b/share/timedef/bg_BG.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/bg_BG.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ca_ES.ISO8859-1.src b/share/timedef/ca_ES.ISO8859-1.src
index 26e319dd3e01..3405d099897d 100644
--- a/share/timedef/ca_ES.ISO8859-1.src
+++ b/share/timedef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:58 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ca_ES.UTF-8.src b/share/timedef/ca_ES.UTF-8.src
index 2a3f85b4aaae..7bc526ad0015 100644
--- a/share/timedef/ca_ES.UTF-8.src
+++ b/share/timedef/ca_ES.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ca_ES.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/cs_CZ.ISO8859-2.src b/share/timedef/cs_CZ.ISO8859-2.src
index 62a9c98e46ab..ebba9a1053ba 100644
--- a/share/timedef/cs_CZ.ISO8859-2.src
+++ b/share/timedef/cs_CZ.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Czech month and day names
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/cs_CZ.ISO8859-2.src,v 1.5 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/cs_CZ.UTF-8.src b/share/timedef/cs_CZ.UTF-8.src
index a34501a507de..074507dffdbf 100644
--- a/share/timedef/cs_CZ.UTF-8.src
+++ b/share/timedef/cs_CZ.UTF-8.src
@@ -1,7 +1,7 @@
 # Czech month and day names
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/cs_CZ.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/da_DK.ISO8859-1.src b/share/timedef/da_DK.ISO8859-1.src
index 5f84abf6894f..1dd14159487f 100644
--- a/share/timedef/da_DK.ISO8859-1.src
+++ b/share/timedef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/da_DK.ISO8859-1.src,v 1.10 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/da_DK.UTF-8.src b/share/timedef/da_DK.UTF-8.src
index 5776822b1c54..2b6f424ef0aa 100644
--- a/share/timedef/da_DK.UTF-8.src
+++ b/share/timedef/da_DK.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/da_DK.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_AT.ISO8859-1.src b/share/timedef/de_AT.ISO8859-1.src
index a07193dd6198..aae6c50f80e2 100644
--- a/share/timedef/de_AT.ISO8859-1.src
+++ b/share/timedef/de_AT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_AT.ISO8859-1.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_AT.UTF-8.src b/share/timedef/de_AT.UTF-8.src
index 4b78c046771f..e458fa0bf17e 100644
--- a/share/timedef/de_AT.UTF-8.src
+++ b/share/timedef/de_AT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_AT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_DE.ISO8859-1.src b/share/timedef/de_DE.ISO8859-1.src
index 64085022b420..55df66c3c003 100644
--- a/share/timedef/de_DE.ISO8859-1.src
+++ b/share/timedef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_DE.ISO8859-1.src,v 1.13 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_DE.UTF-8.src b/share/timedef/de_DE.UTF-8.src
index 535d8dd088dd..ec87ce9eef2d 100644
--- a/share/timedef/de_DE.UTF-8.src
+++ b/share/timedef/de_DE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_DE.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/el_GR.ISO8859-7.src b/share/timedef/el_GR.ISO8859-7.src
index c608672e5f7b..6ac2ebdacd6d 100644
--- a/share/timedef/el_GR.ISO8859-7.src
+++ b/share/timedef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/el_GR.ISO8859-7.src,v 1.4 2001/11/20 18:10:08 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/el_GR.UTF-8.src b/share/timedef/el_GR.UTF-8.src
index 3125320bd5ac..3e3978011f32 100644
--- a/share/timedef/el_GR.UTF-8.src
+++ b/share/timedef/el_GR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/el_GR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/en_GB.ISO8859-1.src b/share/timedef/en_GB.ISO8859-1.src
index 8c10578cdcba..41729858ccb3 100644
--- a/share/timedef/en_GB.ISO8859-1.src
+++ b/share/timedef/en_GB.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/en_GB.ISO8859-1.src,v 1.9 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/en_US.ISO8859-1.src b/share/timedef/en_US.ISO8859-1.src
index 7fee051b5fcd..f7ec05c382cf 100644
--- a/share/timedef/en_US.ISO8859-1.src
+++ b/share/timedef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/en_US.ISO8859-1.src,v 1.9 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/es_ES.ISO8859-1.src b/share/timedef/es_ES.ISO8859-1.src
index 78d2cb848838..dfd4bd7ecd5b 100644
--- a/share/timedef/es_ES.ISO8859-1.src
+++ b/share/timedef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/es_ES.ISO8859-1.src,v 1.8 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/es_ES.UTF-8.src b/share/timedef/es_ES.UTF-8.src
index fb7d7f750209..3ed80d85608f 100644
--- a/share/timedef/es_ES.UTF-8.src
+++ b/share/timedef/es_ES.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/es_ES.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/et_EE.ISO8859-15.src b/share/timedef/et_EE.ISO8859-15.src
index 82595e877c93..020eb4d3252b 100644
--- a/share/timedef/et_EE.ISO8859-15.src
+++ b/share/timedef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/et_EE.ISO8859-15.src,v 1.5 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/et_EE.UTF-8.src b/share/timedef/et_EE.UTF-8.src
index d0a97e673384..2cc66b22b779 100644
--- a/share/timedef/et_EE.UTF-8.src
+++ b/share/timedef/et_EE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/et_EE.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/eu_ES.ISO8859-1.src b/share/timedef/eu_ES.ISO8859-1.src
index 6361cbc32941..a8dda96691d5 100644
--- a/share/timedef/eu_ES.ISO8859-1.src
+++ b/share/timedef/eu_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/eu_ES.ISO8859-1.src,v 1.1 2004/08/28 12:52:31 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/fi_FI.ISO8859-1.src b/share/timedef/fi_FI.ISO8859-1.src
index fffed1848a96..38c99d2ed9d6 100644
--- a/share/timedef/fi_FI.ISO8859-1.src
+++ b/share/timedef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fi_FI.ISO8859-1.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/fi_FI.UTF-8.src b/share/timedef/fi_FI.UTF-8.src
index bd16a0971739..bc9853d5c027 100644
--- a/share/timedef/fi_FI.UTF-8.src
+++ b/share/timedef/fi_FI.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fi_FI.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/fr_FR.ISO8859-1.src b/share/timedef/fr_FR.ISO8859-1.src
index d905c99429b4..c4dbc547e3d1 100644
--- a/share/timedef/fr_FR.ISO8859-1.src
+++ b/share/timedef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fr_FR.ISO8859-1.src,v 1.12 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/fr_FR.UTF-8.src b/share/timedef/fr_FR.UTF-8.src
index 4a98ab4e3415..7f56d910455c 100644
--- a/share/timedef/fr_FR.UTF-8.src
+++ b/share/timedef/fr_FR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fr_FR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/he_IL.UTF-8.src b/share/timedef/he_IL.UTF-8.src
index 5194c8bf40d5..2c15738fb0a9 100644
--- a/share/timedef/he_IL.UTF-8.src
+++ b/share/timedef/he_IL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/he_IL.UTF-8.src,v 1.1 2004/04/21 15:28:23 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hi_IN.ISCII-DEV.src b/share/timedef/hi_IN.ISCII-DEV.src
index c1f3904b025d..bf49c806d028 100644
--- a/share/timedef/hi_IN.ISCII-DEV.src
+++ b/share/timedef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hr_HR.ISO8859-2.src b/share/timedef/hr_HR.ISO8859-2.src
index 2b8d2cca1cf3..0a56a17a703e 100644
--- a/share/timedef/hr_HR.ISO8859-2.src
+++ b/share/timedef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hr_HR.ISO8859-2.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hr_HR.UTF-8.src b/share/timedef/hr_HR.UTF-8.src
index 1d952a743764..b573f1df7b87 100644
--- a/share/timedef/hr_HR.UTF-8.src
+++ b/share/timedef/hr_HR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hr_HR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hu_HU.ISO8859-2.src b/share/timedef/hu_HU.ISO8859-2.src
index 724e24ad1df7..3e0896696056 100644
--- a/share/timedef/hu_HU.ISO8859-2.src
+++ b/share/timedef/hu_HU.ISO8859-2.src
@@ -1,6 +1,6 @@
 # This is a Hungarian LC_TIME file for ISO 8859-2 code-table
 # Made by Gabor Zahemszky <zgabor@CoDe.hu>
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hu_HU.ISO8859-2.src,v 1.6 2001/03/21 22:54:44 ache Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/hu_HU.UTF-8.src b/share/timedef/hu_HU.UTF-8.src
index 62d891c240c7..9a6ebf426544 100644
--- a/share/timedef/hu_HU.UTF-8.src
+++ b/share/timedef/hu_HU.UTF-8.src
@@ -1,6 +1,6 @@
 # This is a Hungarian LC_TIME file for ISO 8859-2 code-table
 # Made by Gabor Zahemszky <zgabor@CoDe.hu>
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hu_HU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/hy_AM.ARMSCII-8.src b/share/timedef/hy_AM.ARMSCII-8.src
index 35c1ec677ecf..9c5355b120ca 100644
--- a/share/timedef/hy_AM.ARMSCII-8.src
+++ b/share/timedef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # LC_TIME source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/timedef/hy_AM.UTF-8.src b/share/timedef/hy_AM.UTF-8.src
index b8ec9461dccb..70f36da55342 100644
--- a/share/timedef/hy_AM.UTF-8.src
+++ b/share/timedef/hy_AM.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hy_AM.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # LC_TIME source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/timedef/is_IS.ISO8859-1.src b/share/timedef/is_IS.ISO8859-1.src
index 9da9efcd66b6..d4ae648c8b6f 100644
--- a/share/timedef/is_IS.ISO8859-1.src
+++ b/share/timedef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/is_IS.ISO8859-1.src,v 1.9 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/is_IS.UTF-8.src b/share/timedef/is_IS.UTF-8.src
index be04488fddbc..0826bae83055 100644
--- a/share/timedef/is_IS.UTF-8.src
+++ b/share/timedef/is_IS.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/is_IS.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/it_IT.ISO8859-1.src b/share/timedef/it_IT.ISO8859-1.src
index 27e5aae4fe8a..4b8e29784e88 100644
--- a/share/timedef/it_IT.ISO8859-1.src
+++ b/share/timedef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/it_IT.ISO8859-1.src,v 1.11 2003/04/05 14:43:05 trhodes Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/it_IT.UTF-8.src b/share/timedef/it_IT.UTF-8.src
index 3ffe0308347e..3da21bf68113 100644
--- a/share/timedef/it_IT.UTF-8.src
+++ b/share/timedef/it_IT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/it_IT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ja_JP.SJIS.src b/share/timedef/ja_JP.SJIS.src
index e5b44d7386ae..d0906cb1427a 100644
--- a/share/timedef/ja_JP.SJIS.src
+++ b/share/timedef/ja_JP.SJIS.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.12 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ja_JP.UTF-8.src b/share/timedef/ja_JP.UTF-8.src
index b3431da4214b..ad2854655bc6 100644
--- a/share/timedef/ja_JP.UTF-8.src
+++ b/share/timedef/ja_JP.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ja_JP.eucJP.src b/share/timedef/ja_JP.eucJP.src
index c73c47d57243..43eea27d87df 100644
--- a/share/timedef/ja_JP.eucJP.src
+++ b/share/timedef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.10 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/kk_KZ.PT154.src b/share/timedef/kk_KZ.PT154.src
index 5bed53e245d3..5213054c0d94 100644
--- a/share/timedef/kk_KZ.PT154.src
+++ b/share/timedef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:22 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/kk_KZ.UTF-8.src b/share/timedef/kk_KZ.UTF-8.src
index 5c1f59febae1..2f46126a1895 100644
--- a/share/timedef/kk_KZ.UTF-8.src
+++ b/share/timedef/kk_KZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/kk_KZ.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ko_KR.UTF-8.src b/share/timedef/ko_KR.UTF-8.src
index e7bf058f268b..c8af3af66328 100644
--- a/share/timedef/ko_KR.UTF-8.src
+++ b/share/timedef/ko_KR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ko_KR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # Originally by CHOI Junho <cjh@FreeBSD.org>
 # 27 Mar 1997
diff --git a/share/timedef/ko_KR.eucKR.src b/share/timedef/ko_KR.eucKR.src
index 59c24244b89c..2b00481fda4b 100644
--- a/share/timedef/ko_KR.eucKR.src
+++ b/share/timedef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ko_KR.eucKR.src,v 1.12 2001/03/21 23:24:41 ache Exp $
 #
 # Originally by CHOI Junho <cjh@FreeBSD.org>
 # 27 Mar 1997
diff --git a/share/timedef/la_LN.ISO8859-1.src b/share/timedef/la_LN.ISO8859-1.src
index 30038445e118..ceb765fcac8e 100644
--- a/share/timedef/la_LN.ISO8859-1.src
+++ b/share/timedef/la_LN.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/la_LN.ISO8859-1.src,v 1.7 2001/03/21 13:52:11 ache Exp $
 # This is Latin. The week with seven days was introduced in the
 # Roman Empire 321 AD. (Konstantin I)
 #
diff --git a/share/timedef/lt_LT.ISO8859-13.src b/share/timedef/lt_LT.ISO8859-13.src
index 2d45e3ebddac..9caa2f377431 100644
--- a/share/timedef/lt_LT.ISO8859-13.src
+++ b/share/timedef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:10 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/lt_LT.ISO8859-4.src b/share/timedef/lt_LT.ISO8859-4.src
index 157597c016c4..d7a5d012a925 100644
--- a/share/timedef/lt_LT.ISO8859-4.src
+++ b/share/timedef/lt_LT.ISO8859-4.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/lt_LT.ISO8859-4.src,v 1.5 2001/03/21 22:54:44 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/lt_LT.UTF-8.src b/share/timedef/lt_LT.UTF-8.src
index cc332de76656..7458d1309b0f 100644
--- a/share/timedef/lt_LT.UTF-8.src
+++ b/share/timedef/lt_LT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/lt_LT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/nl_NL.ISO8859-1.src b/share/timedef/nl_NL.ISO8859-1.src
index f94f21271827..1f860ff5b29b 100644
--- a/share/timedef/nl_NL.ISO8859-1.src
+++ b/share/timedef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/nl_NL.ISO8859-1.src,v 1.7 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/no_NO.ISO8859-1.src b/share/timedef/no_NO.ISO8859-1.src
index 04c7a950b631..fad46330a664 100644
--- a/share/timedef/no_NO.ISO8859-1.src
+++ b/share/timedef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/no_NO.ISO8859-1.src,v 1.12 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/no_NO.UTF-8.src b/share/timedef/no_NO.UTF-8.src
index f352023792bc..69d46c640c7c 100644
--- a/share/timedef/no_NO.UTF-8.src
+++ b/share/timedef/no_NO.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/no_NO.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pl_PL.ISO8859-2.src b/share/timedef/pl_PL.ISO8859-2.src
index 73ba016e9b1d..acac9d698c3e 100644
--- a/share/timedef/pl_PL.ISO8859-2.src
+++ b/share/timedef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pl_PL.ISO8859-2.src,v 1.8 2004/09/20 23:56:43 pjd Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/pl_PL.UTF-8.src b/share/timedef/pl_PL.UTF-8.src
index 181fd78aaa10..62f0e31a787e 100644
--- a/share/timedef/pl_PL.UTF-8.src
+++ b/share/timedef/pl_PL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pl_PL.UTF-8.src,v 1.2 2004/09/20 23:56:43 pjd Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/pt_BR.ISO8859-1.src b/share/timedef/pt_BR.ISO8859-1.src
index fde08a1a68a0..a8f530704508 100644
--- a/share/timedef/pt_BR.ISO8859-1.src
+++ b/share/timedef/pt_BR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_BR.ISO8859-1.src,v 1.1 2002/04/05 15:03:13 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pt_BR.UTF-8.src b/share/timedef/pt_BR.UTF-8.src
index 66c49a39204c..8906f9ca6a26 100644
--- a/share/timedef/pt_BR.UTF-8.src
+++ b/share/timedef/pt_BR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_BR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pt_PT.ISO8859-1.src b/share/timedef/pt_PT.ISO8859-1.src
index 452834d1349f..45ffd2b9da75 100644
--- a/share/timedef/pt_PT.ISO8859-1.src
+++ b/share/timedef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_PT.ISO8859-1.src,v 1.12 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pt_PT.UTF-8.src b/share/timedef/pt_PT.UTF-8.src
index b24d9cb5eca5..e32db54ce7aa 100644
--- a/share/timedef/pt_PT.UTF-8.src
+++ b/share/timedef/pt_PT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_PT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ro_RO.ISO8859-2.src b/share/timedef/ro_RO.ISO8859-2.src
index 515066c46a3f..a09836be1439 100644
--- a/share/timedef/ro_RO.ISO8859-2.src
+++ b/share/timedef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ro_RO.ISO8859-2.src,v 1.1 2002/01/08 15:20:13 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ro_RO.UTF-8.src b/share/timedef/ro_RO.UTF-8.src
index 5f7db7a70136..e701925febda 100644
--- a/share/timedef/ro_RO.UTF-8.src
+++ b/share/timedef/ro_RO.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ro_RO.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.CP1251.src b/share/timedef/ru_RU.CP1251.src
index f121786c9e03..3a8284a604db 100644
--- a/share/timedef/ru_RU.CP1251.src
+++ b/share/timedef/ru_RU.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.CP1251.src,v 1.1 2003/06/07 00:12:12 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.CP866.src b/share/timedef/ru_RU.CP866.src
index db15000322ee..19f235f1258d 100644
--- a/share/timedef/ru_RU.CP866.src
+++ b/share/timedef/ru_RU.CP866.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.CP866.src,v 1.18 2001/03/22 11:39:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.ISO8859-5.src b/share/timedef/ru_RU.ISO8859-5.src
index 750bd189f458..eebcd59babf8 100644
--- a/share/timedef/ru_RU.ISO8859-5.src
+++ b/share/timedef/ru_RU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.ISO8859-5.src,v 1.9 2001/03/22 11:39:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.KOI8-R.src b/share/timedef/ru_RU.KOI8-R.src
index f5a250f62186..bcd992ca28be 100644
--- a/share/timedef/ru_RU.KOI8-R.src
+++ b/share/timedef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.KOI8-R.src,v 1.18 2001/03/22 11:39:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.UTF-8.src b/share/timedef/ru_RU.UTF-8.src
index 4660c2227215..02a52db0a261 100644
--- a/share/timedef/ru_RU.UTF-8.src
+++ b/share/timedef/ru_RU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sk_SK.ISO8859-2.src b/share/timedef/sk_SK.ISO8859-2.src
index a10c861f4dd6..d1fa670d4546 100644
--- a/share/timedef/sk_SK.ISO8859-2.src
+++ b/share/timedef/sk_SK.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Slovak month and day names
 # by Juraj Bednar <juraj@bednar.sk>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sk_SK.ISO8859-2.src,v 1.1 2001/05/13 16:28:38 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sk_SK.UTF-8.src b/share/timedef/sk_SK.UTF-8.src
index 652b3b2b9907..045a94088c29 100644
--- a/share/timedef/sk_SK.UTF-8.src
+++ b/share/timedef/sk_SK.UTF-8.src
@@ -1,7 +1,7 @@
 # Slovak month and day names
 # by Juraj Bednar <juraj@bednar.sk>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sk_SK.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sl_SI.ISO8859-2.src b/share/timedef/sl_SI.ISO8859-2.src
index ea9306ea7349..643840b650c1 100644
--- a/share/timedef/sl_SI.ISO8859-2.src
+++ b/share/timedef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sl_SI.ISO8859-2.src,v 1.8 2004/08/26 08:15:48 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sl_SI.UTF-8.src b/share/timedef/sl_SI.UTF-8.src
index d0fab378acbf..2797b35852cf 100644
--- a/share/timedef/sl_SI.UTF-8.src
+++ b/share/timedef/sl_SI.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sl_SI.UTF-8.src,v 1.2 2004/08/26 08:18:56 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sr_YU.ISO8859-2.src b/share/timedef/sr_YU.ISO8859-2.src
index f3840503c7e2..9458dc75173a 100644
--- a/share/timedef/sr_YU.ISO8859-2.src
+++ b/share/timedef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sr_YU.ISO8859-5.src b/share/timedef/sr_YU.ISO8859-5.src
index c7b962aa698a..7e5929c10406 100644
--- a/share/timedef/sr_YU.ISO8859-5.src
+++ b/share/timedef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sr_YU.UTF-8.src b/share/timedef/sr_YU.UTF-8.src
index 845b37291751..2668bb02819e 100644
--- a/share/timedef/sr_YU.UTF-8.src
+++ b/share/timedef/sr_YU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sr_YU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sv_SE.ISO8859-1.src b/share/timedef/sv_SE.ISO8859-1.src
index 416b110edfc0..4ecbdf99f197 100644
--- a/share/timedef/sv_SE.ISO8859-1.src
+++ b/share/timedef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sv_SE.ISO8859-1.src,v 1.9 2002/10/09 21:02:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/sv_SE.UTF-8.src b/share/timedef/sv_SE.UTF-8.src
index dac8e3b1a646..dc20f4721b91 100644
--- a/share/timedef/sv_SE.UTF-8.src
+++ b/share/timedef/sv_SE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sv_SE.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/tr_TR.ISO8859-9.src b/share/timedef/tr_TR.ISO8859-9.src
index 7a32eb80ef09..441d752e7240 100644
--- a/share/timedef/tr_TR.ISO8859-9.src
+++ b/share/timedef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/tr_TR.ISO8859-9.src,v 1.4 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/tr_TR.UTF-8.src b/share/timedef/tr_TR.UTF-8.src
index 0a1eff984869..8d89af9f1cc3 100644
--- a/share/timedef/tr_TR.UTF-8.src
+++ b/share/timedef/tr_TR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/tr_TR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.CP1251.src b/share/timedef/uk_UA.CP1251.src
index 52d45d9c18d9..35a4e6decb1e 100644
--- a/share/timedef/uk_UA.CP1251.src
+++ b/share/timedef/uk_UA.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:30 ru Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.ISO8859-5.src b/share/timedef/uk_UA.ISO8859-5.src
index f4be516312e0..e5b4c977a029 100644
--- a/share/timedef/uk_UA.ISO8859-5.src
+++ b/share/timedef/uk_UA.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.ISO8859-5.src,v 1.1 2001/12/20 20:48:30 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.KOI8-U.src b/share/timedef/uk_UA.KOI8-U.src
index 647a5f363ed9..30c4660988c7 100644
--- a/share/timedef/uk_UA.KOI8-U.src
+++ b/share/timedef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.KOI8-U.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.UTF-8.src b/share/timedef/uk_UA.UTF-8.src
index 1962c133fdab..d7a1f505507e 100644
--- a/share/timedef/uk_UA.UTF-8.src
+++ b/share/timedef/uk_UA.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.GB18030.src b/share/timedef/zh_CN.GB18030.src
index ff7bba4f083c..edfb9da2b4e5 100644
--- a/share/timedef/zh_CN.GB18030.src
+++ b/share/timedef/zh_CN.GB18030.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.GB18030.src,v 1.2 2003/08/23 20:46:23 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src
index ff7bba4f083c..4b8b0b54f6ef 100644
--- a/share/timedef/zh_CN.GB2312.src
+++ b/share/timedef/zh_CN.GB2312.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.GB2312.src,v 1.1 2003/11/05 22:59:02 davidxu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src
index b1527b2970e1..691cd86651a2 100644
--- a/share/timedef/zh_CN.UTF-8.src
+++ b/share/timedef/zh_CN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.eucCN.src b/share/timedef/zh_CN.eucCN.src
index ff7bba4f083c..d46496c4bd2a 100644
--- a/share/timedef/zh_CN.eucCN.src
+++ b/share/timedef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.eucCN.src,v 1.12 2003/08/23 20:46:23 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_TW.Big5.src b/share/timedef/zh_TW.Big5.src
index d8c28a51f58f..785c3495f73d 100644
--- a/share/timedef/zh_TW.Big5.src
+++ b/share/timedef/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_TW.Big5.src,v 1.10 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src
index 27b74ddc2b1d..478085090405 100644
--- a/share/timedef/zh_TW.UTF-8.src
+++ b/share/timedef/zh_TW.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_TW.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index d60882d0d09c..100bbaa0526a 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/zoneinfo/Makefile,v 1.20 2004/10/19 20:38:49 ru Exp $
 
 CLEANFILES+=	yearistype
 
diff --git a/sys/Makefile b/sys/Makefile
index 99af377a91f9..6bfeb75ac2a8 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $
 
 # The boot loader
 .if !defined(NO_BOOT)
diff --git a/sys/alpha/Makefile b/sys/alpha/Makefile
index da04916256da..b5bffdf21939 100644
--- a/sys/alpha/Makefile
+++ b/sys/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/Makefile,v 1.1 2000/12/31 23:26:34 mjacob Exp $
 
 # Makefile for alpha tags file
 
diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c
index b2577b08544c..14eff2027de1 100644
--- a/sys/alpha/alpha/api_up1000.c
+++ b/sys/alpha/alpha/api_up1000.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.11 2004/07/10 22:29:40 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/atomic.s b/sys/alpha/alpha/atomic.s
index 03b866f28381..bb7d050484cc 100644
--- a/sys/alpha/alpha/atomic.s
+++ b/sys/alpha/alpha/atomic.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/atomic.s,v 1.6 2002/10/30 01:41:44 gallatin Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index bae52779d70c..629aaeaac292 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.63 2005/05/29 23:44:21 marcel Exp $");
 
 #include "opt_bootp.h"
 #include "opt_isa.h"
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index a7eb1c5ad409..7c1f13375064 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.1 2005/09/26 19:35:33 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/alpha/alpha/busspace.c b/sys/alpha/alpha/busspace.c
index bd9e52b61732..31b85dc1905e 100644
--- a/sys/alpha/alpha/busspace.c
+++ b/sys/alpha/alpha/busspace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busspace.c,v 1.4 2003/08/22 07:20:25 imp Exp $");
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c
index 75f84b37b4fd..f6e05d5ed321 100644
--- a/sys/alpha/alpha/clock.c
+++ b/sys/alpha/alpha/clock.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.39 2005/05/14 09:10:00 nyan Exp $");
 
 #include "opt_clock.h"
 
diff --git a/sys/alpha/alpha/clock_if.m b/sys/alpha/alpha/clock_if.m
index d0584b6ce69f..11b18b6c0ea8 100644
--- a/sys/alpha/alpha/clock_if.m
+++ b/sys/alpha/alpha/clock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/alpha/clock_if.m,v 1.6 2005/01/05 20:05:48 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c
index 47d2be889fd7..afb6e881eaae 100644
--- a/sys/alpha/alpha/cpuconf.c
+++ b/sys/alpha/alpha/cpuconf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/alpha/db_disasm.c b/sys/alpha/alpha/db_disasm.c
index dd91ddb9e108..b5554155392e 100644
--- a/sys/alpha/alpha/db_disasm.c
+++ b/sys/alpha/alpha/db_disasm.c
@@ -46,7 +46,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.11 2005/01/05 20:05:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/db_instruction.h b/sys/alpha/alpha/db_instruction.h
index 65e38bac9a90..bc7850673aff 100644
--- a/sys/alpha/alpha/db_instruction.h
+++ b/sys/alpha/alpha/db_instruction.h
@@ -25,7 +25,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.7 2005/01/05 20:05:48 imp Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c
index 12e6877a97d8..8951cd545f29 100644
--- a/sys/alpha/alpha/db_interface.c
+++ b/sys/alpha/alpha/db_interface.c
@@ -47,7 +47,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.30 2005/01/05 20:05:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/db_trace.c b/sys/alpha/alpha/db_trace.c
index fcee2f3f2e5f..a9b8a0fe06e4 100644
--- a/sys/alpha/alpha/db_trace.c
+++ b/sys/alpha/alpha/db_trace.c
@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.23 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c
index 0521af24696c..e30d670196c0 100644
--- a/sys/alpha/alpha/dec_1000a.c
+++ b/sys/alpha/alpha/dec_1000a.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.19 2005/01/05 20:05:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c
index 51486d2c99f2..405541ee97f0 100644
--- a/sys/alpha/alpha/dec_2100_a50.c
+++ b/sys/alpha/alpha/dec_2100_a50.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.20 2005/01/05 20:05:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c
index 10d5df7aeb8a..85c8432afe91 100644
--- a/sys/alpha/alpha/dec_2100_a500.c
+++ b/sys/alpha/alpha/dec_2100_a500.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.19 2005/01/05 20:05:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_3000_300.c b/sys/alpha/alpha/dec_3000_300.c
index d36711113756..d51565536b2c 100644
--- a/sys/alpha/alpha/dec_3000_300.c
+++ b/sys/alpha/alpha/dec_3000_300.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_300.c,v 1.7 2005/01/05 20:05:48 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/alpha/dec_3000_500.c b/sys/alpha/alpha/dec_3000_500.c
index eb144a73f92c..f44d640f88ff 100644
--- a/sys/alpha/alpha/dec_3000_500.c
+++ b/sys/alpha/alpha/dec_3000_500.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_500.c,v 1.7 2005/01/05 20:05:48 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index b19226d2a58a..644d1719f32c 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.23 2005/01/05 20:05:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index e17400181f1c..3b8648f9dd8f 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.21 2005/01/05 20:05:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index f16a39574187..a1e5f9919392 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.18 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index d4d01d075e35..ee75bbb034ea 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.21 2005/02/10 00:35:31 ticso Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c
index 70b11339f843..e527693fe381 100644
--- a/sys/alpha/alpha/dec_kn300.c
+++ b/sys/alpha/alpha/dec_kn300.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.15 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_kn8ae.c b/sys/alpha/alpha/dec_kn8ae.c
index fbc98407d058..54ab752072a7 100644
--- a/sys/alpha/alpha/dec_kn8ae.c
+++ b/sys/alpha/alpha/dec_kn8ae.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.15 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c
index f664b298937a..17efaef84724 100644
--- a/sys/alpha/alpha/dec_st550.c
+++ b/sys/alpha/alpha/dec_st550.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.18 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/dec_st6600.c b/sys/alpha/alpha/dec_st6600.c
index 275094613acf..8182fb46a583 100644
--- a/sys/alpha/alpha/dec_st6600.c
+++ b/sys/alpha/alpha/dec_st6600.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.18 2004/07/10 22:29:40 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/alpha/alpha/divrem.m4 b/sys/alpha/alpha/divrem.m4
index c8a5d549d803..74ac4191880e 100644
--- a/sys/alpha/alpha/divrem.m4
+++ b/sys/alpha/alpha/divrem.m4
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.5 2005/01/05 20:05:49 imp Exp $ */
 /*	$NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $	*/
 
 /*-
diff --git a/sys/alpha/alpha/dump_machdep.c b/sys/alpha/alpha/dump_machdep.c
index 42523d75ddb2..c76350476659 100644
--- a/sys/alpha/alpha/dump_machdep.c
+++ b/sys/alpha/alpha/dump_machdep.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.6 2003/12/23 02:36:41 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/elf_machdep.c b/sys/alpha/alpha/elf_machdep.c
index 6937e843386b..cf540c39cbee 100644
--- a/sys/alpha/alpha/elf_machdep.c
+++ b/sys/alpha/alpha/elf_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.19 2004/08/11 02:35:04 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/alpha/exception.s b/sys/alpha/alpha/exception.s
index 39159b190e2d..507292ccd842 100644
--- a/sys/alpha/alpha/exception.s
+++ b/sys/alpha/alpha/exception.s
@@ -24,7 +24,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *	$NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.18 2005/01/05 20:05:49 imp Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c
index 7e8aa5e5abcd..b0566c58a0d5 100644
--- a/sys/alpha/alpha/fp_emulate.c
+++ b/sys/alpha/alpha/fp_emulate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.15 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/gdb_machdep.c b/sys/alpha/alpha/gdb_machdep.c
index 410aab6ed23d..8b518414f004 100644
--- a/sys/alpha/alpha/gdb_machdep.c
+++ b/sys/alpha/alpha/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.3 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c
index b8cf1714c18c..cd5e7290ea91 100644
--- a/sys/alpha/alpha/genassym.c
+++ b/sys/alpha/alpha/genassym.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.45 2004/11/20 02:28:14 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/ieee_float.c b/sys/alpha/alpha/ieee_float.c
index 003068bca6b4..6816553f13d2 100644
--- a/sys/alpha/alpha/ieee_float.c
+++ b/sys/alpha/alpha/ieee_float.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.10 2004/05/06 09:36:11 das Exp $");
 
 #include <sys/types.h>
 #ifdef TEST
diff --git a/sys/alpha/alpha/ieee_float.h b/sys/alpha/alpha/ieee_float.h
index ae5b8701a944..b16606e182dc 100644
--- a/sys/alpha/alpha/ieee_float.h
+++ b/sys/alpha/alpha/ieee_float.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/ieee_float.h,v 1.2 1999/08/28 00:38:27 peter Exp $
  */
 
 #define S_FORMAT	0	/* IEEE single */
diff --git a/sys/alpha/alpha/in_cksum.c b/sys/alpha/alpha/in_cksum.c
index aa9d939252ae..a4ebf564b6c6 100644
--- a/sys/alpha/alpha/in_cksum.c
+++ b/sys/alpha/alpha/in_cksum.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.9 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index 6f812bb43687..676691d3ff4b 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.86.2.1 2005/10/06 20:18:20 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/locore.s b/sys/alpha/alpha/locore.s
index d96777a71da4..9dbaf296b13e 100644
--- a/sys/alpha/alpha/locore.s
+++ b/sys/alpha/alpha/locore.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/locore.s,v 1.23 2005/01/05 20:05:49 imp Exp $
  */
 
 /*-
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index e09b5f692b93..f805edf3cad7 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.235 2005/04/04 21:53:51 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index fdc59caa6fd2..5b644eda1b58 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.51 2004/08/01 11:40:50 markm Exp $");
 
 /*
  * Memory special file
diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index c1b9706d8118..364d0cc01ea9 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/sys/alpha/alpha/mp_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.56 2005/04/04 21:53:51 jhb Exp $");
 
 #include "opt_kstack_pages.h"
 
diff --git a/sys/alpha/alpha/pal.s b/sys/alpha/alpha/pal.s
index fdf2a469562a..d483f33e61c5 100644
--- a/sys/alpha/alpha/pal.s
+++ b/sys/alpha/alpha/pal.s
@@ -40,7 +40,7 @@
 #include <machine/asm.h>
 
 __KERNEL_RCSID(1, "$NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $");
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pal.s,v 1.9 2005/01/05 20:05:49 imp Exp $");
 
 	.text
 	.loc	1 __LINE__
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index bdcb9f8a5722..8c5c3fbf7572 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.4.1 2005/10/28 06:49:18 ade Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c
index 95a936157f06..c1d5fa978a7b 100644
--- a/sys/alpha/alpha/prom.c
+++ b/sys/alpha/alpha/prom.c
@@ -26,7 +26,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.30 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/alpha/prom_disp.s b/sys/alpha/alpha/prom_disp.s
index 1fb4ff76b934..b6ab7ecc6a5e 100644
--- a/sys/alpha/alpha/prom_disp.s
+++ b/sys/alpha/alpha/prom_disp.s
@@ -29,7 +29,7 @@
 #include <machine/asm.h>
 #else
 __KERNEL_RCSID(2, "$NetBSD: prom_disp.s,v 1.8 1997/11/03 04:22:03 ross Exp $");
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom_disp.s,v 1.6 2005/01/05 20:05:49 imp Exp $");
 #endif
 
 	.globl	prom_dispatch_v
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index baf96c8c7795..50d1f270eb4c 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.44 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/alpha/sgmap.c b/sys/alpha/alpha/sgmap.c
index baa606486b6d..11c6a5e24604 100644
--- a/sys/alpha/alpha/sgmap.c
+++ b/sys/alpha/alpha/sgmap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/support.s b/sys/alpha/alpha/support.s
index b2b7cf438277..fcb67298a430 100644
--- a/sys/alpha/alpha/support.s
+++ b/sys/alpha/alpha/support.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.18 2005/01/05 20:05:49 imp Exp $
  */
 
 /*-
diff --git a/sys/alpha/alpha/swtch.s b/sys/alpha/alpha/swtch.s
index 8523a2457973..bae92b2a1b7a 100644
--- a/sys/alpha/alpha/swtch.s
+++ b/sys/alpha/alpha/swtch.s
@@ -25,7 +25,7 @@
  * rights to redistribute these changes.
  *
  *	$NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.34 2003/08/12 19:33:35 jhb Exp $
  */
 
 #define _LOCORE
diff --git a/sys/alpha/alpha/sys_machdep.c b/sys/alpha/alpha/sys_machdep.c
index 420f666e787e..bf7247062998 100644
--- a/sys/alpha/alpha/sys_machdep.c
+++ b/sys/alpha/alpha/sys_machdep.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.28 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index dc800ef2d53c..33aaa56af665 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.123 2005/04/12 23:18:53 jhb Exp $");
 
 /* #include "opt_fix_unaligned_vax_fp.h" */
 #include "opt_ddb.h"
diff --git a/sys/alpha/alpha/uio_machdep.c b/sys/alpha/alpha/uio_machdep.c
index a96c3982b586..e279cc2de1db 100644
--- a/sys/alpha/alpha/uio_machdep.c
+++ b/sys/alpha/alpha/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.5 2005/01/05 20:05:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/alpha/uma_machdep.c b/sys/alpha/alpha/uma_machdep.c
index 1847022ea29f..6f9945bd4317 100644
--- a/sys/alpha/alpha/uma_machdep.c
+++ b/sys/alpha/alpha/uma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/uma_machdep.c,v 1.1 2004/06/11 19:55:56 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index cfbdf2c1d21f..fa8775a7ff6c 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.110 2005/07/10 23:31:09 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/compile/.cvsignore b/sys/alpha/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/alpha/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/alpha/conf/.cvsignore b/sys/alpha/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/alpha/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index e2beb23095c9..09ae0a7f4dd9 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.186.2.3 2005/09/25 18:34:18 wilko Exp $
 
 machine		alpha
 cpu		EV4
diff --git a/sys/alpha/conf/GENERIC.hints b/sys/alpha/conf/GENERIC.hints
index 0c268d3cae4b..fa444c7d6652 100644
--- a/sys/alpha/conf/GENERIC.hints
+++ b/sys/alpha/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.8 2004/07/11 03:07:28 marcel Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
diff --git a/sys/alpha/conf/Makefile b/sys/alpha/conf/Makefile
index 2c006e9c2c80..55cdda7fb56b 100644
--- a/sys/alpha/conf/Makefile
+++ b/sys/alpha/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/Makefile,v 1.3 2003/02/26 23:36:58 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 82d5ee2f1c40..c779d712e304 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/alpha/include/_bus.h b/sys/alpha/include/_bus.h
index 261120e6ebc1..6b1bab096312 100644
--- a/sys/alpha/include/_bus.h
+++ b/sys/alpha/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/_bus.h,v 1.1 2005/04/18 21:45:32 imp Exp $
  */
 
 #ifndef ALPHA_INCLUDE__BUS_H
diff --git a/sys/alpha/include/_inttypes.h b/sys/alpha/include/_inttypes.h
index e6b2536ff379..6a19622b66b6 100644
--- a/sys/alpha/include/_inttypes.h
+++ b/sys/alpha/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/alpha/include/_limits.h b/sys/alpha/include/_limits.h
index 6e9b5672a301..b6ef6767dfd2 100644
--- a/sys/alpha/include/_limits.h
+++ b/sys/alpha/include/_limits.h
@@ -28,7 +28,7 @@
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  *	From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.16 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/alpha/include/_stdint.h b/sys/alpha/include/_stdint.h
index 1aed3e3b4efc..9ede4e101080 100644
--- a/sys/alpha/include/_stdint.h
+++ b/sys/alpha/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/_stdint.h,v 1.2 2004/05/18 16:04:56 stefanf Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_
diff --git a/sys/alpha/include/_types.h b/sys/alpha/include/_types.h
index a8acbbbce351..91f38690a6bb 100644
--- a/sys/alpha/include/_types.h
+++ b/sys/alpha/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/alpha/include/alpha_cpu.h b/sys/alpha/include/alpha_cpu.h
index a3b4dfc281c1..32e5e1b48bb2 100644
--- a/sys/alpha/include/alpha_cpu.h
+++ b/sys/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.11 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
 
 /*-
diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 3ddaf81f338e..696c07844d19 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -22,7 +22,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *	From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/asm.h,v 1.16 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/alpha/include/atomic.h b/sys/alpha/include/atomic.h
index adae6ecf2423..114d5ce0442a 100644
--- a/sys/alpha/include/atomic.h
+++ b/sys/alpha/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.21.2.3 2005/10/06 18:12:05 jhb Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/alpha/include/bootinfo.h b/sys/alpha/include/bootinfo.h
index 1548cd0dffbe..14bdaf246356 100644
--- a/sys/alpha/include/bootinfo.h
+++ b/sys/alpha/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/bootinfo.h,v 1.7 2005/01/05 20:05:50 imp Exp $ */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h
index bfd5c55092a9..35bc1579ada0 100644
--- a/sys/alpha/include/bus.h
+++ b/sys/alpha/include/bus.h
@@ -67,7 +67,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/sys/alpha/include/bus.h,v 1.30 2005/04/18 21:45:32 imp Exp $ */
 
 #ifndef _ALPHA_BUS_H_
 #define _ALPHA_BUS_H_
diff --git a/sys/alpha/include/bus_dma.h b/sys/alpha/include/bus_dma.h
index 141fff0dea34..c54d344b070f 100644
--- a/sys/alpha/include/bus_dma.h
+++ b/sys/alpha/include/bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/bus_dma.h,v 1.1 2005/03/14 16:46:27 scottl Exp $ */
 
 #ifndef _ALPHA_BUS_DMA_H_
 #define _ALPHA_BUS_DMA_H_
diff --git a/sys/alpha/include/bwx.h b/sys/alpha/include/bwx.h
index bb2866b389f6..5ffafba8a974 100644
--- a/sys/alpha/include/bwx.h
+++ b/sys/alpha/include/bwx.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/bwx.h,v 1.5 2000/08/28 21:48:01 dfr Exp $
  */
 
 #ifndef _MACHINE_BWX_H_
diff --git a/sys/alpha/include/chipset.h b/sys/alpha/include/chipset.h
index 048fbed49000..1e69faa53597 100644
--- a/sys/alpha/include/chipset.h
+++ b/sys/alpha/include/chipset.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/chipset.h,v 1.11 2000/08/28 21:48:01 dfr Exp $
  */
 
 #ifndef _MACHINE_CHIPSET_H_
diff --git a/sys/alpha/include/clock.h b/sys/alpha/include/clock.h
index 31eca15fda0d..ccd34f57242a 100644
--- a/sys/alpha/include/clock.h
+++ b/sys/alpha/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/clock.h,v 1.8 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/alpha/include/clockvar.h b/sys/alpha/include/clockvar.h
index 89b3619af108..844c09230dc6 100644
--- a/sys/alpha/include/clockvar.h
+++ b/sys/alpha/include/clockvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/clockvar.h,v 1.3 2005/01/05 20:05:50 imp Exp $ */
 /* $NetBSD: clockvar.h,v 1.4 1997/06/22 08:02:18 jonathan Exp $ */
 
 /*-
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index 212ced04e3b0..ead0e642b33f 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.42 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
 
 /*-
diff --git a/sys/alpha/include/cpuconf.h b/sys/alpha/include/cpuconf.h
index 669ca6c9bec3..bde7d60ea404 100644
--- a/sys/alpha/include/cpuconf.h
+++ b/sys/alpha/include/cpuconf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/cpuconf.h,v 1.14 2005/01/31 23:07:42 ticso Exp $ */
 /*	$NetBSD: cpuconf.h,v 1.7 1997/11/06 00:42:03 thorpej Exp $	*/
 #ifndef	_ALPHA_CPUCONF_H
 #define	_ALPHA_CPUCONF_H
diff --git a/sys/alpha/include/cpufunc.h b/sys/alpha/include/cpufunc.h
index 5979987c6687..e475ac667f92 100644
--- a/sys/alpha/include/cpufunc.h
+++ b/sys/alpha/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.16 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/alpha/include/db_machdep.h b/sys/alpha/include/db_machdep.h
index f72b2b0aafb4..c0af9e5d1929 100644
--- a/sys/alpha/include/db_machdep.h
+++ b/sys/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.10 2005/01/05 20:05:50 imp Exp $ */
 /* $NetBSD: db_machdep.h,v 1.6 1997/09/06 02:02:25 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/include/elf.h b/sys/alpha/include/elf.h
index a0fb7068aee6..68c1163b45f6 100644
--- a/sys/alpha/include/elf.h
+++ b/sys/alpha/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/elf.h,v 1.14 2003/09/25 01:10:22 peter Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/alpha/include/endian.h b/sys/alpha/include/endian.h
index 974ce1626938..eced1dcfc0b8 100644
--- a/sys/alpha/include/endian.h
+++ b/sys/alpha/include/endian.h
@@ -28,7 +28,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  *	$NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/endian.h,v 1.16 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/alpha/include/exec.h b/sys/alpha/include/exec.h
index e3aa1fe892cb..a799ccd37c08 100644
--- a/sys/alpha/include/exec.h
+++ b/sys/alpha/include/exec.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/exec.h,v 1.4 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/alpha/include/float.h b/sys/alpha/include/float.h
index e2fb31d9dd85..3a7f0536ee3b 100644
--- a/sys/alpha/include/float.h
+++ b/sys/alpha/include/float.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/float.h,v 1.7 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
 
 /*-
diff --git a/sys/alpha/include/floatingpoint.h b/sys/alpha/include/floatingpoint.h
index 22a9f485dba6..9b46bbcc178c 100644
--- a/sys/alpha/include/floatingpoint.h
+++ b/sys/alpha/include/floatingpoint.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/floatingpoint.h,v 1.4 2005/01/05 20:05:50 imp Exp $
  */
 
 #include <machine/ieeefp.h>
diff --git a/sys/alpha/include/fpu.h b/sys/alpha/include/fpu.h
index ad539e90451c..774f0a8a1a9d 100644
--- a/sys/alpha/include/fpu.h
+++ b/sys/alpha/include/fpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.7 2004/05/06 09:35:57 das Exp $
  */
 
 #ifndef _MACHINE_FPU_H_
diff --git a/sys/alpha/include/frame.h b/sys/alpha/include/frame.h
index 050f383d8e6d..fdc09a807352 100644
--- a/sys/alpha/include/frame.h
+++ b/sys/alpha/include/frame.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/frame.h,v 1.6 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: frame.h,v 1.4 1997/04/06 08:47:27 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/gdb_machdep.h b/sys/alpha/include/gdb_machdep.h
index 7518bd536212..bc2bae2a5a85 100644
--- a/sys/alpha/include/gdb_machdep.h
+++ b/sys/alpha/include/gdb_machdep.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/sys/alpha/include/gdb_machdep.h,v 1.3 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/alpha/include/ieee.h b/sys/alpha/include/ieee.h
index 0b1f6312bead..30093cc3a1b0 100644
--- a/sys/alpha/include/ieee.h
+++ b/sys/alpha/include/ieee.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/ieee.h,v 1.4 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/ieeefp.h b/sys/alpha/include/ieeefp.h
index 6fb419ec0e7f..0848aa33eb0a 100644
--- a/sys/alpha/include/ieeefp.h
+++ b/sys/alpha/include/ieeefp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/ieeefp.h,v 1.6 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: ieeefp.h,v 1.2 1997/04/06 08:47:28 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/in_cksum.h b/sys/alpha/include/in_cksum.h
index 09920062a0ae..b9ccbd465cd4 100644
--- a/sys/alpha/include/in_cksum.h
+++ b/sys/alpha/include/in_cksum.h
@@ -29,7 +29,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.7 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/alpha/include/inst.h b/sys/alpha/include/inst.h
index b4088bc009c8..a6b8fc91333e 100644
--- a/sys/alpha/include/inst.h
+++ b/sys/alpha/include/inst.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/inst.h,v 1.2 1999/08/28 00:38:45 peter Exp $
  */
 
 #ifndef _MACHINE_INST_H_
diff --git a/sys/alpha/include/intr.h b/sys/alpha/include/intr.h
index 90a0bbf9f39d..d94f9a4435f5 100644
--- a/sys/alpha/include/intr.h
+++ b/sys/alpha/include/intr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/intr.h,v 1.11 2003/11/17 06:10:14 peter Exp $
  */
 
 #ifndef _MACHINE_INTR_H_
diff --git a/sys/alpha/include/intrcnt.h b/sys/alpha/include/intrcnt.h
index 2c1b897d4724..a86dc2b453bc 100644
--- a/sys/alpha/include/intrcnt.h
+++ b/sys/alpha/include/intrcnt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/intrcnt.h,v 1.6 2005/01/05 20:05:50 imp Exp $ */
 /* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
 
 /*-
diff --git a/sys/alpha/include/ioctl_bt848.h b/sys/alpha/include/ioctl_bt848.h
index ca83a36cdb5a..2bd183abf806 100644
--- a/sys/alpha/include/ioctl_bt848.h
+++ b/sys/alpha/include/ioctl_bt848.h
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.4 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_BT848_H_
diff --git a/sys/alpha/include/ioctl_meteor.h b/sys/alpha/include/ioctl_meteor.h
index 0322f1ede2c1..a40f96d89cd0 100644
--- a/sys/alpha/include/ioctl_meteor.h
+++ b/sys/alpha/include/ioctl_meteor.h
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.5 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_METEOR_H_
diff --git a/sys/alpha/include/kdb.h b/sys/alpha/include/kdb.h
index ded9cd6c079a..be5810649ce4 100644
--- a/sys/alpha/include/kdb.h
+++ b/sys/alpha/include/kdb.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/sys/alpha/include/kdb.h,v 1.2 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/alpha/include/limits.h b/sys/alpha/include/limits.h
index 94447607a886..ef801376c7bf 100644
--- a/sys/alpha/include/limits.h
+++ b/sys/alpha/include/limits.h
@@ -28,7 +28,7 @@
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  *	From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/limits.h,v 1.15 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/alpha/include/md_var.h b/sys/alpha/include/md_var.h
index d57664786e41..292e12d166b1 100644
--- a/sys/alpha/include/md_var.h
+++ b/sys/alpha/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.23 2003/08/17 06:42:07 marcel Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/alpha/include/memdev.h b/sys/alpha/include/memdev.h
index 32cc1fc1f422..f37de09f6f9a 100644
--- a/sys/alpha/include/memdev.h
+++ b/sys/alpha/include/memdev.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/sys/alpha/include/memdev.h,v 1.2 2004/08/01 18:51:44 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/alpha/include/mutex.h b/sys/alpha/include/mutex.h
index 7300c08b15f7..5af41e1e45ed 100644
--- a/sys/alpha/include/mutex.h
+++ b/sys/alpha/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/mutex.h,v 1.27 2001/12/18 00:27:14 jhb Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/alpha/include/pal.h b/sys/alpha/include/pal.h
index 73426af911ab..675442a3c53e 100644
--- a/sys/alpha/include/pal.h
+++ b/sys/alpha/include/pal.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/pal.h,v 1.3 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: pal.h,v 1.1 1997/09/06 01:23:53 thorpej Exp */
 
 /*-
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index 13e8b8f5044d..b9568ece6430 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.38 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*-
diff --git a/sys/alpha/include/pc/bios.h b/sys/alpha/include/pc/bios.h
index ff5edd6de4db..74cae1bd9d91 100644
--- a/sys/alpha/include/pc/bios.h
+++ b/sys/alpha/include/pc/bios.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/bios.h,v 1.6 2004/06/10 20:30:54 jhb Exp $
  *      from: i386/include/pc bios.h,v 1.2
  */
 
diff --git a/sys/alpha/include/pc/display.h b/sys/alpha/include/pc/display.h
index fad568c0cb81..05604ac102d8 100644
--- a/sys/alpha/include/pc/display.h
+++ b/sys/alpha/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/display.h,v 1.6 1999/08/28 00:38:56 peter Exp $
  *	from: i386/include/pc display.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/vesa.h b/sys/alpha/include/pc/vesa.h
index c2c2b168b932..c65ef3b33492 100644
--- a/sys/alpha/include/pc/vesa.h
+++ b/sys/alpha/include/pc/vesa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/vesa.h,v 1.4 2002/09/23 18:54:26 alfred Exp $
  * from: i386/include/pc vesa.h,v 1.1
  */
 
diff --git a/sys/alpha/include/pcb.h b/sys/alpha/include/pcb.h
index 70646c8fefba..e067119c90d5 100644
--- a/sys/alpha/include/pcb.h
+++ b/sys/alpha/include/pcb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/pcb.h,v 1.11 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: pcb.h,v 1.6 1997/04/06 08:47:33 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/pcpu.h b/sys/alpha/include/pcpu.h
index 660839abe81e..57bd6216fb0f 100644
--- a/sys/alpha/include/pcpu.h
+++ b/sys/alpha/include/pcpu.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 56c9d6a92811..714426814e7e 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -39,7 +39,7 @@
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
  *	from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.34 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/alpha/include/pmc_mdep.h b/sys/alpha/include/pmc_mdep.h
index 7fc48f534fd6..559ee7398942 100644
--- a/sys/alpha/include/pmc_mdep.h
+++ b/sys/alpha/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:06 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/alpha/include/ppireg.h b/sys/alpha/include/ppireg.h
index 5774757ce67a..7c306ea20e14 100644
--- a/sys/alpha/include/ppireg.h
+++ b/sys/alpha/include/ppireg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/ppireg.h,v 1.1 2005/05/14 09:10:00 nyan Exp $
  */
 
 #ifndef _MACHINE_PPIREG_H_
diff --git a/sys/alpha/include/proc.h b/sys/alpha/include/proc.h
index 174e64bde9aa..53a9d7c65a87 100644
--- a/sys/alpha/include/proc.h
+++ b/sys/alpha/include/proc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.18 2005/04/04 21:53:51 jhb Exp $ */
 /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/profile.h b/sys/alpha/include/profile.h
index 47f45eb18a7a..3ec52e115735 100644
--- a/sys/alpha/include/profile.h
+++ b/sys/alpha/include/profile.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.8 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/prom.h b/sys/alpha/include/prom.h
index a3ce282808fb..c097447d9edc 100644
--- a/sys/alpha/include/prom.h
+++ b/sys/alpha/include/prom.h
@@ -26,7 +26,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/prom.h,v 1.10 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef	ASSEMBLER
diff --git a/sys/alpha/include/pte.h b/sys/alpha/include/pte.h
index 1ac4e94c182f..0a8735caaf53 100644
--- a/sys/alpha/include/pte.h
+++ b/sys/alpha/include/pte.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/pte.h,v 1.5 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: pte.h,v 1.10 1997/09/02 19:07:22 thorpej Exp */
 
 /*-
diff --git a/sys/alpha/include/ptrace.h b/sys/alpha/include/ptrace.h
index 657800cbd217..9b1973dca589 100644
--- a/sys/alpha/include/ptrace.h
+++ b/sys/alpha/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.13 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h
index 573f82593c98..9cb5497b04f3 100644
--- a/sys/alpha/include/reg.h
+++ b/sys/alpha/include/reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/reg.h,v 1.13 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: reg.h,v 1.3 1997/04/06 08:47:40 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/reloc.h b/sys/alpha/include/reloc.h
index 6e5053602772..50d410dc2b8a 100644
--- a/sys/alpha/include/reloc.h
+++ b/sys/alpha/include/reloc.h
@@ -29,5 +29,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/reloc.h,v 1.3 2005/01/05 20:05:50 imp Exp $
  */
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h
index edde5eb29908..b9d211180fcc 100644
--- a/sys/alpha/include/resource.h
+++ b/sys/alpha/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/resource.h,v 1.5 2005/01/05 20:05:50 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/alpha/include/rpb.h b/sys/alpha/include/rpb.h
index 0dd44812b9b3..19e3207ba42f 100644
--- a/sys/alpha/include/rpb.h
+++ b/sys/alpha/include/rpb.h
@@ -1,5 +1,5 @@
 /* $NetBSD: rpb.h,v 1.20 1998/04/15 00:47:33 mjacob Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/rpb.h,v 1.11 2005/01/05 20:05:50 imp Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/include/runq.h b/sys/alpha/include/runq.h
index 6d03646fd539..511493b0e902 100644
--- a/sys/alpha/include/runq.h
+++ b/sys/alpha/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/runq.h,v 1.3 2005/01/05 20:05:50 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/alpha/include/setjmp.h b/sys/alpha/include/setjmp.h
index bf1bec6b564b..d8d5fbb9a23c 100644
--- a/sys/alpha/include/setjmp.h
+++ b/sys/alpha/include/setjmp.h
@@ -25,7 +25,7 @@
  * rights to redistribute these changes.
  *
  *	$NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/setjmp.h,v 1.6 2002/10/05 05:47:55 mike Exp $
  */
 
 /*
diff --git a/sys/alpha/include/sf_buf.h b/sys/alpha/include/sf_buf.h
index d000e3032804..84367d67d779 100644
--- a/sys/alpha/include/sf_buf.h
+++ b/sys/alpha/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/sf_buf.h,v 1.2 2004/04/18 06:24:51 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/alpha/include/sgmap.h b/sys/alpha/include/sgmap.h
index 08ccbc7b7a47..283112a6e0ac 100644
--- a/sys/alpha/include/sgmap.h
+++ b/sys/alpha/include/sgmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/sgmap.h,v 1.2 1999/08/28 00:38:51 peter Exp $
  */
 
 #ifndef _MACHINE_SGMAP_H_
diff --git a/sys/alpha/include/sigframe.h b/sys/alpha/include/sigframe.h
index 01196e569e83..690cf422428d 100644
--- a/sys/alpha/include/sigframe.h
+++ b/sys/alpha/include/sigframe.h
@@ -25,7 +25,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/sys/alpha/include/sigframe.h,v 1.4 2002/10/25 19:10:55 peter Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index 7e91ed8ae47e..08b335396561 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.12 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/smp.h b/sys/alpha/include/smp.h
index 9660d098ee6b..6d74efe56a15 100644
--- a/sys/alpha/include/smp.h
+++ b/sys/alpha/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/smp.h,v 1.8 2005/01/05 20:05:50 imp Exp $
  *
  */
 
diff --git a/sys/alpha/include/stdarg.h b/sys/alpha/include/stdarg.h
index 13449627c907..54f731cb1a93 100644
--- a/sys/alpha/include/stdarg.h
+++ b/sys/alpha/include/stdarg.h
@@ -33,7 +33,7 @@
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  *	$NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.7 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/alpha/include/swiz.h b/sys/alpha/include/swiz.h
index 465a81a23371..ac5d2d065b36 100644
--- a/sys/alpha/include/swiz.h
+++ b/sys/alpha/include/swiz.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/swiz.h,v 1.4 2000/08/28 21:48:01 dfr Exp $
  */
 
 #ifndef _MACHINE_SWIZ_H_
diff --git a/sys/alpha/include/sysarch.h b/sys/alpha/include/sysarch.h
index b953d2fd9807..6fa7685eb60c 100644
--- a/sys/alpha/include/sysarch.h
+++ b/sys/alpha/include/sysarch.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.8 2004/04/05 21:00:50 imp Exp $
  */
 
 /*
diff --git a/sys/alpha/include/timerreg.h b/sys/alpha/include/timerreg.h
index 0ab7d40510a7..52374b078cd8 100644
--- a/sys/alpha/include/timerreg.h
+++ b/sys/alpha/include/timerreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/timerreg.h,v 1.2 2005/05/28 13:40:26 nyan Exp $
  */
 
 /*
diff --git a/sys/alpha/include/ucontext.h b/sys/alpha/include/ucontext.h
index d60cc6c3523b..25a8fa35e497 100644
--- a/sys/alpha/include/ucontext.h
+++ b/sys/alpha/include/ucontext.h
@@ -25,7 +25,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/sys/alpha/include/ucontext.h,v 1.7 2003/07/24 07:34:31 marcel Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/alpha/include/varargs.h b/sys/alpha/include/varargs.h
index b05a9a5b1113..3715a450ee0f 100644
--- a/sys/alpha/include/varargs.h
+++ b/sys/alpha/include/varargs.h
@@ -38,7 +38,7 @@
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  *	$NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.7 2005/03/02 21:33:20 joerg Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/alpha/include/vmparam.h b/sys/alpha/include/vmparam.h
index 57a116bdd8e5..e670ab1792cb 100644
--- a/sys/alpha/include/vmparam.h
+++ b/sys/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.10 2005/01/05 20:05:50 imp Exp $ */
 /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
 #ifndef	_ALPHA_VMPARAM_H
 #define	_ALPHA_VMPARAM_H
diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c
index ac08c7b7e646..1cee76dd5fad 100644
--- a/sys/alpha/isa/isa.c
+++ b/sys/alpha/isa/isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36 2004/07/01 15:07:26 gallatin Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/isa/isa_dma.c b/sys/alpha/isa/isa_dma.c
index 85e088f76684..3c41e441b309 100644
--- a/sys/alpha/isa/isa_dma.c
+++ b/sys/alpha/isa/isa_dma.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.14 2005/05/14 10:14:55 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/isa/isavar.h b/sys/alpha/isa/isavar.h
index adadbf7f1eb6..fb8b7a5f2341 100644
--- a/sys/alpha/isa/isavar.h
+++ b/sys/alpha/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/isa/isavar.h,v 1.5 2001/01/24 10:25:44 jhb Exp $
  */
 
 /*
diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c
index de13690c0bd5..3fcac42a1bd5 100644
--- a/sys/alpha/isa/mcclock_isa.c
+++ b/sys/alpha/isa/mcclock_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.12 2005/05/29 04:42:15 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/linux/Makefile b/sys/alpha/linux/Makefile
index bd6b32a7d4a8..e2a216262084 100644
--- a/sys/alpha/linux/Makefile
+++ b/sys/alpha/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/linux/Makefile,v 1.5 2000/11/01 08:47:33 obrien Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/alpha/linux/linux.h b/sys/alpha/linux/linux.h
index 07753649cfa3..cbf6b6a4599a 100644
--- a/sys/alpha/linux/linux.h
+++ b/sys/alpha/linux/linux.h
@@ -25,7 +25,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/sys/alpha/linux/linux.h,v 1.59 2004/08/16 07:05:44 tjr Exp $
  */
 
 #ifndef _ALPHA_LINUX_LINUX_H_
diff --git a/sys/alpha/linux/linux_dummy.c b/sys/alpha/linux/linux_dummy.c
index d27b52a48c18..0a53b4517cc0 100644
--- a/sys/alpha/linux/linux_dummy.c
+++ b/sys/alpha/linux/linux_dummy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.38 2004/03/29 02:19:43 bms Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/linux/linux_genassym.c b/sys/alpha/linux/linux_genassym.c
index d06831dca0b5..de987522b2fb 100644
--- a/sys/alpha/linux/linux_genassym.c
+++ b/sys/alpha/linux/linux_genassym.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_genassym.c,v 1.19 2003/08/22 07:20:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
diff --git a/sys/alpha/linux/linux_ipc64.h b/sys/alpha/linux/linux_ipc64.h
index e91c4fd922b4..259bfb5b6131 100644
--- a/sys/alpha/linux/linux_ipc64.h
+++ b/sys/alpha/linux/linux_ipc64.h
@@ -25,7 +25,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/sys/alpha/linux/linux_ipc64.h,v 1.1 2002/10/11 11:43:09 sobomax Exp $
  */
 
 #ifndef _ALPHA_LINUX_LINUX_IPC64_H_
diff --git a/sys/alpha/linux/linux_locore.s b/sys/alpha/linux/linux_locore.s
index 1ed699d15933..2a8b63614038 100644
--- a/sys/alpha/linux/linux_locore.s
+++ b/sys/alpha/linux/linux_locore.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/linux/linux_locore.s,v 1.3 2000/12/03 01:30:30 marcel Exp $ */
 
 #include <machine/asm.h>
 #include <alpha/linux/linux_syscall.h>
diff --git a/sys/alpha/linux/linux_machdep.c b/sys/alpha/linux/linux_machdep.c
index b4cebb09fbd7..52915338ef6e 100644
--- a/sys/alpha/linux/linux_machdep.c
+++ b/sys/alpha/linux/linux_machdep.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h
index c3cbedc0a37c..ab389eff14cf 100644
--- a/sys/alpha/linux/linux_proto.h
+++ b/sys/alpha/linux/linux_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.22.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h
index 260261288de9..2814a54b58bc 100644
--- a/sys/alpha/linux/linux_syscall.h
+++ b/sys/alpha/linux/linux_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.20.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c
index 7d71bdb82914..fe7a234479f6 100644
--- a/sys/alpha/linux/linux_sysent.c
+++ b/sys/alpha/linux/linux_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.20.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index a09dfdcd0abd..432a224cbc5f 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.94 2005/01/29 23:11:57 sobomax Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/alpha/linux/syscalls.conf b/sys/alpha/linux/syscalls.conf
index 74b687eb1201..0c847a8cba16 100644
--- a/sys/alpha/linux/syscalls.conf
+++ b/sys/alpha/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/linux/syscalls.conf,v 1.6 2003/12/24 00:32:07 peter Exp $
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index a5025a114345..f8bffbbdae2e 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63.2.1 2005/07/20 17:42:14 jhb Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/alpha/mcbus/mcbus.c b/sys/alpha/mcbus/mcbus.c
index 48bf47bdaf13..3b46024a947b 100644
--- a/sys/alpha/mcbus/mcbus.c
+++ b/sys/alpha/mcbus/mcbus.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcbus.c,v 1.6 2005/01/05 20:05:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/mcbus/mcbusreg.h b/sys/alpha/mcbus/mcbusreg.h
index d52c1a5b3e02..aa8624ada0b9 100644
--- a/sys/alpha/mcbus/mcbusreg.h
+++ b/sys/alpha/mcbus/mcbusreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/mcbus/mcbusreg.h,v 1.3 2005/01/05 20:05:51 imp Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 by Matthew Jacob
diff --git a/sys/alpha/mcbus/mcbusvar.h b/sys/alpha/mcbus/mcbusvar.h
index 63e8d27e9659..57caafa91609 100644
--- a/sys/alpha/mcbus/mcbusvar.h
+++ b/sys/alpha/mcbus/mcbusvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/mcbus/mcbusvar.h,v 1.3 2005/01/05 20:05:51 imp Exp $ */
 /*-
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/sys/alpha/mcbus/mcmem.c b/sys/alpha/mcbus/mcmem.c
index bd3a784d83ed..2b2f53fb378e 100644
--- a/sys/alpha/mcbus/mcmem.c
+++ b/sys/alpha/mcbus/mcmem.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcmem.c,v 1.4 2005/01/05 20:05:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/mcbus/mcpcia.c b/sys/alpha/mcbus/mcpcia.c
index 6059f37ca69c..3dcdea78976f 100644
--- a/sys/alpha/mcbus/mcpcia.c
+++ b/sys/alpha/mcbus/mcpcia.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.30 2005/01/05 20:05:51 imp Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/mcbus/mcpciareg.h b/sys/alpha/mcbus/mcpciareg.h
index ae477fd4f5d9..def11d1eca1a 100644
--- a/sys/alpha/mcbus/mcpciareg.h
+++ b/sys/alpha/mcbus/mcpciareg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/mcbus/mcpciareg.h,v 1.3 2005/01/05 20:05:51 imp Exp $ */
 
 /*-
  * Copyright (c) 2000 by Matthew Jacob
diff --git a/sys/alpha/mcbus/mcpciavar.h b/sys/alpha/mcbus/mcpciavar.h
index 00c1adaba8b6..36c65a41181a 100644
--- a/sys/alpha/mcbus/mcpciavar.h
+++ b/sys/alpha/mcbus/mcpciavar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/mcbus/mcpciavar.h,v 1.4 2005/01/05 20:05:51 imp Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 by Matthew Jacob
diff --git a/sys/alpha/osf1/Makefile b/sys/alpha/osf1/Makefile
index d542007663cf..c6dc94f33fcb 100644
--- a/sys/alpha/osf1/Makefile
+++ b/sys/alpha/osf1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/osf1/Makefile,v 1.2.34.1 2005/07/18 19:54:49 jhb Exp $
 
 # Makefile for syscall tables.
 
diff --git a/sys/alpha/osf1/README.mach-traps b/sys/alpha/osf1/README.mach-traps
index bbc1a790a1ea..41519c72b4fb 100644
--- a/sys/alpha/osf1/README.mach-traps
+++ b/sys/alpha/osf1/README.mach-traps
@@ -1,5 +1,5 @@
 $NetBSD: README.mach-traps,v 1.2 1999/03/23 09:19:25 itohy Exp $
-$FreeBSD$
+$FreeBSD: src/sys/alpha/osf1/README.mach-traps,v 1.1 1999/12/14 22:39:27 gallatin Exp $
 
 Some Alpha AXP OSF/1 binaries directly use the facilities provided by
 the Mach kernel that is the basis for OSF/1.  These include (but are
diff --git a/sys/alpha/osf1/exec_ecoff.h b/sys/alpha/osf1/exec_ecoff.h
index b88861299cf8..7dab8657a490 100644
--- a/sys/alpha/osf1/exec_ecoff.h
+++ b/sys/alpha/osf1/exec_ecoff.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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/osf1/exec_ecoff.h,v 1.2 2005/01/05 20:05:51 imp Exp $
  */
 
 #ifndef	_SYS_EXEC_ECOFF_H_
diff --git a/sys/alpha/osf1/imgact_osf1.c b/sys/alpha/osf1/imgact_osf1.c
index 55498e0740d4..e07a69e23c66 100644
--- a/sys/alpha/osf1/imgact_osf1.c
+++ b/sys/alpha/osf1/imgact_osf1.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.23 2005/04/01 20:00:10 jhb Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
diff --git a/sys/alpha/osf1/osf1.h b/sys/alpha/osf1/osf1.h
index 41592d928f2a..005755392661 100644
--- a/sys/alpha/osf1/osf1.h
+++ b/sys/alpha/osf1/osf1.h
@@ -24,7 +24,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/sys/alpha/osf1/osf1.h,v 1.6 2005/01/05 20:05:51 imp Exp $ 
  */
 
 extern struct sysent osf1_sysent[];
diff --git a/sys/alpha/osf1/osf1_ioctl.c b/sys/alpha/osf1/osf1_ioctl.c
index 09d970dc1d52..b1ab3c959366 100644
--- a/sys/alpha/osf1/osf1_ioctl.c
+++ b/sys/alpha/osf1/osf1_ioctl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.13 2005/01/05 20:05:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c
index 63ce5eed5cc4..798256e794cc 100644
--- a/sys/alpha/osf1/osf1_misc.c
+++ b/sys/alpha/osf1/osf1_misc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.56 2005/07/07 19:16:30 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/osf1/osf1_mount.c b/sys/alpha/osf1/osf1_mount.c
index d0ef28125020..803e13fdf8bb 100644
--- a/sys/alpha/osf1/osf1_mount.c
+++ b/sys/alpha/osf1/osf1_mount.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.25 2005/06/11 14:58:20 pjd Exp $");
 
 #include "opt_mac.h"
 #include "opt_nfs.h"
diff --git a/sys/alpha/osf1/osf1_proto.h b/sys/alpha/osf1/osf1_proto.h
index b318386f785a..33b47a8b4ffb 100644
--- a/sys/alpha/osf1/osf1_proto.h
+++ b/sys/alpha/osf1/osf1_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.12.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.11.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/alpha/osf1/osf1_signal.c b/sys/alpha/osf1/osf1_signal.c
index 355cb1c20e9b..86d724354c24 100644
--- a/sys/alpha/osf1/osf1_signal.c
+++ b/sys/alpha/osf1/osf1_signal.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.40 2005/02/13 17:37:20 sobomax Exp $");
 
 #include "opt_compat.h"
 #ifndef COMPAT_43
diff --git a/sys/alpha/osf1/osf1_signal.h b/sys/alpha/osf1/osf1_signal.h
index ec1fbeba43ae..dca4a2e03d46 100644
--- a/sys/alpha/osf1/osf1_signal.h
+++ b/sys/alpha/osf1/osf1_signal.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/osf1/osf1_signal.h,v 1.3 2002/03/20 18:58:46 obrien Exp $ */
 
 #ifndef _OSF1_SIGNAL_H
 #define	_OSF1_SIGNAL_H
diff --git a/sys/alpha/osf1/osf1_syscall.h b/sys/alpha/osf1/osf1_syscall.h
index d42c07d44bf2..9a233f4d703b 100644
--- a/sys/alpha/osf1/osf1_syscall.h
+++ b/sys/alpha/osf1/osf1_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.11.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.11.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/alpha/osf1/osf1_sysent.c b/sys/alpha/osf1/osf1_sysent.c
index e815c3ce4e2e..4873d4146fc8 100644
--- a/sys/alpha/osf1/osf1_sysent.c
+++ b/sys/alpha/osf1/osf1_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.11.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.11.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/alpha/osf1/osf1_sysvec.c b/sys/alpha/osf1/osf1_sysvec.c
index 818255368215..384fa4a308fe 100644
--- a/sys/alpha/osf1/osf1_sysvec.c
+++ b/sys/alpha/osf1/osf1_sysvec.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.12 2005/01/29 23:11:57 sobomax Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/alpha/osf1/osf1_util.h b/sys/alpha/osf1/osf1_util.h
index f5a6ddf0addb..52311ca2b27b 100644
--- a/sys/alpha/osf1/osf1_util.h
+++ b/sys/alpha/osf1/osf1_util.h
@@ -25,7 +25,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/sys/alpha/osf1/osf1_util.h,v 1.8 2005/02/18 18:37:26 jhb Exp $
  */
 
 #include <vm/vm.h>
diff --git a/sys/alpha/osf1/syscalls.conf b/sys/alpha/osf1/syscalls.conf
index 466046a4a567..2e9e016e67c7 100644
--- a/sys/alpha/osf1/syscalls.conf
+++ b/sys/alpha/osf1/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/osf1/syscalls.conf,v 1.2 2003/12/24 00:32:07 peter Exp $
 sysnames="/dev/null"
 sysproto="osf1_proto.h"
 sysproto_h=_OSF1_SYSPROTO_H_
diff --git a/sys/alpha/osf1/syscalls.master b/sys/alpha/osf1/syscalls.master
index 1de440ade9a3..127d1a86c4c8 100644
--- a/sys/alpha/osf1/syscalls.master
+++ b/sys/alpha/osf1/syscalls.master
@@ -1,4 +1,4 @@
-;	$FreeBSD$
+;	$FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.11.2.1 2005/07/20 17:42:14 jhb Exp $
 
 ;       @(#)syscalls.master     8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from OSF1).
diff --git a/sys/alpha/pci/alphapci_if.m b/sys/alpha/pci/alphapci_if.m
index 32b0b5defbcb..36b1e048e9f7 100644
--- a/sys/alpha/pci/alphapci_if.m
+++ b/sys/alpha/pci/alphapci_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/pci/alphapci_if.m,v 1.2 2005/01/05 20:05:51 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index 3faf1e1ae826..8ebc7e1d671c 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.27 2005/01/05 20:05:51 imp Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c
index d074563b3bf4..6c4fd924bd49 100644
--- a/sys/alpha/pci/apecs_pci.c
+++ b/sys/alpha/pci/apecs_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/apecsreg.h b/sys/alpha/pci/apecsreg.h
index a9e180b507f8..c560b194248d 100644
--- a/sys/alpha/pci/apecsreg.h
+++ b/sys/alpha/pci/apecsreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/pci/apecsreg.h,v 1.3 2005/01/05 20:05:51 imp Exp $ */
 /* $NetBSD: apecsreg.h,v 1.7 1997/06/06 23:54:24 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/pci/apecsvar.h b/sys/alpha/pci/apecsvar.h
index 2c6987edc54f..176b7ff8498d 100644
--- a/sys/alpha/pci/apecsvar.h
+++ b/sys/alpha/pci/apecsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/apecsvar.h,v 1.4 2000/12/01 15:27:48 gallatin Exp $
  */
 
 struct device;
diff --git a/sys/alpha/pci/bwx.c b/sys/alpha/pci/bwx.c
index fd63ebb78f88..71150261cb01 100644
--- a/sys/alpha/pci/bwx.c
+++ b/sys/alpha/pci/bwx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/bwx.c,v 1.3 2003/08/22 07:20:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index 91deb356acd4..0094c33ec431 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -87,7 +87,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.44 2005/01/05 20:05:52 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index 69fd4f3c7242..a02ed0cd953d 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/cia_pci.c,v 1.18 2005/01/05 20:05:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/ciareg.h b/sys/alpha/pci/ciareg.h
index 4b5d153b5149..f02ed18c4afd 100644
--- a/sys/alpha/pci/ciareg.h
+++ b/sys/alpha/pci/ciareg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/pci/ciareg.h,v 1.3 2005/01/05 20:05:52 imp Exp $ */
 /* $NetBSD: ciareg.h,v 1.22 1998/06/06 20:40:14 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/pci/ciavar.h b/sys/alpha/pci/ciavar.h
index 1e50032dec90..fd16237f1206 100644
--- a/sys/alpha/pci/ciavar.h
+++ b/sys/alpha/pci/ciavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/ciavar.h,v 1.2 1999/08/28 00:39:01 peter Exp $
  */
 
 extern void cia_init(void);
diff --git a/sys/alpha/pci/irongate.c b/sys/alpha/pci/irongate.c
index a744c3db8e3a..5bb9db432ce0 100644
--- a/sys/alpha/pci/irongate.c
+++ b/sys/alpha/pci/irongate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/irongate.c,v 1.9 2003/08/22 07:20:27 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/pci/irongate_pci.c b/sys/alpha/pci/irongate_pci.c
index e3bdf6983a4b..96167d66415f 100644
--- a/sys/alpha/pci/irongate_pci.c
+++ b/sys/alpha/pci/irongate_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.10 2003/08/22 07:20:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/irongatereg.h b/sys/alpha/pci/irongatereg.h
index 0d10d1514717..2c1cd6b79105 100644
--- a/sys/alpha/pci/irongatereg.h
+++ b/sys/alpha/pci/irongatereg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/irongatereg.h,v 1.1 2000/06/19 21:15:45 gallatin Exp $
  */
 
 /*
diff --git a/sys/alpha/pci/irongatevar.h b/sys/alpha/pci/irongatevar.h
index 31012d97f8d5..75c5142e8e35 100644
--- a/sys/alpha/pci/irongatevar.h
+++ b/sys/alpha/pci/irongatevar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/irongatevar.h,v 1.1 2000/06/19 21:15:45 gallatin Exp $
  */
 
 extern void irongate_init(void);
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index e2795557d63a..7f528e0bafec 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/lca.c,v 1.21 2005/01/31 23:07:42 ticso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c
index 54a55d406459..5a57a6217d5d 100644
--- a/sys/alpha/pci/lca_pci.c
+++ b/sys/alpha/pci/lca_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/lcareg.h b/sys/alpha/pci/lcareg.h
index c6255d838449..e8ad8d6fd8f2 100644
--- a/sys/alpha/pci/lcareg.h
+++ b/sys/alpha/pci/lcareg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/pci/lcareg.h,v 1.4 2005/01/31 23:07:42 ticso Exp $ */
 /* $NetBSD: lcareg.h,v 1.8 1997/09/05 02:14:31 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/pci/lcavar.h b/sys/alpha/pci/lcavar.h
index ee53b755ffdd..aad57bff712e 100644
--- a/sys/alpha/pci/lcavar.h
+++ b/sys/alpha/pci/lcavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/lcavar.h,v 1.4 2000/12/01 15:27:48 gallatin Exp $
  */
 
 struct device;
diff --git a/sys/alpha/pci/pci_eb164_intr.s b/sys/alpha/pci/pci_eb164_intr.s
index 542839feea86..15c86cebc303 100644
--- a/sys/alpha/pci/pci_eb164_intr.s
+++ b/sys/alpha/pci/pci_eb164_intr.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/pci/pci_eb164_intr.s,v 1.5 2005/01/05 20:05:52 imp Exp $ */
 /* $NetBSD: pci_eb164_intr.s,v 1.5 1997/09/02 13:19:42 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/pci/pci_eb64plus_intr.s b/sys/alpha/pci/pci_eb64plus_intr.s
index ce33c2a3b401..a949e4bc88d7 100644
--- a/sys/alpha/pci/pci_eb64plus_intr.s
+++ b/sys/alpha/pci/pci_eb64plus_intr.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/pci/pci_eb64plus_intr.s,v 1.4 2005/01/05 20:05:52 imp Exp $ */
 /* $NetBSD: pci_eb64plus_intr.s,v 1.2 1997/09/02 13:19:43 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index 03fc77c02ba9..2bc0ee45efe0 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36 2005/01/05 20:05:52 imp Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/alpha/pci/pcibus.h b/sys/alpha/pci/pcibus.h
index 608b2a5cda3e..8b0031a4d522 100644
--- a/sys/alpha/pci/pcibus.h
+++ b/sys/alpha/pci/pcibus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/pcibus.h,v 1.5 2002/02/28 18:18:41 gallatin Exp $
  */
 
 void pci_init_resources(void);
diff --git a/sys/alpha/pci/swiz.c b/sys/alpha/pci/swiz.c
index fe25038970db..0e3b9bc02f1e 100644
--- a/sys/alpha/pci/swiz.c
+++ b/sys/alpha/pci/swiz.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/swiz.c,v 1.3 2003/08/22 07:20:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c
index b1c0b266a117..e2565071ccb2 100644
--- a/sys/alpha/pci/t2.c
+++ b/sys/alpha/pci/t2.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.22 2005/01/05 20:05:52 imp Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/pci/t2_pci.c b/sys/alpha/pci/t2_pci.c
index 44288a0daa23..dea2fc61e88e 100644
--- a/sys/alpha/pci/t2_pci.c
+++ b/sys/alpha/pci/t2_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/t2_pci.c,v 1.13 2003/08/22 07:20:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/pci/t2reg.h b/sys/alpha/pci/t2reg.h
index b8052018cb6b..820c38a9f234 100644
--- a/sys/alpha/pci/t2reg.h
+++ b/sys/alpha/pci/t2reg.h
@@ -45,7 +45,7 @@
  * *                                                               *
  * *****************************************************************
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/t2reg.h,v 1.3 2005/01/05 20:05:52 imp Exp $
  */
 
 
diff --git a/sys/alpha/pci/t2var.h b/sys/alpha/pci/t2var.h
index 73ec13e64fa5..d6401c2c550d 100644
--- a/sys/alpha/pci/t2var.h
+++ b/sys/alpha/pci/t2var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/t2var.h,v 1.5 2001/06/01 17:39:11 gallatin Exp $
  */
 
 extern vm_offset_t	sable_lynx_base;
diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c
index 23dd370916d8..51616813726d 100644
--- a/sys/alpha/pci/tsunami.c
+++ b/sys/alpha/pci/tsunami.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.24 2004/07/01 15:07:27 gallatin Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/alpha/pci/tsunami_pci.c b/sys/alpha/pci/tsunami_pci.c
index d0ee84d8d742..0a5f803edc98 100644
--- a/sys/alpha/pci/tsunami_pci.c
+++ b/sys/alpha/pci/tsunami_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.17 2004/07/01 15:07:27 gallatin Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/pci/tsunamireg.h b/sys/alpha/pci/tsunamireg.h
index 36ecaaf9779d..ca2cfca54435 100644
--- a/sys/alpha/pci/tsunamireg.h
+++ b/sys/alpha/pci/tsunamireg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/pci/tsunamireg.h,v 1.4 2002/09/23 05:55:10 peter Exp $ */
 
 /*
  * 21271 Chipset registers and constants.
diff --git a/sys/alpha/pci/tsunamivar.h b/sys/alpha/pci/tsunamivar.h
index 89cb2aba65cd..3140fa61baa3 100644
--- a/sys/alpha/pci/tsunamivar.h
+++ b/sys/alpha/pci/tsunamivar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/tsunamivar.h,v 1.3 1999/10/12 22:10:53 gallatin Exp $
  */
 
 extern void tsunami_init(void);
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index e95f10e5711f..ac85a9c6b3e8 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.28 2005/01/05 20:05:52 imp Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/alpha/tlsb/dwlpxreg.h b/sys/alpha/tlsb/dwlpxreg.h
index 826af3269be7..6539a23eeef2 100644
--- a/sys/alpha/tlsb/dwlpxreg.h
+++ b/sys/alpha/tlsb/dwlpxreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/dwlpxreg.h,v 1.5 2005/01/05 20:05:52 imp Exp $ */
 /* $NetBSD: dwlpxreg.h,v 1.9 1998/03/21 22:02:42 mjacob Exp $ */
 
 /*-
diff --git a/sys/alpha/tlsb/dwlpxvar.h b/sys/alpha/tlsb/dwlpxvar.h
index 7d880b1007ad..56b96ca14d6a 100644
--- a/sys/alpha/tlsb/dwlpxvar.h
+++ b/sys/alpha/tlsb/dwlpxvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/dwlpxvar.h,v 1.2 2005/01/05 20:05:52 imp Exp $ */
 /*-
  * Copyright (c) 2000 by Matthew Jacob
  * NASA AMES Research Center.
diff --git a/sys/alpha/tlsb/gbus.c b/sys/alpha/tlsb/gbus.c
index 092423b8972c..31db44b4a266 100644
--- a/sys/alpha/tlsb/gbus.c
+++ b/sys/alpha/tlsb/gbus.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/gbus.c,v 1.13 2005/01/05 20:05:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/tlsb/gbusreg.h b/sys/alpha/tlsb/gbusreg.h
index 3402185ac8b1..af6ec576b6b5 100644
--- a/sys/alpha/tlsb/gbusreg.h
+++ b/sys/alpha/tlsb/gbusreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/gbusreg.h,v 1.2 2000/05/01 20:17:51 peter Exp $ */
 /* $NetBSD: gbusreg.h,v 1.1 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tlsb/gbusvar.h b/sys/alpha/tlsb/gbusvar.h
index cc0bd8e47835..d0ff8c2fe8de 100644
--- a/sys/alpha/tlsb/gbusvar.h
+++ b/sys/alpha/tlsb/gbusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/gbusvar.h,v 1.4 1999/08/28 00:39:16 peter Exp $
  */
 /* $NetBSD: gbusvar.h,v 1.1 1998/05/13 02:50:29 thorpej Exp $ */
 
diff --git a/sys/alpha/tlsb/kftxx.c b/sys/alpha/tlsb/kftxx.c
index f0714e3cfcc2..5dfa44cd2b2b 100644
--- a/sys/alpha/tlsb/kftxx.c
+++ b/sys/alpha/tlsb/kftxx.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/kftxx.c,v 1.13 2005/01/05 20:05:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/tlsb/kftxxreg.h b/sys/alpha/tlsb/kftxxreg.h
index d4431d2ee56e..093db5731b17 100644
--- a/sys/alpha/tlsb/kftxxreg.h
+++ b/sys/alpha/tlsb/kftxxreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/kftxxreg.h,v 1.5 2005/01/05 20:05:52 imp Exp $ */
 /* $NetBSD: kftxxreg.h,v 1.5 1998/07/08 00:45:08 mjacob Exp $ */
 
 /*-
diff --git a/sys/alpha/tlsb/kftxxvar.h b/sys/alpha/tlsb/kftxxvar.h
index 2bdb24882dd2..e6f7ba1840d4 100644
--- a/sys/alpha/tlsb/kftxxvar.h
+++ b/sys/alpha/tlsb/kftxxvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/kftxxvar.h,v 1.4 1999/08/28 00:39:17 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/tlsb/mcclock_tlsb.c b/sys/alpha/tlsb/mcclock_tlsb.c
index bbbaa297a5ac..efc61addc939 100644
--- a/sys/alpha/tlsb/mcclock_tlsb.c
+++ b/sys/alpha/tlsb/mcclock_tlsb.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/mcclock_tlsb.c,v 1.10 2005/01/05 20:05:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/tlsb/tlsb.c b/sys/alpha/tlsb/tlsb.c
index 34b6686b3a7b..31e72f5de8f5 100644
--- a/sys/alpha/tlsb/tlsb.c
+++ b/sys/alpha/tlsb/tlsb.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsb.c,v 1.17 2005/01/05 20:05:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/tlsb/tlsbcpu.c b/sys/alpha/tlsb/tlsbcpu.c
index 68fa84aef18a..5c02e19fb46f 100644
--- a/sys/alpha/tlsb/tlsbcpu.c
+++ b/sys/alpha/tlsb/tlsbcpu.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsbcpu.c,v 1.6 2005/01/05 20:05:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/tlsb/tlsbmem.c b/sys/alpha/tlsb/tlsbmem.c
index 778601f297f7..ac9c1a50fa42 100644
--- a/sys/alpha/tlsb/tlsbmem.c
+++ b/sys/alpha/tlsb/tlsbmem.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsbmem.c,v 1.6 2005/01/05 20:05:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/alpha/tlsb/tlsbreg.h b/sys/alpha/tlsb/tlsbreg.h
index cfff1c82e5c7..2390f6253fae 100644
--- a/sys/alpha/tlsb/tlsbreg.h
+++ b/sys/alpha/tlsb/tlsbreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/tlsbreg.h,v 1.3 2005/01/05 20:05:52 imp Exp $ */
 /* $NetBSD: tlsbreg.h,v 1.5 2000/01/27 22:27:50 mjacob Exp $ */
 
 /*-
diff --git a/sys/alpha/tlsb/tlsbvar.h b/sys/alpha/tlsb/tlsbvar.h
index 238f9082b092..a2d57a488361 100644
--- a/sys/alpha/tlsb/tlsbvar.h
+++ b/sys/alpha/tlsb/tlsbvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/tlsbvar.h,v 1.5 2005/01/05 20:05:52 imp Exp $ */
 /* $NetBSD: tlsbvar.h,v 1.5 1998/05/13 23:23:23 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 22093b27069d..b6ea7ac3f604 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.49 2004/10/18 21:51:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/alpha/tlsb/zsreg.h b/sys/alpha/tlsb/zsreg.h
index f087a7ba55fe..ccf7167fc46f 100644
--- a/sys/alpha/tlsb/zsreg.h
+++ b/sys/alpha/tlsb/zsreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/zsreg.h,v 1.3 1999/08/28 00:39:18 peter Exp $
  */
 
 #define ZSC_CHANNELA	0x80
diff --git a/sys/alpha/tlsb/zsvar.h b/sys/alpha/tlsb/zsvar.h
index 84701544274b..c4abb3ad4f04 100644
--- a/sys/alpha/tlsb/zsvar.h
+++ b/sys/alpha/tlsb/zsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/zsvar.h,v 1.2 1999/08/28 00:39:18 peter Exp $
  */
 
 int zs_cnattach(vm_offset_t base, vm_offset_t offset);
diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index b7d021a7d3d1..1cf099312a62 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/Makefile,v 1.11 2002/06/21 06:18:02 mckusick Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c
index f12b42fd0bfa..e477f8ba238c 100644
--- a/sys/amd64/acpica/OsdEnvironment.c
+++ b/sys/amd64/acpica/OsdEnvironment.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $");
 
 /*
  * 6.1 : Environmental support
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 1a3263c027f3..8a3da0d2fe83 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index a82fbcd3c6ad..53b544220122 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.21 2003/08/28 16:30:31 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c
index 93442e3650b0..53ec6066c77a 100644
--- a/sys/amd64/acpica/madt.c
+++ b/sys/amd64/acpica/madt.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16 2005/04/15 18:44:53 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index 9264a2b2a81c..2c1336cb0fd7 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 5d7685b1d6a0..ca488f31af55 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.103 2005/06/30 05:33:26 peter Exp $
  */
 
 /*
diff --git a/sys/amd64/amd64/atomic.c b/sys/amd64/amd64/atomic.c
index 1b4ff7eaa693..b112258b93b1 100644
--- a/sys/amd64/amd64/atomic.c
+++ b/sys/amd64/amd64/atomic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.5 2003/07/25 21:15:44 obrien Exp $");
 
 /* This file creates publically callable functions to perform various
  * simple arithmetic on memory which is atomic in the presence of
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index ee3274040390..c5e0a270e584 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.182 2005/05/29 23:44:22 marcel Exp $");
 
 /*
  * Setup the system to run on the current machine.
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index d08f5ccd160c..3a91f959123c 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bios.c,v 1.72 2004/09/24 01:08:34 peter Exp $");
 
 /*
  * Subset of the i386 bios support code.  We cannot make bios16 nor bios32
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 3c9a7e001fd1..f51738015a21 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.70 2005/03/12 07:05:59 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 881d514fed1d..3d9d1b3b413f 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.151 2004/08/16 22:53:29 peter Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index 97582df9edc6..fa574108bf89 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.30 2005/03/30 22:57:41 peter Exp $");
 
 /*
  * Instruction disassembler.
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index b2976167bd6b..a6a0c54ca435 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.81 2005/01/05 20:17:20 imp Exp $");
 
 /*
  * Interface to new debugger.
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 4cc901fbea15..06dfb0ae465f 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.66.2.1 2005/09/03 11:57:28 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/dump_machdep.c b/sys/amd64/amd64/dump_machdep.c
index d9badb78ea7e..412f1cf05f0a 100644
--- a/sys/amd64/amd64/dump_machdep.c
+++ b/sys/amd64/amd64/dump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index 11a71a5f3876..158f2999a30e 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.22 2004/08/11 02:35:04 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 9b87cee04bc8..64ad242c9b08 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.125.2.1 2005/09/03 11:57:28 jkoshy Exp $
  */
 
 #include "opt_atpic.h"
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index eeb39e808c43..d1f649497d63 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/gdb_machdep.c b/sys/amd64/amd64/gdb_machdep.c
index dd775e332f19..769760edc715 100644
--- a/sys/amd64/amd64/gdb_machdep.c
+++ b/sys/amd64/amd64/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.4 2005/01/05 20:17:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 6157348d0b13..4feb32bd6906 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.155.2.1 2005/09/03 11:57:28 jkoshy Exp $");
 
 #include "opt_compat.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 40004488af0f..8c66138f2cef 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.136 2005/05/29 17:43:23 schweikh Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/amd64/in_cksum.c b/sys/amd64/amd64/in_cksum.c
index ae02e91d9203..966449f90fdc 100644
--- a/sys/amd64/amd64/in_cksum.c
+++ b/sys/amd64/amd64/in_cksum.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.5 2005/01/05 20:17:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index 88b7dc01f5b6..16cf708882d5 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.48 2004/06/08 01:02:51 peter Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/amd64/intr_machdep.c b/sys/amd64/amd64/intr_machdep.c
index 0e0ee9562188..b32cf4e2f683 100644
--- a/sys/amd64/amd64/intr_machdep.c
+++ b/sys/amd64/amd64/intr_machdep.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.15 2005/06/24 00:45:01 peter Exp $
  */
 
 /*
diff --git a/sys/amd64/amd64/io.c b/sys/amd64/amd64/io.c
index 1aaf2ef63282..34336647732d 100644
--- a/sys/amd64/amd64/io.c
+++ b/sys/amd64/amd64/io.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/amd64/amd64/io_apic.c b/sys/amd64/amd64/io_apic.c
index 016bd6184787..4cd7da63e0a2 100644
--- a/sys/amd64/amd64/io_apic.c
+++ b/sys/amd64/amd64/io_apic.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15 2005/04/15 18:44:53 peter Exp $");
 
 #include "opt_atpic.h"
 #include "opt_isa.h"
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index 01c497f98c65..9cb5ddbb2c62 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.59 2005/02/15 07:26:28 njl Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c
index 9ae15e9f5e40..7198d682d624 100644
--- a/sys/amd64/amd64/local_apic.c
+++ b/sys/amd64/amd64/local_apic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17 2005/06/24 00:45:01 peter Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 55cda3ab1863..50827fc7ecf1 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.175 2003/05/31 06:54:28 peter Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 5345dc1318e9..45871bbf3235 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.638.2.1 2005/10/02 16:38:12 cperciva Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index f3280d0dfc75..adf2df61d4a6 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.121 2004/08/07 06:21:37 scottl Exp $");
 
 /*
  * Memory special file
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 3336cf7b273e..71ca369ebd7a 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.2 2005/08/30 15:14:40 pjd Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kdb.h"
diff --git a/sys/amd64/amd64/mp_watchdog.c b/sys/amd64/amd64/mp_watchdog.c
index bc5e6d2edc67..102cd6c1b1c4 100644
--- a/sys/amd64/amd64/mp_watchdog.c
+++ b/sys/amd64/amd64/mp_watchdog.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.4 2005/02/28 08:55:53 pjd Exp $
  */
 
 #include "opt_mp_watchdog.h"
diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index ec30c72ecb9b..33921960a7f6 100644
--- a/sys/amd64/amd64/mpboot.S
+++ b/sys/amd64/amd64/mpboot.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.26 2004/06/08 01:02:52 peter Exp $
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 5ce5c79099ab..90f16e48444c 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236 2005/04/15 18:44:53 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/mptable_pci.c b/sys/amd64/amd64/mptable_pci.c
index 5a3437321fd9..9cc7397419ca 100644
--- a/sys/amd64/amd64/mptable_pci.c
+++ b/sys/amd64/amd64/mptable_pci.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.2.8.1 2005/09/18 02:55:09 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index 1de744de3e63..8aebcad85d5e 100644
--- a/sys/amd64/amd64/nexus.c
+++ b/sys/amd64/amd64/nexus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.66 2005/03/18 11:57:43 phk Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 59bc89e507d2..c2297a9c3cc4 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.516.4.1 2005/10/28 06:49:18 ade Exp $");
 
 /*
  *	Manages physical address maps.
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index d78365f18c6b..60d1b3ddf533 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.24 2005/05/14 09:10:00 nyan Exp $");
 
 #ifdef GUPROF
 #if 0
diff --git a/sys/amd64/amd64/sigtramp.S b/sys/amd64/amd64/sigtramp.S
index a05ea8587b56..0ce6d87a1b2a 100644
--- a/sys/amd64/amd64/sigtramp.S
+++ b/sys/amd64/amd64/sigtramp.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/sigtramp.S,v 1.1 2003/05/01 01:05:21 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 49ef65b0fcd3..e8db6dd4398f 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.115 2005/06/24 00:45:01 peter Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 7f022d00bcce..87f27b1216f3 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.90 2005/07/10 23:31:10 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 95b79820f416..1da70c75b22c 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.289.2.2 2005/10/07 14:00:02 glebius Exp $");
 
 /*
  * AMD64 Trap and System call handling
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 6a5b17c2e90d..d91e27584f1e 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.205 2003/11/17 08:58:13 peter Exp $");
 
 #include "opt_clock.h"
 
diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c
index d3897cf14d9a..ee21abc03201 100644
--- a/sys/amd64/amd64/uio_machdep.c
+++ b/sys/amd64/amd64/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.6 2005/01/05 20:17:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/amd64/uma_machdep.c b/sys/amd64/amd64/uma_machdep.c
index 85cf720bc3f5..7770df463171 100644
--- a/sys/amd64/amd64/uma_machdep.c
+++ b/sys/amd64/amd64/uma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.1 2003/10/14 05:51:31 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 424adafc5bb3..a3b3fa9f4d69 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.248 2005/07/10 23:31:10 davidxu Exp $");
 
 #include "opt_isa.h"
 #include "opt_cpu.h"
diff --git a/sys/amd64/compile/.cvsignore b/sys/amd64/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/amd64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/amd64/conf/.cvsignore b/sys/amd64/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/amd64/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index cf822b3a9666..4f457a679949 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.2.4.1 2005/10/28 19:22:41 jhb Exp $
 
 # Not yet, this would break all existing configs
 #machine		amd64
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 9270d568f951..7b8f6ea2a8a9 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.6.2.1 2005/10/28 19:22:41 jhb Exp $
 
 machine		amd64
 cpu		HAMMER
diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints
index 4d28c16ad9b9..5186f968d368 100644
--- a/sys/amd64/conf/GENERIC.hints
+++ b/sys/amd64/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.15 2004/07/22 22:28:34 imp Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
diff --git a/sys/amd64/conf/Makefile b/sys/amd64/conf/Makefile
index 2c006e9c2c80..b4888a02a6dd 100644
--- a/sys/amd64/conf/Makefile
+++ b/sys/amd64/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index dbaf17d65313..88c9871c2d60 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.5 2005/10/07 14:00:03 glebius Exp $
 #
 
 #
diff --git a/sys/amd64/conf/SMP b/sys/amd64/conf/SMP
index e2c6c4324112..1120ac6c0586 100644
--- a/sys/amd64/conf/SMP
+++ b/sys/amd64/conf/SMP
@@ -2,7 +2,7 @@
 # SMP -- Generic kernel configuration file for FreeBSD/amd64 SMP
 #	 Use this for multi-processor machines
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/SMP,v 1.1.6.1 2005/09/18 03:37:58 scottl Exp $
 
 include GENERIC
 
diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S
index c65634e268f1..afbe140c1fc7 100644
--- a/sys/amd64/ia32/ia32_exception.S
+++ b/sys/amd64/ia32/ia32_exception.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.4 2004/05/24 11:28:11 bde Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/amd64/ia32/ia32_reg.c b/sys/amd64/ia32/ia32_reg.c
index b66dbbd58eee..d7ae82d581b3 100644
--- a/sys/amd64/ia32/ia32_reg.c
+++ b/sys/amd64/ia32/ia32_reg.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.1.4.1 2005/10/26 22:07:03 peter Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.1.4.1 2005/10/26 22:07:03 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c
index 58aeb3d4c74c..2feeb73ffdcc 100644
--- a/sys/amd64/ia32/ia32_signal.c
+++ b/sys/amd64/ia32/ia32_signal.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.10 2004/04/05 23:55:14 imp Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/amd64/ia32/ia32_sigtramp.S b/sys/amd64/ia32/ia32_sigtramp.S
index 0387cb7f34f7..3d9d904aa106 100644
--- a/sys/amd64/ia32/ia32_sigtramp.S
+++ b/sys/amd64/ia32/ia32_sigtramp.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_sigtramp.S,v 1.2 2003/08/22 23:19:02 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index f159cfb645cb..5506a4a06e12 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.8 2005/04/12 23:18:53 jhb Exp $");
 
 /*
  * 386 Trap and System call handling
diff --git a/sys/amd64/include/_bus.h b/sys/amd64/include/_bus.h
index a8cbf4810c75..aa2a1970494d 100644
--- a/sys/amd64/include/_bus.h
+++ b/sys/amd64/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef AMD64_INCLUDE__BUS_H
diff --git a/sys/amd64/include/_inttypes.h b/sys/amd64/include/_inttypes.h
index e6b2536ff379..849e6501a05b 100644
--- a/sys/amd64/include/_inttypes.h
+++ b/sys/amd64/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.3 2003/05/01 01:05:23 peter Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/amd64/include/_limits.h b/sys/amd64/include/_limits.h
index fdea69e353e7..dd5fccca84b0 100644
--- a/sys/amd64/include/_limits.h
+++ b/sys/amd64/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.10 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/amd64/include/_stdint.h b/sys/amd64/include/_stdint.h
index 0c56c6d4e1fa..b72eade0fdda 100644
--- a/sys/amd64/include/_stdint.h
+++ b/sys/amd64/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.3 2004/05/18 16:04:56 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/amd64/include/_types.h b/sys/amd64/include/_types.h
index 4217c82b060b..d6837ed4b46a 100644
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_types.h,v 1.9 2005/07/02 23:13:30 thompsa Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/amd64/include/acpica_machdep.h b/sys/amd64/include/acpica_machdep.h
index 14cf85a5d4bf..b512dfa8a5d9 100644
--- a/sys/amd64/include/acpica_machdep.h
+++ b/sys/amd64/include/acpica_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.6 2004/10/11 05:39:15 njl Exp $
  */
 
 /******************************************************************************
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index d5d5dc39ac67..70762b8da092 100644
--- a/sys/amd64/include/apicreg.h
+++ b/sys/amd64/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.28 2005/01/21 06:01:20 peter Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_
diff --git a/sys/amd64/include/apicvar.h b/sys/amd64/include/apicvar.h
index eb05c6afce98..d5b0add31d23 100644
--- a/sys/amd64/include/apicvar.h
+++ b/sys/amd64/include/apicvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.13 2005/06/09 18:23:54 ups Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index e1f2e4b51f48..11658d254ee9 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 7ca8c62afdb8..c98acd3c9bca 100644
--- a/sys/amd64/include/asmacros.h
+++ b/sys/amd64/include/asmacros.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.28 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index dc0f3e9c0fa4..dce35ab82806 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.34.2.4 2005/10/06 18:12:05 jhb Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index b1a91a27b2d1..bf2abe2060d2 100644
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.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/sys/amd64/include/bus.h,v 1.16 2005/05/29 04:42:15 nyan Exp $
  */
 
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 9820d310adba..9d01d455bea6 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.29 2005/03/14 16:46:27 scottl Exp $ */
 
 #ifndef _AMD64_BUS_DMA_H_
 #define _AMD64_BUS_DMA_H_
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 3d0fa4a820d4..63a04ea54773 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.50 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index f069d2ebebb8..ed001d54b933 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.74 2004/08/03 18:44:26 mux Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 2c5fcb2acda1..6ffb9933af9a 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.148 2005/05/13 00:05:55 nectar Exp $
  */
 
 /*
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index 6b0e8fda4681..6978159ad776 100644
--- a/sys/amd64/include/cputypes.h
+++ b/sys/amd64/include/cputypes.h
@@ -24,7 +24,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/sys/amd64/include/cputypes.h,v 1.19 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index 29e385e3af0c..ffd6193881b2 100644
--- a/sys/amd64/include/db_machdep.h
+++ b/sys/amd64/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.22 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h
index be1d3a032b3f..975357afa5f8 100644
--- a/sys/amd64/include/elf.h
+++ b/sys/amd64/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/amd64/include/endian.h b/sys/amd64/include/endian.h
index 24e59e42889f..5455cbe0387a 100644
--- a/sys/amd64/include/endian.h
+++ b/sys/amd64/include/endian.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index 8d07887be252..7c4a2bb8e91f 100644
--- a/sys/amd64/include/exec.h
+++ b/sys/amd64/include/exec.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/exec.h,v 1.10 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index 52b899f6e4ce..001dedc09732 100644
--- a/sys/amd64/include/float.h
+++ b/sys/amd64/include/float.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/float.h,v 1.15 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index cda9e46230ca..80f14ca3c9fa 100644
--- a/sys/amd64/include/floatingpoint.h
+++ b/sys/amd64/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/floatingpoint.h,v 1.14 2005/04/02 17:31:42 netchild Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 88932ed39135..04b205b15ec6 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.33 2004/04/05 21:25:51 imp Exp $
  */
 
 /*
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index 199654696dec..8ca236e83242 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/include/frame.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/frame.h,v 1.28 2004/07/10 22:39:56 marcel Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/amd64/include/gdb_machdep.h b/sys/amd64/include/gdb_machdep.h
index a914b9ba2d3c..b39af8fd65f6 100644
--- a/sys/amd64/include/gdb_machdep.h
+++ b/sys/amd64/include/gdb_machdep.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/sys/amd64/include/gdb_machdep.h,v 1.3 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index 196f79f12116..096cabd3a548 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.14 2005/04/12 23:12:00 jhb Exp $
  */
 
 /*
diff --git a/sys/amd64/include/in_cksum.h b/sys/amd64/include/in_cksum.h
index adfde8f22d1b..dd01b40e2a44 100644
--- a/sys/amd64/include/in_cksum.h
+++ b/sys/amd64/include/in_cksum.h
@@ -29,7 +29,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.5 2005/03/11 22:16:09 peter Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/amd64/include/intr_machdep.h b/sys/amd64/include/intr_machdep.h
index ff193467788b..ee776efcd0ea 100644
--- a/sys/amd64/include/intr_machdep.h
+++ b/sys/amd64/include/intr_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.5 2005/01/21 06:01:20 peter Exp $
  */
 
 #ifndef __MACHINE_INTR_MACHDEP_H__
diff --git a/sys/amd64/include/iodev.h b/sys/amd64/include/iodev.h
index 2273620ccba4..cf51165a7f6e 100644
--- a/sys/amd64/include/iodev.h
+++ b/sys/amd64/include/iodev.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/sys/amd64/include/iodev.h,v 1.1 2004/08/01 11:40:51 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/amd64/include/kdb.h b/sys/amd64/include/kdb.h
index ba359140beb7..840275cdf1a2 100644
--- a/sys/amd64/include/kdb.h
+++ b/sys/amd64/include/kdb.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/sys/amd64/include/kdb.h,v 1.2 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/amd64/include/legacyvar.h b/sys/amd64/include/legacyvar.h
index 91f784f1f143..e70d5c6d0c0c 100644
--- a/sys/amd64/include/legacyvar.h
+++ b/sys/amd64/include/legacyvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.6.2.1 2005/09/18 02:55:10 imp Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h
index 35eea1f619de..95a146c56807 100644
--- a/sys/amd64/include/limits.h
+++ b/sys/amd64/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/limits.h,v 1.10 2005/03/02 21:33:21 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 2e36bd815d0e..642c718d6c90 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.75 2004/06/10 20:30:55 jhb Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/amd64/include/memdev.h b/sys/amd64/include/memdev.h
index b6d31220cb93..50f556a87d8f 100644
--- a/sys/amd64/include/memdev.h
+++ b/sys/amd64/include/memdev.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/sys/amd64/include/memdev.h,v 1.1 2004/08/01 11:40:51 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/amd64/include/metadata.h b/sys/amd64/include/metadata.h
index 84e6f8739970..09d78e7c9fff 100644
--- a/sys/amd64/include/metadata.h
+++ b/sys/amd64/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.2 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/amd64/include/mp_watchdog.h b/sys/amd64/include/mp_watchdog.h
index bcec051a942f..78c2889e660f 100644
--- a/sys/amd64/include/mp_watchdog.h
+++ b/sys/amd64/include/mp_watchdog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/mp_watchdog.h,v 1.1 2004/08/15 18:02:09 rwatson Exp $
  */
 
 #ifndef	_MACHINE_MP_WATCHDOG_H_
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index aad99ed2d7f7..6c2ac998c679 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.222 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef __MACHINE_MPTABLE_H__
diff --git a/sys/amd64/include/mutex.h b/sys/amd64/include/mutex.h
index 919a4415ef8a..d3557ab95489 100644
--- a/sys/amd64/include/mutex.h
+++ b/sys/amd64/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.38 2003/12/06 23:17:18 peter Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index 39ce1ffd3279..d1722e38015e 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.18 2005/06/29 15:13:25 jhb Exp $
  */
 
 /*
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index 87279727afec..7892393b49d9 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.18 2004/09/24 00:42:36 peter Exp $
  */
 
 #ifndef _MACHINE_PC_BIOS_H_
diff --git a/sys/amd64/include/pc/display.h b/sys/amd64/include/pc/display.h
index cd2d5ff35b73..f8173c317b2a 100644
--- a/sys/amd64/include/pc/display.h
+++ b/sys/amd64/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pc/display.h,v 1.7 2005/01/05 20:11:13 imp Exp $
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 305b7ff895fe..ea2fc51dbbb6 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.60 2004/07/10 19:55:58 marcel Exp $
  */
 
 #ifndef _AMD64_PCB_H_
diff --git a/sys/amd64/include/pcb_ext.h b/sys/amd64/include/pcb_ext.h
index 6d1bde2d5f84..34f530a0a0b1 100644
--- a/sys/amd64/include/pcb_ext.h
+++ b/sys/amd64/include/pcb_ext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pcb_ext.h,v 1.10 2003/05/01 01:05:23 peter Exp $
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/amd64/include/pci_cfgreg.h b/sys/amd64/include/pci_cfgreg.h
index 1df8972a4447..2026b3ee9b04 100644
--- a/sys/amd64/include/pci_cfgreg.h
+++ b/sys/amd64/include/pci_cfgreg.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/sys/amd64/include/pci_cfgreg.h,v 1.13 2005/01/05 20:17:20 imp Exp $
  *
  */
 
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index 414bd9335aa1..747b1fadd462 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 504d9f8c1984..57bba1ca0658 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -39,7 +39,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.127 2005/06/29 22:28:45 peter Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/amd64/include/pmc_mdep.h b/sys/amd64/include/pmc_mdep.h
index 4a676587fcbe..7a55250611af 100644
--- a/sys/amd64/include/pmc_mdep.h
+++ b/sys/amd64/include/pmc_mdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.3 2005/06/09 19:45:06 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/amd64/include/ppireg.h b/sys/amd64/include/ppireg.h
index 5774757ce67a..846069827f83 100644
--- a/sys/amd64/include/ppireg.h
+++ b/sys/amd64/include/ppireg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/ppireg.h,v 1.1 2005/05/14 09:10:00 nyan Exp $
  */
 
 #ifndef _MACHINE_PPIREG_H_
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index ba6354b68dce..a44a440d8d7e 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24 2005/04/04 21:53:52 jhb Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index 44bb6e7c4b97..d7d63612e5f7 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/profile.h,v 1.45 2005/03/11 22:16:09 peter Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 07c21ea6e8e8..a57c9c0d5b7f 100644
--- a/sys/amd64/include/psl.h
+++ b/sys/amd64/include/psl.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/psl.h,v 1.13 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index eef24f829b48..0b35522bf5e4 100644
--- a/sys/amd64/include/ptrace.h
+++ b/sys/amd64/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/ptrace.h,v 1.13 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index 32d0f3bb05f7..316b9f015dc7 100644
--- a/sys/amd64/include/reg.h
+++ b/sys/amd64/include/reg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/reg.h,v 1.35 2004/04/05 23:55:14 imp Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index 188319323399..b2a15c090b9d 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/reloc.h,v 1.8 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/amd64/include/resource.h b/sys/amd64/include/resource.h
index edde5eb29908..96d8f182c12d 100644
--- a/sys/amd64/include/resource.h
+++ b/sys/amd64/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/amd64/include/resource.h,v 1.4 2005/01/05 20:17:20 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/amd64/include/runq.h b/sys/amd64/include/runq.h
index 855e315b6847..79af4b1826ec 100644
--- a/sys/amd64/include/runq.h
+++ b/sys/amd64/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/runq.h,v 1.4 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 4de820b13412..1403fea7ffaf 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/segments.h,v 1.38 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/amd64/include/setjmp.h b/sys/amd64/include/setjmp.h
index 2c17b5d1768d..0d0b7b46d987 100644
--- a/sys/amd64/include/setjmp.h
+++ b/sys/amd64/include/setjmp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.9 2003/06/02 21:49:35 peter Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/amd64/include/sf_buf.h b/sys/amd64/include/sf_buf.h
index b5245e63d210..44ca3a3b9f8d 100644
--- a/sys/amd64/include/sf_buf.h
+++ b/sys/amd64/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.3 2005/02/28 23:38:15 peter Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/amd64/include/sigframe.h b/sys/amd64/include/sigframe.h
index d104507d52f8..fdca8cd73b66 100644
--- a/sys/amd64/include/sigframe.h
+++ b/sys/amd64/include/sigframe.h
@@ -25,7 +25,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/sys/amd64/include/sigframe.h,v 1.9 2003/05/01 01:05:23 peter Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 412a34f2f817..cdb3aa268ccc 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/signal.h,v 1.28 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index 2c63dc9ce1ca..53db08ff363a 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.84 2005/04/30 20:00:58 dwhite Exp $
  *
  */
 
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index 37f232874a9d..9325b04d0261 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.30 2004/06/08 01:02:52 peter Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/amd64/include/stdarg.h b/sys/amd64/include/stdarg.h
index a0c1662ce74b..2b682b4d49bd 100644
--- a/sys/amd64/include/stdarg.h
+++ b/sys/amd64/include/stdarg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.8 2005/03/11 22:16:09 peter Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index 67c8a4ae99b5..bf170747bfdf 100644
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.24 2005/04/14 16:57:58 peter Exp $
  */
 
 /*
diff --git a/sys/amd64/include/timerreg.h b/sys/amd64/include/timerreg.h
index 0ab7d40510a7..fdb016ee6efb 100644
--- a/sys/amd64/include/timerreg.h
+++ b/sys/amd64/include/timerreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/timerreg.h,v 1.2 2005/05/28 13:40:26 nyan Exp $
  */
 
 /*
diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h
index 2a1e12015a03..226ff4db096c 100644
--- a/sys/amd64/include/trap.h
+++ b/sys/amd64/include/trap.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/trap.h,v 1.14 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index fbbe3aff4189..da80fa4f1d3a 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/tss.h,v 1.18 2005/04/15 18:39:31 peter Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/amd64/include/ucontext.h b/sys/amd64/include/ucontext.h
index 5c1380336321..0d2d3db136e3 100644
--- a/sys/amd64/include/ucontext.h
+++ b/sys/amd64/include/ucontext.h
@@ -26,7 +26,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/sys/amd64/include/ucontext.h,v 1.18 2003/11/08 04:39:22 peter Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index 93faac6a84dd..659236e5762a 100644
--- a/sys/amd64/include/varargs.h
+++ b/sys/amd64/include/varargs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.14 2005/03/11 22:16:09 peter Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 954cebc3d8b3..57a59b97442e 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $
  */
 
 
diff --git a/sys/amd64/isa/atpic.c b/sys/amd64/isa/atpic.c
index f6d3fb1b4de1..b532b2a2eb39 100644
--- a/sys/amd64/isa/atpic.c
+++ b/sys/amd64/isa/atpic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.15 2005/01/21 06:01:20 peter Exp $");
 
 #include "opt_auto_eoi.h"
 #include "opt_isa.h"
diff --git a/sys/amd64/isa/atpic_vector.S b/sys/amd64/isa/atpic_vector.S
index 37390a062dbf..ff4a3a2edaa1 100644
--- a/sys/amd64/isa/atpic_vector.S
+++ b/sys/amd64/isa/atpic_vector.S
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.45 2004/05/24 12:08:56 bde Exp $
  */
 
 /*
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index e875610e13b2..1c8e614d2aee 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.221.2.1 2005/07/18 19:52:04 jhb Exp $");
 
 /*
  * Routines to handle clock hardware.
diff --git a/sys/amd64/isa/elcr.c b/sys/amd64/isa/elcr.c
index 266d78396db9..9dcee88b6bb8 100644
--- a/sys/amd64/isa/elcr.c
+++ b/sys/amd64/isa/elcr.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/elcr.c,v 1.2 2005/01/21 06:01:20 peter Exp $");
 
 /*
  * The ELCR is a register that controls the trigger mode and polarity of
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h
index f25fac6b83f9..f4d1271bbf5c 100644
--- a/sys/amd64/isa/icu.h
+++ b/sys/amd64/isa/icu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.34 2004/05/16 20:30:47 peter Exp $
  */
 
 /*
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 9ac9c32e76a0..fd9c9dd5c90d 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.148 2005/01/21 05:56:41 peter Exp $");
 
 /*-
  * Modifications for Intel architecture by Garrett A. Wollman.
diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index 3c58e6c600ca..63d06b05348e 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.29 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
diff --git a/sys/amd64/isa/isa_dma.c b/sys/amd64/isa/isa_dma.c
index ffd3baaddbae..a41e6917872d 100644
--- a/sys/amd64/isa/isa_dma.c
+++ b/sys/amd64/isa/isa_dma.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.22 2005/05/14 10:14:56 nyan Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 887879a31998..1b1dd951ad0b 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/nmi.c,v 1.80 2004/05/16 20:30:47 peter Exp $");
 
 #include "opt_mca.h"
 
diff --git a/sys/amd64/linux32/Makefile b/sys/amd64/linux32/Makefile
index ae4f1078a2ad..3b9c9144f2e4 100644
--- a/sys/amd64/linux32/Makefile
+++ b/sys/amd64/linux32/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/linux32/Makefile,v 1.1 2004/08/16 07:55:06 tjr Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h
index 7362b228cbfb..882796fde7af 100644
--- a/sys/amd64/linux32/linux.h
+++ b/sys/amd64/linux32/linux.h
@@ -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/sys/amd64/linux32/linux.h,v 1.1 2004/08/16 07:55:06 tjr Exp $
  */
 
 #ifndef _AMD64_LINUX_LINUX_H_
diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy.c
index 5322c8e9bee5..7698ea0e8782 100644
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.1 2004/08/16 07:55:06 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/linux32/linux32_genassym.c b/sys/amd64/linux32/linux32_genassym.c
index de7726d19c88..41fa0580cbac 100644
--- a/sys/amd64/linux32/linux32_genassym.c
+++ b/sys/amd64/linux32/linux32_genassym.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.1 2004/08/16 07:55:06 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
diff --git a/sys/amd64/linux32/linux32_ipc64.h b/sys/amd64/linux32/linux32_ipc64.h
index f8c92c4803ec..81ebba872edd 100644
--- a/sys/amd64/linux32/linux32_ipc64.h
+++ b/sys/amd64/linux32/linux32_ipc64.h
@@ -25,7 +25,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/sys/amd64/linux32/linux32_ipc64.h,v 1.1 2004/08/16 07:55:06 tjr Exp $
  */
 
 #ifndef _AMD64_LINUX_LINUX_IPC64_H_
diff --git a/sys/amd64/linux32/linux32_locore.s b/sys/amd64/linux32/linux32_locore.s
index 6c3d2082e87a..caca0f1a1b57 100644
--- a/sys/amd64/linux32/linux32_locore.s
+++ b/sys/amd64/linux32/linux32_locore.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.1 2004/08/16 07:55:06 tjr Exp $ */
 
 #include "linux32_assym.h"			/* system definitions */
 #include <machine/asmacros.h>			/* miscellaneous asm macros */
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index 7f738bb5b2b8..259f2fcc867b 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10 2005/06/24 17:41:27 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index 73851e653fad..65393f7dc271 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.5.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index 5036854349a6..44b232dc3d7e 100644
--- a/sys/amd64/linux32/linux32_syscall.h
+++ b/sys/amd64/linux32/linux32_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.5.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index c628116dcafe..b967658ac921 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.5.2.1 2005/07/20 17:43:52 jhb Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.1 2005/07/20 17:42:14 jhb Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index fdef0133ba38..6c46743876dc 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.7.2.1 2005/10/03 20:08:00 ups Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/amd64/linux32/syscalls.conf b/sys/amd64/linux32/syscalls.conf
index 8c57f888ab0d..109128b40734 100644
--- a/sys/amd64/linux32/syscalls.conf
+++ b/sys/amd64/linux32/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/linux32/syscalls.conf,v 1.1 2004/08/16 07:55:06 tjr Exp $
 sysnames="/dev/null"
 sysproto="linux32_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
index 8e38b5ffcdd1..83d415675265 100644
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.1 2005/07/20 17:42:14 jhb Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 15eccf70ac76..774ac91a2a0b 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.113.2.1 2005/09/18 02:55:10 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index e4a5a2a80df1..163c1be8dc6b 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.108 2005/01/21 05:56:41 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/autoconf.c b/sys/arm/arm/autoconf.c
index 417639894bff..9802dd60a293 100644
--- a/sys/arm/arm/autoconf.c
+++ b/sys/arm/arm/autoconf.c
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/autoconf.c,v 1.3 2005/05/29 23:44:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/bcopy_page.S b/sys/arm/arm/bcopy_page.S
index 9e13c5dbdf28..170eca6f0c05 100644
--- a/sys/arm/arm/bcopy_page.S
+++ b/sys/arm/arm/bcopy_page.S
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #include <machine/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 #ifndef __XSCALE__
 
 /* #define BIG_LOOPS */
diff --git a/sys/arm/arm/bcopyinout.S b/sys/arm/arm/bcopyinout.S
index fdd57d6cb98c..3b723a27536d 100644
--- a/sys/arm/arm/bcopyinout.S
+++ b/sys/arm/arm/bcopyinout.S
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.6 2005/05/24 23:55:09 cognet Exp $");
 #ifdef __XSCALE__
 #include <arm/arm/bcopyinout_xscale.S>
 #else
diff --git a/sys/arm/arm/bcopyinout_xscale.S b/sys/arm/arm/bcopyinout_xscale.S
index bb785f8e32d6..7568b233e067 100644
--- a/sys/arm/arm/bcopyinout_xscale.S
+++ b/sys/arm/arm/bcopyinout_xscale.S
@@ -36,7 +36,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout_xscale.S,v 1.4 2005/05/24 23:55:09 cognet Exp $");
 
 	.text
 	.align	0
diff --git a/sys/arm/arm/blockio.S b/sys/arm/arm/blockio.S
index 7e750b45e132..8f697a141789 100644
--- a/sys/arm/arm/blockio.S
+++ b/sys/arm/arm/blockio.S
@@ -48,7 +48,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/blockio.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Read bytes from an I/O address into a block of memory
diff --git a/sys/arm/arm/bootconfig.c b/sys/arm/arm/bootconfig.c
index 0a5d3057a2c0..4ee582a388d6 100644
--- a/sys/arm/arm/bootconfig.c
+++ b/sys/arm/arm/bootconfig.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bootconfig.c,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/arm/arm/bus_space_asm_generic.S b/sys/arm/arm/bus_space_asm_generic.S
index 37c1808cc43d..a63dae66c862 100644
--- a/sys/arm/arm/bus_space_asm_generic.S
+++ b/sys/arm/arm/bus_space_asm_generic.S
@@ -37,7 +37,7 @@
 
 #include <machine/asm.h>
 #include <machine/cpuconf.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bus_space_asm_generic.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Generic bus_space functions.
diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
index bab00adda499..cd6ce2162a7e 100644
--- a/sys/arm/arm/busdma_machdep.c
+++ b/sys/arm/arm/busdma_machdep.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.22 2005/06/24 23:57:27 cognet Exp $");
 
 /*
  * MacPPC bus dma support routines
diff --git a/sys/arm/arm/copystr.S b/sys/arm/arm/copystr.S
index 13bbf01d5238..440160561971 100644
--- a/sys/arm/arm/copystr.S
+++ b/sys/arm/arm/copystr.S
@@ -43,7 +43,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/copystr.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 #include <sys/errno.h>
 
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 45fd5037838f..7b0a626d15a5 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -45,7 +45,7 @@
  * Created      : 30/01/97
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.9 2005/05/25 13:46:32 cognet Exp $");
 
 #include <sys/cdefs.h>
 
diff --git a/sys/arm/arm/cpufunc_asm.S b/sys/arm/arm/cpufunc_asm.S
index d9cc70d5495f..b64d8e9eb712 100644
--- a/sys/arm/arm/cpufunc_asm.S
+++ b/sys/arm/arm/cpufunc_asm.S
@@ -43,7 +43,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm.S,v 1.6 2005/02/26 18:59:01 cognet Exp $");
 
 	.text
 	.align	0
diff --git a/sys/arm/arm/cpufunc_asm_arm10.S b/sys/arm/arm/cpufunc_asm_arm10.S
index d1d55ff254aa..eb6459aae15a 100644
--- a/sys/arm/arm/cpufunc_asm_arm10.S
+++ b/sys/arm/arm/cpufunc_asm_arm10.S
@@ -33,7 +33,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm10.S,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Functions to set the MMU Translation Table Base register
diff --git a/sys/arm/arm/cpufunc_asm_arm7tdmi.S b/sys/arm/arm/cpufunc_asm_arm7tdmi.S
index d301efc1f7f0..fa768e8095c6 100644
--- a/sys/arm/arm/cpufunc_asm_arm7tdmi.S
+++ b/sys/arm/arm/cpufunc_asm_arm7tdmi.S
@@ -36,7 +36,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm7tdmi.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Functions to set the MMU Translation Table Base register
diff --git a/sys/arm/arm/cpufunc_asm_arm8.S b/sys/arm/arm/cpufunc_asm_arm8.S
index febe8f0a545e..7f37b841eb64 100644
--- a/sys/arm/arm/cpufunc_asm_arm8.S
+++ b/sys/arm/arm/cpufunc_asm_arm8.S
@@ -37,7 +37,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm8.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 ENTRY(arm8_clock_config)
 	mrc	p15, 0, r3, c15, c0, 0	/* Read the clock register */
diff --git a/sys/arm/arm/cpufunc_asm_arm9.S b/sys/arm/arm/cpufunc_asm_arm9.S
index d2f4904ca39a..5d2f9e650824 100644
--- a/sys/arm/arm/cpufunc_asm_arm9.S
+++ b/sys/arm/arm/cpufunc_asm_arm9.S
@@ -33,7 +33,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm9.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Functions to set the MMU Translation Table Base register
diff --git a/sys/arm/arm/cpufunc_asm_armv4.S b/sys/arm/arm/cpufunc_asm_armv4.S
index ccdcce213c89..49e40f18ab8a 100644
--- a/sys/arm/arm/cpufunc_asm_armv4.S
+++ b/sys/arm/arm/cpufunc_asm_armv4.S
@@ -38,7 +38,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv4.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * TLB functions
diff --git a/sys/arm/arm/cpufunc_asm_ixp12x0.S b/sys/arm/arm/cpufunc_asm_ixp12x0.S
index efc59500a7a4..0859d4d5bfa0 100644
--- a/sys/arm/arm/cpufunc_asm_ixp12x0.S
+++ b/sys/arm/arm/cpufunc_asm_ixp12x0.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_ixp12x0.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * This function is the same as sa110_context_switch for now, the plan
diff --git a/sys/arm/arm/cpufunc_asm_sa1.S b/sys/arm/arm/cpufunc_asm_sa1.S
index 7279e65077e7..cacf1cc93bd9 100644
--- a/sys/arm/arm/cpufunc_asm_sa1.S
+++ b/sys/arm/arm/cpufunc_asm_sa1.S
@@ -37,7 +37,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sa1.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 .Lblock_userspace_access:
 	.word	_C_LABEL(block_userspace_access)
diff --git a/sys/arm/arm/cpufunc_asm_sa11x0.S b/sys/arm/arm/cpufunc_asm_sa11x0.S
index ca167c8fee70..44428fe5cf75 100644
--- a/sys/arm/arm/cpufunc_asm_sa11x0.S
+++ b/sys/arm/arm/cpufunc_asm_sa11x0.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sa11x0.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 	.data
 	.global	_C_LABEL(sa11x0_idle_mem)
diff --git a/sys/arm/arm/cpufunc_asm_xscale.S b/sys/arm/arm/cpufunc_asm_xscale.S
index b4700e4a4810..b08b1758a472 100644
--- a/sys/arm/arm/cpufunc_asm_xscale.S
+++ b/sys/arm/arm/cpufunc_asm_xscale.S
@@ -73,7 +73,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_xscale.S,v 1.4 2005/01/10 22:41:08 cognet Exp $");
 
 /*
  * Size of the XScale core D-cache.
diff --git a/sys/arm/arm/db_disasm.c b/sys/arm/arm/db_disasm.c
index 52ff7d700235..3bfd2c52c117 100644
--- a/sys/arm/arm/db_disasm.c
+++ b/sys/arm/arm/db_disasm.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_disasm.c,v 1.2 2005/01/05 21:58:47 imp Exp $");
 #include <sys/param.h>
 #include <machine/db_machdep.h>
 #include <ddb/ddb.h>
diff --git a/sys/arm/arm/db_interface.c b/sys/arm/arm/db_interface.c
index cb3c968f28c0..b6bea78e4749 100644
--- a/sys/arm/arm/db_interface.c
+++ b/sys/arm/arm/db_interface.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.5 2005/06/23 11:38:47 cognet Exp $");
 #include "opt_ddb.h"
 
 #include <sys/param.h>
diff --git a/sys/arm/arm/db_trace.c b/sys/arm/arm/db_trace.c
index 869713a4a520..62278bc0c765 100644
--- a/sys/arm/arm/db_trace.c
+++ b/sys/arm/arm/db_trace.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.10 2005/01/05 21:58:47 imp Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arm/arm/disassem.c b/sys/arm/arm/disassem.c
index 9aa63d886eb8..b13b36b79155 100644
--- a/sys/arm/arm/disassem.c
+++ b/sys/arm/arm/disassem.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/disassem.c,v 1.2 2005/01/05 21:58:47 imp Exp $");
 #include <sys/param.h>
 
 
diff --git a/sys/arm/arm/dump_machdep.c b/sys/arm/arm/dump_machdep.c
index 38841e447a5e..8c077d14e352 100644
--- a/sys/arm/arm/dump_machdep.c
+++ b/sys/arm/arm/dump_machdep.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c
index 496b975bc2d9..c147f9376058 100644
--- a/sys/arm/arm/elf_machdep.c
+++ b/sys/arm/arm/elf_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.5 2004/11/04 18:48:52 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
index 0d21fb4fb4e5..5554e42d91a5 100644
--- a/sys/arm/arm/exception.S
+++ b/sys/arm/arm/exception.S
@@ -51,7 +51,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/exception.S,v 1.5 2005/01/05 21:58:47 imp Exp $");
 
 	.text	
 	.align	0
diff --git a/sys/arm/arm/fiq.c b/sys/arm/arm/fiq.c
index f990812b5760..28bb00fb7d16 100644
--- a/sys/arm/arm/fiq.c
+++ b/sys/arm/arm/fiq.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/fiq.c,v 1.3 2005/03/16 07:56:21 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/fiq_subr.S b/sys/arm/arm/fiq_subr.S
index 4cde665229e2..c78e8fd5a598 100644
--- a/sys/arm/arm/fiq_subr.S
+++ b/sys/arm/arm/fiq_subr.S
@@ -39,7 +39,7 @@
 
 #include <machine/armreg.h>
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/fiq_subr.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * MODE_CHANGE_NOP should be inserted between a mode change and a
diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S
index 095491aa96ad..d29ef20aaaca 100644
--- a/sys/arm/arm/fusu.S
+++ b/sys/arm/arm/fusu.S
@@ -37,7 +37,7 @@
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
 #include "assym.s"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.7 2005/04/23 16:45:04 cognet Exp $");
 
 #ifdef MULTIPROCESSOR
 .Lcpu_info:
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index d0e8cede63de..a23441a974bc 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.5 2005/02/26 18:59:01 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/assym.h>
diff --git a/sys/arm/arm/identcpu.c b/sys/arm/arm/identcpu.c
index fff1baec88c0..5ca555e36a0a 100644
--- a/sys/arm/arm/identcpu.c
+++ b/sys/arm/arm/identcpu.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.4 2005/01/05 21:58:47 imp Exp $");
 #include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/arm/arm/in_cksum.c b/sys/arm/arm/in_cksum.c
index 98b96703a13b..f430a07df012 100644
--- a/sys/arm/arm/in_cksum.c
+++ b/sys/arm/arm/in_cksum.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum.c,v 1.4 2005/05/24 21:44:34 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/arm/arm/in_cksum_arm.S b/sys/arm/arm/in_cksum_arm.S
index 9490c65c70d8..7d5ee41f92a1 100644
--- a/sys/arm/arm/in_cksum_arm.S
+++ b/sys/arm/arm/in_cksum_arm.S
@@ -44,7 +44,7 @@
 
 #include <machine/asm.h>
 #include "assym.s"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum_arm.S,v 1.5 2005/05/24 21:44:34 cognet Exp $");
 
 /*
  * int in_cksum(struct mbuf *m, int len)
diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index cb941f736917..538bae862b44 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.9 2005/06/09 12:26:19 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h> 
diff --git a/sys/arm/arm/irq_dispatch.S b/sys/arm/arm/irq_dispatch.S
index 862471761b4d..05530361463a 100644
--- a/sys/arm/arm/irq_dispatch.S
+++ b/sys/arm/arm/irq_dispatch.S
@@ -72,7 +72,7 @@
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.4 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * irq_entry:
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index 748896aef52f..0d39c2418be8 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -37,7 +37,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/pte.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.10 2005/03/16 07:53:02 jmg Exp $");
 
 /* What size should this really be ? It is only used by init_arm() */
 #define INIT_ARM_STACK_SIZE	2048
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 6d8313dbe61a..15b41fcb973d 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -44,7 +44,7 @@
 
 #include "opt_compat.h"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.16 2005/04/04 21:53:52 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c
index a9582a623e9a..566b53fbc326 100644
--- a/sys/arm/arm/mem.c
+++ b/sys/arm/arm/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.1 2004/11/07 23:01:36 cognet Exp $");
 
 /*
  * Memory special file
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 131bbc61c664..6143fc44313e 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.5 2005/06/09 12:26:19 cognet Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/arm/arm/nexus_io.c b/sys/arm/arm/nexus_io.c
index 61f8e4e3c482..14fcfa715c7f 100644
--- a/sys/arm/arm/nexus_io.c
+++ b/sys/arm/arm/nexus_io.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.5 2005/01/05 21:58:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/nexus_io_asm.S b/sys/arm/arm/nexus_io_asm.S
index db9caf66bb38..bbf7eb782f0b 100644
--- a/sys/arm/arm/nexus_io_asm.S
+++ b/sys/arm/arm/nexus_io_asm.S
@@ -34,7 +34,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io_asm.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * bus_space I/O functions for nexus
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index 8083ceae637b..73ae84ae42cf 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.36 2005/06/23 11:37:41 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/arm/setcpsr.S b/sys/arm/arm/setcpsr.S
index 4597d53df099..6434007cec14 100644
--- a/sys/arm/arm/setcpsr.S
+++ b/sys/arm/arm/setcpsr.S
@@ -49,7 +49,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/setcpsr.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /* Sets and clears bits in the CPSR register
  *
diff --git a/sys/arm/arm/setstack.s b/sys/arm/arm/setstack.s
index f6d412ebf13a..9a80d3c159e1 100644
--- a/sys/arm/arm/setstack.s
+++ b/sys/arm/arm/setstack.s
@@ -50,7 +50,7 @@
 
 #include <machine/armreg.h>
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/setstack.s,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 /* To set the stack pointer for a particular mode we must switch
  * to that mode update the banked r13 and then switch back.
diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S
index 242ece22cfb9..936bf3fda613 100644
--- a/sys/arm/arm/support.S
+++ b/sys/arm/arm/support.S
@@ -26,7 +26,7 @@
 
 #include <machine/asm.h>
 #include <machine/asmacros.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.9 2005/04/12 22:46:09 cognet Exp $");
 
 #include "assym.s"
 
diff --git a/sys/arm/arm/swtch.S b/sys/arm/arm/swtch.S
index 63b20b63453e..ecd96a1e1ee4 100644
--- a/sys/arm/arm/swtch.S
+++ b/sys/arm/arm/swtch.S
@@ -83,7 +83,7 @@
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.15 2005/05/24 21:47:10 cognet Exp $");
 
 
 /*
diff --git a/sys/arm/arm/sys_machdep.c b/sys/arm/arm/sys_machdep.c
index 16ec846b926b..9f7e31c71b65 100644
--- a/sys/arm/arm/sys_machdep.c
+++ b/sys/arm/arm/sys_machdep.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.4 2005/02/25 22:56:16 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c
index 824878300e52..97fb597423d4 100644
--- a/sys/arm/arm/trap.c
+++ b/sys/arm/arm/trap.c
@@ -82,7 +82,7 @@
 #include "opt_ktrace.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.17 2005/06/23 11:39:18 cognet Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c
index ef6fa428c756..b111ad2619f4 100644
--- a/sys/arm/arm/uio_machdep.c
+++ b/sys/arm/arm/uio_machdep.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.5 2005/01/05 21:58:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c
index 3d7d3cb2423e..4af8265b4f40 100644
--- a/sys/arm/arm/undefined.c
+++ b/sys/arm/arm/undefined.c
@@ -48,7 +48,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.8 2005/04/12 23:18:53 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/arm/arm/vectors.S b/sys/arm/arm/vectors.S
index c91b437e8b81..9302eabf7103 100644
--- a/sys/arm/arm/vectors.S
+++ b/sys/arm/arm/vectors.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vectors.S,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * These are the exception vectors copied down to page 0.
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index 154958dab969..a89ce5d1e7b3 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.17 2005/07/10 23:31:10 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/compile/.cvsignore b/sys/arm/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/arm/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/arm/conf/.cvsignore b/sys/arm/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/arm/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index 1a6b04562485..d4a9af0c2b19 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.11 2005/06/09 15:05:09 cognet Exp $
 
 machine		arm
 ident		IQ31244
diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS
index 94ffa3a5a7ce..3d1af128e651 100644
--- a/sys/arm/conf/SIMICS
+++ b/sys/arm/conf/SIMICS
@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.7 2004/12/18 17:58:49 cognet Exp $
 
 machine		arm
 ident		SIMICS
diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h
index 30dd3fb01ae3..6313f0ec0ca7 100644
--- a/sys/arm/include/_bus.h
+++ b/sys/arm/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef ARM_INCLUDE__BUS_H
diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h
index 7da589d8a771..66f888644f94 100644
--- a/sys/arm/include/_inttypes.h
+++ b/sys/arm/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_inttypes.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index 25616e5a390a..3246572269ec 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_limits.h,v 1.8 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h
index 0d8aedfff5d6..7e91b508d7a8 100644
--- a/sys/arm/include/_stdint.h
+++ b/sys/arm/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_stdint.h,v 1.2 2004/05/18 16:04:56 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index c700f523caf1..aeaeca12cda6 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.6 2005/03/02 21:33:22 joerg Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index 489a8ed89959..a334cb55b84d 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/armreg.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef MACHINE_ARMREG_H
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index a1a0c435193c..fc6e03bff7d7 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -33,7 +33,7 @@
  *
  *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/asm.h,v 1.4 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/arm/include/asmacros.h b/sys/arm/include/asmacros.h
index 605408016cae..1121e3bcde0f 100644
--- a/sys/arm/include/asmacros.h
+++ b/sys/arm/include/asmacros.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.4 2005/04/07 22:03:04 cognet Exp $
  */
 
 #ifndef	_MACHINE_ASMACROS_H_
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index 40288cf2522b..b4dd4dade1cd 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -33,7 +33,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/sys/arm/include/atomic.h,v 1.8.2.3 2005/10/06 18:12:05 jhb Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
diff --git a/sys/arm/include/blockio.h b/sys/arm/include/blockio.h
index 05c35ae0e84b..53a8854e5810 100644
--- a/sys/arm/include/blockio.h
+++ b/sys/arm/include/blockio.h
@@ -26,7 +26,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/sys/arm/include/blockio.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  *
  */
 /*
diff --git a/sys/arm/include/bootconfig.h b/sys/arm/include/bootconfig.h
index 04467a03b7d7..5e8dbb5a6b46 100644
--- a/sys/arm/include/bootconfig.h
+++ b/sys/arm/include/bootconfig.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/bootconfig.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_BOOTCONFIG_H_
diff --git a/sys/arm/include/bus.h b/sys/arm/include/bus.h
index 624edab9fc2f..a0f3cf2f9cde 100644
--- a/sys/arm/include/bus.h
+++ b/sys/arm/include/bus.h
@@ -67,7 +67,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/sys/arm/include/bus.h,v 1.8 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef _MACHINE_BUS_H_
diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h
index f239197df0ca..d3a5081df760 100644
--- a/sys/arm/include/bus_dma.h
+++ b/sys/arm/include/bus_dma.h
@@ -67,7 +67,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/sys/arm/include/bus_dma.h,v 1.1 2005/03/14 16:46:27 scottl Exp $
  */
 
 #ifndef _ARM_BUS_DMA_H
diff --git a/sys/arm/include/clock.h b/sys/arm/include/clock.h
index 61922f4daa93..2f114219fe04 100644
--- a/sys/arm/include/clock.h
+++ b/sys/arm/include/clock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/clock.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef	_MACHINE_CLOCK_H_
diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h
index dc9ce0242205..053c83728f7c 100644
--- a/sys/arm/include/cpu.h
+++ b/sys/arm/include/cpu.h
@@ -1,5 +1,5 @@
 /* $NetBSD: cpu.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.4 2005/02/01 06:36:27 njl Exp $ */
 
 #ifndef MACHINE_CPU_H
 #define MACHINE_CPU_H
diff --git a/sys/arm/include/cpuconf.h b/sys/arm/include/cpuconf.h
index aa8e51b40081..c56a74962255 100644
--- a/sys/arm/include/cpuconf.h
+++ b/sys/arm/include/cpuconf.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.5 2005/05/26 16:05:22 cognet Exp $
  *
  */
 
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index 251b7163cfb3..8ae08f855f2a 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -38,7 +38,7 @@
  *
  * Prototypes for cpu, mmu and tlb related functions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.7 2005/06/03 19:49:53 cognet Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/arm/include/db_machdep.h b/sys/arm/include/db_machdep.h
index ae7de16fc628..0c65bf6597ba 100644
--- a/sys/arm/include/db_machdep.h
+++ b/sys/arm/include/db_machdep.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.5 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/arm/include/disassem.h b/sys/arm/include/disassem.h
index 526875527b3f..6b800d95eef7 100644
--- a/sys/arm/include/disassem.h
+++ b/sys/arm/include/disassem.h
@@ -35,7 +35,7 @@
  *
  * Define the interface structure required by the disassembler.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/disassem.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_DISASSEM_H_
diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h
index a6f1462fb3ba..2cd12780d167 100644
--- a/sys/arm/include/elf.h
+++ b/sys/arm/include/elf.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.5 2004/05/04 22:21:36 cognet Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/arm/include/endian.h b/sys/arm/include/endian.h
index 16a3b663f23f..bc6f0d837279 100644
--- a/sys/arm/include/endian.h
+++ b/sys/arm/include/endian.h
@@ -27,7 +27,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.9 2005/05/24 21:43:16 cognet Exp $
  */
 
 #ifndef _ENDIAN_H_
diff --git a/sys/arm/include/exec.h b/sys/arm/include/exec.h
index f5a2bb26f61f..9c4e2e9c6f4d 100644
--- a/sys/arm/include/exec.h
+++ b/sys/arm/include/exec.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/exec.h,v 1.3 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/arm/include/fiq.h b/sys/arm/include/fiq.h
index ccb29a8d7b5f..704ea50e62f1 100644
--- a/sys/arm/include/fiq.h
+++ b/sys/arm/include/fiq.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/fiq.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  *
  */
 
diff --git a/sys/arm/include/float.h b/sys/arm/include/float.h
index ac5ceb92b27b..7c6f4e1f4593 100644
--- a/sys/arm/include/float.h
+++ b/sys/arm/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/float.h,v 1.5 2005/03/20 00:34:24 cognet Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/arm/include/floatingpoint.h b/sys/arm/include/floatingpoint.h
index fd328a9d739b..c239d6b37984 100644
--- a/sys/arm/include/floatingpoint.h
+++ b/sys/arm/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/floatingpoint.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/arm/include/fp.h b/sys/arm/include/fp.h
index ada720303c7d..202936ff2d56 100644
--- a/sys/arm/include/fp.h
+++ b/sys/arm/include/fp.h
@@ -42,7 +42,7 @@
  *
  * Created      : 10/10/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/fp.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_FP_H
diff --git a/sys/arm/include/frame.h b/sys/arm/include/frame.h
index 4d70c20843dc..e1518a428cd8 100644
--- a/sys/arm/include/frame.h
+++ b/sys/arm/include/frame.h
@@ -42,7 +42,7 @@
  *
  * Created      : 30/09/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/frame.h,v 1.3 2005/01/05 21:58:48 imp Exp $
  *
  */
 
diff --git a/sys/arm/include/ieee.h b/sys/arm/include/ieee.h
index a7411dd2332a..46fae8f8c116 100644
--- a/sys/arm/include/ieee.h
+++ b/sys/arm/include/ieee.h
@@ -39,7 +39,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/ieee.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  *
  */
 
diff --git a/sys/arm/include/ieeefp.h b/sys/arm/include/ieeefp.h
index 8fc9811ce60f..851f20df8052 100644
--- a/sys/arm/include/ieeefp.h
+++ b/sys/arm/include/ieeefp.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ieeefp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/ieeefp.h,v 1.2 2005/01/05 21:58:48 imp Exp $ */
 /*-
  * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
  * Public domain.
diff --git a/sys/arm/include/in_cksum.h b/sys/arm/include/in_cksum.h
index 20868423fb26..222e637cdf18 100644
--- a/sys/arm/include/in_cksum.h
+++ b/sys/arm/include/in_cksum.h
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/in_cksum.h,v 1.2 2005/05/24 21:44:34 cognet Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index dc08c7f717ae..56d01c7c1c83 100644
--- a/sys/arm/include/intr.h
+++ b/sys/arm/include/intr.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.5 2005/06/09 12:26:19 cognet Exp $
  *
  */
 
diff --git a/sys/arm/include/katelib.h b/sys/arm/include/katelib.h
index ef69fe37238f..2f6a8ff7a08c 100644
--- a/sys/arm/include/katelib.h
+++ b/sys/arm/include/katelib.h
@@ -49,7 +49,7 @@
  *
  * Based on kate/katelib/prototypes.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/katelib.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 /*
diff --git a/sys/arm/include/kdb.h b/sys/arm/include/kdb.h
index 9d933d628f37..e9c65cd911ba 100644
--- a/sys/arm/include/kdb.h
+++ b/sys/arm/include/kdb.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/sys/arm/include/kdb.h,v 1.3 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/arm/include/limits.h b/sys/arm/include/limits.h
index 35eea1f619de..f1837e2046d6 100644
--- a/sys/arm/include/limits.h
+++ b/sys/arm/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/limits.h,v 1.8 2005/03/02 21:33:22 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/arm/include/machdep.h b/sys/arm/include/machdep.h
index b26f38642f5b..3777dd731463 100644
--- a/sys/arm/include/machdep.h
+++ b/sys/arm/include/machdep.h
@@ -1,5 +1,5 @@
 /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/machdep.h,v 1.2 2005/02/26 18:59:01 cognet Exp $ */
 
 #ifndef _MACHDEP_BOOT_MACHDEP_H_
 #define _MACHDEP_BOOT_MACHDEP_H_
diff --git a/sys/arm/include/md_var.h b/sys/arm/include/md_var.h
index 14dc2e40f535..03826cd175ef 100644
--- a/sys/arm/include/md_var.h
+++ b/sys/arm/include/md_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/md_var.h,v 1.2 2004/09/23 22:30:05 cognet Exp $
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/arm/include/memdev.h b/sys/arm/include/memdev.h
index 9cf0b4ae7e26..6415c37849f6 100644
--- a/sys/arm/include/memdev.h
+++ b/sys/arm/include/memdev.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/sys/arm/include/memdev.h,v 1.1 2004/11/07 23:01:36 cognet Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/arm/include/metadata.h b/sys/arm/include/metadata.h
index 84e6f8739970..8f3c16739d1a 100644
--- a/sys/arm/include/metadata.h
+++ b/sys/arm/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/metadata.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/arm/include/mutex.h b/sys/arm/include/mutex.h
index c9b2e1ddde07..d5ce2a538544 100644
--- a/sys/arm/include/mutex.h
+++ b/sys/arm/include/mutex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/mutex.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef	_MACHINE_MUTEX_H_
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 885f2d2a48c5..605bc9ab49e2 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/param.h,v 1.9 2004/11/20 16:51:32 cognet Exp $
  */
 
 /*
diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h
index 4a5f330b8a53..1da8eb8254b6 100644
--- a/sys/arm/include/pcb.h
+++ b/sys/arm/include/pcb.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pcb.h,v 1.5 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef	_MACHINE_PCB_H_
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index a610e5d9b426..c40ba308f8dd 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.2 2004/11/04 19:19:44 cognet Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index f8a4db426d66..0c1cd1fac6f4 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -44,7 +44,7 @@
  *      from: @(#)pmap.h        7.4 (Berkeley) 5/12/91
  * 	from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pmap.h,v 1.10 2005/06/07 23:04:24 cognet Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/arm/include/pmc_mdep.h b/sys/arm/include/pmc_mdep.h
index 4e02fc6f1358..614a5815f624 100644
--- a/sys/arm/include/pmc_mdep.h
+++ b/sys/arm/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:06 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h
index 597c75ceaed6..0e11947d646b 100644
--- a/sys/arm/include/proc.h
+++ b/sys/arm/include/proc.h
@@ -32,7 +32,7 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/proc.h,v 1.5 2005/04/04 21:53:52 jhb Exp $
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index 81781bc25943..821f9e396792 100644
--- a/sys/arm/include/profile.h
+++ b/sys/arm/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/arm/include/psl.h b/sys/arm/include/psl.h
index c86ddb8675c6..b9ee82a50142 100644
--- a/sys/arm/include/psl.h
+++ b/sys/arm/include/psl.h
@@ -41,7 +41,7 @@
  *
  * Created      : 21/07/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/psl.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/arm/include/pte.h b/sys/arm/include/pte.h
index 58149effdf24..cc78a019159f 100644
--- a/sys/arm/include/pte.h
+++ b/sys/arm/include/pte.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pte.h,v 1.3 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_PTE_H_
diff --git a/sys/arm/include/ptrace.h b/sys/arm/include/ptrace.h
index d98aa14f3ef7..18cec91ab763 100644
--- a/sys/arm/include/ptrace.h
+++ b/sys/arm/include/ptrace.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ptrace.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/ptrace.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ */
 
 #ifndef _MACHINE_PTRACE_H_
 #define _MACHINE_PTRACE_H_
diff --git a/sys/arm/include/reg.h b/sys/arm/include/reg.h
index 2f8c2ede7d21..fa420f7b469b 100644
--- a/sys/arm/include/reg.h
+++ b/sys/arm/include/reg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: reg.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/reg.h,v 1.2 2004/11/04 19:20:54 cognet Exp $ */
 #ifndef MACHINE_REG_H
 #define MACHINE_REG_H
 
diff --git a/sys/arm/include/reloc.h b/sys/arm/include/reloc.h
index df4a126eb1a9..13f102c23f7c 100644
--- a/sys/arm/include/reloc.h
+++ b/sys/arm/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/reloc.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _MACHINE_RELOC_H_
diff --git a/sys/arm/include/resource.h b/sys/arm/include/resource.h
index 229d14f253b0..27588d68e8a2 100644
--- a/sys/arm/include/resource.h
+++ b/sys/arm/include/resource.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/resource.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_RESOURCE_H_
diff --git a/sys/arm/include/runq.h b/sys/arm/include/runq.h
index e906fa192c6c..3b118cfbfe6d 100644
--- a/sys/arm/include/runq.h
+++ b/sys/arm/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/runq.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/arm/include/setjmp.h b/sys/arm/include/setjmp.h
index 638dc3e98ab9..f2f5aec99543 100644
--- a/sys/arm/include/setjmp.h
+++ b/sys/arm/include/setjmp.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: setjmp.h,v 1.2 2001/08/25 14:45:59 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/setjmp.h,v 1.2 2004/07/12 21:23:58 cognet Exp $ */
 
 /*
  * machine/setjmp.h: machine dependent setjmp-related information.
diff --git a/sys/arm/include/sf_buf.h b/sys/arm/include/sf_buf.h
index 7d438f028644..21324dd55e5f 100644
--- a/sys/arm/include/sf_buf.h
+++ b/sys/arm/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/sf_buf.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/arm/include/sigframe.h b/sys/arm/include/sigframe.h
index 9787f579d563..d221c109d6ec 100644
--- a/sys/arm/include/sigframe.h
+++ b/sys/arm/include/sigframe.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/sigframe.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ */
 #include <machine/frame.h>
diff --git a/sys/arm/include/signal.h b/sys/arm/include/signal.h
index abc5188ce967..3431f665cf09 100644
--- a/sys/arm/include/signal.h
+++ b/sys/arm/include/signal.h
@@ -29,7 +29,7 @@
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  *	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
  *	from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/signal.h,v 1.6 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/arm/include/smp.h b/sys/arm/include/smp.h
index ca707e3bab83..6096fbf60f67 100644
--- a/sys/arm/include/smp.h
+++ b/sys/arm/include/smp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/smp.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ */
 
 #ifndef _MACHINE_SMP_H_
 #define _MACHINE_SMP_H_
diff --git a/sys/arm/include/stdarg.h b/sys/arm/include/stdarg.h
index a8b0ff0eae81..0875f16c3f0e 100644
--- a/sys/arm/include/stdarg.h
+++ b/sys/arm/include/stdarg.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.3 2005/03/02 21:33:22 joerg Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/arm/include/swi.h b/sys/arm/include/swi.h
index 858ed2368b0d..8ed4992d8cfa 100644
--- a/sys/arm/include/swi.h
+++ b/sys/arm/include/swi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: swi.h,v 1.1 2002/01/13 15:03:06 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/swi.h,v 1.2 2005/01/05 21:58:48 imp Exp $ */
 
 /*-
  * This file is in the Public Domain.
diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h
index 4d6234b447e0..d27b5631f7d7 100644
--- a/sys/arm/include/sysarch.h
+++ b/sys/arm/include/sysarch.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/sysarch.h,v 1.4 2005/02/26 18:59:01 cognet Exp $ */
 
 #ifndef _ARM_SYSARCH_H_
 #define _ARM_SYSARCH_H_
diff --git a/sys/arm/include/trap.h b/sys/arm/include/trap.h
index a9f42e3c7838..a4e69c57b875 100644
--- a/sys/arm/include/trap.h
+++ b/sys/arm/include/trap.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: trap.h,v 1.1 2001/02/23 03:48:19 ichiro Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/trap.h,v 1.2 2005/01/10 22:43:16 cognet Exp $ */
 
 #ifndef _MACHINE_TRAP_H_
 #define _MACHINE_TRAP_H_
diff --git a/sys/arm/include/ucontext.h b/sys/arm/include/ucontext.h
index b1f1d63e56c8..f88294ecd7b2 100644
--- a/sys/arm/include/ucontext.h
+++ b/sys/arm/include/ucontext.h
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/ucontext.h,v 1.2 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _MACHINE_MCONTEXT_H_
diff --git a/sys/arm/include/undefined.h b/sys/arm/include/undefined.h
index 9460f706a75a..7fe24d72d97f 100644
--- a/sys/arm/include/undefined.h
+++ b/sys/arm/include/undefined.h
@@ -42,7 +42,7 @@
  *
  * Created      : 08/02/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/undefined.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 
diff --git a/sys/arm/include/utrap.h b/sys/arm/include/utrap.h
index 38a40b0166e5..67c408e4a1c0 100644
--- a/sys/arm/include/utrap.h
+++ b/sys/arm/include/utrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/utrap.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef	_MACHINE_UTRAP_H_
diff --git a/sys/arm/include/vmparam.h b/sys/arm/include/vmparam.h
index d5725a450a51..e40166fcddc2 100644
--- a/sys/arm/include/vmparam.h
+++ b/sys/arm/include/vmparam.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.5 2005/06/07 23:04:24 cognet Exp $
  */
 
 #ifndef	_MACHINE_VMPARAM_H_
diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c
index 40354f71ac8f..b57d18b48fdd 100644
--- a/sys/arm/sa11x0/assabet_machdep.c
+++ b/sys/arm/sa11x0/assabet_machdep.c
@@ -47,7 +47,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.9 2005/01/05 21:58:48 imp Exp $");
 
 #include "opt_md.h"
 
diff --git a/sys/arm/sa11x0/files.sa11x0 b/sys/arm/sa11x0/files.sa11x0
index 44c1f41e401b..4f0af5369de0 100644
--- a/sys/arm/sa11x0/files.sa11x0
+++ b/sys/arm/sa11x0/files.sa11x0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/sa11x0/files.sa11x0,v 1.2 2004/05/14 13:26:52 cognet Exp $
 arm/sa11x0/assabet_machdep.c	optional	assabet
 arm/sa11x0/sa11x0.c		optional	saip
 arm/sa11x0/sa11x0_ost.c		optional	saip
diff --git a/sys/arm/sa11x0/sa11x0.c b/sys/arm/sa11x0/sa11x0.c
index 57fc7192bdf3..552cdc82b2e6 100644
--- a/sys/arm/sa11x0/sa11x0.c
+++ b/sys/arm/sa11x0/sa11x0.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.4 2004/09/23 22:33:38 cognet Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/arm/sa11x0/sa11x0_dmacreg.h b/sys/arm/sa11x0/sa11x0_dmacreg.h
index 9112e2104f38..6e361a711c5a 100644
--- a/sys/arm/sa11x0/sa11x0_dmacreg.h
+++ b/sys/arm/sa11x0/sa11x0_dmacreg.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_dmacreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_gpioreg.h b/sys/arm/sa11x0/sa11x0_gpioreg.h
index 9f46e9d18d81..95ba734a34c6 100644
--- a/sys/arm/sa11x0/sa11x0_gpioreg.h
+++ b/sys/arm/sa11x0/sa11x0_gpioreg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_gpioreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_io.c b/sys/arm/sa11x0/sa11x0_io.c
index e88af0c938cd..5b9269d0b7fd 100644
--- a/sys/arm/sa11x0/sa11x0_io.c
+++ b/sys/arm/sa11x0/sa11x0_io.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.6 2005/04/13 16:02:03 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arm/sa11x0/sa11x0_io_asm.S b/sys/arm/sa11x0/sa11x0_io_asm.S
index 7a821f3e0653..ad4d22230697 100644
--- a/sys/arm/sa11x0/sa11x0_io_asm.S
+++ b/sys/arm/sa11x0/sa11x0_io_asm.S
@@ -35,7 +35,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io_asm.S,v 1.2 2005/01/05 21:58:48 imp Exp $");
 
 /*
  * bus_space I/O functions for sa11x0
diff --git a/sys/arm/sa11x0/sa11x0_irq.S b/sys/arm/sa11x0/sa11x0_irq.S
index 3b6d23ea91a4..a0121b3e06db 100644
--- a/sys/arm/sa11x0/sa11x0_irq.S
+++ b/sys/arm/sa11x0/sa11x0_irq.S
@@ -43,7 +43,7 @@
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
 #include <arm/sa11x0/sa11x0_reg.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.3 2005/01/05 21:58:48 imp Exp $");
 Lcurrent_intr_depth:
 	.word	_C_LABEL(current_intr_depth)
 
diff --git a/sys/arm/sa11x0/sa11x0_irqhandler.c b/sys/arm/sa11x0/sa11x0_irqhandler.c
index 5cda4c6d299e..5a5f2ba4ce83 100644
--- a/sys/arm/sa11x0/sa11x0_irqhandler.c
+++ b/sys/arm/sa11x0/sa11x0_irqhandler.c
@@ -76,7 +76,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.4 2005/06/09 12:26:20 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/sa11x0/sa11x0_ost.c b/sys/arm/sa11x0/sa11x0_ost.c
index 25241af6ac3b..fb55479f2dca 100644
--- a/sys/arm/sa11x0/sa11x0_ost.c
+++ b/sys/arm/sa11x0/sa11x0_ost.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.3 2005/01/05 21:58:48 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/arm/sa11x0/sa11x0_ostreg.h b/sys/arm/sa11x0/sa11x0_ostreg.h
index c03aea1827fe..200f7d5c25fa 100644
--- a/sys/arm/sa11x0/sa11x0_ostreg.h
+++ b/sys/arm/sa11x0/sa11x0_ostreg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_ostreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_ppcreg.h b/sys/arm/sa11x0/sa11x0_ppcreg.h
index 52c129a3a29d..b023a18c4065 100644
--- a/sys/arm/sa11x0/sa11x0_ppcreg.h
+++ b/sys/arm/sa11x0/sa11x0_ppcreg.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_ppcreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_reg.h b/sys/arm/sa11x0/sa11x0_reg.h
index 86ad31d00846..4f71caf530df 100644
--- a/sys/arm/sa11x0/sa11x0_reg.h
+++ b/sys/arm/sa11x0/sa11x0_reg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_reg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_var.h b/sys/arm/sa11x0/sa11x0_var.h
index b1bf2a018757..1464f4ef0ac1 100644
--- a/sys/arm/sa11x0/sa11x0_var.h
+++ b/sys/arm/sa11x0/sa11x0_var.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_var.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/std.sa11x0 b/sys/arm/sa11x0/std.sa11x0
index 3cf84655c97d..3f51f7b276c8 100644
--- a/sys/arm/sa11x0/std.sa11x0
+++ b/sys/arm/sa11x0/std.sa11x0
@@ -1,5 +1,5 @@
 #StrongARM SA11x0 common options
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/sa11x0/std.sa11x0,v 1.2 2004/09/23 22:33:38 cognet Exp $
 files		"../sa11x0/files.sa11x0"
 cpu		CPU_SA1100
 cpu		CPU_SA1110
diff --git a/sys/arm/sa11x0/uart_bus_sa1110.c b/sys/arm/sa11x0/uart_bus_sa1110.c
index fb8b0d6a8ae3..a7f499188505 100644
--- a/sys/arm/sa11x0/uart_bus_sa1110.c
+++ b/sys/arm/sa11x0/uart_bus_sa1110.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_bus_sa1110.c,v 1.3 2005/01/05 21:58:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/uart_cpu_sa1110.c b/sys/arm/sa11x0/uart_cpu_sa1110.c
index ef0cf6abf1b1..c4ace431fbde 100644
--- a/sys/arm/sa11x0/uart_cpu_sa1110.c
+++ b/sys/arm/sa11x0/uart_cpu_sa1110.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.3 2005/01/05 21:58:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/uart_dev_sa1110.c b/sys/arm/sa11x0/uart_dev_sa1110.c
index e1ba5fe2fd82..8c019c763dc4 100644
--- a/sys/arm/sa11x0/uart_dev_sa1110.c
+++ b/sys/arm/sa11x0/uart_dev_sa1110.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.2 2005/01/05 21:58:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/uart_dev_sa1110.h b/sys/arm/sa11x0/uart_dev_sa1110.h
index 29610b28d102..1a79be505740 100644
--- a/sys/arm/sa11x0/uart_dev_sa1110.h
+++ b/sys/arm/sa11x0/uart_dev_sa1110.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/sys/arm/sa11x0/uart_dev_sa1110.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _DEV_UART_DEV_SA1110_H_
diff --git a/sys/arm/xscale/i80321/files.i80321 b/sys/arm/xscale/i80321/files.i80321
index c10a961fceb7..ec670599286b 100644
--- a/sys/arm/xscale/i80321/files.i80321
+++ b/sys/arm/xscale/i80321/files.i80321
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/files.i80321,v 1.2 2005/01/15 16:56:22 cognet Exp $
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
 arm/xscale/i80321/i80321.c		standard
diff --git a/sys/arm/xscale/i80321/files.iq31244 b/sys/arm/xscale/i80321/files.iq31244
index 66d89b3db630..7b00b8150108 100644
--- a/sys/arm/xscale/i80321/files.iq31244
+++ b/sys/arm/xscale/i80321/files.iq31244
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/files.iq31244,v 1.2 2005/01/15 18:55:22 cognet Exp $
 arm/xscale/i80321/iq80321.c		standard
 arm/xscale/i80321/iq31244_machdep.c	standard
 arm/xscale/i80321/iq31244_7seg.c	optional	iq31244_7seg
diff --git a/sys/arm/xscale/i80321/i80321.c b/sys/arm/xscale/i80321/i80321.c
index dfd03a1013fb..489077415f79 100644
--- a/sys/arm/xscale/i80321/i80321.c
+++ b/sys/arm/xscale/i80321/i80321.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.5 2005/06/09 12:26:20 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_intr.h b/sys/arm/xscale/i80321/i80321_intr.h
index 5f777ce5fd02..473ceebd9897 100644
--- a/sys/arm/xscale/i80321/i80321_intr.h
+++ b/sys/arm/xscale/i80321/i80321_intr.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/i80321_intr.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/i80321_mcu.c b/sys/arm/xscale/i80321/i80321_mcu.c
index a51a43348618..c7abde90e439 100644
--- a/sys/arm/xscale/i80321/i80321_mcu.c
+++ b/sys/arm/xscale/i80321/i80321_mcu.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_mcu.c,v 1.2 2005/01/05 21:58:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index 50ebe494db77..bff080f0123e 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.4 2005/06/09 12:26:20 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_space.c b/sys/arm/xscale/i80321/i80321_space.c
index b3a8cc52cba5..3642fbef0def 100644
--- a/sys/arm/xscale/i80321/i80321_space.c
+++ b/sys/arm/xscale/i80321/i80321_space.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.3 2005/02/13 18:20:39 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_timer.c b/sys/arm/xscale/i80321/i80321_timer.c
index 3e4840bf50b8..58925c3ff29d 100644
--- a/sys/arm/xscale/i80321/i80321_timer.c
+++ b/sys/arm/xscale/i80321/i80321_timer.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.5 2005/02/13 18:05:36 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_wdog.c b/sys/arm/xscale/i80321/i80321_wdog.c
index a33812cc71c5..d1e687e4d29d 100644
--- a/sys/arm/xscale/i80321/i80321_wdog.c
+++ b/sys/arm/xscale/i80321/i80321_wdog.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.2 2005/01/15 18:38:10 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321reg.h b/sys/arm/xscale/i80321/i80321reg.h
index 19092daf63d6..a5f62d5287e4 100644
--- a/sys/arm/xscale/i80321/i80321reg.h
+++ b/sys/arm/xscale/i80321/i80321reg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/i80321reg.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/i80321var.h b/sys/arm/xscale/i80321/i80321var.h
index fef194ba5333..6e69bc309d69 100644
--- a/sys/arm/xscale/i80321/i80321var.h
+++ b/sys/arm/xscale/i80321/i80321var.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/i80321var.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/iq31244_7seg.c b/sys/arm/xscale/i80321/iq31244_7seg.c
index 7cd1bc30da37..7406e8651b21 100644
--- a/sys/arm/xscale/i80321/iq31244_7seg.c
+++ b/sys/arm/xscale/i80321/iq31244_7seg.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_7seg.c,v 1.3 2005/05/25 13:44:55 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c
index 483114987e50..6b961fea93f2 100644
--- a/sys/arm/xscale/i80321/iq31244_machdep.c
+++ b/sys/arm/xscale/i80321/iq31244_machdep.c
@@ -48,7 +48,7 @@
 #include "opt_msgbuf.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.13 2005/06/23 11:40:45 cognet Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c
index 32924063d91c..9587e9c8c7bf 100644
--- a/sys/arm/xscale/i80321/iq80321.c
+++ b/sys/arm/xscale/i80321/iq80321.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.8 2005/06/09 12:26:20 cognet Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/i80321/iq80321reg.h b/sys/arm/xscale/i80321/iq80321reg.h
index 1e518eb096ac..9bc58d427d81 100644
--- a/sys/arm/xscale/i80321/iq80321reg.h
+++ b/sys/arm/xscale/i80321/iq80321reg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/iq80321reg.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/iq80321var.h b/sys/arm/xscale/i80321/iq80321var.h
index 4a035001bdf5..e5027d22da06 100644
--- a/sys/arm/xscale/i80321/iq80321var.h
+++ b/sys/arm/xscale/i80321/iq80321var.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/iq80321var.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/obio.c b/sys/arm/xscale/i80321/obio.c
index 523f14e451f8..87af59352bae 100644
--- a/sys/arm/xscale/i80321/obio.c
+++ b/sys/arm/xscale/i80321/obio.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio.c,v 1.2 2005/01/05 21:58:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/obio_space.c b/sys/arm/xscale/i80321/obio_space.c
index 74e00dc928ff..727d0be12254 100644
--- a/sys/arm/xscale/i80321/obio_space.c
+++ b/sys/arm/xscale/i80321/obio_space.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio_space.c,v 1.3 2005/04/07 22:03:34 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/obiovar.h b/sys/arm/xscale/i80321/obiovar.h
index 8d8c5c577183..9a5f2e12dca7 100644
--- a/sys/arm/xscale/i80321/obiovar.h
+++ b/sys/arm/xscale/i80321/obiovar.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/obiovar.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/std.i80321 b/sys/arm/xscale/i80321/std.i80321
index 3d8b8f960016..dfa4f3560345 100644
--- a/sys/arm/xscale/i80321/std.i80321
+++ b/sys/arm/xscale/i80321/std.i80321
@@ -1,5 +1,5 @@
 #XScale i80321 generic configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/std.i80321,v 1.3 2005/02/26 18:59:01 cognet Exp $
 files		"../xscale/i80321/files.i80321"
 include		"../xscale/std.xscale"
 cpu 		CPU_XSCALE_80321
diff --git a/sys/arm/xscale/i80321/std.iq31244 b/sys/arm/xscale/i80321/std.iq31244
index 5994c6a8e360..a882a2a1239d 100644
--- a/sys/arm/xscale/i80321/std.iq31244
+++ b/sys/arm/xscale/i80321/std.iq31244
@@ -1,5 +1,5 @@
 #IQ31244 board configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.2 2004/11/18 00:05:09 cognet Exp $
 include		"../xscale/i80321/std.i80321"
 files		"../xscale/i80321/files.iq31244"
 makeoptions	KERNPHYSADDR=0xa0200000
diff --git a/sys/arm/xscale/i80321/uart_bus_i80321.c b/sys/arm/xscale/i80321/uart_bus_i80321.c
index 5bb903df64cd..30913803ac4b 100644
--- a/sys/arm/xscale/i80321/uart_bus_i80321.c
+++ b/sys/arm/xscale/i80321/uart_bus_i80321.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_bus_i80321.c,v 1.3 2005/01/05 21:58:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/uart_cpu_i80321.c b/sys/arm/xscale/i80321/uart_cpu_i80321.c
index 987422ee24d0..330c569f3395 100644
--- a/sys/arm/xscale/i80321/uart_cpu_i80321.c
+++ b/sys/arm/xscale/i80321/uart_cpu_i80321.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.4 2005/01/20 22:23:26 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/std.xscale b/sys/arm/xscale/std.xscale
index 48c588f8833f..a9b26e347d23 100644
--- a/sys/arm/xscale/std.xscale
+++ b/sys/arm/xscale/std.xscale
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/xscale/std.xscale,v 1.1 2005/02/26 18:59:01 cognet Exp $
 options		ARM_CACHE_LOCK_ENABLE
diff --git a/sys/arm/xscale/xscalereg.h b/sys/arm/xscale/xscalereg.h
index 85e64d194cdc..8e1480de0626 100644
--- a/sys/arm/xscale/xscalereg.h
+++ b/sys/arm/xscale/xscalereg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/xscalereg.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  */
 
 #ifndef _ARM_XSCALE_XSCALEREG_H_ 
diff --git a/sys/arm/xscale/xscalevar.h b/sys/arm/xscale/xscalevar.h
index 32a510ff458f..e1c03b728ffa 100644
--- a/sys/arm/xscale/xscalevar.h
+++ b/sys/arm/xscale/xscalevar.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/xscalevar.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index d9b9e502ee7f..8b2911e6c5d8 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/Makefile,v 1.26 2004/12/21 12:32:13 ru Exp $
 
 .if !defined(NO_FORTH)
 # Build the add-in FORTH interpreter.
diff --git a/sys/boot/README b/sys/boot/README
index 22faea26b80c..95ae40c23c10 100644
--- a/sys/boot/README
+++ b/sys/boot/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/README,v 1.4 2005/01/05 22:16:10 imp Exp $
 
        README file, for the boot config file setup.  This is meant
        to explain how to manage the loader configuration process.
diff --git a/sys/boot/alpha/Makefile b/sys/boot/alpha/Makefile
index e97c8e897415..6996e7ff57aa 100644
--- a/sys/boot/alpha/Makefile
+++ b/sys/boot/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/Makefile,v 1.6 1999/11/03 20:19:30 dfr Exp $
 
 SUBDIR=		libalpha
 SUBDIR+=	boot1 loader cdboot netboot
diff --git a/sys/boot/alpha/Makefile.inc b/sys/boot/alpha/Makefile.inc
index 17d17b96ab15..06fb2ee02ef4 100644
--- a/sys/boot/alpha/Makefile.inc
+++ b/sys/boot/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/Makefile.inc,v 1.11 2004/08/23 16:25:07 obrien Exp $
 # Options used when building app-specific libalpha components
 
 BINDIR?=		/boot
diff --git a/sys/boot/alpha/boot1/Makefile b/sys/boot/alpha/boot1/Makefile
index 666fd143edec..0002c90fe705 100644
--- a/sys/boot/alpha/boot1/Makefile
+++ b/sys/boot/alpha/boot1/Makefile
@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.18 2004/12/21 08:47:11 ru Exp $
 
 PROG=	boot1.sym
 INTERNALPROG=
diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index 94540114b99d..d8997afc7f20 100644
--- a/sys/boot/alpha/boot1/boot1.c
+++ b/sys/boot/alpha/boot1/boot1.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.13 2003/04/16 21:09:41 phk Exp $
  * From	$NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/cdboot/Makefile b/sys/boot/alpha/cdboot/Makefile
index 632f8e5a8038..f83daba81b28 100644
--- a/sys/boot/alpha/cdboot/Makefile
+++ b/sys/boot/alpha/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.9 2004/12/21 08:47:12 ru Exp $
 
 BOOT= 		cdboot
 NO_MAN=
diff --git a/sys/boot/alpha/cdboot/version b/sys/boot/alpha/cdboot/version
index 028be8b5295c..5ae71c0d4aa0 100644
--- a/sys/boot/alpha/cdboot/version
+++ b/sys/boot/alpha/cdboot/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/alpha/cdboot/version,v 1.5 2001/12/11 00:49:33 jhb Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common
index bbe9099f7419..28d244e5c266 100644
--- a/sys/boot/alpha/common/Makefile.common
+++ b/sys/boot/alpha/common/Makefile.common
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.20 2004/12/21 12:32:13 ru Exp $
 #
 # Common Alpha loader build rules
 
diff --git a/sys/boot/alpha/common/conf.c b/sys/boot/alpha/common/conf.c
index 71562b34c158..7c2f3c54497f 100644
--- a/sys/boot/alpha/common/conf.c
+++ b/sys/boot/alpha/common/conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.6 2004/03/25 20:36:57 jhb Exp $");
 
 #include <stand.h>
 #include "libalpha/libalpha.h"
diff --git a/sys/boot/alpha/common/help.alpha b/sys/boot/alpha/common/help.alpha
index ce30524bd6e6..e2915c3ffb0a 100644
--- a/sys/boot/alpha/common/help.alpha
+++ b/sys/boot/alpha/common/help.alpha
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/alpha/common/help.alpha,v 1.2 2004/10/01 19:44:42 ru Exp $
 
 ################################################################################
 # Treboot DReboot the system
diff --git a/sys/boot/alpha/common/ldscript b/sys/boot/alpha/common/ldscript
index 30f7dbb6fc91..55fd5f8e655c 100644
--- a/sys/boot/alpha/common/ldscript
+++ b/sys/boot/alpha/common/ldscript
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/alpha/common/ldscript,v 1.1 2004/08/22 00:26:01 marcel Exp $ */
 /* Script for -N: mix text and data on same page; don't align data */
 OUTPUT_FORMAT("elf64-alpha-freebsd", "elf64-alpha-freebsd",
               "elf64-alpha-freebsd")
diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c
index f0fac9d7f241..43b9cd2ce303 100644
--- a/sys/boot/alpha/common/main.c
+++ b/sys/boot/alpha/common/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/common/main.c,v 1.15 2005/05/31 21:22:01 jhb Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index 596611678631..3b62e94ef100 100644
--- a/sys/boot/alpha/libalpha/Makefile
+++ b/sys/boot/alpha/libalpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $
 
 LIB=		alpha
 INTERNALLIB=
diff --git a/sys/boot/alpha/libalpha/OSFpal.c b/sys/boot/alpha/libalpha/OSFpal.c
index 1c61f800b4c7..0e5fce70e13d 100644
--- a/sys/boot/alpha/libalpha/OSFpal.c
+++ b/sys/boot/alpha/libalpha/OSFpal.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.4 2004/01/04 23:21:01 obrien Exp $");
 
 #include <sys/types.h>
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c
index 6c8c683d7ec9..fbb8f6d2cdaf 100644
--- a/sys/boot/alpha/libalpha/alpha_copy.c
+++ b/sys/boot/alpha/libalpha/alpha_copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.6 2004/01/04 23:21:01 obrien Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/alpha/libalpha/alpha_module.c b/sys/boot/alpha/libalpha/alpha_module.c
index 804d4849d931..609211414a22 100644
--- a/sys/boot/alpha/libalpha/alpha_module.c
+++ b/sys/boot/alpha/libalpha/alpha_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.4 2004/01/04 23:21:01 obrien Exp $");
 
 /*
  * alpha-specific module functionality.
diff --git a/sys/boot/alpha/libalpha/bbinfo.h b/sys/boot/alpha/libalpha/bbinfo.h
index 94aa4bbff07f..6d3600113143 100644
--- a/sys/boot/alpha/libalpha/bbinfo.h
+++ b/sys/boot/alpha/libalpha/bbinfo.h
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/bbinfo.h,v 1.2 1999/08/28 00:39:26 peter Exp $
  * From $NetBSD: bbinfo.h,v 1.2 1997/04/06 08:40:57 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c
index 106ad4527adf..631b3a681319 100644
--- a/sys/boot/alpha/libalpha/bootinfo.c
+++ b/sys/boot/alpha/libalpha/bootinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.14 2004/01/04 23:21:01 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/alpha/libalpha/common.h b/sys/boot/alpha/libalpha/common.h
index 7ae583099600..525f8e2bbcb7 100644
--- a/sys/boot/alpha/libalpha/common.h
+++ b/sys/boot/alpha/libalpha/common.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $
  * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/delay.c b/sys/boot/alpha/libalpha/delay.c
index 5a81c78531d5..08275a343c4b 100644
--- a/sys/boot/alpha/libalpha/delay.c
+++ b/sys/boot/alpha/libalpha/delay.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.4 2005/06/04 21:50:44 marcel Exp $");
 
 #include <stand.h>
 #include <machine/rpb.h>
diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c
index bceeb37afac4..a08eab6519d8 100644
--- a/sys/boot/alpha/libalpha/devicename.c
+++ b/sys/boot/alpha/libalpha/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.6 2005/05/31 21:23:43 jhb Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/alpha/libalpha/elf_freebsd.c b/sys/boot/alpha/libalpha/elf_freebsd.c
index bc5ce6aab8de..9f94833a62f8 100644
--- a/sys/boot/alpha/libalpha/elf_freebsd.c
+++ b/sys/boot/alpha/libalpha/elf_freebsd.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.14 2004/04/05 23:41:28 imp Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/alpha/libalpha/getsecs.c b/sys/boot/alpha/libalpha/getsecs.c
index e4e175c49331..9a5e23e71841 100644
--- a/sys/boot/alpha/libalpha/getsecs.c
+++ b/sys/boot/alpha/libalpha/getsecs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.4 2005/06/04 21:55:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <machine/prom.h>
diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h
index 2ccd4dcbf957..c8fae3c61bee 100644
--- a/sys/boot/alpha/libalpha/libalpha.h
+++ b/sys/boot/alpha/libalpha/libalpha.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/alpha/libalpha/libalpha.h,v 1.7 2005/05/31 21:23:43 jhb Exp $ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/alpha/libalpha/pal.S b/sys/boot/alpha/libalpha/pal.S
index 79f9306aa5da..fb17d28ba6d2 100644
--- a/sys/boot/alpha/libalpha/pal.S
+++ b/sys/boot/alpha/libalpha/pal.S
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/pal.S,v 1.3 2001/05/28 09:52:21 obrien Exp $
  * From: $NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom.c b/sys/boot/alpha/libalpha/prom.c
index 0ee3b6df1dd3..cd9e4a6c784a 100644
--- a/sys/boot/alpha/libalpha/prom.c
+++ b/sys/boot/alpha/libalpha/prom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.4 2004/01/04 23:21:01 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/boot/alpha/libalpha/prom_disp.S b/sys/boot/alpha/libalpha/prom_disp.S
index 184f1d3c9f00..05a8730de1f4 100644
--- a/sys/boot/alpha/libalpha/prom_disp.S
+++ b/sys/boot/alpha/libalpha/prom_disp.S
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/boot/alpha/libalpha/prom_disp.S,v 1.2 1999/08/28 00:39:28 peter Exp $ 
  * From: $NetBSD: prom_disp.S,v 1.2 1997/04/06 08:41:00 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom_swpal.S b/sys/boot/alpha/libalpha/prom_swpal.S
index be57632ddd9b..f75f77d96357 100644
--- a/sys/boot/alpha/libalpha/prom_swpal.S
+++ b/sys/boot/alpha/libalpha/prom_swpal.S
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/prom_swpal.S,v 1.2 1999/08/28 00:39:29 peter Exp $
  * From: $NetBSD: prom_swpal.S,v 1.2 1997/04/06 08:41:01 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/reboot.c b/sys/boot/alpha/libalpha/reboot.c
index f8de5614ad3a..dbf1900b654e 100644
--- a/sys/boot/alpha/libalpha/reboot.c
+++ b/sys/boot/alpha/libalpha/reboot.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.3 2004/01/04 23:21:01 obrien Exp $");
 
 #include <stand.h>
 #include <machine/rpb.h>
diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c
index 8b46b89b21a2..3715e170c1a5 100644
--- a/sys/boot/alpha/libalpha/srmdisk.c
+++ b/sys/boot/alpha/libalpha/srmdisk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.14 2005/05/31 21:23:21 jhb Exp $");
 
 /*
  * SRM disk device handling.
diff --git a/sys/boot/alpha/libalpha/srmnet.c b/sys/boot/alpha/libalpha/srmnet.c
index 7a76284900ac..0f443319a3b5 100644
--- a/sys/boot/alpha/libalpha/srmnet.c
+++ b/sys/boot/alpha/libalpha/srmnet.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.5 2004/01/04 23:21:01 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/boot/alpha/libalpha/start.S b/sys/boot/alpha/libalpha/start.S
index f7a46e12760b..adeb04378a1d 100644
--- a/sys/boot/alpha/libalpha/start.S
+++ b/sys/boot/alpha/libalpha/start.S
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/boot/alpha/libalpha/start.S,v 1.9 2001/03/04 04:38:14 obrien Exp $ 
  * From: $NetBSD: start.S,v 1.4 1998/03/28 00:54:15 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/time.c b/sys/boot/alpha/libalpha/time.c
index 73987c80ee1e..65ce05301995 100644
--- a/sys/boot/alpha/libalpha/time.c
+++ b/sys/boot/alpha/libalpha/time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.3 2004/01/04 23:21:01 obrien Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/alpha/loader/Makefile b/sys/boot/alpha/loader/Makefile
index 12eec01b29c2..7caac3548fd3 100644
--- a/sys/boot/alpha/loader/Makefile
+++ b/sys/boot/alpha/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/loader/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $
 
 BOOT= 		loader
 NEWVERSWHAT=	"SRM disk boot" alpha
diff --git a/sys/boot/alpha/loader/version b/sys/boot/alpha/loader/version
index d16c21538a7a..25fa5683c9b4 100644
--- a/sys/boot/alpha/loader/version
+++ b/sys/boot/alpha/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/alpha/loader/version,v 1.6 2001/12/11 00:49:33 jhb Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/alpha/netboot/Makefile b/sys/boot/alpha/netboot/Makefile
index f3d7d67afbd9..17210297911f 100644
--- a/sys/boot/alpha/netboot/Makefile
+++ b/sys/boot/alpha/netboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.12 2004/12/21 08:47:12 ru Exp $
 #	$NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $
 
 BOOT= 		netboot
diff --git a/sys/boot/alpha/netboot/version b/sys/boot/alpha/netboot/version
index d16c21538a7a..c441f7c4a012 100644
--- a/sys/boot/alpha/netboot/version
+++ b/sys/boot/alpha/netboot/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/alpha/netboot/version,v 1.3 2002/01/11 00:09:59 jhb Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/arc/Makefile b/sys/boot/arc/Makefile
index 82043c438af8..886a1ad08bbb 100644
--- a/sys/boot/arc/Makefile
+++ b/sys/boot/arc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/arc/Makefile,v 1.2 1999/08/28 00:39:33 peter Exp $
 
 SUBDIR=		lib
 SUBDIR+=	loader
diff --git a/sys/boot/arc/Makefile.inc b/sys/boot/arc/Makefile.inc
index e3a86c463a81..737144818b15 100644
--- a/sys/boot/arc/Makefile.inc
+++ b/sys/boot/arc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/arc/Makefile.inc,v 1.2 2000/05/01 20:26:21 peter Exp $
 # Options used when building app-specific libalpha components
 LOAD_ADDRESS=		0xffffffff80900000
 DPADD+=			${DESTDIR}/${LIBDIR}/libstand.a
diff --git a/sys/boot/arc/include/arcfuncs.h b/sys/boot/arc/include/arcfuncs.h
index 13e4792961f0..42071379980f 100644
--- a/sys/boot/arc/include/arcfuncs.h
+++ b/sys/boot/arc/include/arcfuncs.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/sys/boot/arc/include/arcfuncs.h,v 1.4 2005/03/02 21:33:22 joerg Exp $
  *
  */
 
diff --git a/sys/boot/arc/include/arctypes.h b/sys/boot/arc/include/arctypes.h
index b823e49babad..7df853ef2e07 100644
--- a/sys/boot/arc/include/arctypes.h
+++ b/sys/boot/arc/include/arctypes.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/sys/boot/arc/include/arctypes.h,v 1.2 1999/08/28 00:39:34 peter Exp $
  *
  */
 
diff --git a/sys/boot/arc/include/libarc.h b/sys/boot/arc/include/libarc.h
index 085d6bbc8eed..cd2800ea2b6b 100644
--- a/sys/boot/arc/include/libarc.h
+++ b/sys/boot/arc/include/libarc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/arc/include/libarc.h,v 1.2 1999/08/28 00:39:34 peter Exp $ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile
index 26336c4f81bf..598c0123cb6e 100644
--- a/sys/boot/arc/lib/Makefile
+++ b/sys/boot/arc/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/arc/lib/Makefile,v 1.10 2004/10/24 15:32:49 ru Exp $
 
 LIB=		arc
 INTERNALLIB=
diff --git a/sys/boot/arc/lib/abort.c b/sys/boot/arc/lib/abort.c
index 21839ab18087..420b848885b4 100644
--- a/sys/boot/arc/lib/abort.c
+++ b/sys/boot/arc/lib/abort.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.3 2004/01/04 23:28:01 obrien Exp $");
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/sys/boot/arc/lib/arcconsole.c b/sys/boot/arc/lib/arcconsole.c
index f1e869ba702a..fbdc0329007d 100644
--- a/sys/boot/arc/lib/arcconsole.c
+++ b/sys/boot/arc/lib/arcconsole.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.3 2004/01/04 23:28:01 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/boot/arc/lib/arcdisk.c b/sys/boot/arc/lib/arcdisk.c
index c5fb83995e43..75ebdb106d6f 100644
--- a/sys/boot/arc/lib/arcdisk.c
+++ b/sys/boot/arc/lib/arcdisk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.7 2004/01/04 23:28:01 obrien Exp $");
 
 /*
  * ARC disk device handling.
diff --git a/sys/boot/arc/lib/arch/alpha/copy.c b/sys/boot/arc/lib/arch/alpha/copy.c
index 2847812fed05..36f9b113e2ad 100644
--- a/sys/boot/arc/lib/arch/alpha/copy.c
+++ b/sys/boot/arc/lib/arch/alpha/copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arc/lib/arch/alpha/copy.c,v 1.2 1999/08/28 00:39:40 peter Exp $
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/arc/lib/arch/alpha/rpb.c b/sys/boot/arc/lib/arch/alpha/rpb.c
index 492346155751..852a2ff2cd09 100644
--- a/sys/boot/arc/lib/arch/alpha/rpb.c
+++ b/sys/boot/arc/lib/arch/alpha/rpb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arc/lib/arch/alpha/rpb.c,v 1.2 1999/08/28 00:39:40 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/arch/alpha/setjmp.S b/sys/boot/arc/lib/arch/alpha/setjmp.S
index 8e153f7ddd77..dfefc003fdc5 100644
--- a/sys/boot/arc/lib/arch/alpha/setjmp.S
+++ b/sys/boot/arc/lib/arch/alpha/setjmp.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/arc/lib/arch/alpha/setjmp.S,v 1.2 1999/08/28 00:39:40 peter Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/boot/arc/lib/arch/alpha/start.S b/sys/boot/arc/lib/arch/alpha/start.S
index 1b4fc598d6ae..d77f08b2bee7 100644
--- a/sys/boot/arc/lib/arch/alpha/start.S
+++ b/sys/boot/arc/lib/arch/alpha/start.S
@@ -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/sys/boot/arc/lib/arch/alpha/start.S,v 1.2 1999/08/28 00:39:41 peter Exp $
  *
  */
 
diff --git a/sys/boot/arc/lib/bootinfo.c b/sys/boot/arc/lib/bootinfo.c
index 4304b7945e27..6ac7c83cf887 100644
--- a/sys/boot/arc/lib/bootinfo.c
+++ b/sys/boot/arc/lib/bootinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.6 2004/01/04 23:28:01 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/arc/lib/delay.c b/sys/boot/arc/lib/delay.c
index 2236978cab94..6569ce03b4af 100644
--- a/sys/boot/arc/lib/delay.c
+++ b/sys/boot/arc/lib/delay.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.3 2004/01/04 23:28:01 obrien Exp $");
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/sys/boot/arc/lib/devicename.c b/sys/boot/arc/lib/devicename.c
index a3db40d0cbc0..cb9e450b16aa 100644
--- a/sys/boot/arc/lib/devicename.c
+++ b/sys/boot/arc/lib/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.4 2004/01/04 23:28:01 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/arc/lib/elf_freebsd.c b/sys/boot/arc/lib/elf_freebsd.c
index 8cebb6897c03..319112923416 100644
--- a/sys/boot/arc/lib/elf_freebsd.c
+++ b/sys/boot/arc/lib/elf_freebsd.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.6 2004/04/07 20:45:55 imp Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/arc/lib/module.c b/sys/boot/arc/lib/module.c
index 0ad48f60272b..60cc04954882 100644
--- a/sys/boot/arc/lib/module.c
+++ b/sys/boot/arc/lib/module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/module.c,v 1.3 2004/01/04 23:28:01 obrien Exp $");
 
 /*
  * alpha-specific module functionality.
diff --git a/sys/boot/arc/lib/prom.c b/sys/boot/arc/lib/prom.c
index 8246d4a38958..46bc9923077e 100644
--- a/sys/boot/arc/lib/prom.c
+++ b/sys/boot/arc/lib/prom.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/prom.c,v 1.3 2004/01/04 23:28:01 obrien Exp $");
 
 #define	PROM_E_BOOTED_DEV	"XXX1"
 #define	PROM_E_BOOTED_FILE	"XXX2"
diff --git a/sys/boot/arc/lib/setjmperr.c b/sys/boot/arc/lib/setjmperr.c
index 8938a33f568f..67d19c36eb4e 100644
--- a/sys/boot/arc/lib/setjmperr.c
+++ b/sys/boot/arc/lib/setjmperr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/setjmperr.c,v 1.3 2004/01/04 23:28:01 obrien Exp $");
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/sys/boot/arc/lib/time.c b/sys/boot/arc/lib/time.c
index 059853401791..2773d434a5b0 100644
--- a/sys/boot/arc/lib/time.c
+++ b/sys/boot/arc/lib/time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/lib/time.c,v 1.3 2004/01/04 23:28:01 obrien Exp $");
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/sys/boot/arc/loader/Makefile b/sys/boot/arc/loader/Makefile
index b9a7e75202a1..9ccd1306f651 100644
--- a/sys/boot/arc/loader/Makefile
+++ b/sys/boot/arc/loader/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/arc/loader/Makefile,v 1.8 2004/12/21 08:47:12 ru Exp $
 
 BASE= 		loader
 PROG= 		${BASE}.exe
diff --git a/sys/boot/arc/loader/conf.c b/sys/boot/arc/loader/conf.c
index 3b07b7b69068..8e8b6652f26d 100644
--- a/sys/boot/arc/loader/conf.c
+++ b/sys/boot/arc/loader/conf.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.5 2004/01/04 23:28:01 obrien Exp $");
 
 #include <stand.h>
 #include "libarc.h"
diff --git a/sys/boot/arc/loader/main.c b/sys/boot/arc/loader/main.c
index 0a0faf53ff13..8b4739b857eb 100644
--- a/sys/boot/arc/loader/main.c
+++ b/sys/boot/arc/loader/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arc/loader/main.c,v 1.4 2004/01/04 23:28:01 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/arc/loader/version b/sys/boot/arc/loader/version
index bc9aa00ed9ab..f7c5a7361052 100644
--- a/sys/boot/arc/loader/version
+++ b/sys/boot/arc/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/arc/loader/version,v 1.2 1999/08/28 00:39:43 peter Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index 9f12af2ab716..948009f761b9 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.21 2004/10/24 12:32:41 ru Exp $
 
 SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index c88adca6230f..654fe91f69ad 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/bcache.c,v 1.13 2004/10/03 16:34:01 stefanf Exp $");
 
 /*
  * Simple LRU block cache
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 515d0fa1f4a0..ec60f8db4773 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.31 2005/05/19 23:03:01 sobomax Exp $");
 
 /*
  * Loading modules, booting the system
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index f84c8e3ebafe..c52c003349c6 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.41 2004/08/29 00:48:41 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index 0559d1558c4d..997aec1b917a 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.22 2004/11/13 17:04:55 ru Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index d140a96b570b..1f1b7585f43d 100644
--- a/sys/boot/common/console.c
+++ b/sys/boot/common/console.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.7.2.1 2005/08/05 00:36:59 brian Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index b7ccbca72ea7..5f13ef53acaa 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.15 2004/07/08 22:35:33 brian Exp $");
 
 /*-
  * This module implements a "raw device" interface suitable for
diff --git a/sys/boot/common/dev_net.h b/sys/boot/common/dev_net.h
index 3b3d10728a3d..af3329735519 100644
--- a/sys/boot/common/dev_net.h
+++ b/sys/boot/common/dev_net.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/dev_net.h,v 1.2 1999/08/28 00:39:46 peter Exp $
  */
 
 extern struct devsw netdev;
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c
index 28a2fab26230..4b3b33363710 100644
--- a/sys/boot/common/devopen.c
+++ b/sys/boot/common/devopen.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.4 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 33f48e65e0f5..82888cdfe07a 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp.c,v 1.29 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * Simple commandline interpreter, toplevel and misc.
diff --git a/sys/boot/common/interp_backslash.c b/sys/boot/common/interp_backslash.c
index 3cbdd5b105ea..6847b414aba2 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/sys/boot/common/interp_backslash.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.6 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index cc66c4d26e49..b9595163a78f 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_forth.c,v 1.23 2003/08/25 23:30:41 obrien Exp $");
 
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
 #include <string.h>
diff --git a/sys/boot/common/interp_parse.c b/sys/boot/common/interp_parse.c
index 32b01c8c7aec..2ae6d45f46f9 100644
--- a/sys/boot/common/interp_parse.c
+++ b/sys/boot/common/interp_parse.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_parse.c,v 1.10 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/isapnp.c b/sys/boot/common/isapnp.c
index a8efb28c7e1b..c98f17654edf 100644
--- a/sys/boot/common/isapnp.c
+++ b/sys/boot/common/isapnp.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/isapnp.c,v 1.7 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * Machine-independant ISA PnP enumerator implementing a subset of the
diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h
index 0f9956c4f183..923acb744c13 100644
--- a/sys/boot/common/isapnp.h
+++ b/sys/boot/common/isapnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/isapnp.h,v 1.7 2002/03/20 07:59:37 alfred Exp $
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/boot/common/load.c b/sys/boot/common/load.c
index a4c665d72ff4..9e912562aa64 100644
--- a/sys/boot/common/load.c
+++ b/sys/boot/common/load.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load.c,v 1.5 2004/08/22 08:57:05 maxim Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index a44145b5e520..6b8ec838f754 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.32 2004/08/28 23:03:05 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/boot/common/load_elf32.c b/sys/boot/common/load_elf32.c
index 1de5dc1fb694..c55b9fff643b 100644
--- a/sys/boot/common/load_elf32.c
+++ b/sys/boot/common/load_elf32.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf32.c,v 1.2 2003/08/25 23:30:41 obrien Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/load_elf32_obj.c b/sys/boot/common/load_elf32_obj.c
index fed25efafc9f..120f9f33a825 100644
--- a/sys/boot/common/load_elf32_obj.c
+++ b/sys/boot/common/load_elf32_obj.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf32_obj.c,v 1.1 2004/08/29 00:48:41 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/load_elf64.c b/sys/boot/common/load_elf64.c
index c29e8e3596a7..dbf28fbadbf3 100644
--- a/sys/boot/common/load_elf64.c
+++ b/sys/boot/common/load_elf64.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf64.c,v 1.2 2003/08/25 23:30:41 obrien Exp $");
 
 #define __ELF_WORD_SIZE 64
 
diff --git a/sys/boot/common/load_elf64_obj.c b/sys/boot/common/load_elf64_obj.c
index 3c9371ba0130..72b7bb90a6f8 100644
--- a/sys/boot/common/load_elf64_obj.c
+++ b/sys/boot/common/load_elf64_obj.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf64_obj.c,v 1.1 2004/08/29 00:48:41 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 64
 
diff --git a/sys/boot/common/load_elf_obj.c b/sys/boot/common/load_elf_obj.c
index 53b1317a0299..2611d94b27b5 100644
--- a/sys/boot/common/load_elf_obj.c
+++ b/sys/boot/common/load_elf_obj.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf_obj.c,v 1.1 2004/08/29 00:48:41 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 13331c1a416d..b8a27d37a0fb 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.82 2005/06/14 08:49:14 ru Exp $
 .\"
 .Dd May 27, 2005
 .Dt LOADER 8
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index 86f83c39a9d8..3f0c4f4c3fe2 100644
--- a/sys/boot/common/ls.c
+++ b/sys/boot/common/ls.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/ls.c,v 1.11 2003/08/25 23:30:41 obrien Exp $");
 
 #include <sys/param.h>
 #include <ufs/ufs/dinode.h>
diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk
index 02fbc4ac7b2d..eb274ca314a7 100644
--- a/sys/boot/common/merge_help.awk
+++ b/sys/boot/common/merge_help.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.5 2001/11/07 17:53:25 fenner Exp $
 #
 # Merge two boot loader help files for FreeBSD 3.0
 # Joe Abley <jabley@patho.gen.nz>
diff --git a/sys/boot/common/misc.c b/sys/boot/common/misc.c
index f1a049194cef..50ec67e89c78 100644
--- a/sys/boot/common/misc.c
+++ b/sys/boot/common/misc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/misc.c,v 1.9 2004/08/28 14:57:34 iedowse Exp $");
 
 #include <string.h>
 #include <stand.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index ae93426848a5..4f7c38288434 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.25 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * file/module function dispatcher, support, etc.
diff --git a/sys/boot/common/newvers.sh b/sys/boot/common/newvers.sh
index fd7b0b1685c4..e2b05e4aa9fd 100755
--- a/sys/boot/common/newvers.sh
+++ b/sys/boot/common/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $
 #	$NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
diff --git a/sys/boot/common/panic.c b/sys/boot/common/panic.c
index 181c4c715070..c9bad95a213a 100644
--- a/sys/boot/common/panic.c
+++ b/sys/boot/common/panic.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.7 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <machine/stdarg.h>
diff --git a/sys/boot/common/pnp.c b/sys/boot/common/pnp.c
index 05cce99f9d2a..bca39cc652f9 100644
--- a/sys/boot/common/pnp.c
+++ b/sys/boot/common/pnp.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/pnp.c,v 1.16 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * "Plug and Play" functionality.
diff --git a/sys/boot/common/pnpdata b/sys/boot/common/pnpdata
index f2e262070d96..cd15bb87084e 100644
--- a/sys/boot/common/pnpdata
+++ b/sys/boot/common/pnpdata
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/pnpdata,v 1.2 1999/08/28 00:39:51 peter Exp $
 #
 # This file contains the system default Plug-and-Play data.  It is
 # derived from a number of sources, including:
diff --git a/sys/boot/common/reloc_elf.c b/sys/boot/common/reloc_elf.c
index d6ff99944318..d97a17577908 100644
--- a/sys/boot/common/reloc_elf.c
+++ b/sys/boot/common/reloc_elf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/reloc_elf.c,v 1.1 2004/08/28 23:03:05 iedowse Exp $");
 
 #include <sys/types.h>
 #include <machine/elf.h>
diff --git a/sys/boot/common/reloc_elf32.c b/sys/boot/common/reloc_elf32.c
index 03d9d73bab7f..b5a35d669df6 100644
--- a/sys/boot/common/reloc_elf32.c
+++ b/sys/boot/common/reloc_elf32.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/reloc_elf32.c,v 1.1 2004/08/28 23:03:05 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/reloc_elf64.c b/sys/boot/common/reloc_elf64.c
index c8dcf2a36b0d..df7696ebc6c6 100644
--- a/sys/boot/common/reloc_elf64.c
+++ b/sys/boot/common/reloc_elf64.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/reloc_elf64.c,v 1.1 2004/08/28 23:03:05 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 64
 
diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c
index ae0b356a5a57..38c0f124b975 100644
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.14 2005/01/30 14:58:00 rwatson Exp $");
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile
index ce5211393c22..c27ee3d1eb13 100644
--- a/sys/boot/efi/Makefile
+++ b/sys/boot/efi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/Makefile,v 1.2 2004/11/23 06:04:51 marcel Exp $
 
 SUBDIR=		libefi
 
diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc
index 2668708befb5..9617bf498cb3 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/sys/boot/efi/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.7 2004/02/12 08:10:33 ru Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/efi/include/README b/sys/boot/efi/include/README
index bf821fae7e60..353a41924090 100644
--- a/sys/boot/efi/include/README
+++ b/sys/boot/efi/include/README
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/README,v 1.2 2005/01/05 22:16:57 imp Exp $ */
 /*-
 
 Files in this directory and subdirectories are subject to the following
diff --git a/sys/boot/efi/include/efi.h b/sys/boot/efi/include/efi.h
index f476a25daa35..bbcef56cffcd 100644
--- a/sys/boot/efi/include/efi.h
+++ b/sys/boot/efi/include/efi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.3 2002/05/19 03:17:20 marcel Exp $ */
 /*++
 
 Copyright (c) 1998  Intel Corporation
diff --git a/sys/boot/efi/include/efi_nii.h b/sys/boot/efi/include/efi_nii.h
index 6a9c05d5a889..748c352b5f8a 100644
--- a/sys/boot/efi/include/efi_nii.h
+++ b/sys/boot/efi/include/efi_nii.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efi_nii.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_NII_H
 #define _EFI_NII_H
 
diff --git a/sys/boot/efi/include/efiapi.h b/sys/boot/efi/include/efiapi.h
index 93c6995ec67a..d92800ec2885 100644
--- a/sys/boot/efi/include/efiapi.h
+++ b/sys/boot/efi/include/efiapi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.6 2003/12/10 19:08:09 jhb Exp $ */
 #ifndef _EFI_API_H
 #define _EFI_API_H
 
diff --git a/sys/boot/efi/include/eficon.h b/sys/boot/efi/include/eficon.h
index a2885713baad..906cf82b3e66 100644
--- a/sys/boot/efi/include/eficon.h
+++ b/sys/boot/efi/include/eficon.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/eficon.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_CON_H
 #define _EFI_CON_H
 
diff --git a/sys/boot/efi/include/efidebug.h b/sys/boot/efi/include/efidebug.h
index 5214737bb0a3..2ed7a5e9831b 100644
--- a/sys/boot/efi/include/efidebug.h
+++ b/sys/boot/efi/include/efidebug.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efidebug.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_DEBUG_H
 #define _EFI_DEBUG_H
 
diff --git a/sys/boot/efi/include/efidef.h b/sys/boot/efi/include/efidef.h
index 2bd7f9b4eae3..44ce45920f1a 100644
--- a/sys/boot/efi/include/efidef.h
+++ b/sys/boot/efi/include/efidef.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efidef.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_DEF_H
 #define _EFI_DEF_H
 
diff --git a/sys/boot/efi/include/efidevp.h b/sys/boot/efi/include/efidevp.h
index ebd6b3b93c1d..863e11c24004 100644
--- a/sys/boot/efi/include/efidevp.h
+++ b/sys/boot/efi/include/efidevp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efidevp.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _DEVPATH_H
 #define _DEVPATH_H
 
diff --git a/sys/boot/efi/include/efierr.h b/sys/boot/efi/include/efierr.h
index a6db90c35724..308c8f298aec 100644
--- a/sys/boot/efi/include/efierr.h
+++ b/sys/boot/efi/include/efierr.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efierr.h,v 1.1 2001/06/09 16:49:49 dfr Exp $ */
 #ifndef _EFI_ERR_H
 #define _EFI_ERR_H
 
diff --git a/sys/boot/efi/include/efifpswa.h b/sys/boot/efi/include/efifpswa.h
index 3e039ef6a26d..5280be5264ee 100644
--- a/sys/boot/efi/include/efifpswa.h
+++ b/sys/boot/efi/include/efifpswa.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efifpswa.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_FPSWA_H
 #define _EFI_FPSWA_H
 
diff --git a/sys/boot/efi/include/efifs.h b/sys/boot/efi/include/efifs.h
index 8ef361549a6f..102a7c677f89 100644
--- a/sys/boot/efi/include/efifs.h
+++ b/sys/boot/efi/include/efifs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efifs.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_FS_H
 #define _EFI_FS_H
 
diff --git a/sys/boot/efi/include/efilib.h b/sys/boot/efi/include/efilib.h
index abd3e507c707..dc13b50ba20f 100644
--- a/sys/boot/efi/include/efilib.h
+++ b/sys/boot/efi/include/efilib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.4 2004/11/28 00:30:22 marcel Exp $
  */
 
 extern EFI_HANDLE		IH;
diff --git a/sys/boot/efi/include/efinet.h b/sys/boot/efi/include/efinet.h
index c137ef8c8ab1..792b1edba0b2 100644
--- a/sys/boot/efi/include/efinet.h
+++ b/sys/boot/efi/include/efinet.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efinet.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFINET_H
 #define _EFINET_H
 
diff --git a/sys/boot/efi/include/efipart.h b/sys/boot/efi/include/efipart.h
index b504bd9c8bfe..abb81a82677b 100644
--- a/sys/boot/efi/include/efipart.h
+++ b/sys/boot/efi/include/efipart.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efipart.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_PART_H
 #define _EFI_PART_H
 
diff --git a/sys/boot/efi/include/efiprot.h b/sys/boot/efi/include/efiprot.h
index d81d6051e1e6..f271d0149f02 100644
--- a/sys/boot/efi/include/efiprot.h
+++ b/sys/boot/efi/include/efiprot.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efiprot.h,v 1.3 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_PROT_H
 #define _EFI_PROT_H
 
diff --git a/sys/boot/efi/include/efipxebc.h b/sys/boot/efi/include/efipxebc.h
index 7a6df76b2b4e..0d3ff1ec8b62 100644
--- a/sys/boot/efi/include/efipxebc.h
+++ b/sys/boot/efi/include/efipxebc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efipxebc.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFIPXEBC_H
 #define _EFIPXEBC_H
 
diff --git a/sys/boot/efi/include/efiser.h b/sys/boot/efi/include/efiser.h
index e2d63bd938b5..d1b4dfd7f19e 100644
--- a/sys/boot/efi/include/efiser.h
+++ b/sys/boot/efi/include/efiser.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efiser.h,v 1.2 2002/05/19 03:17:21 marcel Exp $ */
 #ifndef _EFI_SER_H
 #define _EFI_SER_H
 
diff --git a/sys/boot/efi/include/efistdarg.h b/sys/boot/efi/include/efistdarg.h
index 68c222127724..ee2f4cadd7b9 100644
--- a/sys/boot/efi/include/efistdarg.h
+++ b/sys/boot/efi/include/efistdarg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efistdarg.h,v 1.1 2001/06/09 16:49:49 dfr Exp $ */
 #ifndef _EFISTDARG_H_
 #define _EFISTDARG_H_
 
diff --git a/sys/boot/efi/include/i386/efibind.h b/sys/boot/efi/include/i386/efibind.h
index 1c62eb61a58e..1863b7e3499f 100644
--- a/sys/boot/efi/include/i386/efibind.h
+++ b/sys/boot/efi/include/i386/efibind.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/i386/efibind.h,v 1.3 2005/03/07 15:38:37 stefanf Exp $ */
 /*++
 
 Copyright (c) 1998  Intel Corporation
diff --git a/sys/boot/efi/include/i386/pe.h b/sys/boot/efi/include/i386/pe.h
index 11204647697d..ebb5615bff9c 100644
--- a/sys/boot/efi/include/i386/pe.h
+++ b/sys/boot/efi/include/i386/pe.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/i386/pe.h,v 1.1 2001/06/09 16:49:50 dfr Exp $ */
 /* 
     PE32+ header file
  */
diff --git a/sys/boot/efi/include/ia64/efibind.h b/sys/boot/efi/include/ia64/efibind.h
index 0c77dca8f559..a7e63cbdfee0 100644
--- a/sys/boot/efi/include/ia64/efibind.h
+++ b/sys/boot/efi/include/ia64/efibind.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/ia64/efibind.h,v 1.6 2005/03/07 15:38:37 stefanf Exp $ */
 /*++
 
 Copyright (c) 1998  Intel Corporation
diff --git a/sys/boot/efi/include/ia64/pe.h b/sys/boot/efi/include/ia64/pe.h
index 59839d28c8b0..818a7be2897c 100644
--- a/sys/boot/efi/include/ia64/pe.h
+++ b/sys/boot/efi/include/ia64/pe.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/ia64/pe.h,v 1.1 2001/06/09 16:49:50 dfr Exp $ */
 /* 
     PE32+ header file
  */
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index c52ffc9f27d0..6d3ff06fd875 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $
 
 .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/sys/boot/efi/libefi/bootinfo.c b/sys/boot/efi/libefi/bootinfo.c
index 44fde4661134..c97cb2a7a4e6 100644
--- a/sys/boot/efi/libefi/bootinfo.c
+++ b/sys/boot/efi/libefi/bootinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.11 2004/12/01 04:59:31 scottl Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/efi/libefi/copy.c b/sys/boot/efi/libefi/copy.c
index 4b4b9bd1385e..10fa406e4ffc 100644
--- a/sys/boot/efi/libefi/copy.c
+++ b/sys/boot/efi/libefi/copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.6 2004/11/28 00:30:22 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/delay.c b/sys/boot/efi/libefi/delay.c
index 723f681c5286..5674760dd028 100644
--- a/sys/boot/efi/libefi/delay.c
+++ b/sys/boot/efi/libefi/delay.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/delay.c,v 1.3 2003/04/03 21:36:29 obrien Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/devicename.c b/sys/boot/efi/libefi/devicename.c
index d9f5275a4197..57cc7ee78dea 100644
--- a/sys/boot/efi/libefi/devicename.c
+++ b/sys/boot/efi/libefi/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.3 2004/01/04 23:28:16 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/efi/libefi/efi_console.c b/sys/boot/efi/libefi/efi_console.c
index 3538994ac104..4e9da226441b 100644
--- a/sys/boot/efi/libefi/efi_console.c
+++ b/sys/boot/efi/libefi/efi_console.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.5 2004/03/09 04:00:33 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/efiboot.h b/sys/boot/efi/libefi/efiboot.h
index d93213b77885..6a7db43b7936 100644
--- a/sys/boot/efi/libefi/efiboot.h
+++ b/sys/boot/efi/libefi/efiboot.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/sys/boot/efi/libefi/efiboot.h,v 1.9 2005/01/05 22:16:57 imp Exp $
  */
 
 /*
diff --git a/sys/boot/efi/libefi/efifpswa.c b/sys/boot/efi/libefi/efifpswa.c
index f7d514713947..6079869fccdf 100644
--- a/sys/boot/efi/libefi/efifpswa.c
+++ b/sys/boot/efi/libefi/efifpswa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efifpswa.c,v 1.2 2004/01/04 23:28:16 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/efi/libefi/efifs.c b/sys/boot/efi/libefi/efifs.c
index cf89a9d44884..e0743f646b35 100644
--- a/sys/boot/efi/libefi/efifs.c
+++ b/sys/boot/efi/libefi/efifs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.8 2003/08/02 08:22:03 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/efi/libefi/efinet.c b/sys/boot/efi/libefi/efinet.c
index c6fc5231a01b..a05f83d182e2 100644
--- a/sys/boot/efi/libefi/efinet.c
+++ b/sys/boot/efi/libefi/efinet.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.6 2004/01/04 23:28:16 obrien Exp $");
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/sys/boot/efi/libefi/elf_freebsd.c b/sys/boot/efi/libefi/elf_freebsd.c
index 93cfdbde2e3b..c9c321e23cf9 100644
--- a/sys/boot/efi/libefi/elf_freebsd.c
+++ b/sys/boot/efi/libefi/elf_freebsd.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.14 2004/09/23 18:37:36 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c
index 563b533ab232..f06f40ed5027 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/sys/boot/efi/libefi/libefi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/libefi.c,v 1.6 2003/04/03 21:36:29 obrien Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/module.c b/sys/boot/efi/libefi/module.c
index 7a3f4b2f1719..be076472235c 100644
--- a/sys/boot/efi/libefi/module.c
+++ b/sys/boot/efi/libefi/module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/module.c,v 1.3 2003/04/03 21:36:29 obrien Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/efi/libefi/time.c b/sys/boot/efi/libefi/time.c
index 4cdba6be81b4..e8aabb94006e 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/sys/boot/efi/libefi/time.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/time.c,v 1.5 2005/01/05 22:16:57 imp Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 55abdf75d9e0..37b563e0d5b7 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.41 2005/05/31 18:13:29 obrien Exp $
 #
 .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/}
 BASE_SRCS=	dict.c ficl.c fileaccess.c float.c loader.c math64.c \
diff --git a/sys/boot/ficl/alpha/sysdep.c b/sys/boot/ficl/alpha/sysdep.c
index 00b0d4acf0e3..e484c7663192 100644
--- a/sys/boot/ficl/alpha/sysdep.c
+++ b/sys/boot/ficl/alpha/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.c,v 1.8 2000/06/02 20:07:55 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/alpha/sysdep.h b/sys/boot/ficl/alpha/sysdep.h
index c8f892ed2909..ef50ea1c842b 100644
--- a/sys/boot/ficl/alpha/sysdep.h
+++ b/sys/boot/ficl/alpha/sysdep.h
@@ -46,7 +46,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.h,v 1.9 2002/05/16 21:21:50 trhodes Exp $ */
 
 #if !defined (__SYSDEP_H__)
 #define __SYSDEP_H__ 
diff --git a/sys/boot/ficl/dict.c b/sys/boot/ficl/dict.c
index b76d92559f8f..56937c7316ab 100644
--- a/sys/boot/ficl/dict.c
+++ b/sys/boot/ficl/dict.c
@@ -51,7 +51,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.13 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/ficl.c b/sys/boot/ficl/ficl.c
index d4370eb1a48a..9f8b3472ae73 100644
--- a/sys/boot/ficl/ficl.c
+++ b/sys/boot/ficl/ficl.c
@@ -55,7 +55,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ficl.c,v 1.18 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/ficl.h b/sys/boot/ficl/ficl.h
index d10c850a9b7f..aaf452a79472 100644
--- a/sys/boot/ficl/ficl.h
+++ b/sys/boot/ficl/ficl.h
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.21 2004/11/30 11:35:30 scottl Exp $ */
 
 #if !defined (__FICL_H__)
 #define __FICL_H__
diff --git a/sys/boot/ficl/fileaccess.c b/sys/boot/ficl/fileaccess.c
index 686c72153e02..7712c737bad8 100644
--- a/sys/boot/ficl/fileaccess.c
+++ b/sys/boot/ficl/fileaccess.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/fileaccess.c,v 1.1 2002/04/09 17:45:11 dcs Exp $ */
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/sys/boot/ficl/float.c b/sys/boot/ficl/float.c
index 3fe858147c8f..86affa2eaec8 100644
--- a/sys/boot/ficl/float.c
+++ b/sys/boot/ficl/float.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/float.c,v 1.1 2002/04/09 17:45:11 dcs Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/sys/boot/ficl/i386/sysdep.c b/sys/boot/ficl/i386/sysdep.c
index 2a5346aa7b43..a7523604eacb 100644
--- a/sys/boot/ficl/i386/sysdep.c
+++ b/sys/boot/ficl/i386/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/i386/sysdep.c,v 1.7 1999/09/29 04:43:07 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/i386/sysdep.h b/sys/boot/ficl/i386/sysdep.h
index e1900e2a4659..01b959e0935c 100644
--- a/sys/boot/ficl/i386/sysdep.h
+++ b/sys/boot/ficl/i386/sysdep.h
@@ -46,7 +46,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/i386/sysdep.h,v 1.8 2002/05/16 21:21:52 trhodes Exp $ */
 
 #if !defined (__SYSDEP_H__)
 #define __SYSDEP_H__ 
diff --git a/sys/boot/ficl/ia64/sysdep.c b/sys/boot/ficl/ia64/sysdep.c
index 00b0d4acf0e3..b018a0bbc68b 100644
--- a/sys/boot/ficl/ia64/sysdep.c
+++ b/sys/boot/ficl/ia64/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ia64/sysdep.c,v 1.1 2001/09/04 08:50:23 dfr Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/ia64/sysdep.h b/sys/boot/ficl/ia64/sysdep.h
index 08bc0e1f4d0b..5ce8074db580 100644
--- a/sys/boot/ficl/ia64/sysdep.h
+++ b/sys/boot/ficl/ia64/sysdep.h
@@ -48,7 +48,7 @@
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ia64/sysdep.h,v 1.3 2002/05/16 21:21:57 trhodes Exp $ */
 
 #if !defined (__SYSDEP_H__)
 #define __SYSDEP_H__ 
diff --git a/sys/boot/ficl/loader.c b/sys/boot/ficl/loader.c
index d723b1ed6712..f95a56624c72 100644
--- a/sys/boot/ficl/loader.c
+++ b/sys/boot/ficl/loader.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl Exp $
  */
 
 /*******************************************************************
diff --git a/sys/boot/ficl/math64.c b/sys/boot/ficl/math64.c
index 6e50458151bc..1fd6b757c8cb 100644
--- a/sys/boot/ficl/math64.c
+++ b/sys/boot/ficl/math64.c
@@ -42,7 +42,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/math64.c,v 1.4 2002/04/09 17:45:11 dcs Exp $ */
 
 #include "ficl.h"
 #include "math64.h"
diff --git a/sys/boot/ficl/math64.h b/sys/boot/ficl/math64.h
index a4e56369564f..febc5bf13635 100644
--- a/sys/boot/ficl/math64.h
+++ b/sys/boot/ficl/math64.h
@@ -40,7 +40,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/math64.h,v 1.4 2002/04/09 17:45:11 dcs Exp $ */
 
 #if !defined (__MATH64_H__)
 #define __MATH64_H__
diff --git a/sys/boot/ficl/powerpc/sysdep.c b/sys/boot/ficl/powerpc/sysdep.c
index 00b0d4acf0e3..b8732f5784d8 100644
--- a/sys/boot/ficl/powerpc/sysdep.c
+++ b/sys/boot/ficl/powerpc/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/powerpc/sysdep.c,v 1.1 2003/12/10 09:05:08 grehan Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/powerpc/sysdep.h b/sys/boot/ficl/powerpc/sysdep.h
index 3ae748e259c7..4c00bc50df6b 100644
--- a/sys/boot/ficl/powerpc/sysdep.h
+++ b/sys/boot/ficl/powerpc/sysdep.h
@@ -46,7 +46,7 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
+** $FreeBSD: src/sys/boot/ficl/powerpc/sysdep.h,v 1.1 2003/12/10 09:05:08 grehan Exp $
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/sys/boot/ficl/prefix.c b/sys/boot/ficl/prefix.c
index a34fc6c78240..2e83d16d6dd3 100644
--- a/sys/boot/ficl/prefix.c
+++ b/sys/boot/ficl/prefix.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/prefix.c,v 1.3 2002/08/31 01:04:53 scottl Exp $ */
 
 #include <string.h>
 #include <ctype.h>
diff --git a/sys/boot/ficl/search.c b/sys/boot/ficl/search.c
index d445cb32d93a..2f5cf98b8061 100644
--- a/sys/boot/ficl/search.c
+++ b/sys/boot/ficl/search.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/search.c,v 1.2 2002/04/09 17:45:11 dcs Exp $ */
 
 #include <string.h>
 #include "ficl.h"
diff --git a/sys/boot/ficl/softwords/classes.fr b/sys/boot/ficl/softwords/classes.fr
index b56da378e970..0b3d34446d23 100644
--- a/sys/boot/ficl/softwords/classes.fr
+++ b/sys/boot/ficl/softwords/classes.fr
@@ -4,7 +4,7 @@
 \ john sadler  1 sep 98
 \ Needs oop.fr
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/classes.fr,v 1.4 2001/04/29 02:36:35 dcs Exp $
 
 also oop definitions
 
diff --git a/sys/boot/ficl/softwords/ficlclass.fr b/sys/boot/ficl/softwords/ficlclass.fr
index 6d75efb0d3c5..7b8fbf705fef 100644
--- a/sys/boot/ficl/softwords/ficlclass.fr
+++ b/sys/boot/ficl/softwords/ficlclass.fr
@@ -7,7 +7,7 @@
 \ ** C - W O R D
 \ Models a FICL_WORD
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/ficlclass.fr,v 1.1 2002/04/09 17:45:27 dcs Exp $
 
 object subclass c-word
     c-word     ref: .link
diff --git a/sys/boot/ficl/softwords/ficllocal.fr b/sys/boot/ficl/softwords/ficllocal.fr
index c916089696c1..4023076228bd 100644
--- a/sys/boot/ficl/softwords/ficllocal.fr
+++ b/sys/boot/ficl/softwords/ficllocal.fr
@@ -7,7 +7,7 @@
 \ locstate: 0 = looking for -- or }}
 \           1 = found --
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/ficllocal.fr,v 1.1 1999/09/29 04:43:15 dcs Exp $
 
 hide
 0 constant zero
diff --git a/sys/boot/ficl/softwords/fileaccess.fr b/sys/boot/ficl/softwords/fileaccess.fr
index 10ec5bd72486..b3ce08e7c87b 100644
--- a/sys/boot/ficl/softwords/fileaccess.fr
+++ b/sys/boot/ficl/softwords/fileaccess.fr
@@ -4,7 +4,7 @@
 \ ** submitted by Larry Hastings, larry@hastings.org
 \ **
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/fileaccess.fr,v 1.1 2002/04/09 17:45:27 dcs Exp $
 
 : r/o 1 ;
 : r/w 3 ; 
diff --git a/sys/boot/ficl/softwords/forml.fr b/sys/boot/ficl/softwords/forml.fr
index 1144ef536792..3068ed39f6cb 100644
--- a/sys/boot/ficl/softwords/forml.fr
+++ b/sys/boot/ficl/softwords/forml.fr
@@ -1,7 +1,7 @@
 \ examples from FORML conference paper Nov 98
 \ sadler
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/forml.fr,v 1.1 2002/04/09 17:45:27 dcs Exp $
 
 .( loading FORML examples ) cr
 object --> sub c-example
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/sys/boot/ficl/softwords/freebsd.fr
index 96205c0808dd..6bb7ededfb5b 100644
--- a/sys/boot/ficl/softwords/freebsd.fr
+++ b/sys/boot/ficl/softwords/freebsd.fr
@@ -22,7 +22,7 @@
 \ ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ ** SUCH DAMAGE.
 \ **
-\ ** $FreeBSD$
+\ ** $FreeBSD: src/sys/boot/ficl/softwords/freebsd.fr,v 1.4 1999/08/28 00:39:55 peter Exp $
 
 \ Words for use in scripts:
 \ % ignore errors here
diff --git a/sys/boot/ficl/softwords/ifbrack.fr b/sys/boot/ficl/softwords/ifbrack.fr
index a8c60626c4f8..aac9ea3467ce 100644
--- a/sys/boot/ficl/softwords/ifbrack.fr
+++ b/sys/boot/ficl/softwords/ifbrack.fr
@@ -2,7 +2,7 @@
 \ ** ANS conditional compile directives [if] [else] [then]
 \ ** Requires ficl 2.0 or greater...
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/ifbrack.fr,v 1.3 2002/04/09 17:45:27 dcs Exp $
 
 hide
 
diff --git a/sys/boot/ficl/softwords/jhlocal.fr b/sys/boot/ficl/softwords/jhlocal.fr
index b6e84674c9fa..051f4982d37b 100644
--- a/sys/boot/ficl/softwords/jhlocal.fr
+++ b/sys/boot/ficl/softwords/jhlocal.fr
@@ -14,7 +14,7 @@
 \
 \ revised 2 June 2000 - { | a -- } now works correctly
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/jhlocal.fr,v 1.4 2001/04/29 02:36:36 dcs Exp $
 
 hide
 0 constant zero
diff --git a/sys/boot/ficl/softwords/marker.fr b/sys/boot/ficl/softwords/marker.fr
index ee3c9bdf2f64..714324602cb1 100644
--- a/sys/boot/ficl/softwords/marker.fr
+++ b/sys/boot/ficl/softwords/marker.fr
@@ -3,7 +3,7 @@
 \ John Sadler, 4 Oct 98
 \ Requires ficl 2.02 FORGET-WID !!
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/marker.fr,v 1.2 2002/04/09 17:45:27 dcs Exp $
 
 : marker   ( "name" -- )
     create  
diff --git a/sys/boot/ficl/softwords/oo.fr b/sys/boot/ficl/softwords/oo.fr
index 9e6a04ea24df..4b1282d8ee89 100644
--- a/sys/boot/ficl/softwords/oo.fr
+++ b/sys/boot/ficl/softwords/oo.fr
@@ -3,7 +3,7 @@
 \ ** F I C L   O - O   E X T E N S I O N S
 \ ** john sadler aug 1998
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/oo.fr,v 1.4 2002/04/09 17:45:28 dcs Exp $
 
 17 ficl-vocabulary oop
 also oop definitions
diff --git a/sys/boot/ficl/softwords/prefix.fr b/sys/boot/ficl/softwords/prefix.fr
index 53a1d540043d..a338adb8e306 100644
--- a/sys/boot/ficl/softwords/prefix.fr
+++ b/sys/boot/ficl/softwords/prefix.fr
@@ -5,7 +5,7 @@
 \ (jws) To make a prefix, simply create a new definition in the <prefixes> 
 \ wordlist. start-prefixes and end-prefixes handle the bookkeeping
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/prefix.fr,v 1.2 2002/04/09 17:45:28 dcs Exp $
 
 variable save-current
 
diff --git a/sys/boot/ficl/softwords/softcore.awk b/sys/boot/ficl/softwords/softcore.awk
index c41996aebeaa..f258572c6ffe 100644
--- a/sys/boot/ficl/softwords/softcore.awk
+++ b/sys/boot/ficl/softwords/softcore.awk
@@ -10,7 +10,7 @@
 # Note! This script uses strftime() which is a gawk-ism, and the
 # POSIX [[:space:]] character class.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ficl/softwords/softcore.awk,v 1.8 2001/11/03 01:33:12 obrien Exp $
 
 BEGIN \
 {
diff --git a/sys/boot/ficl/softwords/softcore.fr b/sys/boot/ficl/softwords/softcore.fr
index a70ebaa634ef..434c03da9c5e 100644
--- a/sys/boot/ficl/softwords/softcore.fr
+++ b/sys/boot/ficl/softwords/softcore.fr
@@ -3,7 +3,7 @@
 \ ** John Sadler (john_sadler@alum.mit.edu)
 \ ** September, 1998
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/softcore.fr,v 1.12 2002/04/09 17:45:28 dcs Exp $
 
 \ ** Ficl USER variables
 \ ** See words.c for primitive def'n of USER
diff --git a/sys/boot/ficl/softwords/string.fr b/sys/boot/ficl/softwords/string.fr
index dabb3900892f..716fff8c8dd5 100644
--- a/sys/boot/ficl/softwords/string.fr
+++ b/sys/boot/ficl/softwords/string.fr
@@ -11,7 +11,7 @@
 \   s" woof woof woof " str --> cat
 \   str --> type  cr
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/string.fr,v 1.2 2001/04/29 02:36:36 dcs Exp $
 
 also oop definitions
 
diff --git a/sys/boot/ficl/sparc64/sysdep.c b/sys/boot/ficl/sparc64/sysdep.c
index 00b0d4acf0e3..8f2cebc6fd9d 100644
--- a/sys/boot/ficl/sparc64/sysdep.c
+++ b/sys/boot/ficl/sparc64/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/sparc64/sysdep.c,v 1.1 2002/05/19 23:20:56 jake Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/sparc64/sysdep.h b/sys/boot/ficl/sparc64/sysdep.h
index 0a6ca33363dd..152823beba1d 100644
--- a/sys/boot/ficl/sparc64/sysdep.h
+++ b/sys/boot/ficl/sparc64/sysdep.h
@@ -48,7 +48,7 @@
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/sparc64/sysdep.h,v 1.1 2002/05/19 23:20:56 jake Exp $ */
 
 #if !defined (__SYSDEP_H__)
 #define __SYSDEP_H__ 
diff --git a/sys/boot/ficl/stack.c b/sys/boot/ficl/stack.c
index f98a3b61db7d..7a3f5b2bc32d 100644
--- a/sys/boot/ficl/stack.c
+++ b/sys/boot/ficl/stack.c
@@ -40,7 +40,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/stack.c,v 1.5 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/testmain.c b/sys/boot/ficl/testmain.c
index 7167f30a2561..cdd0f454cfde 100644
--- a/sys/boot/ficl/testmain.c
+++ b/sys/boot/ficl/testmain.c
@@ -37,7 +37,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/testmain.c,v 1.8 2002/04/09 17:45:11 dcs Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/sys/boot/ficl/tools.c b/sys/boot/ficl/tools.c
index dc321f8cf2e3..bcca00e890a4 100644
--- a/sys/boot/ficl/tools.c
+++ b/sys/boot/ficl/tools.c
@@ -54,7 +54,7 @@
 ** Specify breakpoint default action
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/tools.c,v 1.2 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/unix.c b/sys/boot/ficl/unix.c
index 4400752f4f48..89809648a8ad 100644
--- a/sys/boot/ficl/unix.c
+++ b/sys/boot/ficl/unix.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/unix.c,v 1.1 2001/04/29 02:36:34 dcs Exp $ */
 
 #include <string.h>
 #include <netinet/in.h>
diff --git a/sys/boot/ficl/vm.c b/sys/boot/ficl/vm.c
index 7bcb19a601f9..6d08de98c46e 100644
--- a/sys/boot/ficl/vm.c
+++ b/sys/boot/ficl/vm.c
@@ -47,7 +47,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/vm.c,v 1.9 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/words.c b/sys/boot/ficl/words.c
index 341993885baa..ae8f755d5623 100644
--- a/sys/boot/ficl/words.c
+++ b/sys/boot/ficl/words.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/words.c,v 1.39 2002/12/30 21:18:06 schweikh Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index fba284e8ab99..eec79827d09d 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -23,7 +23,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.10.4.1 2005/10/30 14:40:40 scottl Exp $
 
 marker task-beastie.4th
 
diff --git a/sys/boot/forth/frames.4th b/sys/boot/forth/frames.4th
index 3b1f4046891f..b10bd2983e4d 100644
--- a/sys/boot/forth/frames.4th
+++ b/sys/boot/forth/frames.4th
@@ -1,6 +1,6 @@
 \ Words implementing frame drawing
 \ XXX Filled boxes are left as an exercise for the reader... ;-/
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/frames.4th,v 1.2 2004/01/18 04:13:27 nyan Exp $
 
 marker task-frames.4th
 
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 8ffb02dd81ff..dac9ff4c72a4 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.24 2002/05/24 02:28:58 gordon Exp $
 
 s" arch-alpha" environment? [if] [if]
 	s" loader_version" environment?  [if]
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 568aa847a355..ff60aba6efd5 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.16 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd September 30, 2004
 .Dt LOADER.4TH 8
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 87eebc694113..5b40ad65ef59 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.95.2.2 2005/09/02 14:08:19 glebius Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 4ee8b98fa13e..bd28c258901c 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.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/sys/boot/forth/loader.conf.5,v 1.23 2004/11/07 17:01:08 krion Exp $
 .Dd November 7, 2004
 .Dt LOADER.CONF 5
 .Os
diff --git a/sys/boot/forth/loader.rc b/sys/boot/forth/loader.rc
index 0f9d37eff018..d293577486d6 100644
--- a/sys/boot/forth/loader.rc
+++ b/sys/boot/forth/loader.rc
@@ -1,5 +1,5 @@
 \ Loader.rc
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/loader.rc,v 1.3 2004/12/06 05:30:31 imp Exp $
 \
 \ Includes additional commands
 include /boot/loader.4th
diff --git a/sys/boot/forth/pnp.4th b/sys/boot/forth/pnp.4th
index 395164deadfc..ced199ff918f 100644
--- a/sys/boot/forth/pnp.4th
+++ b/sys/boot/forth/pnp.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/pnp.4th,v 1.2 2001/12/11 00:49:34 jhb Exp $
 
 pnpdevices drop
 
diff --git a/sys/boot/forth/screen.4th b/sys/boot/forth/screen.4th
index 3ea79e453d80..f7f3624677ae 100644
--- a/sys/boot/forth/screen.4th
+++ b/sys/boot/forth/screen.4th
@@ -1,5 +1,5 @@
 \ Screen manipulation related words.
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/screen.4th,v 1.1 2003/05/30 09:29:23 scottl Exp $
 
 marker task-screen.4th
 
diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th
index 9da74b7b5a24..2137accc24f8 100644
--- a/sys/boot/forth/support.4th
+++ b/sys/boot/forth/support.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.15 2002/05/24 02:28:58 gordon Exp $
 
 \ Loader.rc support functions:
 \
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index aac1821a8857..c142050e89fa 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $
 
 SUBDIR=		mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader
 
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
index c3054b0dc4d5..78b710803bcb 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@@ -1,6 +1,6 @@
 # Common defines for all of /sys/boot/i386/
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.10 2005/03/15 18:43:36 obrien Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index e02b10286206..36c9da6585dc 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.32 2005/04/25 17:41:35 ru Exp $
 
 PROG?=	boot0
 STRIP=
diff --git a/sys/boot/i386/boot0/boot0.S b/sys/boot/i386/boot0/boot0.S
index 4927d218146c..8e3c53f6705c 100644
--- a/sys/boot/i386/boot0/boot0.S
+++ b/sys/boot/i386/boot0/boot0.S
@@ -13,7 +13,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.14 2005/02/08 20:43:04 des Exp $
  */
 
 /* A 512-byte boot manager. */
diff --git a/sys/boot/i386/boot0/boot0ext.S b/sys/boot/i386/boot0/boot0ext.S
index a63de2532109..de1c7e2ce62c 100644
--- a/sys/boot/i386/boot0/boot0ext.S
+++ b/sys/boot/i386/boot0/boot0ext.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot0/boot0ext.S,v 1.7 2004/04/29 18:58:38 ru Exp $
  */
 
 /* A 1024-byte boot manager. */
diff --git a/sys/boot/i386/boot0ext/Makefile b/sys/boot/i386/boot0ext/Makefile
index e68e237a0c61..d45934577943 100644
--- a/sys/boot/i386/boot0ext/Makefile
+++ b/sys/boot/i386/boot0ext/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $
 
 .PATH: ${.CURDIR}/../boot0
 
diff --git a/sys/boot/i386/boot0sio/Makefile b/sys/boot/i386/boot0sio/Makefile
index 1321dd330c4d..cf359af79e2f 100644
--- a/sys/boot/i386/boot0sio/Makefile
+++ b/sys/boot/i386/boot0sio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $
 
 .PATH: ${.CURDIR}/../boot0
 
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index ed0ae9356112..6a9cf2adb5a5 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.58 2005/03/15 18:43:36 obrien Exp $
 
 FILES=		boot boot1 boot2
 
diff --git a/sys/boot/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S
index 909cdf279b13..e9721e39783d 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/sys/boot/i386/boot2/boot1.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.30 2004/08/28 08:32:23 yar Exp $
  */
 
 /* Memory Locations */
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index d12ae4709080..4fdde0785ec1 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.72.2.1 2005/08/15 06:14:07 ssouhlal Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sys/boot/i386/boot2/lib.h b/sys/boot/i386/boot2/lib.h
index 4bb93cfe9d3e..44d1f101b23c 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/sys/boot/i386/boot2/lib.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/lib.h,v 1.2 1999/08/28 00:40:02 peter Exp $
  */
 
 void sio_init(void);
diff --git a/sys/boot/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S
index 3fc2963997e9..5ed451e8f69a 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/sys/boot/i386/boot2/sio.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.9 2004/05/14 20:29:29 ru Exp $
  */
 
 		.set SIO_PRT,SIOPRT		# Base port
diff --git a/sys/boot/i386/btx/Makefile b/sys/boot/i386/btx/Makefile
index 39f78ed639b9..9a65f19def45 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/sys/boot/i386/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/Makefile,v 1.6 1999/08/28 00:40:03 peter Exp $
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/i386/btx/Makefile.inc b/sys/boot/i386/btx/Makefile.inc
index 265f86d1ed55..23b27439117d 100644
--- a/sys/boot/i386/btx/Makefile.inc
+++ b/sys/boot/i386/btx/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/Makefile.inc,v 1.2 2004/02/06 21:58:31 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index bac945b3da27..8e5a9127cd81 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $
 
 PROG=	btx
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index f7d848f3fbe1..13a5d48b6dfa 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/sys/boot/i386/btx/btx/btx.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.38 2004/11/24 14:54:33 jhb Exp $
  */
 
 /*
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index ba7a9938a82c..18efa77ab410 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.18 2004/12/21 08:47:13 ru Exp $
 
 PROG=	btxldr
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/sys/boot/i386/btx/btxldr/btxldr.S
index aa531b889429..3a0349534c35 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/sys/boot/i386/btx/btxldr/btxldr.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.17 2004/05/14 20:29:30 ru Exp $
  */
 
 /*
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index 8fab66a541af..29b789179ab9 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $
 
 PROG=	crt0.o
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/lib/btxcsu.s b/sys/boot/i386/btx/lib/btxcsu.s
index 6a006596295f..5318a9bdd917 100644
--- a/sys/boot/i386/btx/lib/btxcsu.s
+++ b/sys/boot/i386/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxcsu.s,v 1.4 2004/08/05 06:00:05 kan Exp $
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/sys/boot/i386/btx/lib/btxsys.s
index 9c77b4295e7c..6bca7400e3ab 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/sys/boot/i386/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxsys.s,v 1.2 1999/08/28 00:40:07 peter Exp $
 
 #
 # BTX system calls.
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/sys/boot/i386/btx/lib/btxv86.h
index 1152f8b1d963..1ef0712a3a13 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/sys/boot/i386/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/btx/lib/btxv86.h,v 1.5 1999/08/28 00:40:08 peter Exp $
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/sys/boot/i386/btx/lib/btxv86.s
index 0d7d1116322d..6d6af1929696 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/sys/boot/i386/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxv86.s,v 1.3 1999/08/28 00:40:08 peter Exp $
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile
index 77c4b8e99306..de3b6a8a5f40 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/sys/boot/i386/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $
 
 PROG=	cdboot
 STRIP=
diff --git a/sys/boot/i386/cdboot/cdboot.s b/sys/boot/i386/cdboot/cdboot.s
index ab959f45fe6d..856eaafb73c6 100644
--- a/sys/boot/i386/cdboot/cdboot.s
+++ b/sys/boot/i386/cdboot/cdboot.s
@@ -27,7 +27,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.13 2004/06/22 21:55:22 jhb Exp $
 
 #
 # This program is a freestanding boot program to load an a.out binary
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index a124474da4e5..a5a3af4204e8 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.22 2004/12/21 09:59:44 ru Exp $
 
 PROG=	kgzldr.o
 STRIP=
diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c
index 45ed2ee62e16..6b12e3632c00 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/sys/boot/i386/kgzldr/boot.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/kgzldr/boot.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/reboot.h>
diff --git a/sys/boot/i386/kgzldr/crt.s b/sys/boot/i386/kgzldr/crt.s
index cfb479fd2d84..5e2162abc168 100644
--- a/sys/boot/i386/kgzldr/crt.s
+++ b/sys/boot/i386/kgzldr/crt.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: btx.s 1.10 1999/02/25 16:27:41 rnordier
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/crt.s,v 1.4 2002/09/17 01:48:55 peter Exp $
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/sys/boot/i386/kgzldr/kgzldr.h
index 5cd5b44b6005..c8ed8cac32d5 100644
--- a/sys/boot/i386/kgzldr/kgzldr.h
+++ b/sys/boot/i386/kgzldr/kgzldr.h
@@ -23,7 +23,7 @@
  * 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/sys/boot/i386/kgzldr/kgzldr.h,v 1.2 1999/08/28 00:40:10 peter Exp $
  */
 
 #define KGZ_CRT	 0x1		/* Video console */
diff --git a/sys/boot/i386/kgzldr/lib.c b/sys/boot/i386/kgzldr/lib.c
index 538875b510e5..bece56b848a6 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/sys/boot/i386/kgzldr/lib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/kgzldr/lib.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/sys/boot/i386/kgzldr/sio.s b/sys/boot/i386/kgzldr/sio.s
index ff174eb0b71b..bc9489d29d92 100644
--- a/sys/boot/i386/kgzldr/sio.s
+++ b/sys/boot/i386/kgzldr/sio.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: sio.s 1.3 1999/01/10 14:48:03 rnordier
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/sio.s,v 1.5 2002/09/30 20:37:57 peter Exp $
 #
 
 		.globl sio_putchr
diff --git a/sys/boot/i386/kgzldr/start.s b/sys/boot/i386/kgzldr/start.s
index 550fa526d946..5f693582b0f0 100644
--- a/sys/boot/i386/kgzldr/start.s
+++ b/sys/boot/i386/kgzldr/start.s
@@ -23,7 +23,7 @@
 # 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/sys/boot/i386/kgzldr/start.s,v 1.4 2002/09/17 01:48:55 peter Exp $
 #
 
 		.set entry,0x10			# kgz.entry
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 2c388e3206b9..19d719279ea6 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.37 2004/10/24 15:32:49 ru Exp $
 #
 LIB=			i386
 INTERNALLIB=
diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/sys/boot/i386/libi386/amd64_tramp.S
index ff12c661d94d..2e95bd3dc0ce 100644
--- a/sys/boot/i386/libi386/amd64_tramp.S
+++ b/sys/boot/i386/libi386/amd64_tramp.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/amd64_tramp.S,v 1.4 2004/05/14 20:29:30 ru Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c
index cb2021561101..87bb8682a6ae 100644
--- a/sys/boot/i386/libi386/biosacpi.c
+++ b/sys/boot/i386/libi386/biosacpi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.10 2005/04/16 17:38:24 njl Exp $");
 
 #include <stand.h>
 #include <machine/stdarg.h>
diff --git a/sys/boot/i386/libi386/bioscd.c b/sys/boot/i386/libi386/bioscd.c
index 5ffcada26192..00e07376c7cb 100644
--- a/sys/boot/i386/libi386/bioscd.c
+++ b/sys/boot/i386/libi386/bioscd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bioscd.c,v 1.8 2005/05/20 13:14:18 charnier Exp $");
 
 /*
  * BIOS CD device handling for CD's that have been booted off of via no
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index b97a2685c29d..a306d29b8cce 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.45 2004/09/21 06:46:44 wes Exp $");
 
 /*
  * BIOS disk device handling.
diff --git a/sys/boot/i386/libi386/biosmem.c b/sys/boot/i386/libi386/biosmem.c
index 019cf90a30ae..28f327b9bde7 100644
--- a/sys/boot/i386/libi386/biosmem.c
+++ b/sys/boot/i386/libi386/biosmem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.7 2003/08/25 23:28:31 obrien Exp $");
 
 /*
  * Obtain memory configuration information from the BIOS
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index d844b7ead649..d0434eb7b005 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.5 2004/10/22 14:56:23 simokawa Exp $");
 
 /*
  * PnP enumerator using the PCI BIOS.
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index b6e765ad3745..fd079054d072 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/sys/boot/i386/libi386/biospnp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.9 2003/08/25 23:28:31 obrien Exp $");
 
 /*
  * PnP BIOS enumerator.
diff --git a/sys/boot/i386/libi386/biossmap.c b/sys/boot/i386/libi386/biossmap.c
index e417f62c79b8..a69b949677a0 100644
--- a/sys/boot/i386/libi386/biossmap.c
+++ b/sys/boot/i386/libi386/biossmap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.3 2004/11/08 23:59:44 peter Exp $");
 
 /*
  * Obtain memory configuration information from the BIOS
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 623351cec2c5..a8178a54e9db 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.37 2005/05/27 19:30:59 jhb Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index ceb254c5c914..efdeb564e181 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo32.c,v 1.36 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 58b4e3c6b169..961500bebb69 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.36 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c
index 1b08d9bdd7ac..9d3ee523ed06 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/sys/boot/i386/libi386/comconsole.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/comconsole.c,v 1.10 2003/09/16 11:24:23 bde Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c
index fac0b8329df3..76a7167c1a2e 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/sys/boot/i386/libi386/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/devicename.c,v 1.7 2005/05/27 19:28:04 jhb Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c
index 5d8592797b59..0c280e346498 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/sys/boot/i386/libi386/elf32_freebsd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.14 2004/08/29 00:48:41 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c
index 1a5b0b247151..b2086f16aa80 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/sys/boot/i386/libi386/elf64_freebsd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.15 2004/08/29 00:48:41 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 64
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/gatea20.c b/sys/boot/i386/libi386/gatea20.c
index 1c5f0f05fe1d..95f1a2b2d948 100644
--- a/sys/boot/i386/libi386/gatea20.c
+++ b/sys/boot/i386/libi386/gatea20.c
@@ -5,7 +5,7 @@
 /* extracted from freebsd:sys/i386/boot/biosboot/io.c */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/gatea20.c,v 1.4 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <machine/cpufunc.h>
diff --git a/sys/boot/i386/libi386/i386_copy.c b/sys/boot/i386/libi386/i386_copy.c
index 2dce4f1021b8..1cb57613a9cc 100644
--- a/sys/boot/i386/libi386/i386_copy.c
+++ b/sys/boot/i386/libi386/i386_copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/i386_copy.c,v 1.10 2003/08/25 23:28:31 obrien Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c
index 91993df96d76..d5daad73915a 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/sys/boot/i386/libi386/i386_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.12 2003/08/25 23:28:31 obrien Exp $");
 
 /*
  * i386-specific module functionality.
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index 749957689a14..21f0c9e825eb 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.20 2005/05/27 19:28:04 jhb Exp $
  */
 
 
diff --git a/sys/boot/i386/libi386/nullconsole.c b/sys/boot/i386/libi386/nullconsole.c
index ebb1e7edd2b6..d99e8d043fab 100644
--- a/sys/boot/i386/libi386/nullconsole.c
+++ b/sys/boot/i386/libi386/nullconsole.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/nullconsole.c,v 1.2 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/libi386/pread.c b/sys/boot/i386/libi386/pread.c
index 870e2540150f..26c077116b94 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/sys/boot/i386/libi386/pread.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pread.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
 
 /* read into destination in flat addr space */
 
diff --git a/sys/boot/i386/libi386/pxe.c b/sys/boot/i386/libi386/pxe.c
index cd5af3715f0b..340db7a59748 100644
--- a/sys/boot/i386/libi386/pxe.c
+++ b/sys/boot/i386/libi386/pxe.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.22 2005/04/17 21:38:22 wollman Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/i386/libi386/pxe.h b/sys/boot/i386/libi386/pxe.h
index f1f22aac712f..203979b34d8c 100644
--- a/sys/boot/i386/libi386/pxe.h
+++ b/sys/boot/i386/libi386/pxe.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/pxe.h,v 1.6 2002/09/23 18:54:26 alfred Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/pxetramp.s b/sys/boot/i386/libi386/pxetramp.s
index dcf1441aeb24..644e061e5bb4 100644
--- a/sys/boot/i386/libi386/pxetramp.s
+++ b/sys/boot/i386/libi386/pxetramp.s
@@ -12,7 +12,7 @@
 # warranties of merchantability and fitness for a particular
 # purpose.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/libi386/pxetramp.s,v 1.3 2001/10/04 10:18:00 jhb Exp $
 
 # ph33r this
 
diff --git a/sys/boot/i386/libi386/time.c b/sys/boot/i386/libi386/time.c
index 1db9a4a60688..9f72ed821119 100644
--- a/sys/boot/i386/libi386/time.c
+++ b/sys/boot/i386/libi386/time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <btxv86.h>
diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c
index 1f411006e0a9..c66bcca89743 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/sys/boot/i386/libi386/vidconsole.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/vidconsole.c,v 1.20 2005/04/09 14:07:13 stefanf Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index ad2339756230..1ead6cc89e7c 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.81.4.1 2005/10/30 14:40:39 scottl Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 1d8bd047f9e0..37a83de6802c 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.25 2004/08/29 00:48:42 iedowse Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/loader/loader.rc b/sys/boot/i386/loader/loader.rc
index 6443f3fd79bc..bed399a965d6 100644
--- a/sys/boot/i386/loader/loader.rc
+++ b/sys/boot/i386/loader/loader.rc
@@ -1,5 +1,5 @@
 \ Loader.rc
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/i386/loader/loader.rc,v 1.4.4.1 2005/10/30 14:40:39 scottl Exp $
 \
 \ Includes additional commands
 include /boot/loader.4th
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index 1e2f568bb787..a501f9177a70 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.31 2005/05/27 19:31:00 jhb Exp $");
 
 /*
  * MD bootstrap main() and assorted miscellaneous
diff --git a/sys/boot/i386/loader/version b/sys/boot/i386/loader/version
index 7a2acaf1859a..03a6ab38241d 100644
--- a/sys/boot/i386/loader/version
+++ b/sys/boot/i386/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/i386/loader/version,v 1.8 2001/12/11 00:49:33 jhb Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index 7acda10a55bc..fd44ce779ec6 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.15 2004/12/21 08:47:15 ru Exp $
 
 PROG=	mbr
 STRIP=
diff --git a/sys/boot/i386/mbr/mbr.s b/sys/boot/i386/mbr/mbr.s
index 3cfc20dd58e1..9912d676f904 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/sys/boot/i386/mbr/mbr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/mbr/mbr.s,v 1.7 2004/08/28 08:39:35 yar Exp $
 
 # A 512 byte MBR boot manager that simply boots the active partition.
 
diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile
index cc8902f165e0..d05807508454 100644
--- a/sys/boot/i386/pxeldr/Makefile
+++ b/sys/boot/i386/pxeldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.16 2004/04/27 19:45:16 ru Exp $
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
diff --git a/sys/boot/i386/pxeldr/pxeboot.8 b/sys/boot/i386/pxeldr/pxeboot.8
index f8ea8a94191e..27fde369d45c 100644
--- a/sys/boot/i386/pxeldr/pxeboot.8
+++ b/sys/boot/i386/pxeldr/pxeboot.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.7 2002/12/12 17:25:59 ru Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S
index 25ab5c001e5b..dac404c4c5c9 100644
--- a/sys/boot/i386/pxeldr/pxeldr.S
+++ b/sys/boot/i386/pxeldr/pxeldr.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.13 2004/05/14 20:29:30 ru Exp $
  */
 
 /*
diff --git a/sys/boot/ia64/Makefile b/sys/boot/ia64/Makefile
index 7d198697cf15..c4ea232d0bbf 100644
--- a/sys/boot/ia64/Makefile
+++ b/sys/boot/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/Makefile,v 1.4 2004/11/23 06:03:03 marcel Exp $
 
 SUBDIR=		efi ski
 
diff --git a/sys/boot/ia64/Makefile.inc b/sys/boot/ia64/Makefile.inc
index 2e9a113df387..1dbdc9d04f2b 100644
--- a/sys/boot/ia64/Makefile.inc
+++ b/sys/boot/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/Makefile.inc,v 1.3 2004/02/12 08:10:33 ru Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
index 652499258763..444148ab1d04 100644
--- a/sys/boot/ia64/efi/Makefile
+++ b/sys/boot/ia64/efi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.26 2004/12/21 12:32:14 ru Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
diff --git a/sys/boot/ia64/efi/conf.c b/sys/boot/ia64/efi/conf.c
index 8a250e6e8c69..29386bbbf3a7 100644
--- a/sys/boot/ia64/efi/conf.c
+++ b/sys/boot/ia64/efi/conf.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/conf.c,v 1.11 2005/01/05 22:16:57 imp Exp $");
 
 #include <stand.h>
 #include <efi.h>
diff --git a/sys/boot/ia64/efi/efimd.c b/sys/boot/ia64/efi/efimd.c
index accf6c227bf8..5c35dd03d236 100644
--- a/sys/boot/ia64/efi/efimd.c
+++ b/sys/boot/ia64/efi/efimd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/efimd.c,v 1.2 2005/01/05 22:16:57 imp Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64
index 0f79b670e027..b08e18ff00e3 100644
--- a/sys/boot/ia64/efi/ldscript.ia64
+++ b/sys/boot/ia64/efi/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ia64/efi/ldscript.ia64,v 1.9 2004/11/23 05:38:30 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start_plabel)
diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
index 69b6387f4cfe..2d1d4605c4ed 100644
--- a/sys/boot/ia64/efi/main.c
+++ b/sys/boot/ia64/efi/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/main.c,v 1.24 2004/11/23 05:37:47 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/efi/start.S b/sys/boot/ia64/efi/start.S
index 5c2f3e18059c..e782afa4411c 100644
--- a/sys/boot/ia64/efi/start.S
+++ b/sys/boot/ia64/efi/start.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.8 2004/11/23 05:38:30 marcel Exp $
  */
 
 	.text
diff --git a/sys/boot/ia64/efi/version b/sys/boot/ia64/efi/version
index 71f9400f68b0..de7d61410ceb 100644
--- a/sys/boot/ia64/efi/version
+++ b/sys/boot/ia64/efi/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/ia64/efi/version,v 1.6 2004/11/23 05:37:47 marcel Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index c6b8a170d5b3..d5a09f26a091 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.18 2004/12/21 12:32:14 ru Exp $
 
 PROG=		skiload
 NO_MAN=
diff --git a/sys/boot/ia64/ski/acpi_stub.c b/sys/boot/ia64/ski/acpi_stub.c
index caebc7b8d9f9..f0b678be7fd6 100644
--- a/sys/boot/ia64/ski/acpi_stub.c
+++ b/sys/boot/ia64/ski/acpi_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/acpi_stub.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
 
 #include <contrib/dev/acpica/acpi.h>
 
diff --git a/sys/boot/ia64/ski/bootinfo.c b/sys/boot/ia64/ski/bootinfo.c
index 5bc1797520a1..199247575fe8 100644
--- a/sys/boot/ia64/ski/bootinfo.c
+++ b/sys/boot/ia64/ski/bootinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/bootinfo.c,v 1.12 2004/12/01 04:59:32 scottl Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/ski/conf.c b/sys/boot/ia64/ski/conf.c
index 8075371dd4bc..ddb94bb381b3 100644
--- a/sys/boot/ia64/ski/conf.c
+++ b/sys/boot/ia64/ski/conf.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/conf.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/copy.c b/sys/boot/ia64/ski/copy.c
index d86537a14099..7041d1c2668d 100644
--- a/sys/boot/ia64/ski/copy.c
+++ b/sys/boot/ia64/ski/copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/copy.c,v 1.4 2004/09/24 03:53:50 marcel Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/ski/delay.c b/sys/boot/ia64/ski/delay.c
index 2389603edb4a..1600dfc60559 100644
--- a/sys/boot/ia64/ski/delay.c
+++ b/sys/boot/ia64/ski/delay.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/delay.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 void
 delay(int usecs)
diff --git a/sys/boot/ia64/ski/devicename.c b/sys/boot/ia64/ski/devicename.c
index b01bf1830250..ad1ef2837802 100644
--- a/sys/boot/ia64/ski/devicename.c
+++ b/sys/boot/ia64/ski/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/devicename.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/ski/efi_stub.c b/sys/boot/ia64/ski/efi_stub.c
index 20a20b47fb9a..0119f469369c 100644
--- a/sys/boot/ia64/ski/efi_stub.c
+++ b/sys/boot/ia64/ski/efi_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/efi_stub.c,v 1.5 2005/01/05 22:16:58 imp Exp $");
 
 #include <sys/types.h>
 #include <machine/bootinfo.h>
diff --git a/sys/boot/ia64/ski/elf_freebsd.c b/sys/boot/ia64/ski/elf_freebsd.c
index 42481d678076..c0be5b3276d4 100644
--- a/sys/boot/ia64/ski/elf_freebsd.c
+++ b/sys/boot/ia64/ski/elf_freebsd.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/elf_freebsd.c,v 1.12 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/ski/exit.c b/sys/boot/ia64/ski/exit.c
index aeac67c49341..de5377b26594 100644
--- a/sys/boot/ia64/ski/exit.c
+++ b/sys/boot/ia64/ski/exit.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/exit.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/ldscript.ia64 b/sys/boot/ia64/ski/ldscript.ia64
index e4e1dad0bd91..253dcd0bfd76 100644
--- a/sys/boot/ia64/ski/ldscript.ia64
+++ b/sys/boot/ia64/ski/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ia64/ski/ldscript.ia64,v 1.3 2004/09/24 03:51:06 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start)
diff --git a/sys/boot/ia64/ski/libski.h b/sys/boot/ia64/ski/libski.h
index 6fe8034cefd4..6ee3866d9d47 100644
--- a/sys/boot/ia64/ski/libski.h
+++ b/sys/boot/ia64/ski/libski.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ia64/ski/libski.h,v 1.6 2004/09/24 04:06:22 marcel Exp $
  */
 
 /*
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
index 8660518f121f..cb94b57ca690 100644
--- a/sys/boot/ia64/ski/main.c
+++ b/sys/boot/ia64/ski/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/main.c,v 1.6 2004/09/24 04:06:22 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/ski/pal_stub.S b/sys/boot/ia64/ski/pal_stub.S
index 81fbd080e3f4..e33572cbb2db 100644
--- a/sys/boot/ia64/ski/pal_stub.S
+++ b/sys/boot/ia64/ski/pal_stub.S
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ia64/ski/pal_stub.S,v 1.5 2005/01/05 22:16:58 imp Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/boot/ia64/ski/sal_stub.c b/sys/boot/ia64/ski/sal_stub.c
index 1ebbb4cc24bd..7ede2907c673 100644
--- a/sys/boot/ia64/ski/sal_stub.c
+++ b/sys/boot/ia64/ski/sal_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/sal_stub.c,v 1.4 2005/01/05 22:16:58 imp Exp $");
 
 #include <sys/types.h>
 #include <machine/md_var.h>
diff --git a/sys/boot/ia64/ski/skiconsole.c b/sys/boot/ia64/ski/skiconsole.c
index e5cea3dc9936..1356e681ca60 100644
--- a/sys/boot/ia64/ski/skiconsole.c
+++ b/sys/boot/ia64/ski/skiconsole.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/skiconsole.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/skifs.c b/sys/boot/ia64/ski/skifs.c
index 5a272c74563a..86b0f56e79da 100644
--- a/sys/boot/ia64/ski/skifs.c
+++ b/sys/boot/ia64/ski/skifs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/skifs.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/skiload.cmd b/sys/boot/ia64/ski/skiload.cmd
index 48b77e1e40ba..754e98f616e3 100644
--- a/sys/boot/ia64/ski/skiload.cmd
+++ b/sys/boot/ia64/ski/skiload.cmd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/ski/skiload.cmd,v 1.2 2004/09/24 03:51:06 marcel Exp $
 iar
 fr
 pa
diff --git a/sys/boot/ia64/ski/ssc.c b/sys/boot/ia64/ski/ssc.c
index e1f871c4d5c5..a533d3ee3dbc 100644
--- a/sys/boot/ia64/ski/ssc.c
+++ b/sys/boot/ia64/ski/ssc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/ssc.c,v 1.5 2004/09/24 03:53:50 marcel Exp $");
 
 #include <stand.h>
 #include "libski.h"
diff --git a/sys/boot/ia64/ski/start.S b/sys/boot/ia64/ski/start.S
index 0bd10e928d04..93e5b23de162 100644
--- a/sys/boot/ia64/ski/start.S
+++ b/sys/boot/ia64/ski/start.S
@@ -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/sys/boot/ia64/ski/start.S,v 1.4 2005/01/05 22:16:58 imp Exp $
  */
 
 #define	STACKSIZE	16384
diff --git a/sys/boot/ia64/ski/time.c b/sys/boot/ia64/ski/time.c
index 7aa71202d10a..1cb1123dd6a6 100644
--- a/sys/boot/ia64/ski/time.c
+++ b/sys/boot/ia64/ski/time.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/time.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/version b/sys/boot/ia64/ski/version
index 6f4fc3c28a46..3f472882feff 100644
--- a/sys/boot/ia64/ski/version
+++ b/sys/boot/ia64/ski/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/ia64/ski/version,v 1.3 2004/09/24 03:51:06 marcel Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/ofw/Makefile b/sys/boot/ofw/Makefile
index 3b881b780e87..5332c2ed4f35 100644
--- a/sys/boot/ofw/Makefile
+++ b/sys/boot/ofw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ofw/Makefile,v 1.1 2000/10/16 10:46:19 obrien Exp $
 
 SUBDIR=		libofw
 
diff --git a/sys/boot/ofw/common/Makefile.inc b/sys/boot/ofw/common/Makefile.inc
index 5d20372631e6..a1870f185762 100644
--- a/sys/boot/ofw/common/Makefile.inc
+++ b/sys/boot/ofw/common/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ofw/common/Makefile.inc,v 1.1 2000/11/10 06:39:49 benno Exp $
 
 SRCS+=	main.c
diff --git a/sys/boot/ofw/common/main.c b/sys/boot/ofw/common/main.c
index 2fdd2934d519..dc2048871a36 100644
--- a/sys/boot/ofw/common/main.c
+++ b/sys/boot/ofw/common/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.7 2004/08/16 15:45:24 marius Exp $");
 
 #include <stand.h>
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/Makefile b/sys/boot/ofw/libofw/Makefile
index 8a56a778f76f..950329c18b80 100644
--- a/sys/boot/ofw/libofw/Makefile
+++ b/sys/boot/ofw/libofw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.9 2004/10/24 15:32:50 ru Exp $
 
 LIB=		ofw
 INTERNALLIB=
diff --git a/sys/boot/ofw/libofw/devicename.c b/sys/boot/ofw/libofw/devicename.c
index a2c48975417a..4e2876fb9e0a 100644
--- a/sys/boot/ofw/libofw/devicename.c
+++ b/sys/boot/ofw/libofw/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.15 2004/01/04 23:27:31 obrien Exp $");
 
 #include <stand.h>
 #include "libofw.h"
diff --git a/sys/boot/ofw/libofw/elf_freebsd.c b/sys/boot/ofw/libofw/elf_freebsd.c
index 624e9fae1aab..602da0be84ea 100644
--- a/sys/boot/ofw/libofw/elf_freebsd.c
+++ b/sys/boot/ofw/libofw/elf_freebsd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.9 2005/05/24 21:43:49 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sys/boot/ofw/libofw/libofw.h b/sys/boot/ofw/libofw/libofw.h
index df2cd5133ca3..6fb0c7c0b6b9 100644
--- a/sys/boot/ofw/libofw/libofw.h
+++ b/sys/boot/ofw/libofw/libofw.h
@@ -22,7 +22,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/sys/boot/ofw/libofw/libofw.h,v 1.10 2005/01/05 22:16:58 imp Exp $
  */
 
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index 67333ff106fa..aa78d407dffb 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/sys/boot/ofw/libofw/ofw_console.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.10 2005/01/05 22:16:58 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/sys/boot/ofw/libofw/ofw_copy.c
index 2196c67cd884..6eacaee5608a 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/sys/boot/ofw/libofw/ofw_copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.15 2005/05/19 07:21:46 grehan Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ofw/libofw/ofw_disk.c b/sys/boot/ofw/libofw/ofw_disk.c
index dfeafe05d4b5..88cb26a76ffb 100644
--- a/sys/boot/ofw/libofw/ofw_disk.c
+++ b/sys/boot/ofw/libofw/ofw_disk.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.12 2005/01/05 22:16:58 imp Exp $");
 
 /*
  * Disk I/O routines using Open Firmware
diff --git a/sys/boot/ofw/libofw/ofw_memory.c b/sys/boot/ofw/libofw/ofw_memory.c
index 90e98af89bc2..a27a3a4b5ead 100644
--- a/sys/boot/ofw/libofw/ofw_memory.c
+++ b/sys/boot/ofw/libofw/ofw_memory.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_memory.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/boot/ofw/libofw/ofw_module.c b/sys/boot/ofw/libofw/ofw_module.c
index d39a34344556..b37dd40a7e52 100644
--- a/sys/boot/ofw/libofw/ofw_module.c
+++ b/sys/boot/ofw/libofw/ofw_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_module.c,v 1.7 2004/01/04 23:27:31 obrien Exp $");
 
 /*
  * ofw-specific module functionality.
diff --git a/sys/boot/ofw/libofw/ofw_net.c b/sys/boot/ofw/libofw/ofw_net.c
index 5149df9fffc1..4b374e691bb2 100644
--- a/sys/boot/ofw/libofw/ofw_net.c
+++ b/sys/boot/ofw/libofw/ofw_net.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.10 2005/03/02 20:12:27 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/boot/ofw/libofw/ofw_reboot.c b/sys/boot/ofw/libofw/ofw_reboot.c
index bbb420ac1767..4971b7ab0039 100644
--- a/sys/boot/ofw/libofw/ofw_reboot.c
+++ b/sys/boot/ofw/libofw/ofw_reboot.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_reboot.c,v 1.3 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/ofw_time.c b/sys/boot/ofw/libofw/ofw_time.c
index f53997dc059f..1f4288dd0398 100644
--- a/sys/boot/ofw/libofw/ofw_time.c
+++ b/sys/boot/ofw/libofw/ofw_time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_time.c,v 1.5 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/openfirm.c b/sys/boot/ofw/libofw/openfirm.c
index 678b2cf8e7ab..bc0e38618fa6 100644
--- a/sys/boot/ofw/libofw/openfirm.c
+++ b/sys/boot/ofw/libofw/openfirm.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.11 2005/01/05 22:16:58 imp Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/boot/ofw/libofw/openfirm.h b/sys/boot/ofw/libofw/openfirm.h
index a0e9c65ccad1..e78741b0618b 100644
--- a/sys/boot/ofw/libofw/openfirm.h
+++ b/sys/boot/ofw/libofw/openfirm.h
@@ -54,7 +54,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/sys/boot/ofw/libofw/openfirm.h,v 1.10 2005/01/05 22:16:58 imp Exp $
  */
 #ifndef _OPENFIRM_H_
 #define	_OPENFIRM_H_
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index d63cb4c2e0a4..323675702ce2 100644
--- a/sys/boot/pc98/Makefile
+++ b/sys/boot/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/Makefile,v 1.8 2002/10/03 16:21:40 nyan Exp $
 
 SUBDIR=		btx boot0 boot0.5 boot2 kgzldr libpc98 loader
 
diff --git a/sys/boot/pc98/Makefile.inc b/sys/boot/pc98/Makefile.inc
index 0c17dd0beb75..d69f05dd4517 100644
--- a/sys/boot/pc98/Makefile.inc
+++ b/sys/boot/pc98/Makefile.inc
@@ -1,6 +1,6 @@
 # Common defines for all of /sys/boot/pc98/
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.5 2004/02/09 16:01:44 nyan Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/pc98/boot0.5/Makefile b/sys/boot/pc98/boot0.5/Makefile
index 6b54dd0a8108..3b32358d81bd 100644
--- a/sys/boot/pc98/boot0.5/Makefile
+++ b/sys/boot/pc98/boot0.5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
diff --git a/sys/boot/pc98/boot0.5/boot.s b/sys/boot/pc98/boot0.5/boot.s
index 1a3bfc7c8790..c5be97ae9ea4 100644
--- a/sys/boot/pc98/boot0.5/boot.s
+++ b/sys/boot/pc98/boot0.5/boot.s
@@ -25,7 +25,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/sys/boot/pc98/boot0.5/boot.s,v 1.2 2000/08/03 13:01:45 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/boot0.5.s b/sys/boot/pc98/boot0.5/boot0.5.s
index 80dbe2abd498..27cad9c114c8 100644
--- a/sys/boot/pc98/boot0.5/boot0.5.s
+++ b/sys/boot/pc98/boot0.5/boot0.5.s
@@ -25,7 +25,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/sys/boot/pc98/boot0.5/boot0.5.s,v 1.2 2000/08/06 14:35:37 kato Exp $
 #
 	.global	main
 	.code16
diff --git a/sys/boot/pc98/boot0.5/disk.s b/sys/boot/pc98/boot0.5/disk.s
index 9d0db21d925a..4e3adf3a3127 100644
--- a/sys/boot/pc98/boot0.5/disk.s
+++ b/sys/boot/pc98/boot0.5/disk.s
@@ -25,7 +25,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/sys/boot/pc98/boot0.5/disk.s,v 1.4 2000/08/31 10:24:06 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/selector.s b/sys/boot/pc98/boot0.5/selector.s
index 18da4881f6db..2689ca6d6e95 100644
--- a/sys/boot/pc98/boot0.5/selector.s
+++ b/sys/boot/pc98/boot0.5/selector.s
@@ -25,7 +25,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/sys/boot/pc98/boot0.5/selector.s,v 1.2 2000/08/06 14:35:37 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/start.s b/sys/boot/pc98/boot0.5/start.s
index 211de141110a..8efadc9e3bdf 100644
--- a/sys/boot/pc98/boot0.5/start.s
+++ b/sys/boot/pc98/boot0.5/start.s
@@ -25,7 +25,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/sys/boot/pc98/boot0.5/start.s,v 1.2 2003/05/02 09:33:12 kato Exp $
 #
 	.global	start
 	.code16
diff --git a/sys/boot/pc98/boot0.5/support.s b/sys/boot/pc98/boot0.5/support.s
index 65f5a9a63209..5af88e418a0d 100644
--- a/sys/boot/pc98/boot0.5/support.s
+++ b/sys/boot/pc98/boot0.5/support.s
@@ -25,7 +25,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/sys/boot/pc98/boot0.5/support.s,v 1.1 2000/08/02 08:46:08 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/syscons.s b/sys/boot/pc98/boot0.5/syscons.s
index 150b835f795d..11f4dd3e76e0 100644
--- a/sys/boot/pc98/boot0.5/syscons.s
+++ b/sys/boot/pc98/boot0.5/syscons.s
@@ -25,7 +25,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/sys/boot/pc98/boot0.5/syscons.s,v 1.1 2000/08/02 08:46:08 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0/Makefile b/sys/boot/pc98/boot0/Makefile
index be4577c61ac9..4ae2c05ab3c6 100644
--- a/sys/boot/pc98/boot0/Makefile
+++ b/sys/boot/pc98/boot0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
diff --git a/sys/boot/pc98/boot0/boot0.s b/sys/boot/pc98/boot0/boot0.s
index 508e2521157a..177817b0a079 100644
--- a/sys/boot/pc98/boot0/boot0.s
+++ b/sys/boot/pc98/boot0/boot0.s
@@ -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/sys/boot/pc98/boot0/boot0.s,v 1.1 2000/08/02 08:46:08 kato Exp $
 
 	.globl start
 	.code16
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index 2bac1e495d0e..6fe054cb5b28 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.23 2005/05/08 14:17:27 nyan Exp $
 #
 
 PROG=	boot
diff --git a/sys/boot/pc98/boot2/README.serial.98 b/sys/boot/pc98/boot2/README.serial.98
index 97a4b32f5e6d..4682e97e38e6 100644
--- a/sys/boot/pc98/boot2/README.serial.98
+++ b/sys/boot/pc98/boot2/README.serial.98
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/pc98/boot2/README.serial.98,v 1.2 2000/05/01 20:26:24 peter Exp $
 
                             README.srieal.98
                        ¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ë¤Ä¤¤¤Æ
diff --git a/sys/boot/pc98/boot2/asm.S b/sys/boot/pc98/boot2/asm.S
index de51618f162e..dba29892d42d 100644
--- a/sys/boot/pc98/boot2/asm.S
+++ b/sys/boot/pc98/boot2/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.S,v 1.3 2001/05/24 11:18:32 nyan Exp $
  */
 
 
diff --git a/sys/boot/pc98/boot2/asm.h b/sys/boot/pc98/boot2/asm.h
index 914014dea7b8..fed5ced61ec0 100644
--- a/sys/boot/pc98/boot2/asm.h
+++ b/sys/boot/pc98/boot2/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.5 2003/07/13 08:13:52 nyan Exp $
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/boot/pc98/boot2/bios.S b/sys/boot/pc98/boot2/bios.S
index 8a884d6342dc..cedcc6e993b9 100644
--- a/sys/boot/pc98/boot2/bios.S
+++ b/sys/boot/pc98/boot2/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/bios.S,v 1.4 2003/01/06 13:43:13 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index feccc7ec0357..8a3736276a00 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -49,7 +49,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.14 2005/05/27 19:26:11 jhb Exp $");
 
 #include "boot.h"
 #include <a.out.h>
diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h
index e39fee53d1e8..42c804560929 100644
--- a/sys/boot/pc98/boot2/boot.h
+++ b/sys/boot/pc98/boot2/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/boot.h,v 1.7 2005/05/08 14:17:27 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/pc98/boot2/boot2.S b/sys/boot/pc98/boot2/boot2.S
index be85030b0895..152f636e5fcc 100644
--- a/sys/boot/pc98/boot2/boot2.S
+++ b/sys/boot/pc98/boot2/boot2.S
@@ -25,7 +25,7 @@
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
  *	boot2.S,v 1.6 1995/01/25 21:37:40 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/boot2.S,v 1.4 2005/05/08 14:17:27 nyan Exp $
  */
 /*
  * Ported to PC-9801 by Yoshio Kimura
diff --git a/sys/boot/pc98/boot2/dinode.h b/sys/boot/pc98/boot2/dinode.h
index 2a78f344d40c..2eb3de34f034 100644
--- a/sys/boot/pc98/boot2/dinode.h
+++ b/sys/boot/pc98/boot2/dinode.h
@@ -33,7 +33,7 @@
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
  * %FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.7 1999/08/28 00:52:27 peter Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/dinode.h,v 1.4 2004/06/16 18:21:22 phk Exp $
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index f9706cad3e00..8eea7c75c692 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.13 2005/05/08 14:17:27 nyan Exp $");
 
 #include "boot.h"
 #include <sys/disklabel.h>
diff --git a/sys/boot/pc98/boot2/fs.h b/sys/boot/pc98/boot2/fs.h
index 8ac77da6d099..b13fb0af57b5 100644
--- a/sys/boot/pc98/boot2/fs.h
+++ b/sys/boot/pc98/boot2/fs.h
@@ -28,7 +28,7 @@
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
  * %FreeBSD: src/sys/ufs/ffs/fs.h,v 1.14.2.3 2001/09/21 19:15:22 dillon Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/fs.h,v 1.2 2004/04/05 23:41:29 imp Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/boot/pc98/boot2/inode.h b/sys/boot/pc98/boot2/inode.h
index 9a59f99bc77b..bb37432b3cf0 100644
--- a/sys/boot/pc98/boot2/inode.h
+++ b/sys/boot/pc98/boot2/inode.h
@@ -33,7 +33,7 @@
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
  * %FreeBSD: src/sys/ufs/ufs/inode.h,v 1.28.2.2 2001/09/29 12:52:52 iedowse Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/inode.h,v 1.4 2004/06/16 18:21:22 phk Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c
index 4d0324684e2c..42dc26acefd2 100644
--- a/sys/boot/pc98/boot2/io.c
+++ b/sys/boot/pc98/boot2/io.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.8 2005/05/10 12:02:14 nyan Exp $");
 
 #include "boot.h"
 #include <machine/cpufunc.h>
diff --git a/sys/boot/pc98/boot2/probe_keyboard.c b/sys/boot/pc98/boot2/probe_keyboard.c
index f10329683a8c..0efda3ed8613 100644
--- a/sys/boot/pc98/boot2/probe_keyboard.c
+++ b/sys/boot/pc98/boot2/probe_keyboard.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/probe_keyboard.c,v 1.3 2003/09/08 09:11:20 obrien Exp $");
 
 #include "boot.h"
 
diff --git a/sys/boot/pc98/boot2/quota.h b/sys/boot/pc98/boot2/quota.h
index 324131acf561..9444f734ebbd 100644
--- a/sys/boot/pc98/boot2/quota.h
+++ b/sys/boot/pc98/boot2/quota.h
@@ -31,7 +31,7 @@
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
  * %FreeBSD: src/sys/ufs/ufs/quota.h,v 1.15 1999/12/29 04:55:05 peter Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/quota.h,v 1.2 2004/04/05 23:41:29 imp Exp $
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/boot/pc98/boot2/serial.S b/sys/boot/pc98/boot2/serial.S
index ea7b98aac4e3..115559d98621 100644
--- a/sys/boot/pc98/boot2/serial.S
+++ b/sys/boot/pc98/boot2/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/serial.S,v 1.4 2000/03/30 09:25:02 kato Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/serial_16550.S b/sys/boot/pc98/boot2/serial_16550.S
index 114a369c8c98..149dc2ca97d8 100644
--- a/sys/boot/pc98/boot2/serial_16550.S
+++ b/sys/boot/pc98/boot2/serial_16550.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/serial_16550.S,v 1.7 2004/05/20 20:48:29 markm Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/serial_8251.S b/sys/boot/pc98/boot2/serial_8251.S
index 217dbdb17698..21a4208e0a72 100644
--- a/sys/boot/pc98/boot2/serial_8251.S
+++ b/sys/boot/pc98/boot2/serial_8251.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/serial_8251.S,v 1.4 2004/05/20 20:52:04 markm Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/start.S b/sys/boot/pc98/boot2/start.S
index 2a9bcbb7a1b2..6b2ef35c4ad7 100644
--- a/sys/boot/pc98/boot2/start.S
+++ b/sys/boot/pc98/boot2/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/start.S,v 1.5 2002/05/14 12:34:03 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index 0ceb07e5aba3..664e39b9bd39 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $");
 
 /*
  * Ported to PC-9801 by Yoshio Kimura
diff --git a/sys/boot/pc98/boot2/table.c b/sys/boot/pc98/boot2/table.c
index e8e6dea521b0..67f1871f3d4d 100644
--- a/sys/boot/pc98/boot2/table.c
+++ b/sys/boot/pc98/boot2/table.c
@@ -49,7 +49,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/table.c,v 1.5 2005/05/08 14:17:27 nyan Exp $");
 
 #include "boot.h"
 
diff --git a/sys/boot/pc98/btx/Makefile b/sys/boot/pc98/btx/Makefile
index 39f78ed639b9..606b2c09525f 100644
--- a/sys/boot/pc98/btx/Makefile
+++ b/sys/boot/pc98/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/Makefile,v 1.3 1999/08/28 00:40:28 peter Exp $
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/pc98/btx/Makefile.inc b/sys/boot/pc98/btx/Makefile.inc
index 265f86d1ed55..6572d904a4ef 100644
--- a/sys/boot/pc98/btx/Makefile.inc
+++ b/sys/boot/pc98/btx/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/Makefile.inc,v 1.1 2004/02/07 12:19:43 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index ac9a64ebf662..dfe423a38896 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.12 2005/05/08 14:17:27 nyan Exp $
 
 PROG=	btx
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S
index 337f19190f51..4c0a37484d69 100644
--- a/sys/boot/pc98/btx/btx/btx.S
+++ b/sys/boot/pc98/btx/btx/btx.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.21 2005/05/08 14:17:27 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index ba7a9938a82c..3a78809439b1 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btxldr/Makefile,v 1.10 2005/05/08 14:17:27 nyan Exp $
 
 PROG=	btxldr
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.S b/sys/boot/pc98/btx/btxldr/btxldr.S
index 2104605b7436..2ba9586dcf96 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.S
+++ b/sys/boot/pc98/btx/btxldr/btxldr.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/btx/btxldr/btxldr.S,v 1.12 2005/05/08 14:17:27 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index 8fab66a541af..fa7ed759c3da 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.10 2004/12/21 08:47:18 ru Exp $
 
 PROG=	crt0.o
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/lib/btxcsu.s b/sys/boot/pc98/btx/lib/btxcsu.s
index 6a006596295f..34cce304abce 100644
--- a/sys/boot/pc98/btx/lib/btxcsu.s
+++ b/sys/boot/pc98/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxcsu.s,v 1.3 2004/10/24 12:16:18 nyan Exp $
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/pc98/btx/lib/btxsys.s b/sys/boot/pc98/btx/lib/btxsys.s
index 9c77b4295e7c..e2d5477b26e8 100644
--- a/sys/boot/pc98/btx/lib/btxsys.s
+++ b/sys/boot/pc98/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxsys.s,v 1.2 1999/08/28 00:40:32 peter Exp $
 
 #
 # BTX system calls.
diff --git a/sys/boot/pc98/btx/lib/btxv86.h b/sys/boot/pc98/btx/lib/btxv86.h
index 1152f8b1d963..3452c00356b0 100644
--- a/sys/boot/pc98/btx/lib/btxv86.h
+++ b/sys/boot/pc98/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/btx/lib/btxv86.h,v 1.2 1999/08/28 00:40:32 peter Exp $
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/pc98/btx/lib/btxv86.s b/sys/boot/pc98/btx/lib/btxv86.s
index 0d7d1116322d..2dac463a19e4 100644
--- a/sys/boot/pc98/btx/lib/btxv86.s
+++ b/sys/boot/pc98/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxv86.s,v 1.2 1999/08/28 00:40:33 peter Exp $
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/pc98/kgzldr/Makefile b/sys/boot/pc98/kgzldr/Makefile
index 2303fd9663b4..7bca10d6a0f7 100644
--- a/sys/boot/pc98/kgzldr/Makefile
+++ b/sys/boot/pc98/kgzldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.17 2005/05/08 14:17:28 nyan Exp $
 
 PROG=	kgzldr.o
 STRIP=
diff --git a/sys/boot/pc98/kgzldr/crt.s b/sys/boot/pc98/kgzldr/crt.s
index e028bc8e6722..a431915f72a6 100644
--- a/sys/boot/pc98/kgzldr/crt.s
+++ b/sys/boot/pc98/kgzldr/crt.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: btx.s 1.10 1999/02/25 16:27:41 rnordier
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.5 2005/05/08 14:17:28 nyan Exp $
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index 161bbad311bc..2a2b4f9dc5f1 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.22 2005/05/08 14:17:28 nyan Exp $
 #
 LIB=			pc98
 INTERNALLIB=
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index ba736fc1ab15..fa103cc58368 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.32 2005/05/08 14:17:28 nyan Exp $");
 
 /*
  * BIOS disk device handling.
diff --git a/sys/boot/pc98/libpc98/biosmem.c b/sys/boot/pc98/libpc98/biosmem.c
index 4f22086c59d2..fe091b3eca34 100644
--- a/sys/boot/pc98/libpc98/biosmem.c
+++ b/sys/boot/pc98/libpc98/biosmem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosmem.c,v 1.7 2005/05/08 14:17:28 nyan Exp $");
 
 /*
  * Obtain memory configuration information from the BIOS
diff --git a/sys/boot/pc98/libpc98/comconsole.c b/sys/boot/pc98/libpc98/comconsole.c
index 155ecb5a6250..4019467749c6 100644
--- a/sys/boot/pc98/libpc98/comconsole.c
+++ b/sys/boot/pc98/libpc98/comconsole.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/comconsole.c,v 1.6 2005/05/08 14:17:28 nyan Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/libpc98/gatea20.c b/sys/boot/pc98/libpc98/gatea20.c
index 39280647c284..6f50db0d5f2c 100644
--- a/sys/boot/pc98/libpc98/gatea20.c
+++ b/sys/boot/pc98/libpc98/gatea20.c
@@ -5,7 +5,7 @@
 /* extracted from freebsd:sys/i386/boot/biosboot/io.c */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/gatea20.c,v 1.5 2005/05/08 14:17:28 nyan Exp $");
 
 #include <stand.h>
 #include <machine/cpufunc.h>
diff --git a/sys/boot/pc98/libpc98/i386_module.c b/sys/boot/pc98/libpc98/i386_module.c
index d988b27f0058..f04fb9c22282 100644
--- a/sys/boot/pc98/libpc98/i386_module.c
+++ b/sys/boot/pc98/libpc98/i386_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/i386_module.c,v 1.2 2003/09/08 09:11:20 obrien Exp $");
 
 int
 i386_autoload(void)
diff --git a/sys/boot/pc98/libpc98/time.c b/sys/boot/pc98/libpc98/time.c
index b8dbe0227e7c..5c2fd13ffeee 100644
--- a/sys/boot/pc98/libpc98/time.c
+++ b/sys/boot/pc98/libpc98/time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/time.c,v 1.6 2005/05/08 14:17:28 nyan Exp $");
 
 #include <stand.h>
 #include <btxv86.h>
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/sys/boot/pc98/libpc98/vidconsole.c
index 19fb981aaa1c..0d071674e3c1 100644
--- a/sys/boot/pc98/libpc98/vidconsole.c
+++ b/sys/boot/pc98/libpc98/vidconsole.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.14 2005/05/08 14:17:28 nyan Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 9085690c0c96..58b9e4969be0 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.38.4.1 2005/10/30 16:36:00 nyan Exp $
 
 PROG=		loader.sym
 INTERNALPROG=
diff --git a/sys/boot/pc98/loader/conf.c b/sys/boot/pc98/loader/conf.c
index ce80cefd1aac..7bb635a821ba 100644
--- a/sys/boot/pc98/loader/conf.c
+++ b/sys/boot/pc98/loader/conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/conf.c,v 1.3 2004/10/24 12:14:05 nyan Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 14354f377e17..116bae2bc599 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.20 2005/05/27 19:31:00 jhb Exp $");
 
 /*
  * MD bootstrap main() and assorted miscellaneous
diff --git a/sys/boot/powerpc/Makefile b/sys/boot/powerpc/Makefile
index f805d119eb2b..a371f749236b 100644
--- a/sys/boot/powerpc/Makefile
+++ b/sys/boot/powerpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/powerpc/Makefile,v 1.1 2000/10/16 10:46:10 obrien Exp $
 
 SUBDIR=		loader
 
diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile
index c409729a2850..fd8d1456965a 100644
--- a/sys/boot/powerpc/loader/Makefile
+++ b/sys/boot/powerpc/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.18 2004/12/21 12:32:15 ru Exp $
 
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" "Open Firmware/PowerPC"
diff --git a/sys/boot/powerpc/loader/conf.c b/sys/boot/powerpc/loader/conf.c
index d214d1eb9f96..54c05e8d29a6 100644
--- a/sys/boot/powerpc/loader/conf.c
+++ b/sys/boot/powerpc/loader/conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.10 2004/01/04 23:21:18 obrien Exp $");
 
 #include <stand.h>
 #include "bootstrap.h"
diff --git a/sys/boot/powerpc/loader/help.ofw b/sys/boot/powerpc/loader/help.ofw
index 5873eb0512d2..6b1f1c21b825 100644
--- a/sys/boot/powerpc/loader/help.ofw
+++ b/sys/boot/powerpc/loader/help.ofw
@@ -1 +1 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/powerpc/loader/help.ofw,v 1.1 2000/10/16 10:46:16 obrien Exp $
diff --git a/sys/boot/powerpc/loader/ldscript.powerpc b/sys/boot/powerpc/loader/ldscript.powerpc
index ecf8129455aa..10f484ba6d5b 100644
--- a/sys/boot/powerpc/loader/ldscript.powerpc
+++ b/sys/boot/powerpc/loader/ldscript.powerpc
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/powerpc/loader/ldscript.powerpc,v 1.1 2004/07/08 12:52:35 grehan Exp $ */
 
 OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
 OUTPUT_ARCH(powerpc)
diff --git a/sys/boot/powerpc/loader/metadata.c b/sys/boot/powerpc/loader/metadata.c
index fdeaa5960a1c..813679052c59 100644
--- a/sys/boot/powerpc/loader/metadata.c
+++ b/sys/boot/powerpc/loader/metadata.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/metadata.c,v 1.5 2004/12/01 04:59:32 scottl Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/powerpc/loader/start.c b/sys/boot/powerpc/loader/start.c
index ff3fcd88c5a2..04064deabee6 100644
--- a/sys/boot/powerpc/loader/start.c
+++ b/sys/boot/powerpc/loader/start.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 #include "libofw.h"
diff --git a/sys/boot/powerpc/loader/version b/sys/boot/powerpc/loader/version
index cb0f6938f966..d115d531acf8 100644
--- a/sys/boot/powerpc/loader/version
+++ b/sys/boot/powerpc/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/powerpc/loader/version,v 1.1 2000/10/16 10:46:16 obrien Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/sparc64/Makefile b/sys/boot/sparc64/Makefile
index fdc87fde92d5..71b7999d07ca 100644
--- a/sys/boot/sparc64/Makefile
+++ b/sys/boot/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/Makefile,v 1.2 2002/03/28 01:41:23 obrien Exp $
 
 SUBDIR=	boot1 loader
 
diff --git a/sys/boot/sparc64/Makefile.inc b/sys/boot/sparc64/Makefile.inc
index f2170c83a8a7..aa3ec51308e4 100644
--- a/sys/boot/sparc64/Makefile.inc
+++ b/sys/boot/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/Makefile.inc,v 1.1 2004/02/09 14:17:02 ru Exp $
 
 BINDIR?=	/boot
 CFLAGS+=	-ffreestanding
diff --git a/sys/boot/sparc64/boot1/Makefile b/sys/boot/sparc64/boot1/Makefile
index 9670678c20eb..489cf4879b48 100644
--- a/sys/boot/sparc64/boot1/Makefile
+++ b/sys/boot/sparc64/boot1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.11 2004/12/21 08:47:18 ru Exp $
 
 PROG=	boot1.elf
 INTERNALPROG=
diff --git a/sys/boot/sparc64/boot1/_start.s b/sys/boot/sparc64/boot1/_start.s
index 30f8019cc863..3fa176cf8838 100644
--- a/sys/boot/sparc64/boot1/_start.s
+++ b/sys/boot/sparc64/boot1/_start.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/sparc64/boot1/_start.s,v 1.2 2004/02/11 21:17:04 ru Exp $ */
 
 	.text
 	.globl	_start
diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c
index 813da29f4ecf..33af6d8dc9d5 100644
--- a/sys/boot/sparc64/boot1/boot1.c
+++ b/sys/boot/sparc64/boot1/boot1.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.19 2005/01/05 22:16:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile
index c8a423de2ddb..773db8109ea6 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/sys/boot/sparc64/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.19 2004/12/21 12:32:15 ru Exp $
 
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" sparc64
diff --git a/sys/boot/sparc64/loader/locore.S b/sys/boot/sparc64/loader/locore.S
index 5eb69351815d..eab8375e9774 100644
--- a/sys/boot/sparc64/loader/locore.S
+++ b/sys/boot/sparc64/loader/locore.S
@@ -6,7 +6,7 @@
  * As long as the above copyright statement and this notice remain
  * unchanged, you can do what ever you want with this file. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.7 2005/01/05 22:16:58 imp Exp $
  */
 
 #define	LOCORE
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index c93e61038898..31d3c901d87d 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.26 2005/01/05 22:16:58 imp Exp $");
 
 /*
  * FreeBSD/sparc64 kernel loader - machine dependent part
diff --git a/sys/boot/sparc64/loader/metadata.c b/sys/boot/sparc64/loader/metadata.c
index 3fe767799d0e..bc5b2754b27a 100644
--- a/sys/boot/sparc64/loader/metadata.c
+++ b/sys/boot/sparc64/loader/metadata.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.13.2.1 2005/08/27 15:52:05 marius Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/sparc64/loader/version b/sys/boot/sparc64/loader/version
index bef4091e58f6..4f5750d09dbe 100644
--- a/sys/boot/sparc64/loader/version
+++ b/sys/boot/sparc64/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/sparc64/loader/version,v 1.1 2002/07/07 18:23:10 jake Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h
index 566599f798d8..7f96c80de155 100644
--- a/sys/bsm/audit.h
+++ b/sys/bsm/audit.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/bsm/audit.h,v 1.1 2005/05/29 16:10:33 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_H_
diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h
index f7520bc59e37..335126806734 100644
--- a/sys/bsm/audit_kevents.h
+++ b/sys/bsm/audit_kevents.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.2 2005/05/29 16:11:34 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_KEVENTS_H_
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index 9fbdac78907e..dfd7712882aa 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.9 2005/01/05 22:34:34 imp Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 93e00b25f776..88780809690b 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_H
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 61282505a9d9..5eba82cb4f6c 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.28 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_CCB_H
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index 8be45479b16e..848dd4f63315 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_debug.h,v 1.8 2005/01/05 22:34:34 imp Exp $
  */
 #ifndef	_CAM_CAM_DEBUG_H
 #define _CAM_CAM_DEBUG_H 1
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 604d08fc9405..df6f2c971acd 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.60 2005/07/01 15:21:29 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index c5d02fc517e0..ef0ea2b0684d 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_periph.h,v 1.16 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 1e756d2e89a8..6f9f631df14e 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.9 2005/07/01 15:21:29 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index d2990ad26e94..63fcc0604c21 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_queue.h,v 1.9 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_QUEUE_H
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index 322915f20795..e49dbab0dc10 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.9 2005/07/01 15:21:29 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index c4e39109eabd..975034c2bf6f 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_sim.h,v 1.6 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_SIM_H
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 28bcd8e73ebb..2783280d0795 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.155.2.1 2005/09/18 02:29:27 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 1b982c7cc6de..1a0bcbdf9f0d 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.5 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_XPT_H
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index c6b8cc26748f..c43694b3f8de 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.5 2005/07/01 15:21:29 avatar Exp $
  */
 
 #ifndef _CAM_CAM_XPT_PERIPH_H
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 603c9efa22f8..6d5a453d0d5a 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.8 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_XPT_SIM_H
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 4c5114821d30..eac486a7670f 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.48 2005/04/14 03:52:50 mjacob Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 02cfd186a649..91c2001c421e 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.24 2005/01/05 22:34:34 imp Exp $
  */
 
 /*
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index d0b2bb27cd9a..f879f2a5040f 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.93 2005/03/26 06:05:06 ken Exp $");
 
 #include "opt_cd.h"
 
diff --git a/sys/cam/scsi/scsi_cd.h b/sys/cam/scsi/scsi_cd.h
index f502d664391a..0d36247225c6 100644
--- a/sys/cam/scsi/scsi_cd.h
+++ b/sys/cam/scsi/scsi_cd.h
@@ -41,7 +41,7 @@
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
  *	from: scsi_cd.h,v 1.10 1997/02/22 09:44:28 peter Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_cd.h,v 1.7 2003/02/21 06:19:38 ken Exp $
  */
 #ifndef	_SCSI_SCSI_CD_H
 #define _SCSI_SCSI_CD_H 1
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index c79dd992d804..76e7fd81144f 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.42 2005/03/26 04:21:11 ken Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_ch.h b/sys/cam/scsi/scsi_ch.h
index 8490e567fc8a..ddb9f7aad0f2 100644
--- a/sys/cam/scsi/scsi_ch.h
+++ b/sys/cam/scsi/scsi_ch.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/cam/scsi/scsi_ch.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */
 /*	$NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $	*/
 
 /*-
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 30b320c4df56..9afdb8dd8472 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.180 2005/06/09 17:35:04 pjd Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index da099f69cba9..96ba56e8f569 100644
--- a/sys/cam/scsi/scsi_da.h
+++ b/sys/cam/scsi/scsi_da.h
@@ -46,7 +46,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.8 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef	_SCSI_SCSI_DA_H
diff --git a/sys/cam/scsi/scsi_dvcfg.h b/sys/cam/scsi/scsi_dvcfg.h
index 229dec782149..51df96d0656d 100644
--- a/sys/cam/scsi/scsi_dvcfg.h
+++ b/sys/cam/scsi/scsi_dvcfg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/cam/scsi/scsi_dvcfg.h,v 1.2 2005/01/05 22:34:34 imp Exp $	*/
 /*	$NecBSD: scsi_dvcfg.h,v 1.4 1998/03/14 07:05:06 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/cam/scsi/scsi_iu.h b/sys/cam/scsi/scsi_iu.h
index 7e577715d550..7d6b05325339 100644
--- a/sys/cam/scsi/scsi_iu.h
+++ b/sys/cam/scsi/scsi_iu.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_iu.h,v 1.3 2005/01/05 22:34:34 imp Exp $
  */
 #ifndef	_SCSI_SCSI_IU_H
 #define _SCSI_SCSI_IU_H 1
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index dc9a492ab912..e7cc763689d8 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -2,7 +2,7 @@
 /*	$NetBSD$	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.24 2005/07/01 15:21:30 avatar Exp $");
 
 #define	SCSI_LOW_STATICS
 #define	SCSI_LOW_DEBUG
diff --git a/sys/cam/scsi/scsi_low.h b/sys/cam/scsi/scsi_low.h
index 4dfa6021533d..e584325dff95 100644
--- a/sys/cam/scsi/scsi_low.h
+++ b/sys/cam/scsi/scsi_low.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.8 2005/01/05 22:34:34 imp Exp $	*/
 /*	$NecBSD: scsi_low.h,v 1.24.10.5 2001/06/26 07:31:46 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/cam/scsi/scsi_low_pisa.c b/sys/cam/scsi/scsi_low_pisa.c
index 13020bb05313..737e265a5125 100644
--- a/sys/cam/scsi/scsi_low_pisa.c
+++ b/sys/cam/scsi/scsi_low_pisa.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.8 2005/01/05 22:34:34 imp Exp $");
 
 #ifdef	__NetBSD__
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_low_pisa.h b/sys/cam/scsi/scsi_low_pisa.h
index e0f1c7467326..9581be12ecbd 100644
--- a/sys/cam/scsi/scsi_low_pisa.h
+++ b/sys/cam/scsi/scsi_low_pisa.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.h,v 1.5 2005/01/05 22:34:34 imp Exp $	*/
 /*	$NecBSD: scsi_low_pisa.h,v 1.3.14.1 2001/06/08 06:27:49 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/cam/scsi/scsi_message.h b/sys/cam/scsi/scsi_message.h
index 53b7640ade4d..339eeffd1252 100644
--- a/sys/cam/scsi/scsi_message.h
+++ b/sys/cam/scsi/scsi_message.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.7 2005/01/05 22:34:34 imp Exp $
  */
 
 /* Messages (1 byte) */		     /* I/T (M)andatory or (O)ptional */
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 774daee5b326..ec8d946d0c1a 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.43 2005/01/22 07:21:25 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/scsi/scsi_pass.h b/sys/cam/scsi/scsi_pass.h
index ae0e0586b2f4..aec04d22c093 100644
--- a/sys/cam/scsi/scsi_pass.h
+++ b/sys/cam/scsi/scsi_pass.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.5 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _SCSI_PASS_H
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 412155a66ba1..ce2250b37d2c 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.43 2005/01/05 22:34:34 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_pt.h b/sys/cam/scsi/scsi_pt.h
index 0f96b5b58408..098caa5535f2 100644
--- a/sys/cam/scsi/scsi_pt.h
+++ b/sys/cam/scsi/scsi_pt.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pt.h,v 1.4 2005/01/05 22:34:35 imp Exp $
  */
 
 #ifndef	_SCSI_SCSI_PT_H
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index f970cf909117..95efd5bfc099 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.105 2005/07/01 15:21:30 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index b1cee795ac59..1c6589757b08 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_sa.h,v 1.10 2005/01/05 22:34:35 imp Exp $
  */
 
 #ifndef	_SCSI_SCSI_SA_H
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 608290dc85b5..c7df20556d5f 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.32 2005/07/01 15:21:30 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_ses.h b/sys/cam/scsi/scsi_ses.h
index 9574e7c916a1..a310ef4778af 100644
--- a/sys/cam/scsi/scsi_ses.h
+++ b/sys/cam/scsi/scsi_ses.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.3 2005/01/05 22:34:35 imp Exp $ */
 /*-
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index e755f2f60122..32ca818a3e48 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.22 2005/07/01 15:21:30 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 1e3d893fbbbf..32b8f952857c 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.67.2.1 2005/08/13 21:24:15 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index 0c868067c5f6..8ffee5f4d9ca 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.12 2005/01/05 22:34:35 imp Exp $
  */
 
 #ifndef _CAM_SCSI_SCSI_TARGETIO_H_
diff --git a/sys/coda/README b/sys/coda/README
index 19de799c0eac..5cd02cddd335 100644
--- a/sys/coda/README
+++ b/sys/coda/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/coda/README,v 1.3 2002/05/16 21:25:34 trhodes Exp $
 
                 Announcing the Availability of the
                         Coda Distributed
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index 8bbdeb55b0f9..d911af1b2f9b 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/cnode.h,v 1.17 2005/03/13 12:09:34 jeff Exp $
  * 
  */
 
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index bd87a9e2836a..4d133acebd84 100644
--- a/sys/coda/coda.h
+++ b/sys/coda/coda.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda.h,v 1.13 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index dd379d7a4664..96f6d53d47f4 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.42.2.1 2005/08/13 21:24:15 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_io.h b/sys/coda/coda_io.h
index 1985b01a5c56..fe1711cc7730 100644
--- a/sys/coda/coda_io.h
+++ b/sys/coda/coda_io.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_io.h,v 1.8 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_kernel.h b/sys/coda/coda_kernel.h
index fd365b8ad37d..cff7652355d2 100644
--- a/sys/coda/coda_kernel.h
+++ b/sys/coda/coda_kernel.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_kernel.h,v 1.5 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c
index f8a79f5a87d1..60e39bf6f804 100644
--- a/sys/coda/coda_namecache.c
+++ b/sys/coda/coda_namecache.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/coda/coda_namecache.c,v 1.21 2005/01/05 23:35:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_namecache.h b/sys/coda/coda_namecache.h
index 77f2cb168255..152342c70d2d 100644
--- a/sys/coda/coda_namecache.h
+++ b/sys/coda/coda_namecache.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_namecache.h,v 1.10 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_opstats.h b/sys/coda/coda_opstats.h
index a8d52b3a8456..48749d7e89d6 100644
--- a/sys/coda/coda_opstats.h
+++ b/sys/coda/coda_opstats.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_opstats.h,v 1.6 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_pioctl.h b/sys/coda/coda_pioctl.h
index ea61b6429a4e..7164ae591ec5 100644
--- a/sys/coda/coda_pioctl.h
+++ b/sys/coda/coda_pioctl.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_pioctl.h,v 1.8 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index 7e71f1c0570b..5585c7dfd564 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -49,7 +49,7 @@
 /* These routines are the device entry points for Venus. */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/coda/coda_psdev.c,v 1.34 2005/03/15 10:01:31 phk Exp $");
 
 
 extern int coda_nc_initialized;    /* Set if cache has been initialized */
diff --git a/sys/coda/coda_psdev.h b/sys/coda/coda_psdev.h
index 5d1193ba0447..ba7468d1c097 100644
--- a/sys/coda/coda_psdev.h
+++ b/sys/coda/coda_psdev.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_psdev.h,v 1.5 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index 878bd686f03f..b49e92518d6c 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.31 2005/03/13 12:10:15 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_subr.h b/sys/coda/coda_subr.h
index 91bf1228e6ce..6e0fadaf3be3 100644
--- a/sys/coda/coda_subr.h
+++ b/sys/coda/coda_subr.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_subr.h,v 1.9 2005/01/05 23:35:00 imp Exp $
  * 
  */
 
diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c
index 56d627b39292..cce9f4a8e52e 100644
--- a/sys/coda/coda_venus.c
+++ b/sys/coda/coda_venus.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.24 2005/03/15 12:39:30 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_venus.h b/sys/coda/coda_venus.h
index 1d1e0cfd39b5..329ea32a19b1 100644
--- a/sys/coda/coda_venus.h
+++ b/sys/coda/coda_venus.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_venus.h,v 1.8 2005/01/11 07:36:18 phk Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index c73d364fdf81..223f4f2a6cf7 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.59 2005/03/24 07:39:03 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_vfsops.h b/sys/coda/coda_vfsops.h
index 8a665457e55b..fe82b1c3282c 100644
--- a/sys/coda/coda_vfsops.h
+++ b/sys/coda/coda_vfsops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_vfsops.h,v 1.10 2005/02/20 23:01:57 das Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index a6f6e1a6196c..e613132f4a0b 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.66 2005/04/13 10:59:07 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index db8e3f86ec66..bdc0e18f41e9 100644
--- a/sys/coda/coda_vnops.h
+++ b/sys/coda/coda_vnops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.16 2005/01/19 08:24:53 phk Exp $
  * 
   */
 
diff --git a/sys/compat/freebsd32/Makefile b/sys/compat/freebsd32/Makefile
index 0741ec8474aa..c1e889c3c02a 100644
--- a/sys/compat/freebsd32/Makefile
+++ b/sys/compat/freebsd32/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/freebsd32/Makefile,v 1.3 2003/08/22 22:51:48 peter Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
index 806b2ffc6d94..99380db054bb 100644
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.4 2004/04/14 23:17:37 peter Exp $
  */
 
 #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index b84e9dd6bdab..36920381a333 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.38.2.1 2005/07/18 19:49:48 jhb Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index 524988e6f787..2186805d8538 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.38.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index 1e827c0dbad3..39caf234d3a8 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.38.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
index c90d10296d7b..0650479f1412 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.29.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index 61edcf78b23a..16c0312d98c4 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.39.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h
index fadbeb4dbed4..dc82b3faad68 100644
--- a/sys/compat/freebsd32/freebsd32_util.h
+++ b/sys/compat/freebsd32/freebsd32_util.h
@@ -25,7 +25,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/sys/compat/freebsd32/freebsd32_util.h,v 1.10 2005/06/29 15:16:20 jhb Exp $
  */
 
 #include <vm/vm.h>
diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf
index 4c65e7d561c3..85b49a76bda6 100644
--- a/sys/compat/freebsd32/syscalls.conf
+++ b/sys/compat/freebsd32/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/freebsd32/syscalls.conf,v 1.4 2003/12/24 00:32:07 peter Exp $
 sysnames="freebsd32_syscalls.c"
 sysproto="freebsd32_proto.h"
 sysproto_h=_FREEBSD32_SYSPROTO_H_
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index 2a764bfb706b..31e905f20894 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.1 2005/07/20 17:42:15 jhb Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;	from: src/sys/kern/syscalls.master 1.107
 ;
diff --git a/sys/compat/ia32/ia32_genassym.c b/sys/compat/ia32/ia32_genassym.c
index 54cec2189ef4..3166df3cc957 100644
--- a/sys/compat/ia32/ia32_genassym.c
+++ b/sys/compat/ia32/ia32_genassym.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_genassym.c,v 1.4 2004/02/21 23:35:56 peter Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/ia32/ia32_reg.h b/sys/compat/ia32/ia32_reg.h
index 5a9cdf2eebf9..2cc08cfa736a 100644
--- a/sys/compat/ia32/ia32_reg.h
+++ b/sys/compat/ia32/ia32_reg.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ia32/ia32_reg.h,v 1.1 2005/06/30 07:49:21 peter Exp $
  */
 
 #ifndef _COMPAT_IA32_IA32_REG_H_
diff --git a/sys/compat/ia32/ia32_signal.h b/sys/compat/ia32/ia32_signal.h
index e79100a3c8f8..5ee09f21f0c3 100644
--- a/sys/compat/ia32/ia32_signal.h
+++ b/sys/compat/ia32/ia32_signal.h
@@ -26,7 +26,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/sys/compat/ia32/ia32_signal.h,v 1.7 2005/04/05 22:41:49 peter Exp $
  */
 
 struct ia32_sigaltstack {
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index 1052d61c0578..50e66e080cd7 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.20 2005/01/29 23:11:58 sobomax Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/ia32/ia32_util.h b/sys/compat/ia32/ia32_util.h
index a2b88cb4272e..1bbe495ee6d2 100644
--- a/sys/compat/ia32/ia32_util.h
+++ b/sys/compat/ia32/ia32_util.h
@@ -25,7 +25,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/sys/compat/ia32/ia32_util.h,v 1.9 2003/12/11 01:05:09 peter Exp $
  */
 
 #include <vm/vm.h>
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index bdb51081afc2..fadc79acaae0 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.89 2005/03/06 22:28:14 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 79a8ba908483..79de7703c6b7 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.91 2005/04/13 04:31:43 mdodd Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 53aae454c23e..e296a1e5aa4d 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.19 2005/07/09 12:34:49 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 1a59f4bc3fa3..1c7988e1bb81 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.127.2.2 2005/09/02 03:52:28 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h
index 96243dd89a76..663bb2c91ccc 100644
--- a/sys/compat/linux/linux_ioctl.h
+++ b/sys/compat/linux/linux_ioctl.h
@@ -25,7 +25,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/sys/compat/linux/linux_ioctl.h,v 1.22 2005/01/05 22:34:35 imp Exp $
  */
 
 #ifndef _LINUX_IOCTL_H_
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 83c018873f1b..76f598ee2509 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.43 2005/02/11 13:46:55 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_ipc.h b/sys/compat/linux/linux_ipc.h
index 2557f22fedd1..b8ce58916667 100644
--- a/sys/compat/linux/linux_ipc.h
+++ b/sys/compat/linux/linux_ipc.h
@@ -25,7 +25,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/sys/compat/linux/linux_ipc.h,v 1.10 2004/08/16 07:28:16 tjr Exp $
  */
 
 #ifndef _LINUX_IPC_H_
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 916e8ea3c317..fa418d1d87b9 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.23 2005/01/14 04:44:56 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h
index b68e57fd3238..d968f706087b 100644
--- a/sys/compat/linux/linux_mib.h
+++ b/sys/compat/linux/linux_mib.h
@@ -25,7 +25,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/sys/compat/linux/linux_mib.h,v 1.8 2003/03/26 18:29:44 jhb Exp $
  */
 
 #ifndef _LINUX_MIB_H_
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index eb9115d7f00d..d36fef4816c5 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.170 2005/07/07 19:17:55 jhb Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index fc25e3f7bfba..b651d9e984e8 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.51 2005/02/13 19:50:57 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h
index edb7c66b2692..34bb0644bdfb 100644
--- a/sys/compat/linux/linux_signal.h
+++ b/sys/compat/linux/linux_signal.h
@@ -25,7 +25,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/sys/compat/linux/linux_signal.h,v 1.6 2002/03/20 05:42:02 alfred Exp $
  */
 
 #ifndef _LINUX_SIGNAL_H_
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index f1f26bcf9686..f14374acaaa5 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.59 2005/07/09 12:26:22 jhb Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h
index b6b9841ad197..074e8e048b2e 100644
--- a/sys/compat/linux/linux_socket.h
+++ b/sys/compat/linux/linux_socket.h
@@ -25,7 +25,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/sys/compat/linux/linux_socket.h,v 1.2 2002/06/02 20:05:42 schweikh Exp $
  */
 
 #ifndef _LINUX_SOCKET_H_
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index d0c52311e110..e321f787b666 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.72 2005/06/23 22:13:29 pjd Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index f20a1dedf1af..2574e12cd0e8 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_sysctl.c,v 1.14 2005/01/14 04:44:56 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/compat/linux/linux_sysproto.h b/sys/compat/linux/linux_sysproto.h
index 69f1577dc457..2efab86b73f4 100644
--- a/sys/compat/linux/linux_sysproto.h
+++ b/sys/compat/linux/linux_sysproto.h
@@ -25,7 +25,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/sys/compat/linux/linux_sysproto.h,v 1.1 2005/03/07 00:18:06 sobomax Exp $
  */
 
 #ifndef LINUX_SYSPROTO
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index 52a6df288148..f0090eeb9200 100644
--- a/sys/compat/linux/linux_uid16.c
+++ b/sys/compat/linux/linux_uid16.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.16 2005/01/14 04:44:56 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index b0a639167329..8d9e51b5020e 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.29 2005/03/01 17:57:45 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 6aad44dd89ee..d197963a0411 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -28,7 +28,7 @@
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.25 2005/03/01 17:57:45 jhb Exp $
  */
 
 /*
diff --git a/sys/compat/ndis/cfg_var.h b/sys/compat/ndis/cfg_var.h
index 1fb44ce268a1..56a02a37358d 100644
--- a/sys/compat/ndis/cfg_var.h
+++ b/sys/compat/ndis/cfg_var.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.3 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef _CFG_VAR_H_
diff --git a/sys/compat/ndis/hal_var.h b/sys/compat/ndis/hal_var.h
index 69950b30c06c..6510a5c8b371 100644
--- a/sys/compat/ndis/hal_var.h
+++ b/sys/compat/ndis/hal_var.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.8 2005/04/11 02:02:34 wpaul Exp $
  */
 
 #ifndef _HAL_VAR_H_
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index 6e8b347db053..f51eeee5dfec 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.84.2.1.2.1 2005/10/27 17:08:55 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c
index 920291105162..9f526abfa455 100644
--- a/sys/compat/ndis/kern_windrv.c
+++ b/sys/compat/ndis/kern_windrv.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.11.4.1 2005/10/27 17:08:55 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/ndis/ndis_var.h b/sys/compat/ndis/ndis_var.h
index 6f3772dbe76b..181f48359c0d 100644
--- a/sys/compat/ndis/ndis_var.h
+++ b/sys/compat/ndis/ndis_var.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.41.4.1 2005/10/27 17:08:55 wpaul Exp $
  */
 
 #ifndef _NDIS_VAR_H_
diff --git a/sys/compat/ndis/ntoskrnl_var.h b/sys/compat/ndis/ntoskrnl_var.h
index b01b90eb2896..f18518a8dca5 100644
--- a/sys/compat/ndis/ntoskrnl_var.h
+++ b/sys/compat/ndis/ntoskrnl_var.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.36.4.1 2005/10/27 17:08:56 wpaul Exp $
  */
 
 #ifndef _NTOSKRNL_VAR_H_
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
index e778b5805532..915b9fe27ab5 100644
--- a/sys/compat/ndis/pe_var.h
+++ b/sys/compat/ndis/pe_var.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.13.4.1 2005/10/27 17:08:56 wpaul Exp $
  */
 
 #ifndef _PE_VAR_H_
diff --git a/sys/compat/ndis/resource_var.h b/sys/compat/ndis/resource_var.h
index 28f2d62920ee..aa4f40ebbcd0 100644
--- a/sys/compat/ndis/resource_var.h
+++ b/sys/compat/ndis/resource_var.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/resource_var.h,v 1.3 2005/02/16 05:41:17 wpaul Exp $
  */
 
 #ifndef _RESOURCE_VAR_H_
diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c
index 73e574ad5fbb..ed0f94385e12 100644
--- a/sys/compat/ndis/subr_hal.c
+++ b/sys/compat/ndis/subr_hal.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.24.4.1 2005/10/27 17:08:56 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
index eb2ae66722d4..1615bd342784 100644
--- a/sys/compat/ndis/subr_ndis.c
+++ b/sys/compat/ndis/subr_ndis.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.94.4.1 2005/10/27 17:08:56 wpaul Exp $");
 
 /*
  * This file implements a translation layer between the BSD networking
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index f47badb4950c..c0915703ed51 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.71.4.1 2005/10/27 17:08:56 wpaul Exp $");
 
 #include <sys/ctype.h>
 #include <sys/unistd.h>
diff --git a/sys/compat/ndis/subr_pe.c b/sys/compat/ndis/subr_pe.c
index ee8c0fe0c9f0..c4504e4bebf9 100644
--- a/sys/compat/ndis/subr_pe.c
+++ b/sys/compat/ndis/subr_pe.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.11.4.1 2005/10/27 17:08:56 wpaul Exp $");
 
 /*
  * This file contains routines for relocating and dynamically linking
diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c
index 3aa322e3a93c..f65dc2de2a20 100644
--- a/sys/compat/ndis/subr_usbd.c
+++ b/sys/compat/ndis/subr_usbd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.3 2005/05/05 03:56:09 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/ndis/usbd_var.h b/sys/compat/ndis/usbd_var.h
index 8c9f2b3a5854..24aca41e9f47 100644
--- a/sys/compat/ndis/usbd_var.h
+++ b/sys/compat/ndis/usbd_var.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/usbd_var.h,v 1.1 2005/02/24 21:49:14 wpaul Exp $
  */
 
 #ifndef _USBD_VAR_H_
diff --git a/sys/compat/ndis/winx32_wrap.S b/sys/compat/ndis/winx32_wrap.S
index f5d24baa4453..08c89e8840aa 100644
--- a/sys/compat/ndis/winx32_wrap.S
+++ b/sys/compat/ndis/winx32_wrap.S
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/winx32_wrap.S,v 1.2.6.1 2005/10/27 17:08:56 wpaul Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/compat/ndis/winx64_wrap.S b/sys/compat/ndis/winx64_wrap.S
index c44fe053c8c2..dcb0a9813859 100644
--- a/sys/compat/ndis/winx64_wrap.S
+++ b/sys/compat/ndis/winx64_wrap.S
@@ -32,7 +32,7 @@
  * The x86_64 callback routines were written and graciously submitted
  * by Ville-Pertti Keinonen <will@exomi.com>.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/winx64_wrap.S,v 1.4 2005/04/16 04:47:15 wpaul Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/compat/netbsd/dvcfg.h b/sys/compat/netbsd/dvcfg.h
index 817ab3d707b3..f3497c57890f 100644
--- a/sys/compat/netbsd/dvcfg.h
+++ b/sys/compat/netbsd/dvcfg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/compat/netbsd/dvcfg.h,v 1.6 2005/01/05 22:34:36 imp Exp $ */
 /*	$NetBSD$	*/
 /*-
  * [NetBSD for NEC PC98 series]
diff --git a/sys/compat/netbsd/physio_proc.h b/sys/compat/netbsd/physio_proc.h
index fde967367d29..ef14efd5a06b 100644
--- a/sys/compat/netbsd/physio_proc.h
+++ b/sys/compat/netbsd/physio_proc.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/compat/netbsd/physio_proc.h,v 1.7 2005/01/05 22:34:36 imp Exp $	*/
 /*	$NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index e10f460e29e1..40c1b784bc4c 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.39 2005/02/22 01:26:48 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/pecoff/imgact_pecoff.h b/sys/compat/pecoff/imgact_pecoff.h
index a625a9b8e9f8..f8d628f70729 100644
--- a/sys/compat/pecoff/imgact_pecoff.h
+++ b/sys/compat/pecoff/imgact_pecoff.h
@@ -1,5 +1,5 @@
 /* $NetBSD$	 */
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.h,v 1.2 2005/01/05 22:34:36 imp Exp $	*/
 /*-
  * Copyright (c) 2000 Masaru OKI
  */
diff --git a/sys/compat/svr4/Makefile b/sys/compat/svr4/Makefile
index 7da356e4b49f..c6ef650b9255 100644
--- a/sys/compat/svr4/Makefile
+++ b/sys/compat/svr4/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/svr4/Makefile,v 1.7 2001/09/13 22:02:48 julian Exp $
 
 MAINTAINER=	newton@freebsd.org
 
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index 4c710205b5ae..a082ca39420e 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.25 2005/04/01 20:00:10 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index 84ee720597ff..d7f7b87bdd17 100644
--- a/sys/compat/svr4/svr4.h
+++ b/sys/compat/svr4/svr4.h
@@ -24,7 +24,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/sys/compat/svr4/svr4.h,v 1.8.2.1 2005/07/18 19:48:13 jhb Exp $
  */
 
 #include "opt_svr4.h"
diff --git a/sys/compat/svr4/svr4_acl.h b/sys/compat/svr4/svr4_acl.h
index ef2da1a68a6a..29290ee6d98e 100644
--- a/sys/compat/svr4/svr4_acl.h
+++ b/sys/compat/svr4/svr4_acl.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/sys/compat/svr4/svr4_acl.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 #ifndef	_SVR4_ACL_H_
 #define	_SVR4_ACL_H_
diff --git a/sys/compat/svr4/svr4_dirent.h b/sys/compat/svr4/svr4_dirent.h
index 9ce7bf88e0e8..8427d57eb84d 100644
--- a/sys/compat/svr4/svr4_dirent.h
+++ b/sys/compat/svr4/svr4_dirent.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_dirent.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_DIRENT_H_
diff --git a/sys/compat/svr4/svr4_errno.h b/sys/compat/svr4/svr4_errno.h
index b5fa2743365e..721a32e5b10d 100644
--- a/sys/compat/svr4/svr4_errno.h
+++ b/sys/compat/svr4/svr4_errno.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_errno.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_ERRNO_H_
diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h
index adab956ac84c..8d44d9b11046 100644
--- a/sys/compat/svr4/svr4_exec.h
+++ b/sys/compat/svr4/svr4_exec.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_exec.h,v 1.7 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_EXEC_H_
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index ad748383c0e2..8cf9a2811e5c 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.35 2005/02/07 21:53:41 jhb Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h
index 1a354a799457..a6b998e6e08e 100644
--- a/sys/compat/svr4/svr4_fcntl.h
+++ b/sys/compat/svr4/svr4_fcntl.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_fcntl.h,v 1.5 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_FCNTL_H_
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index d7824438266c..23d749e8fe0a 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.34 2005/01/05 22:34:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_filio.h b/sys/compat/svr4/svr4_filio.h
index baf81c7e228e..16d7f9820cdf 100644
--- a/sys/compat/svr4/svr4_filio.h
+++ b/sys/compat/svr4/svr4_filio.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_filio.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_FILIO_H_
diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h
index df2db984bb58..8e1910c2a800 100644
--- a/sys/compat/svr4/svr4_fuser.h
+++ b/sys/compat/svr4/svr4_fuser.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_fuser.h,v 1.5 2005/01/05 22:34:36 imp Exp $
  *	Derived from:
  *	$NetBSD: svr4_fuser.h,v 1.4 1998/09/04 19:54:38 christos Exp $	 */
 
diff --git a/sys/compat/svr4/svr4_hrt.h b/sys/compat/svr4/svr4_hrt.h
index 5a3bb6729394..3b6afd0ac39d 100644
--- a/sys/compat/svr4/svr4_hrt.h
+++ b/sys/compat/svr4/svr4_hrt.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_hrt.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_HRT_H_
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index b192a2c77ec8..9f109899a0fa 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.22 2005/01/05 22:34:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h
index e0633a7e4e1f..bfbe4cc86e1c 100644
--- a/sys/compat/svr4/svr4_ioctl.h
+++ b/sys/compat/svr4/svr4_ioctl.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_ioctl.h,v 1.6 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_IOCTL_H_
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index 9904bff49549..ae8fbfce4b72 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.16 2005/07/07 19:25:47 jhb Exp $");
 
 #include "opt_sysvipc.h"
 
diff --git a/sys/compat/svr4/svr4_ipc.h b/sys/compat/svr4/svr4_ipc.h
index 36cf3ddceb3e..f541345c9004 100644
--- a/sys/compat/svr4/svr4_ipc.h
+++ b/sys/compat/svr4/svr4_ipc.h
@@ -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/sys/compat/svr4/svr4_ipc.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef _SVR4_IPC_H_
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index d7a9069125ec..07b8232d2c5f 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.80 2005/07/07 19:26:43 jhb Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/svr4/svr4_mman.h b/sys/compat/svr4/svr4_mman.h
index e30e4924661c..bf5817ba9ac6 100644
--- a/sys/compat/svr4/svr4_mman.h
+++ b/sys/compat/svr4/svr4_mman.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_mman.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef _SVR4_MMAN_H_
diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h
index 066c34254336..fbe586cfd98c 100644
--- a/sys/compat/svr4/svr4_proto.h
+++ b/sys/compat/svr4/svr4_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.17.2.2 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17.2.2 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 7b57c3f745c3..1b3477af4fcd 100644
--- a/sys/compat/svr4/svr4_resource.c
+++ b/sys/compat/svr4/svr4_resource.c
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.18 2005/01/05 22:34:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_resource.h b/sys/compat/svr4/svr4_resource.h
index 4b93e9a229dc..86830a501bee 100644
--- a/sys/compat/svr4/svr4_resource.h
+++ b/sys/compat/svr4/svr4_resource.h
@@ -38,7 +38,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_resource.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 /*-
diff --git a/sys/compat/svr4/svr4_siginfo.h b/sys/compat/svr4/svr4_siginfo.h
index 4f2eaf4e1961..8454a02597a8 100644
--- a/sys/compat/svr4/svr4_siginfo.h
+++ b/sys/compat/svr4/svr4_siginfo.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_siginfo.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_SIGINFO_H_
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index c0a3a21f0c02..5feece244243 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.33 2005/02/25 19:34:10 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h
index c3230fb1ee38..e3eee237b650 100644
--- a/sys/compat/svr4/svr4_signal.h
+++ b/sys/compat/svr4/svr4_signal.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_signal.h,v 1.11 2005/02/25 19:34:10 sam Exp $
  */
 
 #ifndef	_SVR4_SIGNAL_H_
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index bae6e0c9bb73..3ace58da5e8e 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.25 2005/07/07 19:27:29 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h
index 26d20f0ae548..20ad2ca84aac 100644
--- a/sys/compat/svr4/svr4_socket.h
+++ b/sys/compat/svr4/svr4_socket.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/sys/compat/svr4/svr4_socket.h,v 1.9 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef _SVR4_SOCKET_H_
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 7468c544d195..9cc5fb9707e6 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.16.2.1 2005/08/25 05:01:03 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_sockio.h b/sys/compat/svr4/svr4_sockio.h
index 6160aa3daac5..62abd46d89dd 100644
--- a/sys/compat/svr4/svr4_sockio.h
+++ b/sys/compat/svr4/svr4_sockio.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_sockio.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_SOCKIO_H_
diff --git a/sys/compat/svr4/svr4_sockmod.h b/sys/compat/svr4/svr4_sockmod.h
index 622ff6f8b803..207fcd8845e6 100644
--- a/sys/compat/svr4/svr4_sockmod.h
+++ b/sys/compat/svr4/svr4_sockmod.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_sockmod.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_SOCKMOD_H_
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index d0f4d93aa8c4..0dcf325fde48 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.20 2005/02/07 21:53:42 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_stat.h b/sys/compat/svr4/svr4_stat.h
index 03d6e3c6ed36..cbc82e9599da 100644
--- a/sys/compat/svr4/svr4_stat.h
+++ b/sys/compat/svr4/svr4_stat.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_stat.h,v 1.5 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_STAT_H_
diff --git a/sys/compat/svr4/svr4_statvfs.h b/sys/compat/svr4/svr4_statvfs.h
index 7db9655e5aa2..b281b089e370 100644
--- a/sys/compat/svr4/svr4_statvfs.h
+++ b/sys/compat/svr4/svr4_statvfs.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_statvfs.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_STATVFS_H_
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index bd6fa5af0e13..60f04b12e794 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.53.2.1 2005/07/18 19:48:13 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h
index c7847a63b728..0d9bae1a7414 100644
--- a/sys/compat/svr4/svr4_stropts.h
+++ b/sys/compat/svr4/svr4_stropts.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_stropts.h,v 1.5 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_STROPTS_H_
diff --git a/sys/compat/svr4/svr4_syscall.h b/sys/compat/svr4/svr4_syscall.h
index 09627134ab21..d95a8747288b 100644
--- a/sys/compat/svr4/svr4_syscall.h
+++ b/sys/compat/svr4/svr4_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.15.2.2 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17.2.2 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_syscallnames.c b/sys/compat/svr4/svr4_syscallnames.c
index 3718e25ec267..a06e82f8048b 100644
--- a/sys/compat/svr4/svr4_syscallnames.c
+++ b/sys/compat/svr4/svr4_syscallnames.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.15.2.2 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17.2.2 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_sysconfig.h b/sys/compat/svr4/svr4_sysconfig.h
index b88fe19fac18..d3ba53ad186c 100644
--- a/sys/compat/svr4/svr4_sysconfig.h
+++ b/sys/compat/svr4/svr4_sysconfig.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_sysconfig.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_SYSCONFIG_H_
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index a58bf5f966ad..f53fc8bb609e 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.16.2.2 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17.2.2 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_systeminfo.h b/sys/compat/svr4/svr4_systeminfo.h
index 2d5288e0bf42..d957bb662644 100644
--- a/sys/compat/svr4/svr4_systeminfo.h
+++ b/sys/compat/svr4/svr4_systeminfo.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_systeminfo.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_SYSTEMINFO_H_
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 9bfbd4790148..721cdd4ca839 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.41 2005/02/25 19:34:10 sam Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index 37a6783aff11..8ce8b72c7477 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_termios.c,v 1.12 2005/01/05 22:34:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_termios.h b/sys/compat/svr4/svr4_termios.h
index c2b0c543e2a7..6be4ea681b7b 100644
--- a/sys/compat/svr4/svr4_termios.h
+++ b/sys/compat/svr4/svr4_termios.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_termios.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TERMIOS_H_
diff --git a/sys/compat/svr4/svr4_time.h b/sys/compat/svr4/svr4_time.h
index 0be98235dc77..134a87db4bbb 100644
--- a/sys/compat/svr4/svr4_time.h
+++ b/sys/compat/svr4/svr4_time.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_time.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TIME_H_
diff --git a/sys/compat/svr4/svr4_timod.h b/sys/compat/svr4/svr4_timod.h
index e295a4cc4e41..669e8438a54b 100644
--- a/sys/compat/svr4/svr4_timod.h
+++ b/sys/compat/svr4/svr4_timod.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_timod.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TIMOD_H_
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 3575607faa95..2b130bbcade8 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.14 2005/01/05 22:34:37 imp Exp $");
 
 #ifndef BURN_BRIDGES
 
diff --git a/sys/compat/svr4/svr4_ttold.h b/sys/compat/svr4/svr4_ttold.h
index aecde201c923..e6820c6d623a 100644
--- a/sys/compat/svr4/svr4_ttold.h
+++ b/sys/compat/svr4/svr4_ttold.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_ttold.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TTOLD_H_
diff --git a/sys/compat/svr4/svr4_types.h b/sys/compat/svr4/svr4_types.h
index af801d874322..43ff7d3b2f92 100644
--- a/sys/compat/svr4/svr4_types.h
+++ b/sys/compat/svr4/svr4_types.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_types.h,v 1.6 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TYPES_H_
diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h
index 24cb5a12793e..d733014ac296 100644
--- a/sys/compat/svr4/svr4_ucontext.h
+++ b/sys/compat/svr4/svr4_ucontext.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_ucontext.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_UCONTEXT_H_
diff --git a/sys/compat/svr4/svr4_ulimit.h b/sys/compat/svr4/svr4_ulimit.h
index d636c01d4608..0bbed1edf8c4 100644
--- a/sys/compat/svr4/svr4_ulimit.h
+++ b/sys/compat/svr4/svr4_ulimit.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_ulimit.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_ULIMIT_H_
diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h
index 3b9ade126fcd..9bc78329cb0b 100644
--- a/sys/compat/svr4/svr4_ustat.h
+++ b/sys/compat/svr4/svr4_ustat.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_ustat.h,v 1.5 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_USTAT_H_
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index 66902dd96b0d..6532e00e6ab8 100644
--- a/sys/compat/svr4/svr4_util.h
+++ b/sys/compat/svr4/svr4_util.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_util.h,v 1.9 2005/02/07 21:53:42 jhb Exp $
  */
 
 #ifndef	_SVR4_UTIL_H_
diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h
index 71795755129f..6f304e8a7ed0 100644
--- a/sys/compat/svr4/svr4_utsname.h
+++ b/sys/compat/svr4/svr4_utsname.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_utsname.h,v 1.5 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_UTSNAME_H_
diff --git a/sys/compat/svr4/svr4_wait.h b/sys/compat/svr4/svr4_wait.h
index 0ce5db74c007..c0c88ca1e8f3 100644
--- a/sys/compat/svr4/svr4_wait.h
+++ b/sys/compat/svr4/svr4_wait.h
@@ -25,7 +25,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/sys/compat/svr4/svr4_wait.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_WAIT_H_
diff --git a/sys/compat/svr4/syscalls.conf b/sys/compat/svr4/syscalls.conf
index 24f087ac0f58..d63085b97599 100644
--- a/sys/compat/svr4/syscalls.conf
+++ b/sys/compat/svr4/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/svr4/syscalls.conf,v 1.3 2003/12/24 00:32:07 peter Exp $
 sysnames="svr4_syscallnames.c"
 sysproto="svr4_proto.h"
 sysproto_h=_SVR4_SYSPROTO_H_
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index f160208edc4c..62b630671360 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17.2.2 2005/07/20 17:42:15 jhb Exp $
 ;	from: @(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ;
 ; System call name/number master file (or rather, slave, from SVR4).
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index c9b7c30db9ee..6cdf8569d4dd 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.135.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index c768084ef3d5..f322937b7f40 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -2,7 +2,7 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.16.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 92cc8c1ab5a0..06fba9d828dd 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -1,7 +1,7 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.10.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 3c92a8959419..7cc89c518147 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.265.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index ec4667aaaadd..e04f000bf81f 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -1,7 +1,7 @@
 # Makefile.ia64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.62.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index bee9486ba453..4dd14c793944 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.167.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index c0dd1692ebb6..1da3a4f6ef69 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.powerpc -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.277.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 3b6e71db94c2..2d10b3a9ccd8 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -1,7 +1,7 @@
 # Makefile.sparc64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.33.4.1 2005/10/28 19:20:53 jhb Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 94d8a5369ee8..3e25f60cf497 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.4.2.2 2005/10/28 19:20:00 jhb Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
diff --git a/sys/conf/files b/sys/conf/files
index bf4b6f82ee85..ca0195e22f77 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files,v 1.1031.2.8 2005/10/08 18:00:40 imp Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 1cef92e652c4..843b93c45c75 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.alpha,v 1.121 2005/06/14 04:16:10 marcel Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 388b745c685e..0b30bd16ddee 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.amd64,v 1.71.2.3 2005/10/06 20:43:44 jkim Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 6f907f875772..4ec9f36ecf6f 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.arm,v 1.8 2005/06/09 19:45:07 jkoshy Exp $
 arm/arm/autoconf.c	standard
 arm/arm/bcopy_page.S	standard
 arm/arm/bcopyinout.S		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index b2dec20cf65e..376178f85e5c 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.i386,v 1.538.2.1 2005/08/30 14:56:02 pjd Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 856e5c5d9106..7116c5cb1bd2 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.ia64,v 1.81 2005/06/30 07:49:21 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 41024b1f4195..5d04e67dae97 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801/PC-9821
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.pc98,v 1.327.2.1 2005/10/06 16:34:27 imp Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 704a3a278c95..1986c2bafe41 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.44 2005/06/12 00:47:21 marcel Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 47b1341e692e..f759fb0ea8bd 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.73 2005/06/12 00:47:21 marcel Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 63eae2dd8d52..73eaeda79fc8 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.mk,v 1.45 2005/03/31 22:53:58 peter Exp $
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index f42c7d5abd7a..cc056014aae8 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.83 2005/06/09 05:38:18 imp Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 1169e5214d38..d5f526520b4f 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.65.2.1 2005/10/07 13:55:58 glebius Exp $
 
 # Part of a unified Makefile for building kernels.  This part contains all
 # of the definitions that need to be before %BEFORE_DEPEND.
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index b67de3f49da5..711db9812ec5 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.192.2.1 2005/10/07 13:55:58 glebius Exp $
 #
 # The include file <bsd.kmod.mk> handles building and installing loadable
 # kernel modules.
diff --git a/sys/conf/kmod_syms.awk b/sys/conf/kmod_syms.awk
index 677d813507ee..5a2650079930 100644
--- a/sys/conf/kmod_syms.awk
+++ b/sys/conf/kmod_syms.awk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kmod_syms.awk,v 1.4 2002/08/06 19:31:04 iedowse Exp $
 
 # Read global symbols from object file.
 BEGIN {
diff --git a/sys/conf/ldscript.alpha b/sys/conf/ldscript.alpha
index 89d2d8bf4908..278cb78ccda1 100644
--- a/sys/conf/ldscript.alpha
+++ b/sys/conf/ldscript.alpha
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.alpha,v 1.8 2004/08/27 19:13:35 marcel Exp $ */
 OUTPUT_FORMAT("elf64-alpha-freebsd", "elf64-alpha-freebsd", "elf64-alpha-freebsd")
 OUTPUT_ARCH(alpha)
 ENTRY(locorestart)
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index 68ab1a2c7e4e..ccc96f8d6fba 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm
index d43e730587c6..968e9b44c8c9 100644
--- a/sys/conf/ldscript.arm
+++ b/sys/conf/ldscript.arm
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.arm,v 1.2 2004/09/23 22:52:55 cognet Exp $ */
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index a94f32fdd4c2..2008a851a07b 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.9 2003/12/03 07:40:03 phk Exp $ */
 OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd")
 OUTPUT_ARCH(i386)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.ia64 b/sys/conf/ldscript.ia64
index 8dc0368c7522..9c65fe03b70d 100644
--- a/sys/conf/ldscript.ia64
+++ b/sys/conf/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.12 2004/08/25 07:43:28 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(__start)
diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc
index fac182df7633..74d94c31a4a2 100644
--- a/sys/conf/ldscript.powerpc
+++ b/sys/conf/ldscript.powerpc
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.powerpc,v 1.7 2001/10/08 10:43:34 mp Exp $ */
 
 OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
 OUTPUT_ARCH(powerpc)
diff --git a/sys/conf/ldscript.sparc64 b/sys/conf/ldscript.sparc64
index 6f9c021ae1b3..7a3b01d3ee7f 100644
--- a/sys/conf/ldscript.sparc64
+++ b/sys/conf/ldscript.sparc64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4 2003/06/07 18:23:50 jake Exp $ */
 OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
 	      "elf64-sparc")
 OUTPUT_ARCH(sparc:v9)
diff --git a/sys/conf/makeLINT.mk b/sys/conf/makeLINT.mk
index 08947a91db05..bff4279a5ecb 100644
--- a/sys/conf/makeLINT.mk
+++ b/sys/conf/makeLINT.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/makeLINT.mk,v 1.1 2003/02/26 23:36:58 ru Exp $
 
 all:
 	@echo "make LINT only"
diff --git a/sys/conf/makeLINT.sed b/sys/conf/makeLINT.sed
index 83445cfcb705..6f68d4a05b46 100644
--- a/sys/conf/makeLINT.sed
+++ b/sys/conf/makeLINT.sed
@@ -1,5 +1,5 @@
 #!/usr/bin/sed -E -n -f
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/makeLINT.sed,v 1.3 2003/02/26 23:36:58 ru Exp $
 
 /^(machine|ident|device|nodevice|makeoptions|nomakeoption|options|option|nooption|profile|cpu|maxusers)[[:space:]]/ {
     s/[[:space:]]*#.*$//
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 201e4ecd6e2d..74b4a891f3b4 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.69.2.8.2.1 2005/11/02 02:00:46 scottl Exp $
 
 TYPE="FreeBSD"
 REVISION="6.0"
@@ -36,7 +36,7 @@ BRANCH="RELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-RELEASE="${REVISION}-${BRANCH}"
+RELEASE=6.0-RELEASE
 VERSION="${TYPE} ${RELEASE}"
 
 if [ "X${PARAMFILE}" != "X" ]; then
diff --git a/sys/conf/options b/sys/conf/options
index 27f95b06b70d..4aa0e5200e74 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options,v 1.510.2.3 2005/10/07 14:00:03 glebius Exp $
 #
 #        On the handling of kernel options
 #
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index d1aaf8d3fe26..f0ee9965294d 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.alpha,v 1.43 2004/07/10 22:29:40 marcel Exp $
 # Options specific to the Alpha platform kernels
 
 EV5			opt_global.h
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index fdbc8f838eee..7d7b61c0c7e0 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.amd64,v 1.21 2005/06/29 23:23:16 peter Exp $
 # Options specific to AMD64 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 22c80c3edbcf..38b410ae0a52 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/conf/options.arm,v 1.5 2005/06/07 23:05:04 cognet Exp $
 ARM32_NEW_VM_LAYOUT	opt_vm.h
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 8ad0b8bbb1e2..4e79e7e7a171 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.i386,v 1.225 2005/07/02 20:06:42 delphij Exp $
 # Options specific to the i386 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64
index 8f4b2ac0432a..345250fbafee 100644
--- a/sys/conf/options.ia64
+++ b/sys/conf/options.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.ia64,v 1.26 2004/08/16 18:54:22 marcel Exp $
 # Options specific to the ia64 platform kernels
 
 ITANIUM			opt_global.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index f50c867a57d1..146638f30a12 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.pc98,v 1.189 2005/07/02 20:06:42 delphij Exp $
 # Options specific to the pc98 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc
index a6dc6da17136..851ed3bff736 100644
--- a/sys/conf/options.powerpc
+++ b/sys/conf/options.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.powerpc,v 1.9 2004/06/25 13:44:34 grehan Exp $
 # Options specific to the powerpc platform kernels
 
 OEA			opt_global.h
diff --git a/sys/conf/options.sparc64 b/sys/conf/options.sparc64
index 3944cebd6943..f89beade723e 100644
--- a/sys/conf/options.sparc64
+++ b/sys/conf/options.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.13 2005/06/10 20:58:59 marius Exp $
 
 SUN4U			opt_global.h
 
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index b8d4864b0322..249055c726e0 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)systags.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/systags.sh,v 1.9 2004/04/07 20:45:56 imp Exp $
 #
 # systags.sh - construct a system tags file using dependence relations
 #	in a .depend file
diff --git a/sys/contrib/altq/altq/altq.h b/sys/contrib/altq/altq/altq.h
index c740ed359ad1..51f812de997a 100644
--- a/sys/contrib/altq/altq/altq.h
+++ b/sys/contrib/altq/altq/altq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq.h,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_cbq.c b/sys/contrib/altq/altq/altq_cbq.c
index ef759165805e..a9cfa9cccc20 100644
--- a/sys/contrib/altq/altq/altq_cbq.c
+++ b/sys/contrib/altq/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.2.8.1 2005/08/25 05:01:03 rwatson Exp $	*/
 /*	$KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_cdnr.c b/sys/contrib/altq/altq/altq_cdnr.c
index d0a1313f4fb9..537416d5aa36 100644
--- a/sys/contrib/altq/altq/altq_cdnr.c
+++ b/sys/contrib/altq/altq/altq_cdnr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_hfsc.c b/sys/contrib/altq/altq/altq_hfsc.c
index 7eea5c7e54e4..f62a9b0c3453 100644
--- a/sys/contrib/altq/altq/altq_hfsc.c
+++ b/sys/contrib/altq/altq/altq_hfsc.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_priq.c b/sys/contrib/altq/altq/altq_priq.c
index e4e84e6e524b..2df4747391fb 100644
--- a/sys/contrib/altq/altq/altq_priq.c
+++ b/sys/contrib/altq/altq/altq_priq.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_priq.c,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq_priq.c,v 1.11 2003/09/17 14:23:25 kjc Exp $	*/
 /*
  * Copyright (C) 2000-2003
diff --git a/sys/contrib/altq/altq/altq_red.c b/sys/contrib/altq/altq/altq_red.c
index ff6d83260c7e..d1578edd9ca1 100644
--- a/sys/contrib/altq/altq/altq_red.c
+++ b/sys/contrib/altq/altq/altq_red.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_red.c,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq_red.c,v 1.18 2003/09/05 22:40:36 itojun Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_rio.c b/sys/contrib/altq/altq/altq_rio.c
index 2acf87e65944..627c2a35f169 100644
--- a/sys/contrib/altq/altq/altq_rio.c
+++ b/sys/contrib/altq/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_rio.c,v 1.3 2005/06/10 16:49:03 brooks Exp $	*/
 /*	$KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_rmclass.c b/sys/contrib/altq/altq/altq_rmclass.c
index 63194ee13169..665fac572df0 100644
--- a/sys/contrib/altq/altq/altq_rmclass.c
+++ b/sys/contrib/altq/altq/altq_rmclass.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_rmclass.c,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq_rmclass.c,v 1.18 2003/11/06 06:32:53 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c
index b6b7cf051b8b..8aae20d9ece9 100644
--- a/sys/contrib/altq/altq/altq_subr.c
+++ b/sys/contrib/altq/altq/altq_subr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.7 2005/02/22 04:27:05 green Exp $	*/
 /*	$KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_var.h b/sys/contrib/altq/altq/altq_var.h
index 4c4fc2909b6a..99407fb71ebc 100644
--- a/sys/contrib/altq/altq/altq_var.h
+++ b/sys/contrib/altq/altq/altq_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_var.h,v 1.2 2005/02/21 17:11:09 mlaier Exp $	*/
 /*	$KAME: altq_var.h,v 1.16 2003/10/03 05:05:15 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/if_altq.h b/sys/contrib/altq/altq/if_altq.h
index 0676e401f0b2..2b4537eadd97 100644
--- a/sys/contrib/altq/altq/if_altq.h
+++ b/sys/contrib/altq/altq/if_altq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/if_altq.h,v 1.3 2004/06/15 01:45:19 mlaier Exp $	*/
 /*	$KAME: if_altq.h,v 1.11 2003/07/10 12:07:50 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index bb1605cbfb6b..407100d8ecf4 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.7 2004/04/14 02:03:33 njl Exp $
 #
 # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout
 #
diff --git a/sys/contrib/dev/nve/amd64/nvenetlib.README b/sys/contrib/dev/nve/amd64/nvenetlib.README
index fd4f6b86cda9..c7eaee0fa9c1 100644
--- a/sys/contrib/dev/nve/amd64/nvenetlib.README
+++ b/sys/contrib/dev/nve/amd64/nvenetlib.README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/nve/amd64/nvenetlib.README,v 1.1.2.1 2005/09/11 18:46:33 obrien Exp $
 
 The installation and use of this software is subject to the following license terms and conditions:
 
diff --git a/sys/contrib/dev/nve/i386/nvenetlib.README b/sys/contrib/dev/nve/i386/nvenetlib.README
index fd4f6b86cda9..9916b74ddcd1 100644
--- a/sys/contrib/dev/nve/i386/nvenetlib.README
+++ b/sys/contrib/dev/nve/i386/nvenetlib.README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/nve/i386/nvenetlib.README,v 1.1.2.1 2005/09/11 18:46:33 obrien Exp $
 
 The installation and use of this software is subject to the following license terms and conditions:
 
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index ced116c585c4..5b9e5a6c93a7 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.37.2.2 2005/10/09 04:18:17 delphij Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/contrib/dev/oltr/if_oltr_isa.c b/sys/contrib/dev/oltr/if_oltr_isa.c
index e16d6c73e37d..b627ad804071 100644
--- a/sys/contrib/dev/oltr/if_oltr_isa.c
+++ b/sys/contrib/dev/oltr/if_oltr_isa.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr_isa.c,v 1.1 2005/02/03 23:01:01 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/contrib/dev/oltr/if_oltr_pci.c b/sys/contrib/dev/oltr/if_oltr_pci.c
index 8c7be2ee0b44..3be7eda69da4 100644
--- a/sys/contrib/dev/oltr/if_oltr_pci.c
+++ b/sys/contrib/dev/oltr/if_oltr_pci.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr_pci.c,v 1.2 2005/06/10 16:49:03 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/contrib/dev/oltr/if_oltrvar.h b/sys/contrib/dev/oltr/if_oltrvar.h
index 7b9994d02654..fd35f355060b 100644
--- a/sys/contrib/dev/oltr/if_oltrvar.h
+++ b/sys/contrib/dev/oltr/if_oltrvar.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltrvar.h,v 1.2 2005/06/10 16:49:03 brooks Exp $
  */
 
 /*#define DEBUG_MASK DEBUG_POLL*/
diff --git a/sys/contrib/dev/oltr/trlld.h b/sys/contrib/dev/oltr/trlld.h
index 988cf356df10..9e48f6afab2f 100644
--- a/sys/contrib/dev/oltr/trlld.h
+++ b/sys/contrib/dev/oltr/trlld.h
@@ -14,7 +14,7 @@
  *---------------------------------------------------------------------------

  *

  * Description: PowerMACH Works header file

- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlld.h,v 1.4 2000/03/18 23:51:51 lile Exp $
  *

  *---------------------------------------------------------------------------

  * $Log:   J:/usr/project/trlld/libsrc/include/trlld.h_v  $

diff --git a/sys/contrib/dev/oltr/trlldbm.c b/sys/contrib/dev/oltr/trlldbm.c
index 944606da5a31..77c1aa5828f4 100644
--- a/sys/contrib/dev/oltr/trlldbm.c
+++ b/sys/contrib/dev/oltr/trlldbm.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlldbm.c,v 1.4 2000/03/18 23:51:51 lile Exp $
  *
  *      Copyright (c) 1997
  *      OLICOM A/S
diff --git a/sys/contrib/dev/oltr/trlldhm.c b/sys/contrib/dev/oltr/trlldhm.c
index cdcb250c5a62..22f88cb49d39 100644
--- a/sys/contrib/dev/oltr/trlldhm.c
+++ b/sys/contrib/dev/oltr/trlldhm.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlldhm.c,v 1.4 2000/03/18 23:51:52 lile Exp $
  *
  *      Copyright (c) 1997
  *      OLICOM A/S
diff --git a/sys/contrib/dev/oltr/trlldmac.c b/sys/contrib/dev/oltr/trlldmac.c
index 63cfd3e3cf3b..c0fbe847c6eb 100644
--- a/sys/contrib/dev/oltr/trlldmac.c
+++ b/sys/contrib/dev/oltr/trlldmac.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlldmac.c,v 1.4 2000/03/18 23:51:52 lile Exp $
  *
  *      Copyright (c) 1997
  *      OLICOM A/S
diff --git a/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE b/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE
index 1ee473da33f1..30fa68a7c007 100644
--- a/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE
+++ b/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE,v 1.2 2002/04/25 03:31:38 darrenr Exp $
 
 Copyright (C) 1993-2002 by Darren Reed.
 
diff --git a/sys/contrib/ipfilter/netinet/QNX_OCL.txt b/sys/contrib/ipfilter/netinet/QNX_OCL.txt
index b62377679670..4142b56db621 100644
--- a/sys/contrib/ipfilter/netinet/QNX_OCL.txt
+++ b/sys/contrib/ipfilter/netinet/QNX_OCL.txt
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/ipfilter/netinet/QNX_OCL.txt,v 1.2 2002/04/25 03:31:39 darrenr Exp $
 
    End User License Certificate (EULA) End User License Certificate
    (EULA) 
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index 1233c6f2458b..f0c652d5871d 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.46 2005/06/23 14:19:02 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -136,7 +136,7 @@ struct file;
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.46 2005/06/23 14:19:02 darrenr Exp $";
 /* static const char rcsid[] = "@(#)Id: fil.c,v 2.243.2.57 2005/03/28 10:47:50 darrenr Exp"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c
index bb8705c1a539..9491e7e653b7 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.c
+++ b/sys/contrib/ipfilter/netinet/ip_auth.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.40 2005/04/27 03:48:09 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij.
@@ -119,7 +119,7 @@ extern struct ifqueue   ipintrq;		/* ip packet input queue */
 /* END OF INCLUDES */
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.40 2005/04/27 03:48:09 darrenr Exp $";
 /* static const char rcsid[] = "@(#)Id: ip_auth.c,v 2.73.2.3 2004/08/26 11:25:21 darrenr Exp"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.h b/sys/contrib/ipfilter/netinet/ip_auth.h
index 5c93610c6e64..203b147f7455 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.h
+++ b/sys/contrib/ipfilter/netinet/ip_auth.h
@@ -1,11 +1,11 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.h,v 1.14 2005/04/25 18:43:13 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2001 by Darren Reed & Guido Van Rooij.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.h,v 1.14 2005/04/25 18:43:13 darrenr Exp $
  * Id: ip_auth.h,v 2.16 2003/07/25 12:29:56 darrenr Exp
  *
  */
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index 2afa3334aef1..b18f6ce0e6e2 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.28 2005/05/16 16:22:55 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_compat.h	1.8 1/14/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.28 2005/05/16 16:22:55 darrenr Exp $
  * Id: ip_compat.h,v 2.142.2.25 2005/03/28 09:33:36 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h
index 5eaab638c05a..ab94e134934e 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/sys/contrib/ipfilter/netinet/ip_fil.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.h,v 1.31 2005/04/26 17:58:05 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_fil.h	1.35 6/5/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.h,v 1.31 2005/04/26 17:58:05 darrenr Exp $
  * Id: ip_fil.h,v 2.170.2.18 2005/03/28 10:47:52 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
index 4ee0d3b23052..ba0c00cdb628 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.1.1.1 2005/04/25 18:15:15 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index bcc22283f5be..be943f342f0d 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.c,v 1.29 2005/04/29 05:57:17 ru Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -102,7 +102,7 @@ extern struct timeout fr_slowtimer_ch;
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_frag.c	1.11 3/24/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.c,v 1.29 2005/04/29 05:57:17 ru Exp $";
 /* static const char rcsid[] = "@(#)Id: ip_frag.c,v 2.77 2004/01/27 00:24:54 darrenr Exp"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.h b/sys/contrib/ipfilter/netinet/ip_frag.h
index 519899976879..a5c5566aeb16 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.h
+++ b/sys/contrib/ipfilter/netinet/ip_frag.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.h,v 1.17 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_frag.h	1.5 3/24/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.h,v 1.17 2005/04/25 18:43:14 darrenr Exp $
  * Id: ip_frag.h,v 2.23.2.1 2004/03/29 16:21:56 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
index 91a48c0fbfc0..b26615738927 100644
--- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.25 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2003 by Darren Reed
@@ -8,7 +8,7 @@
  * Simple FTP transparent proxy for in-kernel use.  For use with the NAT
  * code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.25 2005/04/25 18:43:14 darrenr Exp $
  * Id: ip_ftp_pxy.c,v 2.88.2.15 2005/03/19 19:38:10 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_htable.c b/sys/contrib/ipfilter/netinet/ip_htable.c
index d1769b75607b..4cce9ff2c8bc 100644
--- a/sys/contrib/ipfilter/netinet/ip_htable.c
+++ b/sys/contrib/ipfilter/netinet/ip_htable.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_htable.c,v 1.2 2005/06/23 14:19:02 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_htable.h b/sys/contrib/ipfilter/netinet/ip_htable.h
index 1bc40876dcb5..1a7ce90c5e7e 100644
--- a/sys/contrib/ipfilter/netinet/ip_htable.h
+++ b/sys/contrib/ipfilter/netinet/ip_htable.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_htable.h,v 1.1.1.1 2005/04/25 18:15:18 darrenr Exp $	*/
 
 #ifndef __IP_HTABLE_H__
 #define __IP_HTABLE_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c b/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c
index b54961113012..f0bf9c837a3d 100644
--- a/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c,v 1.1.1.2 2005/04/25 18:15:18 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2003 by Darren Reed
diff --git a/sys/contrib/ipfilter/netinet/ip_irc_pxy.c b/sys/contrib/ipfilter/netinet/ip_irc_pxy.c
index 0f61d767ba71..06f5864aa621 100644
--- a/sys/contrib/ipfilter/netinet/ip_irc_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_irc_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c,v 1.1.1.1 2005/04/25 18:15:19 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 Darren Reed
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c
index c42ce0af8685..d7581b5980d9 100644
--- a/sys/contrib/ipfilter/netinet/ip_log.c
+++ b/sys/contrib/ipfilter/netinet/ip_log.c
@@ -1,11 +1,11 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.29 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.29 2005/04/25 18:43:14 darrenr Exp $
  * Id: ip_log.c,v 2.75.2.6 2004/10/16 07:59:27 darrenr Exp
  */
 #include <sys/param.h>
diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.c b/sys/contrib/ipfilter/netinet/ip_lookup.c
index 2f404eededeb..239c5df9d252 100644
--- a/sys/contrib/ipfilter/netinet/ip_lookup.c
+++ b/sys/contrib/ipfilter/netinet/ip_lookup.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_lookup.c,v 1.1.1.1 2005/04/25 18:15:23 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.h b/sys/contrib/ipfilter/netinet/ip_lookup.h
index 7d9acad6a079..f56411e7c75e 100644
--- a/sys/contrib/ipfilter/netinet/ip_lookup.h
+++ b/sys/contrib/ipfilter/netinet/ip_lookup.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_lookup.h,v 1.1.1.1 2005/04/25 18:15:23 darrenr Exp $	*/
 
 
 #ifndef __IP_LOOKUP_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c
index 83464d416619..45eda00f7f6e 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.39 2005/04/27 03:48:09 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
@@ -107,7 +107,7 @@ extern struct ifnet vpnif;
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.39 2005/04/27 03:48:09 darrenr Exp $";
 /* static const char rcsid[] = "@(#)Id: ip_nat.c,v 2.195.2.38 2005/03/28 11:09:54 darrenr Exp"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/contrib/ipfilter/netinet/ip_nat.h
index b30ac7f02947..395129d2e451 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.h
+++ b/sys/contrib/ipfilter/netinet/ip_nat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.h,v 1.24 2005/04/27 03:48:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_nat.h	1.5 2/4/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.h,v 1.24 2005/04/27 03:48:10 darrenr Exp $
  * Id: ip_nat.h,v 2.90.2.9 2005/03/28 11:09:55 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c b/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c
index a55cc33c23c3..ff7db07e1f18 100644
--- a/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c,v 1.1.1.2 2005/04/25 18:15:27 darrenr Exp $	*/
 
 /*
  * Simple netbios-dgm transparent proxy for in-kernel use.
diff --git a/sys/contrib/ipfilter/netinet/ip_pool.c b/sys/contrib/ipfilter/netinet/ip_pool.c
index 9880c9d3d308..4012c3f1b2db 100644
--- a/sys/contrib/ipfilter/netinet/ip_pool.c
+++ b/sys/contrib/ipfilter/netinet/ip_pool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_pool.c,v 1.1.1.1 2005/04/25 18:15:28 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_pool.h b/sys/contrib/ipfilter/netinet/ip_pool.h
index 5ddc74ee19a5..cac3c6b622f5 100644
--- a/sys/contrib/ipfilter/netinet/ip_pool.h
+++ b/sys/contrib/ipfilter/netinet/ip_pool.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_pool.h,v 1.1.1.1 2005/04/25 18:15:28 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c b/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c
index b7ec697d63fe..45c4a3d685de 100644
--- a/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c,v 1.1.1.1 2005/04/25 18:15:30 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2003 by Darren Reed
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index 1336b0e642c0..6fde8f33ba44 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.25 2005/04/27 05:53:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/sys/contrib/ipfilter/netinet/ip_proxy.h
index ae4826dff754..a56c98d6bc33 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.h
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.h
@@ -1,11 +1,11 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.h,v 1.15 2005/04/27 03:48:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2001 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.h,v 1.15 2005/04/27 03:48:10 darrenr Exp $
  * Id: ip_proxy.h,v 2.31.2.2 2005/03/12 19:33:48 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
index d24519f824e4..699fe0071c45 100644
--- a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
@@ -1,7 +1,7 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c,v 1.11 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c,v 1.11 2005/04/25 18:43:14 darrenr Exp $
  * Copyright (C) 1998-2003 by Darren Reed
  *
  * See the IPFILTER.LICENCE file for details on licencing.
diff --git a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
index 540b837dfeff..8540249e1022 100644
--- a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c,v 1.12 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1998-2003 by Darren Reed
@@ -9,7 +9,7 @@
  *
  * Simple RCMD transparent proxy for in-kernel use.  For use with the NAT
  * code.
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c,v 1.12 2005/04/25 18:43:14 darrenr Exp $
  */
 
 #define	IPF_RCMD_PROXY
diff --git a/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c b/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c
index 4c012230130c..486e819716a6 100644
--- a/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c,v 1.1.1.1 2005/04/25 18:15:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2003 by Ryan Beasley <ryanb@goddamnbastard.org>
diff --git a/sys/contrib/ipfilter/netinet/ip_rules.c b/sys/contrib/ipfilter/netinet/ip_rules.c
index f080ec5b8324..edbfedc2d34b 100644
--- a/sys/contrib/ipfilter/netinet/ip_rules.c
+++ b/sys/contrib/ipfilter/netinet/ip_rules.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rules.c,v 1.1.1.1 2005/04/25 18:15:34 darrenr Exp $	*/
 
 /*
 * Copyright (C) 1993-2000 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_rules.h b/sys/contrib/ipfilter/netinet/ip_rules.h
index 37e364613d50..aac1ade27fa7 100644
--- a/sys/contrib/ipfilter/netinet/ip_rules.h
+++ b/sys/contrib/ipfilter/netinet/ip_rules.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rules.h,v 1.1.1.1 2005/04/25 18:15:34 darrenr Exp $	*/
 
 extern int ipfrule_add __P((void));
 extern int ipfrule_remove __P((void));
diff --git a/sys/contrib/ipfilter/netinet/ip_scan.c b/sys/contrib/ipfilter/netinet/ip_scan.c
index b36fccf3dc4a..9f036371c6fd 100644
--- a/sys/contrib/ipfilter/netinet/ip_scan.c
+++ b/sys/contrib/ipfilter/netinet/ip_scan.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_scan.c,v 1.1.1.1 2005/04/25 18:15:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2001 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_scan.h b/sys/contrib/ipfilter/netinet/ip_scan.h
index 8891367b9d2d..d251a3ccd206 100644
--- a/sys/contrib/ipfilter/netinet/ip_scan.h
+++ b/sys/contrib/ipfilter/netinet/ip_scan.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_scan.h,v 1.1.1.1 2005/04/25 18:15:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index 7c1b3119d075..adaddb75c0a6 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.35 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/sys/contrib/ipfilter/netinet/ip_state.h
index 5e3fe87854f5..febb54618fd0 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.h
+++ b/sys/contrib/ipfilter/netinet/ip_state.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.h,v 1.17 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2001 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.h,v 1.17 2005/04/25 18:43:14 darrenr Exp $
  * Id: ip_state.h,v 2.68.2.3 2005/03/03 14:24:11 darrenr Exp
  */
 #ifndef	__IP_STATE_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/sys/contrib/ipfilter/netinet/ip_sync.c
index a091b5380da7..f322a22321ba 100644
--- a/sys/contrib/ipfilter/netinet/ip_sync.c
+++ b/sys/contrib/ipfilter/netinet/ip_sync.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_sync.c,v 1.2 2005/06/14 09:18:26 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_sync.h b/sys/contrib/ipfilter/netinet/ip_sync.h
index 25ad708207e5..ab4779c3d6b4 100644
--- a/sys/contrib/ipfilter/netinet/ip_sync.h
+++ b/sys/contrib/ipfilter/netinet/ip_sync.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_sync.h,v 1.1.1.1 2005/04/25 18:15:41 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ipl.h b/sys/contrib/ipfilter/netinet/ipl.h
index 364423c918df..fa6ea2831a76 100644
--- a/sys/contrib/ipfilter/netinet/ipl.h
+++ b/sys/contrib/ipfilter/netinet/ipl.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ipl.h,v 1.23 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ipl.h	1.21 6/5/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ipl.h,v 1.23 2005/04/25 18:43:14 darrenr Exp $
  * Id: ipl.h,v 2.52.2.9 2005/03/30 14:14:05 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
index 2869697465ff..7541b486adb3 100644
--- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
@@ -1,9 +1,9 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.16 2005/04/25 18:43:14 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.16 2005/04/25 18:43:14 darrenr Exp $
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 
diff --git a/sys/contrib/ngatm/FREEBSD-Xlist b/sys/contrib/ngatm/FREEBSD-Xlist
index 0ead0cc6a5ce..b506cfdecd88 100644
--- a/sys/contrib/ngatm/FREEBSD-Xlist
+++ b/sys/contrib/ngatm/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/contrib/ngatm/FREEBSD-Xlist,v 1.1 2004/08/11 12:25:09 harti Exp $
 */README
 */VERSION
 */Makefile.in
diff --git a/sys/contrib/ngatm/FREEBSD-upgrade b/sys/contrib/ngatm/FREEBSD-upgrade
index cb167acca87d..915030fb1b5e 100644
--- a/sys/contrib/ngatm/FREEBSD-upgrade
+++ b/sys/contrib/ngatm/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/ngatm/FREEBSD-upgrade,v 1.2 2003/11/03 09:15:31 harti Exp $
 
 This is the part of the NgATM stuff that is shared by kernel and user.
 Be careful to feed changes back to the maintainer <harti@freebsd.org>,
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ie.h b/sys/contrib/ngatm/netnatm/msg/uni_ie.h
index f24c560fb8de..924592ee2e18 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_ie.h
+++ b/sys/contrib/ngatm/netnatm/msg/uni_ie.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/ie.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_ie.h,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 #ifndef _NETNATM_MSG_UNI_IE_H_
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ietab.h b/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
index 62cba33cd91d..23511d87336f 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
+++ b/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/ie.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_ietab.h,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_msg.c b/sys/contrib/ngatm/netnatm/msg/uni_msg.c
index f9991858b418..03b89842a7d8 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_msg.c
+++ b/sys/contrib/ngatm/netnatm/msg/uni_msg.c
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_msg.c,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_msg.h b/sys/contrib/ngatm/netnatm/msg/uni_msg.h
index ddb095b612c5..fbb20447734e 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_msg.h
+++ b/sys/contrib/ngatm/netnatm/msg/uni_msg.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_msg.h,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 #ifndef _NETNATM_MSG_UNI_MSG_H_
diff --git a/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk b/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
index be61925c977a..a3415524e543 100644
--- a/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
+++ b/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
@@ -36,7 +36,7 @@ function begin() {
 function first_entry() {
 	print "/* This file was created automatically"
 	print " * Source file: " id
-	print " * $FreeBSD$"
+	print " * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk,v 1.1.1.2 2004/07/08 16:39:00 harti Exp $"
 	print " */"
 	print ""
 	print "#include <netnatm/msg/unistruct.h>"
diff --git a/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk b/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
index f9b44f2b168d..5dc5d5e1c1bb 100644
--- a/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
+++ b/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
@@ -36,7 +36,7 @@ function begin() {
 function first_entry() {
 	print "/* This file was created automatically"
 	print " * Source file: " id
-	print " * $FreeBSD$"
+	print " * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk,v 1.1.1.2 2004/07/08 16:39:00 harti Exp $"
 	print " */"
 	print ""
 }
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c b/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
index 1653ba7438ec..545691283908 100644
--- a/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
+++ b/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c,v 1.1 2003/11/07 08:48:43 harti Exp $
  */
 
 #include <netnatm/msg/unistruct.h>
diff --git a/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h b/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
index 70e4e2eeb8b4..1512c320a5cf 100644
--- a/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
+++ b/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h,v 1.1 2003/11/07 08:48:43 harti Exp $
  */
 
 
diff --git a/sys/contrib/pf/net/if_pflog.c b/sys/contrib/pf/net/if_pflog.c
index 9047c4fc05a4..dbc68fd8f2f0 100644
--- a/sys/contrib/pf/net/if_pflog.c
+++ b/sys/contrib/pf/net/if_pflog.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.13.2.1 2005/08/25 05:01:03 rwatson Exp $	*/
 /*	$OpenBSD: if_pflog.c,v 1.12 2004/05/19 17:50:51 dhartmei Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/if_pflog.h b/sys/contrib/pf/net/if_pflog.h
index 68560e4b5636..917d6880d595 100644
--- a/sys/contrib/pf/net/if_pflog.h
+++ b/sys/contrib/pf/net/if_pflog.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pflog.h,v 1.6 2005/06/10 16:49:03 brooks Exp $	*/
 /* $OpenBSD: if_pflog.h,v 1.11 2004/05/19 17:50:51 dhartmei Exp $ */
 
 /*
diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c
index ae01981e449b..dc46f39caa1e 100644
--- a/sys/contrib/pf/net/if_pfsync.c
+++ b/sys/contrib/pf/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.19.2.3 2005/09/17 15:19:38 mlaier Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/if_pfsync.h b/sys/contrib/pf/net/if_pfsync.h
index f9df354e9b60..0db9f11651cb 100644
--- a/sys/contrib/pf/net/if_pfsync.h
+++ b/sys/contrib/pf/net/if_pfsync.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pfsync.h,v 1.7 2005/06/10 17:23:49 mlaier Exp $	*/
 /*	$OpenBSD: if_pfsync.h,v 1.19 2005/01/20 17:47:38 mcbride Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c
index c552d820f99d..45c6b9e55d2d 100644
--- a/sys/contrib/pf/net/pf.c
+++ b/sys/contrib/pf/net/pf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.34.2.2 2005/09/12 11:25:17 mlaier Exp $	*/
 /*	$OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */
 
 /*
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c
index 8e35070bb1ce..6e624e473449 100644
--- a/sys/contrib/pf/net/pf_if.c
+++ b/sys/contrib/pf/net/pf_if.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.10 2005/05/03 16:43:32 mlaier Exp $ */
 /*	$OpenBSD: pf_if.c,v 1.23 2004/12/22 17:17:55 dhartmei Exp $ */
 
 /*
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index 3fa72a946b38..50c0ed0c4ae7 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/contrib/pf/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.20.2.1 2005/09/12 11:25:17 mlaier Exp $	*/
 /*	$OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */
 
 /*
diff --git a/sys/contrib/pf/net/pf_norm.c b/sys/contrib/pf/net/pf_norm.c
index 50ce270d9d9e..62e046b05e34 100644
--- a/sys/contrib/pf/net/pf_norm.c
+++ b/sys/contrib/pf/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.11.2.1 2005/10/09 05:50:43 ume Exp $	*/
 /*	$OpenBSD: pf_norm.c,v 1.97 2004/09/21 16:59:12 aaron Exp $ */
 
 /*
diff --git a/sys/contrib/pf/net/pf_osfp.c b/sys/contrib/pf/net/pf_osfp.c
index ce1efeedf10a..fb4b8002698d 100644
--- a/sys/contrib/pf/net/pf_osfp.c
+++ b/sys/contrib/pf/net/pf_osfp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_osfp.c,v 1.5 2005/05/03 16:43:32 mlaier Exp $	*/
 /*	$OpenBSD: pf_osfp.c,v 1.10 2004/04/09 19:30:41 frantzen Exp $ */
 
 /*
diff --git a/sys/contrib/pf/net/pf_subr.c b/sys/contrib/pf/net/pf_subr.c
index 3de292426054..52813264a342 100644
--- a/sys/contrib/pf/net/pf_subr.c
+++ b/sys/contrib/pf/net/pf_subr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.2 2005/05/03 16:43:32 mlaier Exp $ */
 /*	from $OpenBSD: kern_subr.c,v 1.26 2003/10/31 11:10:41 markus Exp $	*/
 /*	$NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $	*/
 
diff --git a/sys/contrib/pf/net/pf_table.c b/sys/contrib/pf/net/pf_table.c
index 033616ed9042..e0a6679ed343 100644
--- a/sys/contrib/pf/net/pf_table.c
+++ b/sys/contrib/pf/net/pf_table.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.7 2005/05/04 15:29:28 mlaier Exp $	*/
 /*	$OpenBSD: pf_table.c,v 1.62 2004/12/07 18:02:04 mcbride Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/pfvar.h b/sys/contrib/pf/net/pfvar.h
index 5fdef85413bd..6008fd717939 100644
--- a/sys/contrib/pf/net/pfvar.h
+++ b/sys/contrib/pf/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.11.2.1 2005/08/06 01:52:35 mlaier Exp $	*/
 /*	$OpenBSD: pfvar.h,v 1.213 2005/03/03 07:13:39 dhartmei Exp $ */
 
 /*
diff --git a/sys/contrib/pf/netinet/in4_cksum.c b/sys/contrib/pf/netinet/in4_cksum.c
index 24a04d014562..d30757e0e0fd 100644
--- a/sys/contrib/pf/netinet/in4_cksum.c
+++ b/sys/contrib/pf/netinet/in4_cksum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/netinet/in4_cksum.c,v 1.4 2004/08/05 20:41:38 mlaier Exp $	*/
 /*	$OpenBSD: in4_cksum.c,v 1.7 2003/06/02 23:28:13 millert Exp $	*/
 /*	$KAME: in4_cksum.c,v 1.10 2001/11/30 10:06:15 itojun Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.13 1996/10/13 02:03:03 christos Exp $	*/
diff --git a/sys/crypto/blowfish/arch/i386/bf_enc.S b/sys/crypto/blowfish/arch/i386/bf_enc.S
index bcee9c542354..8cc2b3430c74 100644
--- a/sys/crypto/blowfish/arch/i386/bf_enc.S
+++ b/sys/crypto/blowfish/arch/i386/bf_enc.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: bf_enc.S,v 1.1 2001/09/09 11:01:01 tls Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc.S,v 1.2 2004/11/16 20:42:30 jhb Exp $	*/
 
 /*
  * Written by Jason R. Thorpe <thorpej@zembu.com> and Thor Lancelot Simon
diff --git a/sys/crypto/blowfish/arch/i386/bf_enc_586.S b/sys/crypto/blowfish/arch/i386/bf_enc_586.S
index 680b2e5812e2..b348079f1285 100644
--- a/sys/crypto/blowfish/arch/i386/bf_enc_586.S
+++ b/sys/crypto/blowfish/arch/i386/bf_enc_586.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: bf_enc_586.S,v 1.1 2001/09/09 11:01:01 tls Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc_586.S,v 1.2 2003/04/21 16:30:12 obrien Exp $	*/
 
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/sys/crypto/blowfish/arch/i386/bf_enc_686.S b/sys/crypto/blowfish/arch/i386/bf_enc_686.S
index e480e65790e5..41298e3f7eef 100644
--- a/sys/crypto/blowfish/arch/i386/bf_enc_686.S
+++ b/sys/crypto/blowfish/arch/i386/bf_enc_686.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: bf_enc_686.S,v 1.1 2001/09/09 11:01:02 tls Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc_686.S,v 1.1 2002/03/05 09:19:02 ume Exp $	*/
 
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/sys/crypto/blowfish/bf_ecb.c b/sys/crypto/blowfish/bf_ecb.c
index a40c06e0c60f..5670d83ccd09 100644
--- a/sys/crypto/blowfish/bf_ecb.c
+++ b/sys/crypto/blowfish/bf_ecb.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/blowfish/bf_ecb.c,v 1.1 2003/10/13 19:26:08 ume Exp $");
 
 #include <sys/types.h>
 #include <crypto/blowfish/blowfish.h>
diff --git a/sys/crypto/blowfish/bf_enc.c b/sys/crypto/blowfish/bf_enc.c
index 5f26d408960a..d520be615a48 100644
--- a/sys/crypto/blowfish/bf_enc.c
+++ b/sys/crypto/blowfish/bf_enc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/blowfish/bf_enc.c,v 1.6 2003/06/10 21:38:38 obrien Exp $");
 
 #include <sys/types.h>
 #include <crypto/blowfish/blowfish.h>
diff --git a/sys/crypto/blowfish/bf_locl.h b/sys/crypto/blowfish/bf_locl.h
index 9314ff3c1459..f65e3145a811 100644
--- a/sys/crypto/blowfish/bf_locl.h
+++ b/sys/crypto/blowfish/bf_locl.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/bf_locl.h,v 1.5 2002/03/05 09:19:01 ume Exp $	*/
 /*	$KAME: bf_locl.h,v 1.6 2001/09/10 04:03:56 itojun Exp $	*/
 
 /* crypto/bf/bf_local.h */
diff --git a/sys/crypto/blowfish/bf_pi.h b/sys/crypto/blowfish/bf_pi.h
index fdd5a27e914e..a2be6034d2fe 100644
--- a/sys/crypto/blowfish/bf_pi.h
+++ b/sys/crypto/blowfish/bf_pi.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/bf_pi.h,v 1.4 2002/03/05 09:19:01 ume Exp $	*/
 /*	$KAME: bf_pi.h,v 1.4 2001/09/10 04:03:56 itojun Exp $	*/
 
 /* crypto/bf/bf_pi.h */
diff --git a/sys/crypto/blowfish/bf_skey.c b/sys/crypto/blowfish/bf_skey.c
index df8d1cf3d779..9abd6c12caa5 100644
--- a/sys/crypto/blowfish/bf_skey.c
+++ b/sys/crypto/blowfish/bf_skey.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/blowfish/bf_skey.c,v 1.6 2003/06/10 21:38:38 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sys/crypto/blowfish/blowfish.h b/sys/crypto/blowfish/blowfish.h
index ecc140754bf9..7964c391a5ae 100644
--- a/sys/crypto/blowfish/blowfish.h
+++ b/sys/crypto/blowfish/blowfish.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/blowfish.h,v 1.7 2003/10/13 19:26:08 ume Exp $	*/
 /*	$KAME: blowfish.h,v 1.12 2002/02/27 01:33:59 itojun Exp $	*/
 
 /* crypto/bf/blowfish.h */
diff --git a/sys/crypto/des/arch/i386/des_enc.S b/sys/crypto/des/arch/i386/des_enc.S
index 7fc29e678a4c..1c297d1beb8c 100644
--- a/sys/crypto/des/arch/i386/des_enc.S
+++ b/sys/crypto/des/arch/i386/des_enc.S
@@ -1,5 +1,5 @@
 /* $NetBSD: des_enc.S,v 1.1 2001/09/09 11:01:02 tls Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/crypto/des/arch/i386/des_enc.S,v 1.2 2003/04/21 16:30:12 obrien Exp $ */
 
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/sys/crypto/des/des.h b/sys/crypto/des/des.h
index 81c7bfbeef5e..b5a94fa41f25 100644
--- a/sys/crypto/des/des.h
+++ b/sys/crypto/des/des.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/des.h,v 1.6 2002/03/20 05:13:51 alfred Exp $	*/
 /*	$KAME: des.h,v 1.8 2001/09/10 04:03:57 itojun Exp $	*/
 
 /* lib/des/des.h */
diff --git a/sys/crypto/des/des_ecb.c b/sys/crypto/des/des_ecb.c
index 87a004af4b4d..39b7128acba9 100644
--- a/sys/crypto/des/des_ecb.c
+++ b/sys/crypto/des/des_ecb.c
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/des/des_ecb.c,v 1.6 2004/06/14 00:38:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/des/des_enc.c b/sys/crypto/des/des_enc.c
index c8d484a0d48c..5692c0b42305 100644
--- a/sys/crypto/des/des_enc.c
+++ b/sys/crypto/des/des_enc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/des/des_enc.c,v 1.2 2004/06/14 00:38:54 obrien Exp $");
 
 #include <sys/types.h>
 #include <crypto/des/des_locl.h>
diff --git a/sys/crypto/des/des_locl.h b/sys/crypto/des/des_locl.h
index 2c3cacc1b499..035697f10ca3 100644
--- a/sys/crypto/des/des_locl.h
+++ b/sys/crypto/des/des_locl.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/des_locl.h,v 1.6 2002/03/05 09:19:02 ume Exp $	*/
 /*	$KAME: des_locl.h,v 1.7 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/des_locl.h */
diff --git a/sys/crypto/des/des_setkey.c b/sys/crypto/des/des_setkey.c
index 7d1fb506a22d..d0dbb4ffdd3f 100644
--- a/sys/crypto/des/des_setkey.c
+++ b/sys/crypto/des/des_setkey.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/des/des_setkey.c,v 1.7 2004/06/14 00:38:16 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/des/podd.h b/sys/crypto/des/podd.h
index 0528b9cecafc..8d77aac4f702 100644
--- a/sys/crypto/des/podd.h
+++ b/sys/crypto/des/podd.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/podd.h,v 1.4 2002/04/19 04:46:21 suz Exp $	*/
 /*	$KAME: podd.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/podd.h */
diff --git a/sys/crypto/des/sk.h b/sys/crypto/des/sk.h
index d4aa375024d7..209dca61448b 100644
--- a/sys/crypto/des/sk.h
+++ b/sys/crypto/des/sk.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/sk.h,v 1.4 2002/04/19 04:46:21 suz Exp $	*/
 /*	$KAME: sk.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/sk.h */
diff --git a/sys/crypto/des/spr.h b/sys/crypto/des/spr.h
index 129b8277be3f..4fd00b6179b0 100644
--- a/sys/crypto/des/spr.h
+++ b/sys/crypto/des/spr.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/spr.h,v 1.4 2002/03/05 09:19:02 ume Exp $	*/
 /*	$KAME: spr.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/spr.h */
diff --git a/sys/crypto/rc4/rc4.c b/sys/crypto/rc4/rc4.c
index f94a554b98d4..89cb86fde895 100644
--- a/sys/crypto/rc4/rc4.c
+++ b/sys/crypto/rc4/rc4.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rc4/rc4.c,v 1.5 2003/06/10 21:43:12 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/crypto/rc4/rc4.h b/sys/crypto/rc4/rc4.h
index 670b1a005ba1..39cdcc8d92b0 100644
--- a/sys/crypto/rc4/rc4.h
+++ b/sys/crypto/rc4/rc4.h
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/rc4/rc4.h,v 1.3 2000/07/16 05:53:14 peter Exp $
  */
 
 #ifndef _SYS_CRYPTO_RC4_RC4_H_
diff --git a/sys/crypto/rijndael/Makefile b/sys/crypto/rijndael/Makefile
index d2dc35ea94bf..9794b342485d 100644
--- a/sys/crypto/rijndael/Makefile
+++ b/sys/crypto/rijndael/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/crypto/rijndael/Makefile,v 1.3 2004/12/21 08:47:18 ru Exp $
 
 PROG=test00
 NO_MAN=
diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c
index 5197e226a26e..56811e27e937 100644
--- a/sys/crypto/rijndael/rijndael-alg-fst.c
+++ b/sys/crypto/rijndael/rijndael-alg-fst.c
@@ -25,7 +25,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-alg-fst.c,v 1.8.2.1 2005/08/30 15:01:50 pjd Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
diff --git a/sys/crypto/rijndael/rijndael-api-fst.c b/sys/crypto/rijndael/rijndael-api-fst.c
index 187177b39fff..fd783a20518a 100644
--- a/sys/crypto/rijndael/rijndael-api-fst.c
+++ b/sys/crypto/rijndael/rijndael-api-fst.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-api-fst.c,v 1.12 2005/03/11 16:26:10 ume Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/crypto/rijndael/rijndael-api-fst.h b/sys/crypto/rijndael/rijndael-api-fst.h
index 122bf52d6ce2..b9d2bbadc1af 100644
--- a/sys/crypto/rijndael/rijndael-api-fst.h
+++ b/sys/crypto/rijndael/rijndael-api-fst.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/rijndael/rijndael-api-fst.h,v 1.7 2005/03/11 16:26:10 ume Exp $	*/
 /*	$KAME: rijndael-api-fst.h,v 1.6 2001/05/27 00:23:23 itojun Exp $	*/
 
 /*
diff --git a/sys/crypto/rijndael/rijndael-api.c b/sys/crypto/rijndael/rijndael-api.c
index 9a7fda30af60..35ddbd96e258 100644
--- a/sys/crypto/rijndael/rijndael-api.c
+++ b/sys/crypto/rijndael/rijndael-api.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-api.c,v 1.1 2003/11/12 04:22:37 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/rijndael/rijndael.h b/sys/crypto/rijndael/rijndael.h
index da855284dcc5..c9956476e265 100644
--- a/sys/crypto/rijndael/rijndael.h
+++ b/sys/crypto/rijndael/rijndael.h
@@ -1,5 +1,5 @@
 /*	$KAME: rijndael.h,v 1.6 2003/08/28 08:36:32 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/rijndael/rijndael.h,v 1.6 2005/03/11 22:07:04 ume Exp $	*/
 
 /**
  * rijndael-alg-fst.h
diff --git a/sys/crypto/rijndael/rijndael_local.h b/sys/crypto/rijndael/rijndael_local.h
index 7c765a2b11f8..7cdeecebef2e 100644
--- a/sys/crypto/rijndael/rijndael_local.h
+++ b/sys/crypto/rijndael/rijndael_local.h
@@ -1,5 +1,5 @@
 /*	$KAME: rijndael_local.h,v 1.5 2003/08/28 08:37:24 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/rijndael/rijndael_local.h,v 1.4 2003/10/12 21:05:05 ume Exp $	*/
 
 /* the file should not be used from outside */
 typedef u_int8_t		u8;
diff --git a/sys/crypto/rijndael/test00.c b/sys/crypto/rijndael/test00.c
index f7a534a0cfa2..534b2c119959 100644
--- a/sys/crypto/rijndael/test00.c
+++ b/sys/crypto/rijndael/test00.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/rijndael/test00.c,v 1.1 2003/10/19 22:12:23 phk Exp $
  *
  * This test checks for inplace decryption working.  This is the case
  * where the same buffer is passed as input and output to
diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c
index 208789ab1339..a553d5fb988e 100644
--- a/sys/crypto/sha1.c
+++ b/sys/crypto/sha1.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/sha1.c,v 1.9 2003/06/10 21:36:57 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/sys/crypto/sha1.h b/sys/crypto/sha1.h
index 3686d7ddde51..0bd6cb1ebdae 100644
--- a/sys/crypto/sha1.h
+++ b/sys/crypto/sha1.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/sha1.h,v 1.8 2002/03/20 05:13:50 alfred Exp $	*/
 /*	$KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $	*/
 
 /*
diff --git a/sys/crypto/sha2/sha2.c b/sys/crypto/sha2/sha2.c
index 98e497e3116b..0ca8c9fd34f8 100644
--- a/sys/crypto/sha2/sha2.c
+++ b/sys/crypto/sha2/sha2.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.7 2003/09/08 18:32:33 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sys/crypto/sha2/sha2.h b/sys/crypto/sha2/sha2.h
index 12da95c92bda..eb367e30e197 100644
--- a/sys/crypto/sha2/sha2.h
+++ b/sys/crypto/sha2/sha2.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.2 2002/03/20 05:13:51 alfred Exp $	*/
 /*	$KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $	*/
 
 /*
diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c
index e9b02327e6f7..eebf618777d8 100644
--- a/sys/crypto/via/padlock.c
+++ b/sys/crypto/via/padlock.c
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.1.2.1 2005/08/30 14:56:02 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 2d17504070c6..141f30de6541 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_access.c,v 1.19 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 44915e316d15..3d2e79ddbc22 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_access.h,v 1.11 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index ac0c87418487..cc80f014334b 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_break.c,v 1.25 2005/01/06 01:34:41 imp Exp $");
 
 #include "opt_comconsole.h"
 
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index f30b9337c26c..0bbd249f72d2 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_break.h,v 1.17 2005/01/06 01:34:41 imp Exp $
  */
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 38507c2ef65b..e3012287909a 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60.2.1.2.1 2005/10/25 20:11:58 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/linker_set.h>
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index 1825b0e3c6fc..c4c5a00c1cf8 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_command.h,v 1.13 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 9be98e46048c..b1763853f4a3 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_examine.c,v 1.32 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 0bf6c836e329..14cd2033ff7f 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_expr.c,v 1.17 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 27af2655c19b..6b6cfed53a37 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_input.c,v 1.36 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index a04103b00deb..9ee2aabb53b9 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_lex.c,v 1.22 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 07955e9dc5cd..a94030c6d3fc 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_lex.h,v 1.14 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_main.c b/sys/ddb/db_main.c
index d047aebcec82..989cfadc53be 100644
--- a/sys/ddb/db_main.c
+++ b/sys/ddb/db_main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_main.c,v 1.4 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 3a0fbc5b73d4..a90899b1a55d 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.33 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 7615ea67f6cd..96edcdd2a939 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_output.h,v 1.13 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 6cffd6d8b63a..8d684da3b366 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_print.c,v 1.30 2005/04/14 05:25:40 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index b5175b7c2803..4348a23b4289 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.55 2004/11/20 02:32:42 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 18f9c0df7d26..b72f9af7c7c4 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_run.c,v 1.27 2005/04/14 05:25:40 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index fd7596fb4350..f69a6acbaa0b 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.36 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index f68ccbcaf726..96dbbfe1b178 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_sym.h,v 1.23 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_thread.c b/sys/ddb/db_thread.c
index 5b50f5657d92..cfcbc32a45c2 100644
--- a/sys/ddb/db_thread.c
+++ b/sys/ddb/db_thread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.4 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 706ebe60ec94..267b25fb007c 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_variables.c,v 1.23 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 1ff0e4442d00..fa0edc445c40 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_variables.h,v 1.14 2005/01/06 01:34:41 imp Exp $
  */
 
 /*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index 6aa8103758d7..c91953ffc40f 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_watch.c,v 1.26 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 7c48ce8af1b1..63d659074d0b 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_watch.h,v 1.12 2005/01/06 01:34:41 imp Exp $
  */
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 64d347364875..ba22164906a0 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_write_cmd.c,v 1.15 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index a9cd0f20b060..73361c82b142 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/ddb.h,v 1.39 2005/07/02 23:52:37 marcel Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index bd6f926cfa1f..04b5490529b0 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.109.2.1.2.2 2005/10/29 15:13:07 scottl Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index da9ba65fab57..07cba06de0ac 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.20.2.1 2005/10/09 06:39:21 scottl Exp $");
 
 /*
  * CAM front-end for communicating with non-DASD devices
diff --git a/sys/dev/aac/aac_compat.h b/sys/dev/aac/aac_compat.h
index ef61c0a36503..8897786c6e17 100644
--- a/sys/dev/aac/aac_compat.h
+++ b/sys/dev/aac/aac_compat.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aac/aac_compat.h,v 1.3 2001/09/05 20:43:02 scottl Exp $
  */
 /*
  * Backwards compatibility support.
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index a2b2a4e29a35..5db0e23009d7 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.20.2.1 2005/10/09 06:39:21 scottl Exp $");
 
 /*
  * Debugging support.
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 12c5515ee1fd..98af72942d8b 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43 2005/05/02 22:56:52 scottl Exp $");
 
 #include "opt_aac.h"
 
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
index 21c944b05732..177cbbc8c695 100644
--- a/sys/dev/aac/aac_linux.c
+++ b/sys/dev/aac/aac_linux.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.3 2004/05/30 20:08:23 phk Exp $");
 
 /*
  * Linux ioctl handler for the aac device driver
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index de0f73933fd2..bbaff934bf73 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.54.2.3 2005/10/09 06:39:21 scottl Exp $");
 
 /*
  * PCI bus interface and resource allocation.
diff --git a/sys/dev/aac/aac_tables.h b/sys/dev/aac/aac_tables.h
index 4a0d0e3dddd4..ce9fd3e25a10 100644
--- a/sys/dev/aac/aac_tables.h
+++ b/sys/dev/aac/aac_tables.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/aac/aac_tables.h,v 1.5.2.1 2005/10/09 06:39:21 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index dacdead6c5b4..4c670b30a07e 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/aac/aacreg.h,v 1.21.2.1.2.1 2005/10/28 16:31:34 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index a5ae32bf16ee..ed3d0843ae2a 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.46.8.1 2005/10/09 06:39:21 scottl Exp $
  */
 
 #include <sys/bio.h>
diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c
index 45bd7f3ab076..0a940939d71c 100644
--- a/sys/dev/acpi_support/acpi_asus.c
+++ b/sys/dev/acpi_support/acpi_asus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.24 2005/05/09 12:51:48 philip Exp $");
 
 /*
  * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
diff --git a/sys/dev/acpi_support/acpi_fujitsu.c b/sys/dev/acpi_support/acpi_fujitsu.c
index bea8a99473e4..a2139f6c750d 100644
--- a/sys/dev/acpi_support/acpi_fujitsu.c
+++ b/sys/dev/acpi_support/acpi_fujitsu.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.2 2005/04/04 10:21:20 philip Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c
index a7f4d0f55098..0949581df027 100644
--- a/sys/dev/acpi_support/acpi_ibm.c
+++ b/sys/dev/acpi_support/acpi_ibm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.7.2.1 2005/08/11 15:35:58 markus Exp $");
 
 /*
  * Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops.
diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c
index ac394bdef78b..183d8a8134aa 100644
--- a/sys/dev/acpi_support/acpi_panasonic.c
+++ b/sys/dev/acpi_support/acpi_panasonic.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.8 2005/05/14 10:51:16 nyan Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpi_support/acpi_sony.c b/sys/dev/acpi_support/acpi_sony.c
index c4ecca9c6559..14679c6b87b4 100644
--- a/sys/dev/acpi_support/acpi_sony.c
+++ b/sys/dev/acpi_support/acpi_sony.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.8 2005/03/02 09:22:34 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpi_support/acpi_toshiba.c b/sys/dev/acpi_support/acpi_toshiba.c
index ed721c201eb9..5c0b041865e1 100644
--- a/sys/dev/acpi_support/acpi_toshiba.c
+++ b/sys/dev/acpi_support/acpi_toshiba.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.16 2005/03/24 19:02:13 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c
index 623bade3ba19..e8eb6c01b855 100644
--- a/sys/dev/acpica/Osd/OsdDebug.c
+++ b/sys/dev/acpica/Osd/OsdDebug.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.9.2.1 2005/07/29 16:22:37 njl Exp $");
 
 #include "opt_ddb.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c
index 346fc0feb383..ed5170331f37 100644
--- a/sys/dev/acpica/Osd/OsdHardware.c
+++ b/sys/dev/acpica/Osd/OsdHardware.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.15.2.1 2005/07/29 16:22:37 njl Exp $");
 
 #include "acpi.h"
 
diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c
index f540080b2fb0..f17862f29d56 100644
--- a/sys/dev/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpica/Osd/OsdInterrupt.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.19.2.1 2005/07/29 16:22:37 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c
index 35f32fcbc9d4..73fecb73c919 100644
--- a/sys/dev/acpica/Osd/OsdMemory.c
+++ b/sys/dev/acpica/Osd/OsdMemory.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.11.8.1 2005/07/29 16:22:37 njl Exp $");
 
 #include "acpi.h"
 
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index 82db3ff69162..5d3eee12b892 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.32.2.1 2005/07/29 16:22:37 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/Osd/OsdStream.c b/sys/dev/acpica/Osd/OsdStream.c
index 952029f42224..81bf87bc8685 100644
--- a/sys/dev/acpica/Osd/OsdStream.c
+++ b/sys/dev/acpica/Osd/OsdStream.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdStream.c,v 1.4.8.1 2005/07/29 16:22:37 njl Exp $");
 
 #include "acpi.h"
 
diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c
index 471a22fb2f43..f735872aa24b 100644
--- a/sys/dev/acpica/Osd/OsdSynch.c
+++ b/sys/dev/acpica/Osd/OsdSynch.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.22.8.1 2005/07/29 16:22:37 njl Exp $");
 
 #include "acpi.h"
 
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c
index 92761ec3dbf4..7f2422ff8ba2 100644
--- a/sys/dev/acpica/Osd/OsdTable.c
+++ b/sys/dev/acpica/Osd/OsdTable.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.8.2.1 2005/07/29 16:22:37 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index de0aeab8f1bf..4f4ce29025c4 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.214.4.1 2005/10/25 20:51:58 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c
index 3d49e6ed2bd1..13facc06a2e1 100644
--- a/sys/dev/acpica/acpi_acad.c
+++ b/sys/dev/acpica/acpi_acad.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.33.2.1 2005/07/29 16:22:37 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c
index 218e4d9a68f2..c832831de8bf 100644
--- a/sys/dev/acpica/acpi_battery.c
+++ b/sys/dev/acpica/acpi_battery.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.12.2.2 2005/08/12 17:29:58 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index 3ca4add3616f..4a19d4975972 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.30 2005/03/02 09:22:34 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index e60ea17a3909..b8be03b8b1ca 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.39.2.1 2005/07/29 16:27:07 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index fccd19f0ab59..76a78a4fa54a 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.57 2005/04/10 19:21:42 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index b474a10e6677..3986e206c555 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -136,7 +136,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.65 2005/05/12 22:35:08 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_if.m b/sys/dev/acpica/acpi_if.m
index 51c479cc24a5..097f696637ab 100644
--- a/sys/dev/acpica/acpi_if.m
+++ b/sys/dev/acpica/acpi_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/acpica/acpi_if.m,v 1.6.2.1 2005/07/29 16:27:07 njl Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c
index d61d6e7ad3be..23b5ea16dfe9 100644
--- a/sys/dev/acpica/acpi_isab.c
+++ b/sys/dev/acpica/acpi_isab.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.9 2004/06/29 19:02:27 njl Exp $");
 
 /*
  * ISA Bridge driver for Generic ISA Bus Devices.  See section 10.7 of the
diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c
index 50421c64b95b..bbb0ff905d63 100644
--- a/sys/dev/acpica/acpi_lid.c
+++ b/sys/dev/acpica/acpi_lid.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.27 2004/08/25 20:09:15 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c
index 6e90879450c4..054ea9215c21 100644
--- a/sys/dev/acpica/acpi_package.c
+++ b/sys/dev/acpica/acpi_package.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.6.2.1 2005/07/29 16:22:37 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index c935ae8ffd45..3e821fc10a9a 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.26 2005/01/06 01:42:24 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 456fabea3400..579d68c40f51 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.44.2.1 2005/08/11 15:35:41 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index 35c99edd081b..798c55eef2bf 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.56 2005/03/08 17:22:11 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 33cdd5c5767f..3a38ef5a346b 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.47.2.1 2005/09/18 02:55:09 imp Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c
index 35c3f3da4238..b1aa1e99ae44 100644
--- a/sys/dev/acpica/acpi_pcib_pci.c
+++ b/sys/dev/acpica/acpi_pcib_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.12 2004/12/27 05:36:47 njl Exp $");
 
 #include "opt_acpi.h"
 
diff --git a/sys/dev/acpica/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h
index 5514a262b82d..3a8b7c33d364 100644
--- a/sys/dev/acpica/acpi_pcibvar.h
+++ b/sys/dev/acpica/acpi_pcibvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpi_pcibvar.h,v 1.6 2005/02/28 05:39:34 njl Exp $
  */
 
 #ifndef	_ACPI_PCIBVAR_H_
diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c
index 22b11bb8ece6..e6efa15828f6 100644
--- a/sys/dev/acpica/acpi_perf.c
+++ b/sys/dev/acpica/acpi_perf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.21 2005/05/29 04:42:16 nyan Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index 1a37216463ce..ca6cdea522c6 100644
--- a/sys/dev/acpica/acpi_powerres.c
+++ b/sys/dev/acpica/acpi_powerres.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.28 2004/12/27 05:36:47 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_quirk.c b/sys/dev/acpica/acpi_quirk.c
index 4e3584581cf3..be348d09763a 100644
--- a/sys/dev/acpica/acpi_quirk.c
+++ b/sys/dev/acpica/acpi_quirk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.1.8.1 2005/07/29 16:22:37 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/acpi_quirks b/sys/dev/acpica/acpi_quirks
index 4b2099d59256..39201529db6d 100644
--- a/sys/dev/acpica/acpi_quirks
+++ b/sys/dev/acpica/acpi_quirks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/acpica/acpi_quirks,v 1.6 2005/06/26 18:19:14 dwmalone Exp $
 #
 # Quirks for ACPI tables can be added here.
 #
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index f52ec51f59b7..ce0fdda67dad 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.34 2005/03/18 11:57:44 phk Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 53e791f6407c..08ba659e4193 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.53 2005/02/22 00:40:13 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c
index 105ac1d7d354..68de33f86544 100644
--- a/sys/dev/acpica/acpi_throttle.c
+++ b/sys/dev/acpica/acpi_throttle.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.7 2005/04/10 20:04:30 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index 446a7b7e08d2..f050dd8bfaa7 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.38 2005/03/02 09:22:34 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index f2a5ce0b0b81..85e722c2f7ed 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.10 2005/03/02 09:22:34 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/acpica/acpiio.h b/sys/dev/acpica/acpiio.h
index aa18c385bdf4..185d1f2a754c 100644
--- a/sys/dev/acpica/acpiio.h
+++ b/sys/dev/acpica/acpiio.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.14.2.1 2005/07/29 16:27:07 njl Exp $
  */
 
 #ifndef _ACPIIO_H_
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 9c0547d24daf..af45aaf54a0f 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.95.2.1 2005/07/29 16:27:07 njl Exp $
  */
 
 #ifndef _ACPIVAR_H_
diff --git a/sys/dev/adlink/adlink.c b/sys/dev/adlink/adlink.c
index b87db9ae991b..17d4902fdd87 100644
--- a/sys/dev/adlink/adlink.c
+++ b/sys/dev/adlink/adlink.c
@@ -43,7 +43,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.14 2005/03/19 12:55:46 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index 6d6fa70ca29c..64ce6a29eed1 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.18 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 7bfb93babdf9..711fd8e99386 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.28.2.1 2005/07/18 19:43:45 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 455e2044555b..3c30d0c92dbb 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.27 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index aa6541dfa995..25f70760e31c 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advansys.c,v 1.29 2005/05/29 04:42:16 nyan Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index a8c560472860..4a1c755d0998 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advansys.h,v 1.4 2005/01/06 01:42:24 imp Exp $
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index e89829f962e3..cb143a7f51fa 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advlib.c,v 1.23 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index f7a3acb633b5..bdc60c302648 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advlib.h,v 1.12 2005/01/06 01:42:24 imp Exp $
  */
 /*-
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index d5e7bba9634a..7a983a8bc07d 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advmcode.c,v 1.9 2005/01/06 01:42:24 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index 60b4e03cdb1a..aa6b786304b3 100644
--- a/sys/dev/advansys/advmcode.h
+++ b/sys/dev/advansys/advmcode.h
@@ -1,7 +1,7 @@
 /*-
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advmcode.h,v 1.8 2005/01/06 01:42:24 imp Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 4d40ae3eb7cc..7292b39beec4 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.23 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 3b9ce175eb86..4eb222a60863 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.21 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index b926bba2c159..88b6c9fed751 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.12 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index a1d72ec7c383..00f1e968332f 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwlib.h,v 1.9 2005/02/14 01:10:50 obrien Exp $
  */
 /*-
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index a43720c423dd..e7a6262ffe6a 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwmcode.c,v 1.5 2005/01/06 01:42:24 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index e3ab3f47a0ec..b6370b15fbef 100644
--- a/sys/dev/advansys/adwmcode.h
+++ b/sys/dev/advansys/adwmcode.h
@@ -1,7 +1,7 @@
 /*-
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwmcode.h,v 1.4 2005/01/06 01:42:24 imp Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index 0510ab0185c3..ee25626290d2 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwvar.h,v 1.5 2005/01/06 01:42:24 imp Exp $
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index b828a9daf84c..9f1e82c6a705 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha.c,v 1.59 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index 8805a60c6bc6..60a67a2c17d1 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.36 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c
index 81f106415cb2..8eb84f2b472b 100644
--- a/sys/dev/aha/aha_mca.c
+++ b/sys/dev/aha/aha_mca.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.13 2005/01/19 06:54:10 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index a248caab08da..f80775185581 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.19 2005/01/19 06:54:10 imp Exp $
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index cafcd1a765e7..c471ac250ee3 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.34 2005/05/29 04:42:17 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index d4544434eadb..9adb46c483e0 100644
--- a/sys/dev/ahb/ahbreg.h
+++ b/sys/dev/ahb/ahbreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ahb/ahbreg.h,v 1.5 2005/01/06 01:42:25 imp Exp $
  */
 
 /* Resource Constatns */
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index b09d3e82bc07..e00f3327b5eb 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic.c,v 1.23 2005/05/29 04:42:17 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index 53962aed9d35..84a7bcac0ee5 100644
--- a/sys/dev/aic/aic6360reg.h
+++ b/sys/dev/aic/aic6360reg.h
@@ -29,7 +29,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aic6360reg.h,v 1.4 2005/01/06 01:42:25 imp Exp $
  */
 
 #define SCSISEQ		0x00	/* SCSI sequence control */
diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c
index f72df43ac70c..f2b42946c196 100644
--- a/sys/dev/aic/aic_cbus.c
+++ b/sys/dev/aic/aic_cbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_cbus.c,v 1.11 2005/04/13 13:02:58 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index 71736f21d667..239038bca10d 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.12 2005/05/29 04:42:17 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c
index 37e19a509040..431369426384 100644
--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.16 2005/06/24 14:36:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index d834fb64dda4..f10815a475ac 100644
--- a/sys/dev/aic/aicvar.h
+++ b/sys/dev/aic/aicvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aicvar.h,v 1.8 2002/03/20 02:02:34 alfred Exp $
  */
 
 struct aic_transinfo {
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index f98059f69016..39cb09e8d301 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.35 2005/01/06 01:42:25 imp Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c
index d01ffc96d3f8..620b09cce42e 100644
--- a/sys/dev/aic7xxx/ahc_isa.c
+++ b/sys/dev/aic7xxx/ahc_isa.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.6 2005/01/06 01:42:25 imp Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 4a4889c49707..a7e0e07d1083 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.64 2005/03/05 19:24:22 imp Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index df7fd5c6ecc7..204ecdce95af 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.18 2005/03/05 19:24:22 imp Exp $");
 
 #include <dev/aic7xxx/aic79xx_osm.h>
 
diff --git a/sys/dev/aic7xxx/aic7770.c b/sys/dev/aic7xxx/aic7770.c
index 1ce48f9b8df9..e17fae9ffd83 100644
--- a/sys/dev/aic7xxx/aic7770.c
+++ b/sys/dev/aic7xxx/aic7770.c
@@ -46,7 +46,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.18 2005/01/06 01:42:25 imp Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index 0cd1a7950574..500b5906c8fb 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -46,7 +46,7 @@
 #include "aicasm/aicasm_insformat.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.36 2005/02/16 23:13:38 gibbs Exp $");
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h
index c8de9b776dfe..43e35421e8f5 100644
--- a/sys/dev/aic7xxx/aic79xx.h
+++ b/sys/dev/aic7xxx/aic79xx.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.24 2005/01/06 01:42:25 imp Exp $
  */
 
 #ifndef _AIC79XX_H_
diff --git a/sys/dev/aic7xxx/aic79xx.reg b/sys/dev/aic7xxx/aic79xx.reg
index e856b6236eae..545c27861d94 100644
--- a/sys/dev/aic7xxx/aic79xx.reg
+++ b/sys/dev/aic7xxx/aic79xx.reg
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.reg,v 1.19 2005/01/06 01:42:26 imp Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $"
 
diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq
index d8d4f921380c..835db1d25b0b 100644
--- a/sys/dev/aic7xxx/aic79xx.seq
+++ b/sys/dev/aic7xxx/aic79xx.seq
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.18 2005/01/06 01:42:26 imp Exp $
  */
 
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $"
diff --git a/sys/dev/aic7xxx/aic79xx_inline.h b/sys/dev/aic7xxx/aic79xx_inline.h
index 064a5e8ddd7f..73a278a381d3 100644
--- a/sys/dev/aic7xxx/aic79xx_inline.h
+++ b/sys/dev/aic7xxx/aic79xx_inline.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#57 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_inline.h,v 1.17 2005/01/06 01:42:26 imp Exp $
  */
 
 #ifndef _AIC79XX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index d8f189093830..02c1d1b0a88e 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.21.4.1 2005/10/14 02:19:02 delphij Exp $");
 
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index 66153321a06e..c036f1afc4fc 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -32,7 +32,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#23 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.16 2005/05/29 04:42:17 nyan Exp $
  */
 
 #ifndef _AIC79XX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index d59f1155feb2..a976e7dd01f3 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -46,7 +46,7 @@
 #include "aic79xx_inline.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.23 2005/02/16 18:16:35 gibbs Exp $");
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 #endif
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 71714abb6f99..c6e5b62440b4 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -46,7 +46,7 @@
 #include "aicasm/aicasm_insformat.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.109 2005/03/31 05:00:31 sam Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 0ac10be92752..a755e5d93e42 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.54 2005/01/06 01:42:26 imp Exp $
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index 076c2ba49f92..b90d63a9b743 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.47 2005/01/06 01:42:26 imp Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $"
 
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 0eefaaa41b79..4b3450b4b4b5 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.128 2005/01/06 01:42:26 imp Exp $
  */
 
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $"
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.c b/sys/dev/aic7xxx/aic7xxx_93cx6.c
index ab63f181901b..c028c5695981 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.c
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.c
@@ -70,7 +70,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.c,v 1.21 2005/01/06 05:30:44 scottl Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index 3827015edcbb..34e4fc2584cf 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.h#12 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.h,v 1.12 2005/01/06 01:42:26 imp Exp $
  */
 #ifndef _AIC7XXX_93CX6_H_
 #define _AIC7XXX_93CX6_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h
index 989ac79dfc24..fed8c9da55de 100644
--- a/sys/dev/aic7xxx/aic7xxx_inline.h
+++ b/sys/dev/aic7xxx/aic7xxx_inline.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#47 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_inline.h,v 1.24 2005/01/06 01:42:26 imp Exp $
  */
 
 #ifndef _AIC7XXX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index 638a56a2e419..4ac1badfe945 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.c
+++ b/sys/dev/aic7xxx/aic7xxx_osm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.42.4.1 2005/10/14 02:19:02 delphij Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index 159f9f9c31ba..822501fee967 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -31,7 +31,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.h#18 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.h,v 1.29 2005/05/29 04:42:17 nyan Exp $
  */
 
 #ifndef _AIC7XXX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_pci.c b/sys/dev/aic7xxx/aic7xxx_pci.c
index d37607daadd5..40d182e3e247 100644
--- a/sys/dev/aic7xxx/aic7xxx_pci.c
+++ b/sys/dev/aic7xxx/aic7xxx_pci.c
@@ -48,7 +48,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.34 2005/01/06 01:42:26 imp Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic_osm_lib.c b/sys/dev/aic7xxx/aic_osm_lib.c
index 8919789c6db0..db5dc05e606e 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.c
+++ b/sys/dev/aic7xxx/aic_osm_lib.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.c,v 1.4 2005/01/06 01:42:26 imp Exp $");
 
 static void	aic_recovery_thread(void *arg);
 
diff --git a/sys/dev/aic7xxx/aic_osm_lib.h b/sys/dev/aic7xxx/aic_osm_lib.h
index 1c8678b58bf7..9c000196818b 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.h
+++ b/sys/dev/aic7xxx/aic_osm_lib.h
@@ -32,7 +32,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic_osm_lib.h#5 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.h,v 1.5 2005/01/06 01:42:26 imp Exp $
  */
 
 /******************************** OS Includes *********************************/
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index e89fd34715a5..6db42c448d66 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -1,7 +1,7 @@
 #
 # $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aicasm/Makefile#2 $
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.20 2004/12/21 08:47:19 ru Exp $
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index ad010649c8b5..41371f0818a2 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.38 2005/01/06 01:42:27 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 440cb495f955..2b0c884b20fe 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.h#14 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index f96116d0f9cb..6db26d309bad 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#29 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y,v 1.24 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
index 820310b469cd..a987c66c2dee 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#11 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h,v 1.9 2005/01/06 01:42:27 imp Exp $
  */
 
 struct ins_format1 {
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
index 48551c6b0f84..63237dd1d150 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_gram.y#5 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y,v 1.3 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
index 49557a8837f8..480e97bf8473 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_scan.l#8 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l,v 1.6 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index ced09dc2b12b..b87f8cd2a4d2 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#19 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l,v 1.23 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index 9770a71b8d09..f895fd84b8c3 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.c#24 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c,v 1.24 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index 1496c3768c81..507db5310e24 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.h#17 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17 2005/01/06 01:42:27 imp Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index a91bd68487c4..1954de519669 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -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/sys/dev/amd/amd.c,v 1.30 2005/05/29 04:42:17 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/amd/amd.h b/sys/dev/amd/amd.h
index d9b8cd209b34..1515324695eb 100644
--- a/sys/dev/amd/amd.h
+++ b/sys/dev/amd/amd.h
@@ -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/sys/dev/amd/amd.h,v 1.6 2005/01/06 01:42:27 imp Exp $
  */
 
 #ifndef AMD_H
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 0f9c4e360c1c..6ecc12ba7919 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.65.2.2 2005/09/16 18:04:10 ps Exp $");
 
 /*
  * Driver for the AMI MegaRaid family of controllers.
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index 66e4b5b4a0fb..2aaf02ac5505 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.15 2005/02/09 17:19:12 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/amr/amr_compat.h b/sys/dev/amr/amr_compat.h
index 33a09f0eebbe..b5ecd8c189ba 100644
--- a/sys/dev/amr/amr_compat.h
+++ b/sys/dev/amr/amr_compat.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/amr/amr_compat.h,v 1.6 2003/03/08 08:01:27 phk Exp $
  */
 /*
  * Backwards compatibility support.
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 047ada0fbe7f..f80c626ed752 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.35 2005/01/16 07:34:26 scottl Exp $");
 
 /*
  * Disk driver for AMI MegaRaid controllers
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 0fdfd8c82b75..36583c8be20c 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.29 2005/05/29 04:42:17 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/amr/amr_tables.h b/sys/dev/amr/amr_tables.h
index b1a4e441af42..914438ee9daf 100644
--- a/sys/dev/amr/amr_tables.h
+++ b/sys/dev/amr/amr_tables.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/amr/amr_tables.h,v 1.3 2002/10/30 22:00:11 emoore Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h
index e14ade467cd0..fca855ff13bc 100644
--- a/sys/dev/amr/amrio.h
+++ b/sys/dev/amr/amrio.h
@@ -52,7 +52,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/amr/amrio.h,v 1.6 2004/08/16 17:23:09 ambrisko Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrreg.h b/sys/dev/amr/amrreg.h
index f08b113b7343..d94b63411e1b 100644
--- a/sys/dev/amr/amrreg.h
+++ b/sys/dev/amr/amrreg.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/amr/amrreg.h,v 1.8 2005/01/23 23:25:41 scottl Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 3af12a35063e..a6041b90d6c0 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.26 2005/01/23 23:25:41 scottl Exp $
  */
 
 #if __FreeBSD_version >= 500005
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index 28e4f72148e9..41a6475c3b57 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_aironet_ieee.h,v 1.15 2005/01/06 01:42:28 imp Exp $
  */
 
 #ifndef _IF_AIRONET_IEEE_H
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index f10f30e95c5b..93c5009d5111 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.67.2.2 2005/08/25 05:01:03 rwatson Exp $");
 
 /*
  * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 7144cc8778ad..a7b60021a708 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.15 2005/01/06 01:42:28 imp Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 5e5d9d12d97d..252011381ca1 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.28 2005/06/24 14:36:51 imp Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index 5098f5026dd9..f24bf57e81d4 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.27 2005/03/05 19:06:11 imp Exp $");
 
 /*
  * This is a PCI shim for the Aironet PC4500/4800 wireless network
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index 44a702af7642..0fd2466ae447 100644
--- a/sys/dev/an/if_anreg.h
+++ b/sys/dev/an/if_anreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_anreg.h,v 1.23 2005/06/10 16:49:03 brooks Exp $
  */
 
 #define AN_TIMEOUT	65536
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index da657dd2e257..eba9bfa97037 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.71.2.1 2005/08/25 05:01:04 rwatson Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/ar/if_ar.h b/sys/dev/ar/if_ar.h
index a6fc8cf088ec..5c75a70c8a9b 100644
--- a/sys/dev/ar/if_ar.h
+++ b/sys/dev/ar/if_ar.h
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ar/if_ar.h,v 1.4 2005/01/06 01:42:28 imp Exp $
  */
 
 #ifndef _I386_ISA_IF_AR_H_
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index afe36153d0d3..d97d4a21cb41 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar_isa.c,v 1.55 2005/05/29 04:42:17 nyan Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
index 3715c8b8ee33..b98b63e8dc7a 100644
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar_pci.c,v 1.13 2005/05/29 04:42:18 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index d643cafee44c..b1f07a70dd7f 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ar/if_arregs.h,v 1.10 2005/01/06 01:42:28 imp Exp $
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 35a8716c2508..4f7a650202a8 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -40,7 +40,7 @@
 **     1.00.00.00    3/31/2004	       Erich Chen	     First release
 **     1.20.00.02   11/29/2004         Erich Chen        bug fix with arcmsr_bus_reset when PHY error
 ******************************************************************************************
-** $FreeBSD$
+** $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.8 2005/06/05 23:05:26 imp Exp $
 */
 #define ARCMSR_DEBUG            1
 /*
diff --git a/sys/dev/arcmsr/arcmsr.h b/sys/dev/arcmsr/arcmsr.h
index b94b33078b5c..9f86c09001a6 100644
--- a/sys/dev/arcmsr/arcmsr.h
+++ b/sys/dev/arcmsr/arcmsr.h
@@ -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/sys/dev/arcmsr/arcmsr.h,v 1.1 2005/03/31 18:19:55 scottl Exp $
 */
 #define ARCMSR_DRIVER_VERSION                        "Driver Version 1.20.00.02"
 #define ARCMSR_SCSI_INITIATOR_ID                                               16
diff --git a/sys/dev/arl/if_arl.c b/sys/dev/arl/if_arl.c
index 60cb73bd3d2a..c94b74eeff80 100644
--- a/sys/dev/arl/if_arl.c
+++ b/sys/dev/arl/if_arl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.10.2.1 2005/08/25 05:01:04 rwatson Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/arl/if_arl_isa.c b/sys/dev/arl/if_arl_isa.c
index e318adf7d704..759bf9d0ac38 100644
--- a/sys/dev/arl/if_arl_isa.c
+++ b/sys/dev/arl/if_arl_isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl_isa.c,v 1.5 2005/06/10 16:49:04 brooks Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/arl/if_arlreg.h b/sys/dev/arl/if_arlreg.h
index 49982cb41687..d10cd863cbfa 100644
--- a/sys/dev/arl/if_arlreg.h
+++ b/sys/dev/arl/if_arlreg.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $RISS: if_arl/dev/arl/if_arlreg.h,v 1.4 2004/03/16 04:43:27 count Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.6 2005/06/10 16:49:04 brooks Exp $
  */
 
 #ifndef _IF_ARLREG_H
diff --git a/sys/dev/asr/MAINTAINER b/sys/dev/asr/MAINTAINER
index 337f8fb3d5f0..2dc16cf0f2a0 100644
--- a/sys/dev/asr/MAINTAINER
+++ b/sys/dev/asr/MAINTAINER
@@ -1,2 +1,2 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/asr/MAINTAINER,v 1.3 2001/12/13 23:48:34 obrien Exp $
 MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index 56a9462e3e18..7ec8b28ca0ee 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -164,7 +164,7 @@
 
 #include	"dev/asr/sys_info.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.68 2005/04/29 04:47:11 scottl Exp $");
 
 #define	ASR_VERSION	1
 #define	ASR_REVISION	'1'
diff --git a/sys/dev/asr/dptalign.h b/sys/dev/asr/dptalign.h
index 038dc6f4b5bb..92cff261131a 100644
--- a/sys/dev/asr/dptalign.h
+++ b/sys/dev/asr/dptalign.h
@@ -20,7 +20,7 @@
  *
  * DPT Alignment Description File
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/dptalign.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  */
 #if (!defined(__DPTALIGN_H))
 #define	      __DPTALIGN_H
diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h
index a70ad114bdc3..94bfd5d7035c 100644
--- a/sys/dev/asr/dptsig.h
+++ b/sys/dev/asr/dptsig.h
@@ -19,7 +19,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/dptsig.h,v 1.8 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef __DPTSIG_H_
diff --git a/sys/dev/asr/i2oadptr.h b/sys/dev/asr/i2oadptr.h
index c189d8d658d9..ff8f09b7dc19 100644
--- a/sys/dev/asr/i2oadptr.h
+++ b/sys/dev/asr/i2oadptr.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2oadptr.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2obscsi.h b/sys/dev/asr/i2obscsi.h
index a6666feb661b..1120a4e73fab 100644
--- a/sys/dev/asr/i2obscsi.h
+++ b/sys/dev/asr/i2obscsi.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2obscsi.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h
index c1e6e5067ce2..fa013a568633 100644
--- a/sys/dev/asr/i2odep.h
+++ b/sys/dev/asr/i2odep.h
@@ -46,7 +46,7 @@
  * become a "Registered Developer" of the I2O SIG. This can be done by calling
  * 415-750-8352 in the US, or via http://www.i2osig.org.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2odep.h,v 1.8 2005/01/06 01:42:29 imp Exp $
  *
  **************************************************************************/
 
diff --git a/sys/dev/asr/i2odpt.h b/sys/dev/asr/i2odpt.h
index 4c9a9d462318..2151db958a5a 100644
--- a/sys/dev/asr/i2odpt.h
+++ b/sys/dev/asr/i2odpt.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2000 Adaptec Corporation.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2odpt.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2oexec.h b/sys/dev/asr/i2oexec.h
index ae4327a6cb80..70bd9f657ed9 100644
--- a/sys/dev/asr/i2oexec.h
+++ b/sys/dev/asr/i2oexec.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2oexec.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index 833bd9173d38..79a3bbe7ffe1 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2omsg.h,v 1.7 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2otypes.h b/sys/dev/asr/i2otypes.h
index c85d92dd2c32..53eeeabce671 100644
--- a/sys/dev/asr/i2otypes.h
+++ b/sys/dev/asr/i2otypes.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2otypes.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2outil.h b/sys/dev/asr/i2outil.h
index c7e3061dbb28..3ba1ccf2f8cf 100644
--- a/sys/dev/asr/i2outil.h
+++ b/sys/dev/asr/i2outil.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2outil.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h
index c954be9816b1..481df157a0a7 100644
--- a/sys/dev/asr/osd_defs.h
+++ b/sys/dev/asr/osd_defs.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_defs.h,v 1.7 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		_OSD_DEFS_H
diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index 04f7a29b6969..4bb99a60b5ac 100644
--- a/sys/dev/asr/osd_unix.h
+++ b/sys/dev/asr/osd_unix.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_unix.h,v 1.9 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		__OSD_UNIX_H
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index baa233804a3f..bf5842eb9448 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_util.h,v 1.10 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		__OSD_UTIL_H
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index b4c78fe819fd..d220d0813047 100644
--- a/sys/dev/asr/sys_info.h
+++ b/sys/dev/asr/sys_info.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/sys_info.h,v 1.9 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		__SYS_INFO_H
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 023e41dc5d77..8605f96844ae 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.252.2.2.2.1 2005/10/27 16:41:39 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 5bc3b16cbe52..ac2529125a7a 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -25,7 +25,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/sys/dev/ata/ata-all.h,v 1.103.2.3 2005/10/07 19:25:04 sos Exp $
  */
 
 /* ATA register defines */
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index 069f9f1ae114..e435386b2476 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.36 2005/06/24 14:36:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/ata-cbus.c b/sys/dev/ata/ata-cbus.c
index 6a4898b03c72..0a1d6ac2963e 100644
--- a/sys/dev/ata/ata-cbus.c
+++ b/sys/dev/ata/ata-cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.22 2005/04/30 16:22:06 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c
index e800f2d062c1..1041b0066f9f 100644
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.126.2.4.2.1 2005/10/14 09:34:50 scottl Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 1a79dc1cbb18..8ff4542d59b9 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.189.2.1 2005/08/25 16:21:05 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index cbfc4a65b9c4..91b6a5e8ed61 100644
--- a/sys/dev/ata/ata-disk.h
+++ b/sys/dev/ata/ata-disk.h
@@ -25,7 +25,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/sys/dev/ata/ata-disk.h,v 1.50 2005/03/30 12:03:37 sos Exp $
  */
 
 /* structure describing an ATA disk */
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index 4032a48f6fc2..2e817774b986 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.137.2.1 2005/10/07 19:25:05 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c
index 2c4312073725..efdceb237695 100644
--- a/sys/dev/ata/ata-isa.c
+++ b/sys/dev/ata/ata-isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.29 2005/04/30 16:22:07 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-lowlevel.c b/sys/dev/ata/ata-lowlevel.c
index e22761457b26..c27cf381f1dc 100644
--- a/sys/dev/ata/ata-lowlevel.c
+++ b/sys/dev/ata/ata-lowlevel.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.69.2.2 2005/09/23 18:06:10 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index 43a0a0a3f29a..0dd2d1554b1d 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.105.4.1 2005/10/14 09:34:50 scottl Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index b09afcbcd899..59312a4944e1 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -25,7 +25,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/sys/dev/ata/ata-pci.h,v 1.49.2.3.2.1 2005/10/14 09:34:50 scottl Exp $
  */
 
 /* structure holding chipset config info */
diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c
index da58c403b4ec..2352d21cd82a 100644
--- a/sys/dev/ata/ata-queue.c
+++ b/sys/dev/ata/ata-queue.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.50.2.1 2005/09/23 18:06:10 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index b1380a39fce6..521f60b360d1 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.98.2.2.2.1 2005/10/14 09:34:50 scottl Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-raid.h b/sys/dev/ata/ata-raid.h
index 0d1cc38afbd8..ed05b8050d15 100644
--- a/sys/dev/ata/ata-raid.h
+++ b/sys/dev/ata/ata-raid.h
@@ -25,7 +25,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/sys/dev/ata/ata-raid.h,v 1.34.2.1 2005/09/23 18:06:11 sos Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/ata/ata_if.m b/sys/dev/ata/ata_if.m
index 248216916282..55cd9b3fa6eb 100644
--- a/sys/dev/ata/ata_if.m
+++ b/sys/dev/ata/ata_if.m
@@ -24,7 +24,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/sys/dev/ata/ata_if.m,v 1.5 2005/04/30 16:22:07 sos Exp $
 
 #include <sys/bus.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index 34938373a73d..7dd80f94832c 100644
--- a/sys/dev/ata/atapi-cam.c
+++ b/sys/dev/ata/atapi-cam.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.42 2005/05/16 13:07:27 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 417a4dc3e9f8..339e14fb9109 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.179.2.1.2.1 2005/10/14 09:34:50 scottl Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index ba16837e3517..d710d4880c35 100644
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
@@ -25,7 +25,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/sys/dev/ata/atapi-cd.h,v 1.44 2005/03/30 12:03:38 sos Exp $
  */
 
 /* CDROM Table Of Contents */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 00c53ac39d5f..d661747a66da 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.102 2005/05/16 13:07:27 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/atapi-fd.h b/sys/dev/ata/atapi-fd.h
index 2a2f699e7106..73da7107a57c 100644
--- a/sys/dev/ata/atapi-fd.h
+++ b/sys/dev/ata/atapi-fd.h
@@ -25,7 +25,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/sys/dev/ata/atapi-fd.h,v 1.24 2005/03/30 12:03:38 sos Exp $
  */
 
 /* ATAPI Rewriteable drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index b06ce47dea94..fb6f065f51a7 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.99 2005/05/16 13:07:27 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h
index e51cff22ede4..fd75918e1aa7 100644
--- a/sys/dev/ata/atapi-tape.h
+++ b/sys/dev/ata/atapi-tape.h
@@ -25,7 +25,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/sys/dev/ata/atapi-tape.h,v 1.23 2005/03/30 12:03:38 sos Exp $
  */
 
 /* ATAPI tape drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/ath/ath_rate/amrr/amrr.c b/sys/dev/ath/ath_rate/amrr/amrr.c
index 18a3fa5c3bbe..59228d9cbade 100644
--- a/sys/dev/ath/ath_rate/amrr/amrr.c
+++ b/sys/dev/ath/ath_rate/amrr/amrr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.8.2.2 2005/08/25 05:01:04 rwatson Exp $");
 
 /*
  * AMRR rate control. See:
diff --git a/sys/dev/ath/ath_rate/amrr/amrr.h b/sys/dev/ath/ath_rate/amrr/amrr.h
index cb5d135975bf..1c52df17d3cd 100644
--- a/sys/dev/ath/ath_rate/amrr/amrr.h
+++ b/sys/dev/ath/ath_rate/amrr/amrr.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.h,v 1.2 2004/12/31 22:41:45 sam Exp $
  */
 
 #ifndef _DEV_ATH_RATE_AMRR_H
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.c b/sys/dev/ath/ath_rate/onoe/onoe.c
index 3cf8073d9ad1..a52a657e8727 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.c
+++ b/sys/dev/ath/ath_rate/onoe/onoe.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.8.2.2 2005/08/25 05:01:05 rwatson Exp $");
 
 /*
  * Atsushi Onoe's rate control algorithm.
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.h b/sys/dev/ath/ath_rate/onoe/onoe.h
index 9d0661c23e7f..565c705d3ddf 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.h
+++ b/sys/dev/ath/ath_rate/onoe/onoe.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.2 2004/12/31 22:41:45 sam Exp $
  */
 
 /*
diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c
index 7acdc5cfe447..f1140e21f1f9 100644
--- a/sys/dev/ath/ath_rate/sample/sample.c
+++ b/sys/dev/ath/ath_rate/sample/sample.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.8.2.1 2005/07/29 23:31:03 sam Exp $");
 
 /*
  * John Bicket's SampleRate control algorithm.
diff --git a/sys/dev/ath/ath_rate/sample/sample.h b/sys/dev/ath/ath_rate/sample/sample.h
index c97d23a56e85..095b3788a436 100644
--- a/sys/dev/ath/ath_rate/sample/sample.h
+++ b/sys/dev/ath/ath_rate/sample/sample.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.h,v 1.3 2005/03/20 01:27:33 sam Exp $
  */
 
 /*
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index db36f0061c25..693da5a3ac2b 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.94.2.5 2005/10/09 04:00:47 delphij Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index cb176f06293b..ab819ebec5dc 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.12 2005/03/05 19:06:12 imp Exp $");
 
 /*
  * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
diff --git a/sys/dev/ath/if_athioctl.h b/sys/dev/ath/if_athioctl.h
index 3e7ec733fa46..0fe96ef04b74 100644
--- a/sys/dev/ath/if_athioctl.h
+++ b/sys/dev/ath/if_athioctl.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.10 2005/03/30 20:13:08 sam Exp $
  */
 
 /*
diff --git a/sys/dev/ath/if_athrate.h b/sys/dev/ath/if_athrate.h
index 90a44162dc53..ee5f0953f617 100644
--- a/sys/dev/ath/if_athrate.h
+++ b/sys/dev/ath/if_athrate.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.4 2005/04/02 18:54:30 sam Exp $
  */
 #ifndef _ATH_RATECTRL_H_
 #define _ATH_RATECTRL_H_
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index 21c319e76f3d..aba1fb3d25d7 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.27.2.2 2005/09/03 22:46:42 sam Exp $
  */
 
 /*
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index eedc469a43c7..b37f8fc3c0e4 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.47 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 #include "opt_atkbd.h"
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index 63c30d99f5c9..46a7c9bb4920 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd_atkbdc.c,v 1.19 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index 6889e1ebbfd3..c51e162f1476 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.21 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_ebus.c b/sys/dev/atkbdc/atkbdc_ebus.c
index 639203d548bc..0c59180cd001 100644
--- a/sys/dev/atkbdc/atkbdc_ebus.c
+++ b/sys/dev/atkbdc/atkbdc_ebus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_ebus.c,v 1.1 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index deeb7a0e4961..a4757ea3ee10 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_isa.c,v 1.33 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index b97b592bafa9..a7e91fdefba4 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_subr.c,v 1.33 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_subr.h b/sys/dev/atkbdc/atkbdc_subr.h
index fa8f1f8000b8..a449ff881933 100644
--- a/sys/dev/atkbdc/atkbdc_subr.h
+++ b/sys/dev/atkbdc/atkbdc_subr.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.31 2005/05/29 04:42:28 nyan Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/atkbdc/atkbdc_subr.h,v 1.1 2005/06/10 20:56:37 marius Exp $
  */
 
 #ifndef _DEV_ATKBDC_ATKBDC_SUBR_H_
diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h
index 0715d9ece634..4d4bfb9f08bb 100644
--- a/sys/dev/atkbdc/atkbdcreg.h
+++ b/sys/dev/atkbdc/atkbdcreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/atkbdc/atkbdcreg.h,v 1.12 2005/06/10 20:56:37 marius Exp $
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h
index cf7ee6b31280..594895a91bec 100644
--- a/sys/dev/atkbdc/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdreg.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/sys/dev/atkbdc/atkbdreg.h,v 1.9 2005/06/10 20:56:37 marius Exp $
  */
 
 #ifndef _DEV_ATKBDC_ATKBDREG_H_
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index a48eda92e923..72186218082f 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.86 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_isa.h"
 #include "opt_psm.h"
diff --git a/sys/dev/atkbdc/psm.h b/sys/dev/atkbdc/psm.h
index e687728f56eb..dd025f1f9d3b 100644
--- a/sys/dev/atkbdc/psm.h
+++ b/sys/dev/atkbdc/psm.h
@@ -21,7 +21,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/isa/psm.c,v 1.84 2005/01/10 13:05:58 philip
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/atkbdc/psm.h,v 1.1 2005/06/10 20:56:37 marius Exp $
  */
 
 #ifndef _DEV_ATKBDC_PSM_H_
diff --git a/sys/dev/auxio/auxio.c b/sys/dev/auxio/auxio.c
index e98f9b6322e1..e8776980e57d 100644
--- a/sys/dev/auxio/auxio.c
+++ b/sys/dev/auxio/auxio.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.4 2005/07/10 10:33:00 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/auxio/auxioreg.h b/sys/dev/auxio/auxioreg.h
index 0c9ce8e9fa93..5dd1c388033d 100644
--- a/sys/dev/auxio/auxioreg.h
+++ b/sys/dev/auxio/auxioreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/auxio/auxioreg.h,v 1.2 2005/01/06 01:42:30 imp Exp $ */
 /*	$NetBSD: auxioreg.h,v 1.4 2001/10/22 07:31:41 mrg Exp $	*/
 
 /*-
diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c
index a2eddd4bd768..e7717c866edc 100644
--- a/sys/dev/awi/am79c930.c
+++ b/sys/dev/awi/am79c930.c
@@ -65,7 +65,7 @@
 __KERNEL_RCSID(0, "$NetBSD: am79c930.c,v 1.9 2004/01/15 09:33:48 onoe Exp $");
 #endif
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/am79c930.c,v 1.7 2005/05/29 04:42:18 nyan Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/awi/am79c930reg.h b/sys/dev/awi/am79c930reg.h
index 74d38bf38b37..c31b4c75e127 100644
--- a/sys/dev/awi/am79c930reg.h
+++ b/sys/dev/awi/am79c930reg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: am79c930reg.h,v 1.4 2003/11/02 11:07:45 wiz Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/am79c930reg.h,v 1.2 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/am79c930var.h b/sys/dev/awi/am79c930var.h
index 3836521f1e29..64e6964bfb9b 100644
--- a/sys/dev/awi/am79c930var.h
+++ b/sys/dev/awi/am79c930var.h
@@ -1,5 +1,5 @@
 /* $NetBSD: am79c930var.h,v 1.3 2004/01/15 09:33:48 onoe Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/am79c930var.h,v 1.3 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 6dd75bf34681..5d54bc2acca9 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -89,7 +89,7 @@
 __KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $");
 #endif
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.37.2.4 2005/09/03 22:46:42 sam Exp $");
 #endif
 
 #include "opt_inet.h"
diff --git a/sys/dev/awi/awireg.h b/sys/dev/awi/awireg.h
index 555e058b3d14..133505be439a 100644
--- a/sys/dev/awi/awireg.h
+++ b/sys/dev/awi/awireg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: awireg.h,v 1.8 2003/01/20 05:30:06 simonb Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/awireg.h,v 1.2 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h
index 25934ab0e127..1d3143c8df60 100644
--- a/sys/dev/awi/awivar.h
+++ b/sys/dev/awi/awivar.h
@@ -1,5 +1,5 @@
 /* $NetBSD: awivar.h,v 1.20 2004/01/15 09:39:15 onoe Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.12 2005/06/10 16:49:05 brooks Exp $ */
 
 /*-
  * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c
index bc8bb328dc40..5cc60c9e4448 100644
--- a/sys/dev/awi/if_awi_pccard.c
+++ b/sys/dev/awi/if_awi_pccard.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.21 2005/06/24 14:36:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index 756bba099f17..f4941e094a31 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -26,7 +26,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.25.2.3 2005/10/09 04:15:11 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/bfe/if_bfereg.h b/sys/dev/bfe/if_bfereg.h
index da7cb4ff67fe..7194f818bdb6 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bfe/if_bfereg.h,v 1.7 2005/06/10 16:49:05 brooks Exp $ */
 
 #ifndef _BFE_H
 #define _BFE_H
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index aac8095f455c..f0f3febe251d 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.91.2.4 2005/10/09 04:15:11 delphij Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index 76664fcf9a50..391d3f92ea58 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.36 2005/06/10 16:49:05 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/bktr/CHANGELOG.TXT b/sys/dev/bktr/CHANGELOG.TXT
index eb5e9ce8b478..a11f234100a8 100755
--- a/sys/dev/bktr/CHANGELOG.TXT
+++ b/sys/dev/bktr/CHANGELOG.TXT
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/CHANGELOG.TXT,v 1.20 2004/12/31 09:18:29 julian Exp $ */
 /*
  * MAINTAINER = Roger Hardiman <roger@freebsd.org>
  * Newsflash: Roger is temorararily out of touch and unable 
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index efc63da05bf4..e4aff8cecb67 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.16 2005/05/29 04:42:18 nyan Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_audio.h b/sys/dev/bktr/bktr_audio.h
index c05e40c31ea3..fd31fb0d6b31 100644
--- a/sys/dev/bktr/bktr_audio.h
+++ b/sys/dev/bktr/bktr_audio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_audio.h,v 1.4 2005/01/06 01:42:31 imp Exp $ */
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
  * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index f08f810733a5..bcce274449e9 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.34 2005/05/29 04:42:18 nyan Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_card.h b/sys/dev/bktr/bktr_card.h
index 77ccaf44ab0a..68f29610f1f0 100644
--- a/sys/dev/bktr/bktr_card.h
+++ b/sys/dev/bktr/bktr_card.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.11 2005/01/06 01:42:31 imp Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 41f0b09ad6ea..38ce4b3b0994 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.139 2005/05/29 04:42:18 nyan Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.h b/sys/dev/bktr/bktr_core.h
index 980ced76621a..d707bf58f1a8 100644
--- a/sys/dev/bktr/bktr_core.h
+++ b/sys/dev/bktr/bktr_core.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_core.h,v 1.7 2005/01/06 01:42:31 imp Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 20802f460587..2bcc7462f4e9 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.27 2005/05/29 04:42:19 nyan Exp $");
 
 /*
  * I2C support for the bti2c chipset.
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index a8333519ae91..01243d1f1608 100644
--- a/sys/dev/bktr/bktr_i2c.h
+++ b/sys/dev/bktr/bktr_i2c.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_i2c.h,v 1.4 2002/03/23 15:47:08 nsouch Exp $
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c
index 77c5971bacd4..0961a3034a3a 100644
--- a/sys/dev/bktr/bktr_mem.c
+++ b/sys/dev/bktr/bktr_mem.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.13 2005/01/27 01:40:12 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/bktr/bktr_mem.h b/sys/dev/bktr/bktr_mem.h
index 8feb55206c11..87bd3ca08021 100644
--- a/sys/dev/bktr/bktr_mem.h
+++ b/sys/dev/bktr/bktr_mem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_mem.h,v 1.2 2005/01/06 01:42:31 imp Exp $ */
 
 /*
  * This is prt of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index f55527223363..c85c1053592e 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.51 2005/05/29 04:42:19 nyan Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_os.h b/sys/dev/bktr/bktr_os.h
index 1cd708df3c6a..74ead039940d 100644
--- a/sys/dev/bktr/bktr_os.h
+++ b/sys/dev/bktr/bktr_os.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.8 2005/01/06 01:42:31 imp Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index 982fe2c4a600..7373dcefea29 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.50 2005/05/24 20:42:08 cognet Exp $
  *
  * Copyright (c) 1999 Roger Hardiman
  * Copyright (c) 1998 Amancio Hasty
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index a74dd4faf01b..7195122c97db 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.19 2005/05/29 04:42:19 nyan Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_tuner.h b/sys/dev/bktr/bktr_tuner.h
index 1d6986b7974a..0f33e6522620 100644
--- a/sys/dev/bktr/bktr_tuner.h
+++ b/sys/dev/bktr/bktr_tuner.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.h,v 1.6 2005/01/23 07:13:09 julian Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/ioctl_bt848.h b/sys/dev/bktr/ioctl_bt848.h
index 3731e7d2b34b..fca5decc3603 100644
--- a/sys/dev/bktr/ioctl_bt848.h
+++ b/sys/dev/bktr/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/ioctl_bt848.h,v 1.30 2003/12/20 17:12:25 obrien Exp $
  */
 
 #ifndef  _DEV_BKTR_IOCTL_BT848_H_
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index 681990aa03c0..2f3320319b33 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -28,7 +28,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/ioctl_meteor.h,v 1.16 2005/01/06 01:42:31 imp Exp $
  */
 /*
  *	ioctl constants for Matrox Meteor Capture card.
diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c
index 940205ac4af8..df96ce1aa24f 100644
--- a/sys/dev/bktr/msp34xx.c
+++ b/sys/dev/bktr/msp34xx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.5 2004/12/16 23:19:57 julian Exp $
  */
 
 /*
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 37441f4a5da4..714d7842f76a 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt.c,v 1.45 2005/05/29 04:42:19 nyan Exp $");
 
  /*
   * Special thanks to Leonard N. Zubkoff for writing such a complete and
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index cef2e53d61ce..44199df43465 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_eisa.c,v 1.21 2005/05/29 04:42:19 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 17638b22374f..18f796cf6b57 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_isa.c,v 1.25 2005/05/29 04:42:19 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/bt_mca.c b/sys/dev/buslogic/bt_mca.c
index aca0f00cf4f0..2d55ba6b0c4e 100644
--- a/sys/dev/buslogic/bt_mca.c
+++ b/sys/dev/buslogic/bt_mca.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.10 2004/09/15 11:58:34 phk Exp $");
 
 /*
  * Written using the bt_isa/bt_pci code as a reference.
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index 51d15cb3ca49..f5d3c196715f 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_pci.c,v 1.20 2005/05/29 04:42:19 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index be6e74f90ebe..8bf5b2366d41 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/buslogic/btreg.h,v 1.16 2005/01/06 01:42:31 imp Exp $
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index be90c8889af4..a4bd51aa825a 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.52 2005/03/18 05:19:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index e44d69c4ca47..cfd525ce8596 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.50 2005/02/20 20:36:16 imp Exp $");
 
 /*
  * CIS Handling for the Cardbus Bus
diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h
index 086e4ea2f64f..a5c2c9d4d7ea 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.h,v 1.13 2005/02/06 21:03:13 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index 76332a0ddfd0..96c6614695d9 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.8 2005/01/13 19:12:10 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 1e067ea2d64b..c5c99f1d761f 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cardbus/cardbusvar.h,v 1.11 2005/02/06 21:03:13 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 676c56d1c612..125d99358817 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.64.2.1 2005/09/16 17:59:48 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
index e05422a5ad36..570cee06ce20 100644
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/cissio.h,v 1.5 2005/05/18 05:31:34 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index 16af7bcb03ff..3ffddfaf5fdf 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/cissreg.h,v 1.15.2.1 2005/09/16 17:59:48 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
index 24f8126a72ec..8753cf96ff2a 100644
--- a/sys/dev/ciss/cissvar.h
+++ b/sys/dev/ciss/cissvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/cissvar.h,v 1.10 2005/04/19 06:11:16 ps Exp $
  */
 
 /*
diff --git a/sys/dev/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c
index 1baa6870991c..372bbb6972bd 100644
--- a/sys/dev/cm/if_cm_isa.c
+++ b/sys/dev/cm/if_cm_isa.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.6.2.1 2005/08/25 05:01:06 rwatson Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index e61829220b36..d62211c5091c 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.15.2.1 2005/08/25 05:01:06 rwatson Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6reg.h b/sys/dev/cm/smc90cx6reg.h
index 35e7afd998b2..f9dde5373c55 100644
--- a/sys/dev/cm/smc90cx6reg.h
+++ b/sys/dev/cm/smc90cx6reg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: smc90cx6reg.h,v 1.7 1999/02/16 23:34:13 is Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/cm/smc90cx6reg.h,v 1.1 2002/01/08 20:03:12 fjoe Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6var.h b/sys/dev/cm/smc90cx6var.h
index 7130a880001f..e113447d67fb 100644
--- a/sys/dev/cm/smc90cx6var.h
+++ b/sys/dev/cm/smc90cx6var.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: smc90cx6var.h,v 1.5 2000/03/23 07:01:32 thorpej Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/cm/smc90cx6var.h,v 1.4 2005/06/10 16:49:05 brooks Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index 5db732df41e9..a2d27f1d9ce1 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.18.2.3 2005/10/09 04:15:11 delphij Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/cnw/if_cnwioctl.h b/sys/dev/cnw/if_cnwioctl.h
index cc1b54890a99..f50dd6b5c1b7 100644
--- a/sys/dev/cnw/if_cnwioctl.h
+++ b/sys/dev/cnw/if_cnwioctl.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_cnwioctl.h,v 1.2 1999/11/29 12:54:00 itojun Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cnw/if_cnwioctl.h,v 1.2 2005/01/06 01:42:32 imp Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 Berkeley Software Design, Inc.
diff --git a/sys/dev/cnw/if_cnwreg.h b/sys/dev/cnw/if_cnwreg.h
index 8b62d203d22c..297f82d18658 100644
--- a/sys/dev/cnw/if_cnwreg.h
+++ b/sys/dev/cnw/if_cnwreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_cnwreg.h,v 1.3 2000/07/05 18:42:19 itojun Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cnw/if_cnwreg.h,v 1.1 2001/03/16 07:25:42 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cp/cpddk.c b/sys/dev/cp/cpddk.c
index 7c82f9b85208..94f77ffb2163 100644
--- a/sys/dev/cp/cpddk.c
+++ b/sys/dev/cp/cpddk.c
@@ -18,7 +18,7 @@
  * $Cronyx: cpddk.c,v 1.13.4.37 2004/12/11 16:14:39 rik Exp $
  */									
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cp/cpddk.c,v 1.5 2005/01/06 01:42:32 imp Exp $");
 
 #include <dev/cx/machdep.h>
 
diff --git a/sys/dev/cp/cpddk.h b/sys/dev/cp/cpddk.h
index 3ff40bbd68d1..6871cbd7ecb6 100644
--- a/sys/dev/cp/cpddk.h
+++ b/sys/dev/cp/cpddk.h
@@ -16,7 +16,7 @@
  * works or modified versions.
  *
  * $Cronyx: cpddk.h,v 1.8.4.20 2004/12/06 16:21:06 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cp/cpddk.h,v 1.4 2005/01/06 01:42:32 imp Exp $
  */
 #define NBRD		6	/* the maximum number of installed boards */
 #define NCHAN		4	/* the number of channels on the board */
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index 6a0355e31700..58ebd1fd343f 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.24.2.1 2005/08/25 05:01:06 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/sys/dev/cp/ng_cp.h b/sys/dev/cp/ng_cp.h
index f35d81760499..448ba56b165a 100644
--- a/sys/dev/cp/ng_cp.h
+++ b/sys/dev/cp/ng_cp.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * $Cronyx: ng_cp.h,v 1.1.2.4 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cp/ng_cp.h,v 1.2 2005/01/06 01:42:32 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c
index f28d477a4408..aca804287ac5 100644
--- a/sys/dev/cpufreq/ichss.c
+++ b/sys/dev/cpufreq/ichss.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cpufreq/ichss.c,v 1.9 2005/03/20 01:25:21 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index afa3fb7af6ca..17938c8f74bd 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.41.2.1 2005/08/25 05:01:06 rwatson Exp $");
 
 /*
  *
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 8064f4b3a7a4..f08d9ebee368 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.6 2005/01/06 01:42:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c
index 6935bf49dc04..a295f1a58166 100644
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.17 2005/06/24 14:36:51 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cs/if_csreg.h b/sys/dev/cs/if_csreg.h
index dc844c8cc810..bb9358075d0e 100644
--- a/sys/dev/cs/if_csreg.h
+++ b/sys/dev/cs/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cs/if_csreg.h,v 1.6 2005/01/06 01:42:32 imp Exp $
  */
 
 #define CS_89x0_IO_PORTS	0x0020
diff --git a/sys/dev/cs/if_csvar.h b/sys/dev/cs/if_csvar.h
index 03c4d5def032..dbaa930c5627 100644
--- a/sys/dev/cs/if_csvar.h
+++ b/sys/dev/cs/if_csvar.h
@@ -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/sys/dev/cs/if_csvar.h,v 1.7 2005/06/10 16:49:06 brooks Exp $
  */
 
 #ifndef _IF_CSVAR_H
diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c
index 0e48f77ad286..d42f9da49a5e 100644
--- a/sys/dev/ct/bshw_machdep.c
+++ b/sys/dev/ct/bshw_machdep.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.7 2005/01/06 01:42:33 imp Exp $");
 /*	$NetBSD$	*/
 
 /*-
diff --git a/sys/dev/ct/bshwvar.h b/sys/dev/ct/bshwvar.h
index ba42a7206979..7ba92d1bf733 100644
--- a/sys/dev/ct/bshwvar.h
+++ b/sys/dev/ct/bshwvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/bshwvar.h,v 1.4 2005/01/06 01:42:33 imp Exp $ */
 /*	$NecBSD: bshwvar.h,v 1.3.14.3 2001/06/21 04:07:37 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ct/ct.c b/sys/dev/ct/ct.c
index 602e094509ca..39cec92a2232 100644
--- a/sys/dev/ct/ct.c
+++ b/sys/dev/ct/ct.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.10 2005/01/06 01:42:33 imp Exp $");
 /*	$NetBSD$	*/
 
 #define	CT_DEBUG
diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c
index 7d6dad6452bb..db35991edfcb 100644
--- a/sys/dev/ct/ct_isa.c
+++ b/sys/dev/ct/ct_isa.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.13 2005/05/10 12:02:14 nyan Exp $");
 /*	$NetBSD$	*/
 
 /*-
diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h
index 2e069f5d33a1..d2e985514a5c 100644
--- a/sys/dev/ct/ct_machdep.h
+++ b/sys/dev/ct/ct_machdep.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.6 2005/01/06 01:42:33 imp Exp $ */
 /*	$NecBSD: ct_machdep.h,v 1.4.12.2 2001/06/20 06:13:34 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ct/ctvar.h b/sys/dev/ct/ctvar.h
index 8c63445e0200..22d2be956190 100644
--- a/sys/dev/ct/ctvar.h
+++ b/sys/dev/ct/ctvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/ctvar.h,v 1.4 2005/01/06 01:42:33 imp Exp $ */
 /*	$NecBSD: ctvar.h,v 1.4.14.3 2001/06/20 06:13:34 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ctau/am8530.h b/sys/dev/ctau/am8530.h
index 09831c624ed7..a85e2637f0d3 100644
--- a/sys/dev/ctau/am8530.h
+++ b/sys/dev/ctau/am8530.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: am8530.h,v 1.1.2.2 2003/11/12 17:31:21 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/am8530.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctau.c b/sys/dev/ctau/ctau.c
index 9b4f40475af3..0deffbd11165 100644
--- a/sys/dev/ctau/ctau.c
+++ b/sys/dev/ctau/ctau.c
@@ -17,7 +17,7 @@
  * Cronyx Id: ctau.c,v 1.1.2.4 2003/12/11 17:33:43 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/ctau.c,v 1.3 2005/01/06 01:42:33 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>
diff --git a/sys/dev/ctau/ctau2fw.h b/sys/dev/ctau/ctau2fw.h
index 6d43f9725858..fcd1e819593d 100644
--- a/sys/dev/ctau/ctau2fw.h
+++ b/sys/dev/ctau/ctau2fw.h
@@ -4,7 +4,7 @@
  * from the file `ctau2.dat'
  *
  * Cronyx Id: ctau2fw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctau2fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctau2_fw_len = 98448;
 
diff --git a/sys/dev/ctau/ctaue1fw.h b/sys/dev/ctau/ctaue1fw.h
index cb3311cd1d66..7058e2b91013 100644
--- a/sys/dev/ctau/ctaue1fw.h
+++ b/sys/dev/ctau/ctaue1fw.h
@@ -4,7 +4,7 @@
  * from the file `ctaue1.dat'
  *
  * Cronyx Id: ctaue1fw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaue1fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctaue1_fw_len = 323982;
 
diff --git a/sys/dev/ctau/ctaufw.h b/sys/dev/ctau/ctaufw.h
index 354f2bac974d..3212a4c3f683 100644
--- a/sys/dev/ctau/ctaufw.h
+++ b/sys/dev/ctau/ctaufw.h
@@ -4,7 +4,7 @@
  * from the file `ctau.dat'
  *
  * Cronyx Id: ctaufw.h,v 1.1 2002/06/03 10:19:40 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaufw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctau_fw_len = 131234;
 
diff --git a/sys/dev/ctau/ctaug7fw.h b/sys/dev/ctau/ctaug7fw.h
index 523008932a0f..8c487da76a72 100644
--- a/sys/dev/ctau/ctaug7fw.h
+++ b/sys/dev/ctau/ctaug7fw.h
@@ -4,7 +4,7 @@
  * from the file `ctaug703.dat'
  *
  * Cronyx Id: ctaug7fw.h,v 1.1 2002/06/03 10:19:40 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaug7fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctaug703_fw_len = 323982;
 
diff --git a/sys/dev/ctau/ctaureg.h b/sys/dev/ctau/ctaureg.h
index 3cd2ce21cedd..8d9e003faa5f 100644
--- a/sys/dev/ctau/ctaureg.h
+++ b/sys/dev/ctau/ctaureg.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ctaureg.h,v 1.1.2.1 2003/11/12 17:16:10 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaureg.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctddk.c b/sys/dev/ctau/ctddk.c
index 0a9dbd2fd46b..756b036ef36e 100644
--- a/sys/dev/ctau/ctddk.c
+++ b/sys/dev/ctau/ctddk.c
@@ -21,7 +21,7 @@
  * Cronyx Id: ctddk.c,v 1.1.2.3 2003/11/14 16:55:36 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/ctddk.c,v 1.2 2005/01/06 01:42:33 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>
diff --git a/sys/dev/ctau/ctddk.h b/sys/dev/ctau/ctddk.h
index 99620902fc96..e25510b7d0eb 100644
--- a/sys/dev/ctau/ctddk.h
+++ b/sys/dev/ctau/ctddk.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ctddk.h,v 1.1.2.3 2003/12/11 17:33:44 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctddk.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 #define NBRD		3	/* the maximum number of installed boards */
 #define NPORT		32	/* the number of i/o ports per board */
diff --git a/sys/dev/ctau/ds2153.h b/sys/dev/ctau/ds2153.h
index 44ab02d41fe9..92076fbe3bd1 100644
--- a/sys/dev/ctau/ds2153.h
+++ b/sys/dev/ctau/ds2153.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ds2153.h,v 1.2.4.1 2003/11/12 17:22:33 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ds2153.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/hdc64570.h b/sys/dev/ctau/hdc64570.h
index 29d28cddb04c..580fa8b45a1e 100644
--- a/sys/dev/ctau/hdc64570.h
+++ b/sys/dev/ctau/hdc64570.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: hdc64570.h,v 1.1.2.2 2003/11/12 17:31:21 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/hdc64570.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index 00751e2e9158..23beeb1f9266 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.25.2.1 2005/08/25 05:01:06 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/dev/ctau/lxt318.h b/sys/dev/ctau/lxt318.h
index a1064afca67c..a0a6506e0f05 100644
--- a/sys/dev/ctau/lxt318.h
+++ b/sys/dev/ctau/lxt318.h
@@ -17,7 +17,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: lxt318.h,v 1.2.4.4 2003/11/14 19:08:45 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/lxt318.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 #define LX_WRITE	0x00
diff --git a/sys/dev/ctau/ng_ct.h b/sys/dev/ctau/ng_ct.h
index bd4d208e1204..6447510e7636 100644
--- a/sys/dev/ctau/ng_ct.h
+++ b/sys/dev/ctau/ng_ct.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  * 
  * Cronyx Id: ng_ct.h,v 1.1.2.3 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ng_ct.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cx/cronyxfw.h b/sys/dev/cx/cronyxfw.h
index 56b2033b09ab..83a6f6bb0bb4 100644
--- a/sys/dev/cx/cronyxfw.h
+++ b/sys/dev/cx/cronyxfw.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cronyxfw.h,v 1.1.2.1 2003/11/12 17:09:49 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cronyxfw.h,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 #define CRONYX_DAT_MAGIC 2001107011L	/* firmware file magic */
 
diff --git a/sys/dev/cx/csigma.c b/sys/dev/cx/csigma.c
index e880b88cbef0..a0edab4faa92 100644
--- a/sys/dev/cx/csigma.c
+++ b/sys/dev/cx/csigma.c
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: csigma.c,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/csigma.c,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>
diff --git a/sys/dev/cx/csigmafw.h b/sys/dev/cx/csigmafw.h
index a5e4e05d7542..b43af9605fed 100644
--- a/sys/dev/cx/csigmafw.h
+++ b/sys/dev/cx/csigmafw.h
@@ -4,7 +4,7 @@
  * from the file `csigma.dat'
  *
  * Cronyx Id: csigmafw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/csigmafw.h,v 1.1 2003/12/03 07:29:38 imp Exp $
  */
 long csigma_fw_len = 131234;
 
diff --git a/sys/dev/cx/cxddk.c b/sys/dev/cx/cxddk.c
index bbcc904051e8..1193c2ecd004 100644
--- a/sys/dev/cx/cxddk.c
+++ b/sys/dev/cx/cxddk.c
@@ -17,7 +17,7 @@
  * Cronyx Id: cxddk.c,v 1.1.2.2 2003/11/27 14:24:50 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cx/cxddk.c,v 1.2 2005/01/06 01:42:34 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>
diff --git a/sys/dev/cx/cxddk.h b/sys/dev/cx/cxddk.h
index bd95aa6e254c..55a89d9e791f 100644
--- a/sys/dev/cx/cxddk.h
+++ b/sys/dev/cx/cxddk.h
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cxddk.h,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cxddk.h,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 
 #ifndef port_t
diff --git a/sys/dev/cx/cxreg.h b/sys/dev/cx/cxreg.h
index 70a937d11280..aa1f750d5b0e 100644
--- a/sys/dev/cx/cxreg.h
+++ b/sys/dev/cx/cxreg.h
@@ -13,7 +13,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cxreg.h,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cxreg.h,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 #define REVCL_MIN   7		/* CD2400 min. revision number G */
 #define REVCL_MAX   13		/* CD2400 max. revision number M */
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 2d75f97a9d5c..fde696a0b058 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.45.2.1 2005/08/25 05:01:07 rwatson Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/cx/machdep.h b/sys/dev/cx/machdep.h
index a425af5b717d..ea071aa7025e 100644
--- a/sys/dev/cx/machdep.h
+++ b/sys/dev/cx/machdep.h
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/machdep.h,v 1.5 2005/03/02 21:33:23 joerg Exp $
  */
 
 /*
diff --git a/sys/dev/cx/ng_cx.h b/sys/dev/cx/ng_cx.h
index 30b3c14daa4e..33d77105bd05 100644
--- a/sys/dev/cx/ng_cx.h
+++ b/sys/dev/cx/ng_cx.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * Cronyx Id: ng_cx.h,v 1.1.2.3 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/ng_cx.h,v 1.3 2005/01/06 01:42:34 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index d6fe330938ec..7ac0bffa76c2 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.160 2004/10/05 07:42:19 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 8d6df24127a0..128daf3c371f 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy_isa.c,v 1.146 2004/05/30 20:08:29 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 2d072359e07b..594de9424c5f 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy_pci.c,v 1.37 2005/03/05 18:30:10 imp Exp $");
 
 #include "opt_cy_pci_fastintr.h"
 
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index 88a36eb4a65e..6d643ff9c9bd 100644
--- a/sys/dev/cy/cyreg.h
+++ b/sys/dev/cy/cyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cy/cyreg.h,v 1.9 1999/08/28 00:44:40 peter Exp $
  */
 
 /*
diff --git a/sys/dev/cy/cyvar.h b/sys/dev/cy/cyvar.h
index 15ee98ca3f89..17ed741db230 100644
--- a/sys/dev/cy/cyvar.h
+++ b/sys/dev/cy/cyvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cy/cyvar.h,v 1.1 2004/05/01 17:44:03 bde Exp $
  */
 
 typedef u_char volatile *cy_addr;
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index 0bfbbe2fce8a..c68eb2f7d7ae 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.20 2005/01/06 01:42:34 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index daf9cb4e3b0e..7c73c4d8f08e 100644
--- a/sys/dev/dcons/dcons.h
+++ b/sys/dev/dcons/dcons.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.h,v 1.15 2003/10/23 15:05:31 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons.h,v 1.5 2005/01/06 01:42:34 imp Exp $
  */
 
 #if defined(_KERNEL) || defined(_BOOT)
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index bfa91464a834..e442f398df89 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons_crom.c,v 1.6 2005/01/06 01:42:34 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c
index 8ca20aa272f3..69b39e827784 100644
--- a/sys/dev/dcons/dcons_os.c
+++ b/sys/dev/dcons/dcons_os.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.6 2005/01/06 01:42:34 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons_os.h b/sys/dev/dcons/dcons_os.h
index b1d1c627589c..3eae3cc4db67 100644
--- a/sys/dev/dcons/dcons_os.h
+++ b/sys/dev/dcons/dcons_os.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons_os.h,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 
 struct dcons_global {
diff --git a/sys/dev/dec/mc146818reg.h b/sys/dev/dec/mc146818reg.h
index 4a3df1c117b0..6de955739b8b 100644
--- a/sys/dev/dec/mc146818reg.h
+++ b/sys/dev/dec/mc146818reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/dec/mc146818reg.h,v 1.4 2005/01/06 01:42:34 imp Exp $ */
 /*	$NetBSD: mc146818reg.h,v 1.2 1997/03/12 06:53:42 cgd Exp $	*/
 
 /*-
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index da8664e007af..da76b0f8c964 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,7 +1,7 @@
 /* $NetBSD: mcclock.c,v 1.11 1998/04/19 07:50:25 jonathan Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dec/mcclock.c,v 1.9 2005/01/06 01:42:34 imp Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/dev/dec/mcclock_if.m b/sys/dev/dec/mcclock_if.m
index 89bc6c481194..b28d68edbcf7 100644
--- a/sys/dev/dec/mcclock_if.m
+++ b/sys/dev/dec/mcclock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/dec/mcclock_if.m,v 1.5 2005/01/06 01:42:34 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/dec/mcclockvar.h b/sys/dev/dec/mcclockvar.h
index b0df9d2eff2c..a5771a02ef01 100644
--- a/sys/dev/dec/mcclockvar.h
+++ b/sys/dev/dec/mcclockvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/dec/mcclockvar.h,v 1.5 2005/01/06 01:42:34 imp Exp $ */
 /* $NetBSD: mcclockvar.h,v 1.4 1997/06/22 08:02:19 jonathan Exp $ */
 
 /*-
diff --git a/sys/dev/digi/CX.bios.h b/sys/dev/digi/CX.bios.h
index 9688921c8c77..0d18291affa8 100644
--- a/sys/dev/digi/CX.bios.h
+++ b/sys/dev/digi/CX.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_bios[] = {
diff --git a/sys/dev/digi/CX.c b/sys/dev/digi/CX.c
index 3a9aa31297ce..0f231d43a45d 100644
--- a/sys/dev/digi/CX.c
+++ b/sys/dev/digi/CX.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/CX.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/CX.fepos.h b/sys/dev/digi/CX.fepos.h
index 9b32459f256b..a861226b43e3 100644
--- a/sys/dev/digi/CX.fepos.h
+++ b/sys/dev/digi/CX.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX.fepos.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_fepos[] = {
diff --git a/sys/dev/digi/CX_PCI.bios.h b/sys/dev/digi/CX_PCI.bios.h
index c4feb28566ff..338c0826fea1 100644
--- a/sys/dev/digi/CX_PCI.bios.h
+++ b/sys/dev/digi/CX_PCI.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX_PCI.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_PCI_bios[] = {
diff --git a/sys/dev/digi/CX_PCI.c b/sys/dev/digi/CX_PCI.c
index 2a941f7ef5a5..3c74188fcaf8 100644
--- a/sys/dev/digi/CX_PCI.c
+++ b/sys/dev/digi/CX_PCI.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/CX_PCI.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/CX_PCI.fepos.h b/sys/dev/digi/CX_PCI.fepos.h
index 66ff9d34ef0b..ef6115954321 100644
--- a/sys/dev/digi/CX_PCI.fepos.h
+++ b/sys/dev/digi/CX_PCI.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX_PCI.fepos.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_PCI_fepos[] = {
diff --git a/sys/dev/digi/EPCX.bios.h b/sys/dev/digi/EPCX.bios.h
index c0a1a7e523a8..8e5a8dca5cd7 100644
--- a/sys/dev/digi/EPCX.bios.h
+++ b/sys/dev/digi/EPCX.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char EPCX_bios[] = {
diff --git a/sys/dev/digi/EPCX.c b/sys/dev/digi/EPCX.c
index a920eb66a2e7..ad3cea30aa35 100644
--- a/sys/dev/digi/EPCX.c
+++ b/sys/dev/digi/EPCX.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/EPCX.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/EPCX.fepos.h b/sys/dev/digi/EPCX.fepos.h
index ba4de30446ec..b026888ce40e 100644
--- a/sys/dev/digi/EPCX.fepos.h
+++ b/sys/dev/digi/EPCX.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX.fepos.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char EPCX_fepos[] = {
diff --git a/sys/dev/digi/EPCX_PCI.bios.h b/sys/dev/digi/EPCX_PCI.bios.h
index e471a3615d27..a8c18f2f0df5 100644
--- a/sys/dev/digi/EPCX_PCI.bios.h
+++ b/sys/dev/digi/EPCX_PCI.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX_PCI.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char EPCX_PCI_bios[] = {
diff --git a/sys/dev/digi/EPCX_PCI.c b/sys/dev/digi/EPCX_PCI.c
index a9ef049ea6be..36d23785040f 100644
--- a/sys/dev/digi/EPCX_PCI.c
+++ b/sys/dev/digi/EPCX_PCI.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/EPCX_PCI.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/EPCX_PCI.fepos.h b/sys/dev/digi/EPCX_PCI.fepos.h
index 84b4630fc6b4..cdcafd53b7fc 100644
--- a/sys/dev/digi/EPCX_PCI.fepos.h
+++ b/sys/dev/digi/EPCX_PCI.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX_PCI.fepos.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char EPCX_PCI_fepos[] = {
diff --git a/sys/dev/digi/Xe.bios.h b/sys/dev/digi/Xe.bios.h
index 53b0ff2eb479..7077dbe192fb 100644
--- a/sys/dev/digi/Xe.bios.h
+++ b/sys/dev/digi/Xe.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xe.bios.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xe_bios[] = {
diff --git a/sys/dev/digi/Xe.c b/sys/dev/digi/Xe.c
index b1bb5e53f07a..3b79aec2983f 100644
--- a/sys/dev/digi/Xe.c
+++ b/sys/dev/digi/Xe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xe.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xe.fepos.h b/sys/dev/digi/Xe.fepos.h
index fef506e71441..9965dad82c1e 100644
--- a/sys/dev/digi/Xe.fepos.h
+++ b/sys/dev/digi/Xe.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xe.fepos.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xe_fepos[] = {
diff --git a/sys/dev/digi/Xem.bios.h b/sys/dev/digi/Xem.bios.h
index b417571249b9..05a1fc27564a 100644
--- a/sys/dev/digi/Xem.bios.h
+++ b/sys/dev/digi/Xem.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xem.bios.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xem_bios[] = {
diff --git a/sys/dev/digi/Xem.c b/sys/dev/digi/Xem.c
index fb903b624546..8f3fb4a561ea 100644
--- a/sys/dev/digi/Xem.c
+++ b/sys/dev/digi/Xem.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xem.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xem.fepos.h b/sys/dev/digi/Xem.fepos.h
index 87df0505e710..9077ff529654 100644
--- a/sys/dev/digi/Xem.fepos.h
+++ b/sys/dev/digi/Xem.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xem.fepos.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xem_fepos[] = {
diff --git a/sys/dev/digi/Xr.bios.h b/sys/dev/digi/Xr.bios.h
index a0805ae9eb3b..8f616160b6e8 100644
--- a/sys/dev/digi/Xr.bios.h
+++ b/sys/dev/digi/Xr.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xr.bios.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 static const u_char Xr_bios[] = {
diff --git a/sys/dev/digi/Xr.c b/sys/dev/digi/Xr.c
index 4d68c87d211b..9d4cc59f5c61 100644
--- a/sys/dev/digi/Xr.c
+++ b/sys/dev/digi/Xr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xr.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xr.fepos.h b/sys/dev/digi/Xr.fepos.h
index 66fbd10e1d2f..e91f93e75436 100644
--- a/sys/dev/digi/Xr.fepos.h
+++ b/sys/dev/digi/Xr.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xr.fepos.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 static const u_char Xr_fepos[] = {
diff --git a/sys/dev/digi/con.CX-IBM.h b/sys/dev/digi/con.CX-IBM.h
index b0c9db315986..b7871fe29ee6 100644
--- a/sys/dev/digi/con.CX-IBM.h
+++ b/sys/dev/digi/con.CX-IBM.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.CX-IBM.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_CX_IBM[] = {
diff --git a/sys/dev/digi/con.CX.h b/sys/dev/digi/con.CX.h
index 8bfb77a81a03..c6b6f40e770f 100644
--- a/sys/dev/digi/con.CX.h
+++ b/sys/dev/digi/con.CX.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.CX.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_CX[] = {
diff --git a/sys/dev/digi/con.EPCX.h b/sys/dev/digi/con.EPCX.h
index 329c2f1f63f7..b005ac62d419 100644
--- a/sys/dev/digi/con.EPCX.h
+++ b/sys/dev/digi/con.EPCX.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.EPCX.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_EPCX[] = {
diff --git a/sys/dev/digi/con.MBank.h b/sys/dev/digi/con.MBank.h
index 89f2d0ae2901..97647d27d4d7 100644
--- a/sys/dev/digi/con.MBank.h
+++ b/sys/dev/digi/con.MBank.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.MBank.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 const u_char con_MBank[] = {
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 7f68c02f1758..867c9daa47bb 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi.c,v 1.58 2005/02/25 20:50:20 sam Exp $
  */
 
 /*-
diff --git a/sys/dev/digi/digi.h b/sys/dev/digi/digi.h
index 7be171bde763..8e5d288eafed 100644
--- a/sys/dev/digi/digi.h
+++ b/sys/dev/digi/digi.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi.h,v 1.19 2004/10/14 18:37:59 phk Exp $
  */
 
 #define	W(p)				(*(u_int16_t *)(p))
diff --git a/sys/dev/digi/digi_isa.c b/sys/dev/digi/digi_isa.c
index f1f4a5f9ab45..c977563fa614 100644
--- a/sys/dev/digi/digi_isa.c
+++ b/sys/dev/digi/digi_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.13 2004/05/30 20:08:30 phk Exp $");
 
 /*-
  * TODO:
diff --git a/sys/dev/digi/digi_mod.h b/sys/dev/digi/digi_mod.h
index f1e8ced70374..50e00b1d7abf 100644
--- a/sys/dev/digi/digi_mod.h
+++ b/sys/dev/digi/digi_mod.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi_mod.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 #define	DIGI_MOD_VERSION	1
diff --git a/sys/dev/digi/digi_pci.c b/sys/dev/digi/digi_pci.c
index 342858e5774e..b230af569467 100644
--- a/sys/dev/digi/digi_pci.c
+++ b/sys/dev/digi/digi_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/digi_pci.c,v 1.12 2005/03/05 18:30:10 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/digi/digi_pci.h b/sys/dev/digi/digi_pci.h
index 2273d0048ded..22163341655b 100644
--- a/sys/dev/digi/digi_pci.h
+++ b/sys/dev/digi/digi_pci.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi_pci.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 #define	PCI_VENDOR_DIGI		0x114F
diff --git a/sys/dev/digi/digireg.h b/sys/dev/digi/digireg.h
index 4a1641f92d7e..ab7bb05c26c7 100644
--- a/sys/dev/digi/digireg.h
+++ b/sys/dev/digi/digireg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digireg.h,v 1.3 2003/08/07 15:04:24 jhb Exp $
  */
 
 struct global_data {
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 39171950f414..872eb1d760be 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -40,7 +40,7 @@
  */
 
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt.h,v 1.16 2005/01/06 01:42:35 imp Exp $"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index 1a6ef9a7bb6d..0e331e22e16a 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.20 2005/05/29 04:42:19 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_isa.c b/sys/dev/dpt/dpt_isa.c
index c9264af3708c..64feffe5ccb6 100644
--- a/sys/dev/dpt/dpt_isa.c
+++ b/sys/dev/dpt/dpt_isa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_isa.c,v 1.9 2005/05/29 04:42:19 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index c91ab25b1ef9..967e85a7d867 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.34 2005/05/29 04:42:19 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 129c95b94824..3e32218eb62c 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -27,9 +27,9 @@
  * SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.50 2005/05/29 04:42:19 nyan Exp $"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.50 2005/05/29 04:42:19 nyan Exp $");
 
 /*
  * dpt_scsi.c: SCSI dependant code for the DPT driver
diff --git a/sys/dev/drm/ati_pcigart.c b/sys/dev/drm/ati_pcigart.c
index 1442247e9852..240b2eb669f5 100644
--- a/sys/dev/drm/ati_pcigart.c
+++ b/sys/dev/drm/ati_pcigart.c
@@ -27,7 +27,7 @@
  * Authors:
  *   Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/ati_pcigart.c,v 1.1.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h
index 00a79bfe941e..a77bdc62b005 100644
--- a/sys/dev/drm/drm.h
+++ b/sys/dev/drm/drm.h
@@ -32,7 +32,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm.h,v 1.9 2005/04/16 03:44:43 anholt Exp $
  */
 
 /**
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index d17cabf98b4a..ba03dc304c68 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.13.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #ifndef _DRM_P_H_
diff --git a/sys/dev/drm/drm_agpsupport.c b/sys/dev/drm/drm_agpsupport.c
index 8507be5cebad..eda76d03c1af 100644
--- a/sys/dev/drm/drm_agpsupport.c
+++ b/sys/dev/drm/drm_agpsupport.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.1.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_atomic.h b/sys/dev/drm/drm_atomic.h
index 8cdabc7ffe69..78e60e7b21d4 100644
--- a/sys/dev/drm/drm_atomic.h
+++ b/sys/dev/drm/drm_atomic.h
@@ -28,7 +28,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_atomic.h,v 1.1 2005/04/16 03:44:43 anholt Exp $
  */
 
 /* Many of these implementations are rather fake, but good enough. */
diff --git a/sys/dev/drm/drm_auth.c b/sys/dev/drm/drm_auth.c
index 910c0b03d961..1ed8a42c2013 100644
--- a/sys/dev/drm/drm_auth.c
+++ b/sys/dev/drm/drm_auth.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_auth.c,v 1.1 2005/04/16 03:44:43 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_bufs.c b/sys/dev/drm/drm_bufs.c
index 1601b36996de..ea4f230a60ca 100644
--- a/sys/dev/drm/drm_bufs.c
+++ b/sys/dev/drm/drm_bufs.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_bufs.c,v 1.2 2005/04/24 19:03:32 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_context.c b/sys/dev/drm/drm_context.c
index 7c02d92b710a..6f2216388ce2 100644
--- a/sys/dev/drm/drm_context.c
+++ b/sys/dev/drm/drm_context.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_context.c,v 1.1 2005/04/16 03:44:43 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_dma.c b/sys/dev/drm/drm_dma.c
index 21073b676df8..3414b6c71a37 100644
--- a/sys/dev/drm/drm_dma.c
+++ b/sys/dev/drm/drm_dma.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_dma.c,v 1.1 2005/04/16 03:44:43 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_drawable.c b/sys/dev/drm/drm_drawable.c
index 43d71e8791f6..3b8371520438 100644
--- a/sys/dev/drm/drm_drawable.c
+++ b/sys/dev/drm/drm_drawable.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_drawable.c,v 1.1 2005/04/16 03:44:43 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c
index 4f5831c607bc..d9328d7d5d61 100644
--- a/sys/dev/drm/drm_drv.c
+++ b/sys/dev/drm/drm_drv.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.1 2005/04/16 03:44:43 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_fops.c b/sys/dev/drm/drm_fops.c
index 9f051159faff..5839aa65ff3b 100644
--- a/sys/dev/drm/drm_fops.c
+++ b/sys/dev/drm/drm_fops.c
@@ -30,7 +30,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_fops.c,v 1.1 2005/04/16 03:44:43 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_ioctl.c b/sys/dev/drm/drm_ioctl.c
index 6a5646518bb1..f5ec2d771de2 100644
--- a/sys/dev/drm/drm_ioctl.c
+++ b/sys/dev/drm/drm_ioctl.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_ioctl.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_irq.c b/sys/dev/drm/drm_irq.c
index c7a9981431f1..34dfdb9c4204 100644
--- a/sys/dev/drm/drm_irq.c
+++ b/sys/dev/drm/drm_irq.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_irq.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_linux_list.h b/sys/dev/drm/drm_linux_list.h
index f3d07447d292..130e8b5d7a65 100644
--- a/sys/dev/drm/drm_linux_list.h
+++ b/sys/dev/drm/drm_linux_list.h
@@ -27,7 +27,7 @@
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_linux_list.h,v 1.3 2005/04/16 03:44:44 anholt Exp $
  */
 
 struct list_head {
diff --git a/sys/dev/drm/drm_lock.c b/sys/dev/drm/drm_lock.c
index 6bfec3f88a36..1c5d4998636b 100644
--- a/sys/dev/drm/drm_lock.c
+++ b/sys/dev/drm/drm_lock.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_lock.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_memory.c b/sys/dev/drm/drm_memory.c
index 7d0ab5ae54d7..7ff42833605a 100644
--- a/sys/dev/drm/drm_memory.c
+++ b/sys/dev/drm/drm_memory.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_memory.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_pci.c b/sys/dev/drm/drm_pci.c
index 0569e9315328..ce70b57fa761 100644
--- a/sys/dev/drm/drm_pci.c
+++ b/sys/dev/drm/drm_pci.c
@@ -27,7 +27,7 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_pci.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_pciids.h b/sys/dev/drm/drm_pciids.h
index 8a5e8f7f9210..2bdf730d63c6 100644
--- a/sys/dev/drm/drm_pciids.h
+++ b/sys/dev/drm/drm_pciids.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_pciids.h,v 1.2.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 /*
diff --git a/sys/dev/drm/drm_sarea.h b/sys/dev/drm/drm_sarea.h
index 5215d2e33af1..8326b8b933d5 100644
--- a/sys/dev/drm/drm_sarea.h
+++ b/sys/dev/drm/drm_sarea.h
@@ -28,7 +28,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_sarea.h,v 1.5 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef _DRM_SAREA_H_
diff --git a/sys/dev/drm/drm_scatter.c b/sys/dev/drm/drm_scatter.c
index fe8bb4b25b81..533320c5dc8e 100644
--- a/sys/dev/drm/drm_scatter.c
+++ b/sys/dev/drm/drm_scatter.c
@@ -27,7 +27,7 @@
  *   Gareth Hughes <gareth@valinux.com>
  *   Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_scatter.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_sysctl.c b/sys/dev/drm/drm_sysctl.c
index 5a9e35b556b6..1a7c5f14560b 100644
--- a/sys/dev/drm/drm_sysctl.c
+++ b/sys/dev/drm/drm_sysctl.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_sysctl.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_vm.c b/sys/dev/drm/drm_vm.c
index 81c00c26a7ae..e7c158551871 100644
--- a/sys/dev/drm/drm_vm.c
+++ b/sys/dev/drm/drm_vm.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_vm.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/i915_dma.c b/sys/dev/drm/i915_dma.c
index 035bf204b3dc..d691b4485d45 100644
--- a/sys/dev/drm/i915_dma.c
+++ b/sys/dev/drm/i915_dma.c
@@ -1,6 +1,6 @@
 /* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 /**************************************************************************
  *
diff --git a/sys/dev/drm/i915_drm.h b/sys/dev/drm/i915_drm.h
index 8d54d9c4fadb..9636019f6160 100644
--- a/sys/dev/drm/i915_drm.h
+++ b/sys/dev/drm/i915_drm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/drm/i915_drm.h,v 1.1 2005/04/16 03:44:44 anholt Exp $ */
 
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
diff --git a/sys/dev/drm/i915_drv.c b/sys/dev/drm/i915_drv.c
index 126fff136946..5717a577fdc2 100644
--- a/sys/dev/drm/i915_drv.c
+++ b/sys/dev/drm/i915_drv.c
@@ -27,7 +27,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/i915_drv.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/sys/dev/drm/i915_drv.h b/sys/dev/drm/i915_drv.h
index df4dda38ea04..356794afd89a 100644
--- a/sys/dev/drm/i915_drv.h
+++ b/sys/dev/drm/i915_drv.h
@@ -1,6 +1,6 @@
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/i915_drv.h,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 /**************************************************************************
  *
diff --git a/sys/dev/drm/i915_irq.c b/sys/dev/drm/i915_irq.c
index 64a5913fe74d..bc46fef1c3ee 100644
--- a/sys/dev/drm/i915_irq.c
+++ b/sys/dev/drm/i915_irq.c
@@ -1,6 +1,6 @@
 /* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/i915_irq.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 /**************************************************************************
  *
diff --git a/sys/dev/drm/i915_mem.c b/sys/dev/drm/i915_mem.c
index 2ef6d77e3b10..038c2cb1e715 100644
--- a/sys/dev/drm/i915_mem.c
+++ b/sys/dev/drm/i915_mem.c
@@ -1,6 +1,6 @@
 /* i915_mem.c -- Simple agp/fb memory manager for i915 -*- linux-c -*-
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/i915_mem.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 /**************************************************************************
  *
diff --git a/sys/dev/drm/mach64_dma.c b/sys/dev/drm/mach64_dma.c
index f9951670d3e8..8b4a8d41f5ec 100644
--- a/sys/dev/drm/mach64_dma.c
+++ b/sys/dev/drm/mach64_dma.c
@@ -33,7 +33,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mach64_dma.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mach64_drm.h b/sys/dev/drm/mach64_drm.h
index 43d0f7f3b47b..756da05dd82d 100644
--- a/sys/dev/drm/mach64_drm.h
+++ b/sys/dev/drm/mach64_drm.h
@@ -29,7 +29,7 @@
  *    Frank C. Earl <fearl@airmail.net>
  *    Leif Delgass <ldelgass@retinalburn.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mach64_drm.h,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __MACH64_DRM_H__
diff --git a/sys/dev/drm/mach64_drv.c b/sys/dev/drm/mach64_drv.c
index 9c5b483424a8..bcb9e3aad3aa 100644
--- a/sys/dev/drm/mach64_drv.c
+++ b/sys/dev/drm/mach64_drv.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mach64_drv.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 
diff --git a/sys/dev/drm/mach64_drv.h b/sys/dev/drm/mach64_drv.h
index 9c33af20a530..673d04e0aee3 100644
--- a/sys/dev/drm/mach64_drv.h
+++ b/sys/dev/drm/mach64_drv.h
@@ -30,7 +30,7 @@
  *    Leif Delgass <ldelgass@retinalburn.net>
  *    Jos�Fonseca <j_r_fonseca@yahoo.co.uk>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mach64_drv.h,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __MACH64_DRV_H__
diff --git a/sys/dev/drm/mach64_irq.c b/sys/dev/drm/mach64_irq.c
index 912372978d4b..6cd466f43503 100644
--- a/sys/dev/drm/mach64_irq.c
+++ b/sys/dev/drm/mach64_irq.c
@@ -33,7 +33,7 @@
  *    Eric Anholt <anholt@FreeBSD.org>
  *    Leif Delgass <ldelgass@retinalburn.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mach64_irq.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mach64_state.c b/sys/dev/drm/mach64_state.c
index 81c5481388d3..de95bcdc486b 100644
--- a/sys/dev/drm/mach64_state.c
+++ b/sys/dev/drm/mach64_state.c
@@ -28,7 +28,7 @@
  *    Leif Delgass <ldelgass@retinalburn.net>
  *    Jos�Fonseca <j_r_fonseca@yahoo.co.uk>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mach64_state.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_dma.c b/sys/dev/drm/mga_dma.c
index 9feac053bb1a..1f32e9f8198b 100644
--- a/sys/dev/drm/mga_dma.c
+++ b/sys/dev/drm/mga_dma.c
@@ -32,7 +32,7 @@
  * Rewritten by:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.12 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_drm.h b/sys/dev/drm/mga_drm.h
index 60b51533f79d..558a13ba8385 100644
--- a/sys/dev/drm/mga_drm.h
+++ b/sys/dev/drm/mga_drm.h
@@ -31,7 +31,7 @@
  * Rewritten by:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_drm.h,v 1.6 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __MGA_DRM_H__
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index 05569a91b34b..71efb8a749cf 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.9 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga_drv.h
index 5bca56a0ae51..5153c13f7752 100644
--- a/sys/dev/drm/mga_drv.h
+++ b/sys/dev/drm/mga_drv.h
@@ -27,7 +27,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_drv.h,v 1.9 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __MGA_DRV_H__
diff --git a/sys/dev/drm/mga_irq.c b/sys/dev/drm/mga_irq.c
index 2aaef9cb895f..f3f5c1a13a3d 100644
--- a/sys/dev/drm/mga_irq.c
+++ b/sys/dev/drm/mga_irq.c
@@ -29,7 +29,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_irq.c,v 1.5 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_state.c b/sys/dev/drm/mga_state.c
index 136ff16c0a88..cc3d207cf381 100644
--- a/sys/dev/drm/mga_state.c
+++ b/sys/dev/drm/mga_state.c
@@ -30,9 +30,9 @@
  *
  * Rewritten by:
  *    Gareth Hughes <gareth@valinux.com>
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_state.c,v 1.10 2005/04/16 03:44:44 anholt Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_state.c,v 1.10 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_ucode.h b/sys/dev/drm/mga_ucode.h
index dbf9eba38021..27e6a0f9df3e 100644
--- a/sys/dev/drm/mga_ucode.h
+++ b/sys/dev/drm/mga_ucode.h
@@ -25,7 +25,7 @@
  * Kernel-based WARP engine management:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_ucode.h,v 1.3 2005/04/16 03:44:44 anholt Exp $
  */
 
 /*
diff --git a/sys/dev/drm/mga_warp.c b/sys/dev/drm/mga_warp.c
index b2d5de73aced..75bd3ecb120d 100644
--- a/sys/dev/drm/mga_warp.c
+++ b/sys/dev/drm/mga_warp.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_warp.c,v 1.7 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/r128_cce.c b/sys/dev/drm/r128_cce.c
index a7fa0f799641..673c93ae0b1d 100644
--- a/sys/dev/drm/r128_cce.c
+++ b/sys/dev/drm/r128_cce.c
@@ -27,7 +27,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_cce.c,v 1.12.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/r128_drm.h b/sys/dev/drm/r128_drm.h
index d5778aebe027..2a1dc5ac2c70 100644
--- a/sys/dev/drm/r128_drm.h
+++ b/sys/dev/drm/r128_drm.h
@@ -28,7 +28,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Kevin E. Martin <martin@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drm.h,v 1.7 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __R128_DRM_H__
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index 0a645ec694bf..18df10ec0465 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -29,7 +29,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.9 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128_drv.h
index f3caa0581dce..f7869f94eea8 100644
--- a/sys/dev/drm/r128_drv.h
+++ b/sys/dev/drm/r128_drv.h
@@ -30,7 +30,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Michel D�zer <daenzerm@student.ethz.ch>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drv.h,v 1.10 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __R128_DRV_H__
diff --git a/sys/dev/drm/r128_irq.c b/sys/dev/drm/r128_irq.c
index d40330517680..db3def954fff 100644
--- a/sys/dev/drm/r128_irq.c
+++ b/sys/dev/drm/r128_irq.c
@@ -29,7 +29,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_irq.c,v 1.5 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128_state.c
index 90b50749e184..6317fc9ff58e 100644
--- a/sys/dev/drm/r128_state.c
+++ b/sys/dev/drm/r128_state.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_state.c,v 1.12 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/r300_cmdbuf.c b/sys/dev/drm/r300_cmdbuf.c
index 131d7f8e7e25..edc1c536a389 100644
--- a/sys/dev/drm/r300_cmdbuf.c
+++ b/sys/dev/drm/r300_cmdbuf.c
@@ -30,7 +30,7 @@
  * Authors:
  *    Nicolai Haehnle <prefect_@gmx.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r300_cmdbuf.c,v 1.2.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/r300_reg.h b/sys/dev/drm/r300_reg.h
index 64f2ab9ef073..ea0671ad1d5e 100644
--- a/sys/dev/drm/r300_reg.h
+++ b/sys/dev/drm/r300_reg.h
@@ -24,7 +24,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r300_reg.h,v 1.1.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #ifndef _R300_REG_H
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c
index fb2c77937857..f8a6817c5a13 100644
--- a/sys/dev/drm/radeon_cp.c
+++ b/sys/dev/drm/radeon_cp.c
@@ -27,7 +27,7 @@
  *    Kevin E. Martin <martin@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_cp.c,v 1.15.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/radeon_drm.h b/sys/dev/drm/radeon_drm.h
index 78d302d31a3b..728d4cab2b19 100644
--- a/sys/dev/drm/radeon_drm.h
+++ b/sys/dev/drm/radeon_drm.h
@@ -29,7 +29,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Keith Whitwell <keith@tungstengraphics.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_drm.h,v 1.10.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #ifndef __RADEON_DRM_H__
diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c
index a515780988d8..314874417b7d 100644
--- a/sys/dev/drm/radeon_drv.c
+++ b/sys/dev/drm/radeon_drv.c
@@ -27,7 +27,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.12 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/radeon_drv.h b/sys/dev/drm/radeon_drv.h
index 1032cab0f586..209443b604ba 100644
--- a/sys/dev/drm/radeon_drv.h
+++ b/sys/dev/drm/radeon_drv.h
@@ -27,7 +27,7 @@
  *    Kevin E. Martin <martin@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_drv.h,v 1.12.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #ifndef __RADEON_DRV_H__
diff --git a/sys/dev/drm/radeon_irq.c b/sys/dev/drm/radeon_irq.c
index 56be38a1139b..0485ca8785c3 100644
--- a/sys/dev/drm/radeon_irq.c
+++ b/sys/dev/drm/radeon_irq.c
@@ -29,7 +29,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  *    Michel D�zer <michel@daenzer.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.6 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/radeon_mem.c b/sys/dev/drm/radeon_mem.c
index 89c07afe3551..a567b96d066a 100644
--- a/sys/dev/drm/radeon_mem.c
+++ b/sys/dev/drm/radeon_mem.c
@@ -28,7 +28,7 @@
  * Authors:
  *    Keith Whitwell <keith@tungstengraphics.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_mem.c,v 1.7 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/radeon_state.c b/sys/dev/drm/radeon_state.c
index 7d42df669751..0e7605918a57 100644
--- a/sys/dev/drm/radeon_state.c
+++ b/sys/dev/drm/radeon_state.c
@@ -26,7 +26,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Kevin E. Martin <martin@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.15.2.1 2005/08/04 17:31:02 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/savage_bci.c b/sys/dev/drm/savage_bci.c
index f1a844a4d92c..e89f5e2af0df 100644
--- a/sys/dev/drm/savage_bci.c
+++ b/sys/dev/drm/savage_bci.c
@@ -22,7 +22,7 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/savage_bci.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/sys/dev/drm/savage_drm.h b/sys/dev/drm/savage_drm.h
index b6a9fde1c083..2d04add2d756 100644
--- a/sys/dev/drm/savage_drm.h
+++ b/sys/dev/drm/savage_drm.h
@@ -22,7 +22,7 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/savage_drm.h,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __SAVAGE_DRM_H__
diff --git a/sys/dev/drm/savage_drv.c b/sys/dev/drm/savage_drv.c
index 4d02e8d8e55a..249a6dd0e263 100644
--- a/sys/dev/drm/savage_drv.c
+++ b/sys/dev/drm/savage_drv.c
@@ -25,7 +25,7 @@
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/savage_drv.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/sys/dev/drm/savage_drv.h b/sys/dev/drm/savage_drv.h
index d3d43a91592a..f6c7a4188ce0 100644
--- a/sys/dev/drm/savage_drv.h
+++ b/sys/dev/drm/savage_drv.h
@@ -22,7 +22,7 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/savage_drv.h,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __SAVAGE_DRV_H__
diff --git a/sys/dev/drm/savage_state.c b/sys/dev/drm/savage_state.c
index 5181cbdb0057..8967177429e9 100644
--- a/sys/dev/drm/savage_state.c
+++ b/sys/dev/drm/savage_state.c
@@ -22,7 +22,7 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/savage_state.c,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/sys/dev/drm/sis_drm.h b/sys/dev/drm/sis_drm.h
index 3c6fb02efbd3..8cb4138f68e9 100644
--- a/sys/dev/drm/sis_drm.h
+++ b/sys/dev/drm/sis_drm.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_drm.h,v 1.5 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __SIS_DRM_H__
diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis_drv.c
index 954d34b64dd6..e5c8ccd1968f 100644
--- a/sys/dev/drm/sis_drv.c
+++ b/sys/dev/drm/sis_drv.c
@@ -24,7 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_drv.c,v 1.5 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/sis_drv.h b/sys/dev/drm/sis_drv.h
index 4e06e005c4f5..f1ab06ab2ce4 100644
--- a/sys/dev/drm/sis_drv.h
+++ b/sys/dev/drm/sis_drv.h
@@ -23,7 +23,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_drv.h,v 1.3 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef _SIS_DRV_H_
diff --git a/sys/dev/drm/sis_ds.c b/sys/dev/drm/sis_ds.c
index 3f3a4b67fedc..c61c10f47c68 100644
--- a/sys/dev/drm/sis_ds.c
+++ b/sys/dev/drm/sis_ds.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Sung-Ching Lin <sclin@sis.com.tw>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_ds.c,v 1.3 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/sis_ds.h b/sys/dev/drm/sis_ds.h
index d5b0faa3b95b..d508a3a28e30 100644
--- a/sys/dev/drm/sis_ds.h
+++ b/sys/dev/drm/sis_ds.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Sung-Ching Lin <sclin@sis.com.tw>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_ds.h,v 1.4 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __SIS_DS_H__
diff --git a/sys/dev/drm/sis_mm.c b/sys/dev/drm/sis_mm.c
index 8f4bc7c792b2..6fa5fe618e86 100644
--- a/sys/dev/drm/sis_mm.c
+++ b/sys/dev/drm/sis_mm.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Sung-Ching Lin <sclin@sis.com.tw>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_mm.c,v 1.7 2005/04/16 03:44:44 anholt Exp $
  */
 
 #if defined(__linux__) && defined(CONFIG_FB_SIS)
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c
index e99bb3281a05..4f189eb2dc45 100644
--- a/sys/dev/drm/tdfx_drv.c
+++ b/sys/dev/drm/tdfx_drv.c
@@ -30,7 +30,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.8 2005/04/16 03:44:44 anholt Exp $
  */
 
 #include "dev/drm/tdfx_drv.h"
diff --git a/sys/dev/drm/tdfx_drv.h b/sys/dev/drm/tdfx_drv.h
index 05c1f7f9904c..643d561fabe9 100644
--- a/sys/dev/drm/tdfx_drv.h
+++ b/sys/dev/drm/tdfx_drv.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/tdfx_drv.h,v 1.1 2005/04/16 03:44:44 anholt Exp $
  */
 
 #ifndef __TDFX_H__
diff --git a/sys/dev/ed/ax88x90reg.h b/sys/dev/ed/ax88x90reg.h
index 9d2eeeda32fc..04ab80189dea 100644
--- a/sys/dev/ed/ax88x90reg.h
+++ b/sys/dev/ed/ax88x90reg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/ax88x90reg.h,v 1.1.2.1 2005/10/08 18:00:40 imp Exp $
  */
 
 /* AX88x90 based miibus defines */
diff --git a/sys/dev/ed/dl100xxreg.h b/sys/dev/ed/dl100xxreg.h
index a4659b0a9d2e..d429efe2154d 100644
--- a/sys/dev/ed/dl100xxreg.h
+++ b/sys/dev/ed/dl100xxreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/dl100xxreg.h,v 1.1.2.1 2005/10/08 18:00:40 imp Exp $
  */
 
 /* Dlink chipset used on some Netgear and Dlink PCMCIA cards */
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 7b679397695c..6932313acdcd 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.254.2.4 2005/10/08 18:00:40 imp Exp $");
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
diff --git a/sys/dev/ed/if_ed98.h b/sys/dev/ed/if_ed98.h
index b16054960b31..08c20588d383 100644
--- a/sys/dev/ed/if_ed98.h
+++ b/sys/dev/ed/if_ed98.h
@@ -24,7 +24,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/sys/dev/ed/if_ed98.h,v 1.3 2005/04/13 13:02:58 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_3c503.c b/sys/dev/ed/if_ed_3c503.c
index c0fcd67f44b5..26a44da24642 100644
--- a/sys/dev/ed/if_ed_3c503.c
+++ b/sys/dev/ed/if_ed_3c503.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_3c503.c,v 1.2.2.1 2005/09/17 04:01:03 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index d5bdfdcbe7e0..125bda2314eb 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.21.2.1 2005/09/17 04:01:03 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_ed_hpp.c b/sys/dev/ed/if_ed_hpp.c
index 28e07485f611..191d32f85fab 100644
--- a/sys/dev/ed/if_ed_hpp.c
+++ b/sys/dev/ed/if_ed_hpp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_hpp.c,v 1.2.2.1 2005/09/17 04:01:03 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index fcf9b2097621..2f88fe4027c2 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.23.2.1 2005/09/17 04:01:03 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_novell.c b/sys/dev/ed/if_ed_novell.c
index 032dc572d748..3712c9ce1ec2 100644
--- a/sys/dev/ed/if_ed_novell.c
+++ b/sys/dev/ed/if_ed_novell.c
@@ -29,7 +29,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_novell.c,v 1.6.2.1 2005/09/17 04:01:03 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 42fe2613f2f6..477969dfb60d 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.84.2.2 2005/10/08 18:00:40 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 67a655fb74f6..c2754ff3d5a2 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.43.2.2.2.1 2005/10/17 02:25:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ed/if_ed_rtl80x9.c b/sys/dev/ed/if_ed_rtl80x9.c
index cec1b61890cd..6f84d6fb94b7 100644
--- a/sys/dev/ed/if_ed_rtl80x9.c
+++ b/sys/dev/ed/if_ed_rtl80x9.c
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_rtl80x9.c,v 1.1.2.1.2.1 2005/10/17 02:25:26 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_sic.c b/sys/dev/ed/if_ed_sic.c
index 627202b88e98..03e3175f1840 100644
--- a/sys/dev/ed/if_ed_sic.c
+++ b/sys/dev/ed/if_ed_sic.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_sic.c,v 1.4.2.1 2005/09/17 04:01:03 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_wd80x3.c b/sys/dev/ed/if_ed_wd80x3.c
index 348fe8ebdfc9..c5bdf96713cf 100644
--- a/sys/dev/ed/if_ed_wd80x3.c
+++ b/sys/dev/ed/if_ed_wd80x3.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_wd80x3.c,v 1.4.2.1 2005/09/17 04:01:03 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 3f2b71932a1a..8870142a7cac 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_edreg.h,v 1.37.2.2 2005/10/08 18:00:40 imp Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index 4c9b95b46502..d5a078664c2a 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_edvar.h,v 1.32.2.2 2005/10/08 18:00:40 imp Exp $
  */
 
 #ifndef SYS_DEV_ED_IF_EDVAR_H
diff --git a/sys/dev/ed/rtl80x9reg.h b/sys/dev/ed/rtl80x9reg.h
index 2120fcffa852..fd7b24ef9cd1 100644
--- a/sys/dev/ed/rtl80x9reg.h
+++ b/sys/dev/ed/rtl80x9reg.h
@@ -28,7 +28,7 @@
  *
  * Based on patches subitted by: David Madole, edited by M. Warner Losh.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/rtl80x9reg.h,v 1.1.2.1 2005/10/08 18:00:40 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ed/tc5299jreg.h b/sys/dev/ed/tc5299jreg.h
index 6fb79398b848..7f6dd639eaca 100644
--- a/sys/dev/ed/tc5299jreg.h
+++ b/sys/dev/ed/tc5299jreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/tc5299jreg.h,v 1.1.2.1 2005/10/08 18:00:40 imp Exp $
  */
 
 /* Tamarack TC5299J */
diff --git a/sys/dev/eisa/eisa_if.m b/sys/dev/eisa/eisa_if.m
index 72c8184cdce5..94db7e5cb676 100644
--- a/sys/dev/eisa/eisa_if.m
+++ b/sys/dev/eisa/eisa_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/eisa/eisa_if.m,v 1.2 2005/01/06 01:42:38 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index ce0aba6eb408..8a995050bf1a 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.72 2005/03/17 17:36:07 imp Exp $");
 
 #include "opt_eisa.h"
 
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 522cd5db59e1..e75c069ded72 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/eisa/eisaconf.h,v 1.24 2005/01/06 01:42:38 imp Exp $
  */
 
 #ifndef _DEV_EISA_EISACONF_H_
diff --git a/sys/dev/em/LICENSE b/sys/dev/em/LICENSE
index 42545ca85f97..62b1f2515b55 100644
--- a/sys/dev/em/LICENSE
+++ b/sys/dev/em/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/LICENSE,v 1.3 2005/01/06 01:42:38 imp Exp $
 /*-
 Copyright (c) 2001-2003, Intel Corporation 
 All rights reserved.
diff --git a/sys/dev/em/README b/sys/dev/em/README
index 776238daab05..10e1c1180b50 100644
--- a/sys/dev/em/README
+++ b/sys/dev/em/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/README,v 1.10 2005/07/11 02:33:25 delphij Exp $
 FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters
 ============================================================
 
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 584201796949..910e6b841004 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.65.2.5.2.1 2005/10/22 22:07:20 glebius Exp $*/
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/em/if_em.h b/sys/dev/em/if_em.h
index e51d1ca3aec9..c3fb6cf3accf 100644
--- a/sys/dev/em/if_em.h
+++ b/sys/dev/em/if_em.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.32.4.1 2005/10/22 22:07:20 glebius Exp $*/
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
diff --git a/sys/dev/em/if_em_hw.c b/sys/dev/em/if_em_hw.c
index 8795f6d1e7c4..33c774b71284 100644
--- a/sys/dev/em/if_em_hw.c
+++ b/sys/dev/em/if_em_hw.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/em/if_em_hw.c,v 1.16 2005/05/26 23:32:02 tackerman Exp $");
 
 #include <dev/em/if_em_hw.h>
 
diff --git a/sys/dev/em/if_em_hw.h b/sys/dev/em/if_em_hw.h
index 11f3b0ed3e5f..f40d10b71df5 100644
--- a/sys/dev/em/if_em_hw.h
+++ b/sys/dev/em/if_em_hw.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em_hw.h,v 1.15.4.1 2005/10/22 22:07:20 glebius Exp $*/
 /* if_em_hw.h
  * Structures, enums, and macros for the MAC
  */
diff --git a/sys/dev/em/if_em_osdep.h b/sys/dev/em/if_em_osdep.h
index 9d5bdc2ba986..d2d568f2525f 100644
--- a/sys/dev/em/if_em_osdep.h
+++ b/sys/dev/em/if_em_osdep.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em_osdep.h,v 1.14 2005/05/26 23:32:02 tackerman Exp $*/
 
 #ifndef _FREEBSD_OS_H_
 #define _FREEBSD_OS_H_
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index bfff233e3481..cfc1dad4c64e 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.36.2.2 2005/10/09 04:15:11 delphij Exp $");
 
 /*
  * i f _ e n _ p c i . c  
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.36.2.2 2005/10/09 04:15:11 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 219d5420aca7..5222cc864d5b 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.65.2.1 2005/08/25 05:01:07 rwatson Exp $");
 
 /*
  *
diff --git a/sys/dev/en/midwayreg.h b/sys/dev/en/midwayreg.h
index 5c2fe1b8fdbd..8f214da44220 100644
--- a/sys/dev/en/midwayreg.h
+++ b/sys/dev/en/midwayreg.h
@@ -6,7 +6,7 @@
  * this file contains the description of the ENI ATM midway chip
  * data structures.   see midway.c for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/en/midwayreg.h,v 1.5 2003/04/25 16:14:03 harti Exp $
  */
 
 #define MID_SZTOB(X) 	((X) * 256 * 4) /* size to bytes */
diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h
index 8c2a8c54e04b..a01de1cb3221 100644
--- a/sys/dev/en/midwayvar.h
+++ b/sys/dev/en/midwayvar.h
@@ -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/sys/dev/en/midwayvar.h,v 1.15 2005/06/10 16:49:07 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 3cf9623bbbc0..ff218e078403 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.140.2.2 2005/09/17 04:01:04 imp Exp $");
 
 /*
  *	Modified from the FreeBSD 1.1.5.1 version by:
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index 123bad74ffa5..313617a63fb0 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.33.2.1 2005/09/17 04:01:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index a1c6b5a42bb0..c8dc6b08d9ce 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_isa.c,v 1.28 2005/07/01 05:31:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_ep_mca.c b/sys/dev/ep/if_ep_mca.c
index e9900f9ee7c7..e40ce00060ae 100644
--- a/sys/dev/ep/if_ep_mca.c
+++ b/sys/dev/ep/if_ep_mca.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_mca.c,v 1.12 2005/07/01 05:31:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 37f494bf5280..acf7fa60aa22 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_pccard.c,v 1.48.2.1 2005/09/17 04:01:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 25ab182ae40c..b06c42bd9b37 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -19,7 +19,7 @@
  * 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/sys/dev/ep/if_epreg.h,v 1.37.2.1 2005/09/17 04:01:04 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
index 704fe025406e..af4f8173070e 100644
--- a/sys/dev/ep/if_epvar.h
+++ b/sys/dev/ep/if_epvar.h
@@ -19,7 +19,7 @@
  * 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/sys/dev/ep/if_epvar.h,v 1.18.2.1 2005/09/17 04:01:04 imp Exp $
  */
 
 struct ep_board {
diff --git a/sys/dev/esp/esp_sbus.c b/sys/dev/esp/esp_sbus.c
index cc92f19fd6e5..05023d500058 100644
--- a/sys/dev/esp/esp_sbus.c
+++ b/sys/dev/esp/esp_sbus.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.11 2005/05/19 14:51:10 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index 010e9c6668bd..4f2a31a4de95 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -104,7 +104,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/ncr53c9x.c,v 1.12 2005/05/19 14:51:10 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/ncr53c9xreg.h b/sys/dev/esp/ncr53c9xreg.h
index c24f807cc06d..d11ac93175b1 100644
--- a/sys/dev/esp/ncr53c9xreg.h
+++ b/sys/dev/esp/ncr53c9xreg.h
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/esp/ncr53c9xreg.h,v 1.5 2005/05/19 14:51:10 marius Exp $ */
 
 /*
  * Register addresses, relative to some base address
diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h
index 79afceea59c7..a51fad6a112f 100644
--- a/sys/dev/esp/ncr53c9xvar.h
+++ b/sys/dev/esp/ncr53c9xvar.h
@@ -66,7 +66,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/esp/ncr53c9xvar.h,v 1.7 2005/05/19 14:51:10 marius Exp $ */
 
 #ifndef _DEV_IC_NCR53C9XVAR_H_
 #define _DEV_IC_NCR53C9XVAR_H_
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 3c1296f0b86f..fd313e00c1a9 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.56.2.3 2005/10/09 04:15:12 delphij Exp $");
 
 /*
  * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver
diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c
index 214a53e12e84..258f1ff6228b 100644
--- a/sys/dev/ex/if_ex_isa.c
+++ b/sys/dev/ex/if_ex_isa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.11 2005/06/10 16:49:08 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c
index c41b7e9eb304..f3d3705f7181 100644
--- a/sys/dev/ex/if_ex_pccard.c
+++ b/sys/dev/ex/if_ex_pccard.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_pccard.c,v 1.14 2005/06/24 14:36:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ex/if_exreg.h b/sys/dev/ex/if_exreg.h
index 157eda37298c..3d8701b49a97 100644
--- a/sys/dev/ex/if_exreg.h
+++ b/sys/dev/ex/if_exreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ex/if_exreg.h,v 1.6 2005/01/06 01:42:39 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ex/if_exvar.h b/sys/dev/ex/if_exvar.h
index 5e2f001b52b8..0c36e6852054 100644
--- a/sys/dev/ex/if_exvar.h
+++ b/sys/dev/ex/if_exvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ex/if_exvar.h,v 1.6 2005/06/10 16:49:08 brooks Exp $
  */
 
 struct ex_softc {
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 3700cbd44cbe..2631fa0b9af1 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/exca/exca.c,v 1.19 2005/01/11 00:32:43 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index 094379e79c77..818463d31caa 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: i82365reg.h,v 1.3 1998/12/20 17:53:28 nathanw Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/exca/excareg.h,v 1.5 2005/01/06 01:42:40 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 M Warner Losh.  All rights reserved.
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index bc29c81a0990..f2c5ac42fc51 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/exca/excavar.h,v 1.7 2005/01/06 01:42:40 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 M Warner Losh.  All rights reserved.
diff --git a/sys/dev/fatm/firmware.h b/sys/dev/fatm/firmware.h
index 24c7bc8e8865..8697d0890ab0 100644
--- a/sys/dev/fatm/firmware.h
+++ b/sys/dev/fatm/firmware.h
@@ -37,7 +37,7 @@
  *
  * phk got permission from Fore to put firmware images into our tree.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/firmware.h,v 1.2 2005/01/06 01:42:40 imp Exp $
  */
 
 static uint32_t firmware[] = {
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index cf4437415313..3bfa614061b3 100644
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.19.2.1 2005/08/25 05:01:08 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/fatm/if_fatm_rate.h b/sys/dev/fatm/if_fatm_rate.h
index 5cfd38a9c28c..08dfe95dcc2c 100644
--- a/sys/dev/fatm/if_fatm_rate.h
+++ b/sys/dev/fatm/if_fatm_rate.h
@@ -35,7 +35,7 @@
  *	    for(i=period-1; i>0; i--) printf "{ 0x%08x, %u },\n", \
  *		(i * 65536) + (period - i), i * linerate/period; }'
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatm_rate.h,v 1.2 2005/01/06 01:42:40 imp Exp $
  */
 { 0x00000000, 353053 },
 { 0x00fe0001, 351668 },
diff --git a/sys/dev/fatm/if_fatmreg.h b/sys/dev/fatm/if_fatmreg.h
index d488dbfda5bf..038a20f76cae 100644
--- a/sys/dev/fatm/if_fatmreg.h
+++ b/sys/dev/fatm/if_fatmreg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatmreg.h,v 1.2 2005/01/06 01:42:40 imp Exp $
  *
  * Fore PCA200E hardware definitions.
  */
diff --git a/sys/dev/fatm/if_fatmvar.h b/sys/dev/fatm/if_fatmvar.h
index 697e91543bd7..5a3c5c8fff97 100644
--- a/sys/dev/fatm/if_fatmvar.h
+++ b/sys/dev/fatm/if_fatmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatmvar.h,v 1.6 2005/06/10 16:49:08 brooks Exp $
  *
  * Fore PCA200E driver definitions.
  */
diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c
index 436ae40f4669..f1d6cc3cb1fa 100644
--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/boot_font.c,v 1.5 2005/05/29 04:42:20 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c
index 288e4dd3fe1a..accb5dcc893b 100644
--- a/sys/dev/fb/creator.c
+++ b/sys/dev/fb/creator.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/creator.c,v 1.8.2.1 2005/10/05 21:48:02 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 0878feb299d0..e8ace87e8b2a 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/fb.c,v 1.32 2004/07/15 08:26:00 phk Exp $");
 
 #include "opt_fb.h"
 
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 1e829460de34..873509fea21d 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.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/sys/dev/fb/fbreg.h,v 1.18.8.1 2005/10/05 21:48:02 marius Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/gallant12x22.h b/sys/dev/fb/gallant12x22.h
index a089f6a2ec46..3d12e6cb9125 100644
--- a/sys/dev/fb/gallant12x22.h
+++ b/sys/dev/fb/gallant12x22.h
@@ -35,7 +35,7 @@
  *
  * Derived from: @(#)gallant19.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/gallant12x22.h,v 1.3 2005/01/06 01:42:40 imp Exp $
  */
 
 static u_char gallant12x22_data[] = {
diff --git a/sys/dev/fb/gfb.c b/sys/dev/fb/gfb.c
index c3c8ef9d22cf..0d7d59668a9c 100644
--- a/sys/dev/fb/gfb.c
+++ b/sys/dev/fb/gfb.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.7.2.1 2005/10/05 21:48:02 marius Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h
index 89ead2e3a225..595d1d09df5a 100644
--- a/sys/dev/fb/gfb.h
+++ b/sys/dev/fb/gfb.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/gfb.h,v 1.3 2005/01/06 01:42:40 imp Exp $
  */
 
 #ifndef _FB_GFB_H_
diff --git a/sys/dev/fb/machfb.c b/sys/dev/fb/machfb.c
index 31b22ab26137..c222f7b1f7c6 100644
--- a/sys/dev/fb/machfb.c
+++ b/sys/dev/fb/machfb.c
@@ -55,7 +55,7 @@
  */
  
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/machfb.c,v 1.3.2.1 2005/10/05 21:48:02 marius Exp $");
 
 /*
  * Driver for ATI Mach64 graphics chips. Some code is derived from the
diff --git a/sys/dev/fb/machfbreg.h b/sys/dev/fb/machfbreg.h
index 8990a4e3993a..d73d0ee86a92 100644
--- a/sys/dev/fb/machfbreg.h
+++ b/sys/dev/fb/machfbreg.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: machfbreg.h,v 1.1 2002/10/24 18:15:57 junyoung Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/machfbreg.h,v 1.1 2005/05/21 20:47:38 marius Exp $
  */
 
 #ifndef _DEV_FB_MACHFB_H_
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 9935b9e414cd..09852b06087e 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/s3_pci.c,v 1.9.2.1 2005/10/05 21:48:02 marius Exp $");
 
 /* Enable LFB on S3 cards that has only VESA 1.2 BIOS */
 
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index ec25d1cf03a4..8b8938e86989 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/splash.c,v 1.14 2004/05/30 20:08:31 phk Exp $");
 
 #include "opt_splash.h"
 
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index ca4885c63ebb..6cabbce771bc 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/splash_bmp.c,v 1.19 2004/08/06 20:37:08 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index e67bb244e4a1..589084432107 100644
--- a/sys/dev/fb/splash_pcx.c
+++ b/sys/dev/fb/splash_pcx.c
@@ -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/sys/dev/fb/splash_pcx.c,v 1.8 2004/08/06 21:35:51 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index 36ba9a708d89..ff3822e99c6b 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.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/sys/dev/fb/splashreg.h,v 1.6 2004/07/15 08:26:01 phk Exp $
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
diff --git a/sys/dev/fb/tga.c b/sys/dev/fb/tga.c
index bfd7ce4c4e29..b6ad6c8e8012 100644
--- a/sys/dev/fb/tga.c
+++ b/sys/dev/fb/tga.c
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.7.2.1 2005/10/05 21:48:02 marius Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/fb/tga.h b/sys/dev/fb/tga.h
index 3616b61bd04c..efaceb0d672a 100644
--- a/sys/dev/fb/tga.h
+++ b/sys/dev/fb/tga.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/tga.h,v 1.2 2005/01/06 01:42:40 imp Exp $
  */
 
 #ifndef _FB_TGA_H_
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 62ba23559fe9..ae3b130c6255 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.34.2.1 2005/10/05 21:48:02 marius Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index 4ccef40d616f..d069aeed9351 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.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/sys/dev/fb/vgareg.h,v 1.8 2005/02/28 21:06:14 iedowse Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index dd39abba7ef8..0166bf7da45a 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.307.2.1 2005/09/02 00:33:30 rodrigc Exp $");
 
 #include "opt_fdc.h"
 
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c
index 6a3cacd5e722..ae5558919b58 100644
--- a/sys/dev/fdc/fdc_acpi.c
+++ b/sys/dev/fdc/fdc_acpi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.10 2004/09/29 19:08:34 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index ab7057d260b4..bde0c844ac6a 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.22 2005/03/15 08:02:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c
index f960c3b5b141..b90845b4f436 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_pccard.c,v 1.13 2005/06/24 14:36:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 5ab60a6a6443..10ee3869142f 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fdc/fdcvar.h,v 1.9 2005/01/19 07:46:38 imp Exp $
  */
 
 /* XXX should audit this file to see if additional copyrights needed */
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 0bc11979da1d..71ec4893b91d 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.91.2.3 2005/10/09 04:18:17 delphij Exp $");
 
 /*
  *
diff --git a/sys/dev/fe/if_fe_cbus.c b/sys/dev/fe/if_fe_cbus.c
index 7076f42268ce..1c5484beddac 100644
--- a/sys/dev/fe/if_fe_cbus.c
+++ b/sys/dev/fe/if_fe_cbus.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_cbus.c,v 1.13 2005/06/11 16:30:43 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fe/if_fe_isa.c b/sys/dev/fe/if_fe_isa.c
index 3c37575a40d9..e10f6628d0e3 100644
--- a/sys/dev/fe/if_fe_isa.c
+++ b/sys/dev/fe/if_fe_isa.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_isa.c,v 1.9 2005/06/10 16:49:08 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c
index a143e637893a..9dab878254e2 100644
--- a/sys/dev/fe/if_fe_pccard.c
+++ b/sys/dev/fe/if_fe_pccard.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.27 2005/06/24 14:36:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index afc9c5704c58..fa352b75c807 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/fe/if_fereg.h,v 1.10 2005/02/20 19:33:13 imp Exp $ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/dev/fe/if_fevar.h b/sys/dev/fe/if_fevar.h
index e80c9567b8a4..32aa1b8caffe 100644
--- a/sys/dev/fe/if_fevar.h
+++ b/sys/dev/fe/if_fevar.h
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fe/if_fevar.h,v 1.6 2005/06/10 16:49:08 brooks Exp $
  */
 
 /* How many registers does an fe-supported adapter have at maximum?  */
diff --git a/sys/dev/fe/mb86960.h b/sys/dev/fe/mb86960.h
index 1272dde68331..66599d296ab9 100644
--- a/sys/dev/fe/mb86960.h
+++ b/sys/dev/fe/mb86960.h
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fe/mb86960.h,v 1.5 2005/02/20 19:33:13 imp Exp $
  */
 
 /*
diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README
index a6536ae61405..52b75ac715e3 100644
--- a/sys/dev/firewire/00README
+++ b/sys/dev/firewire/00README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/firewire/00README,v 1.1.16.1 2005/10/07 14:00:03 glebius Exp $
 
 IEEE 1394 support for FreeBSD-5.X and 4.X.
 
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 9636b12ad6e3..fe5e01f78e0c 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.80 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index ab34748bec25..704080484eea 100644
--- a/sys/dev/firewire/firewire.h
+++ b/sys/dev/firewire/firewire.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.20 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire_phy.h b/sys/dev/firewire/firewire_phy.h
index 42feff2d27c8..bfa88c11d002 100644
--- a/sys/dev/firewire/firewire_phy.h
+++ b/sys/dev/firewire/firewire_phy.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire_phy.h,v 1.3 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 4061b8be41f2..7fa0fb8ed3b1 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.37.2.1 2005/08/13 21:24:15 rwatson Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c
index 45bedee9c4df..7dd4363bc36b 100644
--- a/sys/dev/firewire/fwcrom.c
+++ b/sys/dev/firewire/fwcrom.c
@@ -34,7 +34,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwcrom.c,v 1.13 2004/10/22 15:39:39 simokawa Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index e42c30a78c97..4c01de9ee5ca 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.46.2.1 2005/08/13 21:24:15 rwatson Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index c64dbe66731a..260d4004715b 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -35,7 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.7 2005/01/06 01:42:41 imp Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index 3a8278c1c709..68c4ae89533c 100644
--- a/sys/dev/firewire/fwdma.h
+++ b/sys/dev/firewire/fwdma.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwdma.h,v 1.3 2005/01/06 01:42:41 imp Exp $
  */
 
 struct fwdma_alloc {
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index 4fac8dd06b4d..d429a317739e 100644
--- a/sys/dev/firewire/fwmem.c
+++ b/sys/dev/firewire/fwmem.c
@@ -35,7 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.31 2005/01/06 01:42:41 imp Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index de717947e844..43b3c632aa82 100644
--- a/sys/dev/firewire/fwmem.h
+++ b/sys/dev/firewire/fwmem.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwmem.h,v 1.8 2005/01/06 01:42:41 imp Exp $
  */
 
 struct fw_xfer *fwmem_read_quad(struct fw_device *, caddr_t, uint8_t,
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index bdf75e84dee7..a41b128a339e 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.81 2005/03/29 01:44:59 sam Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index f584b98ca70e..3e649445fef3 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.52 2005/05/20 12:37:16 marius Exp $
  */
 
 #define BOUNCE_BUFFER_TEST	0
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 2cccb255391e..b52d9994d275 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohcireg.h,v 1.22 2005/05/20 12:37:16 marius Exp $
  *
  */
 #define		PCI_CBMEM		PCIR_BAR(0)
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 3002b63c0ce4..6ce7f3b047fe 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohcivar.h,v 1.14 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index 77a006ed3c54..825a21f520bb 100644
--- a/sys/dev/firewire/fwphyreg.h
+++ b/sys/dev/firewire/fwphyreg.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwphyreg.h,v 1.3 2005/01/06 01:42:41 imp Exp $
  */
 
 struct phyreg_base {
diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index 058649fc0cc4..f018518cb1f9 100644
--- a/sys/dev/firewire/iec13213.h
+++ b/sys/dev/firewire/iec13213.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/iec13213.h,v 1.14 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 11f3042ff9b0..9dc83266640e 100644
--- a/sys/dev/firewire/iec68113.h
+++ b/sys/dev/firewire/iec68113.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/iec68113.h,v 1.9 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 83c57ac54567..1c6e618e7aa2 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.37.2.2 2005/10/07 14:00:03 glebius Exp $
  */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index 73fcb3df285c..667a349cd9ae 100644
--- a/sys/dev/firewire/if_fwevar.h
+++ b/sys/dev/firewire/if_fwevar.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwevar.h,v 1.5 2005/06/10 16:49:08 brooks Exp $
  */
 
 #ifndef _NET_IF_FWEVAR_H_
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 0d7e5feae929..ba21b7749f64 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.7.2.3 2005/10/07 14:00:03 glebius Exp $
  */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index 153ce949865d..0da4b6538723 100644
--- a/sys/dev/firewire/if_fwipvar.h
+++ b/sys/dev/firewire/if_fwipvar.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwipvar.h,v 1.4 2005/06/10 16:49:08 brooks Exp $
  */
 
 #ifndef _NET_IF_FWIPVAR_H_
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index c2f8e4f23a57..b43bf26fc681 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.81 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index 9f85fab38de5..190bdb6e0420 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.5 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index 5267ea3b3532..9461432c53e4 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp_targ.c,v 1.8 2005/01/06 01:42:41 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 7ae1dac112fc..da6d4f86bfe7 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.240.2.5 2005/10/07 14:00:03 glebius Exp $");
 
 /*
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index e6bb98b7f2e7..1bdb9bf2811a 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.39 2005/04/22 13:05:53 mux Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index f8da9874b94a..4b0a0e6da574 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.37.2.1 2005/08/26 14:35:45 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/fxp/rcvbundl.h b/sys/dev/fxp/rcvbundl.h
index 2510f420b6fd..ef994002e85b 100644
--- a/sys/dev/fxp/rcvbundl.h
+++ b/sys/dev/fxp/rcvbundl.h
@@ -29,7 +29,7 @@ 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/sys/dev/fxp/rcvbundl.h,v 1.3 2005/04/21 19:34:57 mux Exp $
  */
 /*
 rcvbundl.h
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index 84033e36fefc..a72513a2231e 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.29.2.5 2005/10/05 22:08:17 marius Exp $");
 
 /*
  * Driver for Sun GEM ethernet controllers.
diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index bca56fe0e7d5..57ac21c25be8 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.19.2.1 2005/10/05 22:08:17 marius Exp $");
 
 /*
  * PCI bindings for Sun GEM ethernet controllers.
diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h
index fecfb152eddd..ce4870b89ed0 100644
--- a/sys/dev/gem/if_gemreg.h
+++ b/sys/dev/gem/if_gemreg.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: gemreg.h,v 1.15 2002/05/11 00:36:02 matt Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gem/if_gemreg.h,v 1.3 2005/01/06 01:42:42 imp Exp $
  */
 
 #ifndef	_IF_GEMREG_H
diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h
index abfe327e566b..30fa1ddcf4c8 100644
--- a/sys/dev/gem/if_gemvar.h
+++ b/sys/dev/gem/if_gemvar.h
@@ -25,7 +25,7 @@
  *
  *	from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.10.2.1 2005/10/05 22:08:17 marius Exp $
  */
 
 #ifndef	_IF_GEMVAR_H
diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c
index 9dc31aa45442..6c32d3072fa0 100644
--- a/sys/dev/gfb/gfb_pci.c
+++ b/sys/dev/gfb/gfb_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.15 2005/05/29 04:42:20 nyan Exp $");
 
 #include "opt_fb.h"
 
diff --git a/sys/dev/gfb/gfb_pci.h b/sys/dev/gfb/gfb_pci.h
index 263b3980c5b8..8c0bb4573996 100644
--- a/sys/dev/gfb/gfb_pci.h
+++ b/sys/dev/gfb/gfb_pci.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gfb/gfb_pci.h,v 1.2 2005/01/06 01:42:42 imp Exp $
  */
 
 #ifndef _PCI_GFB_H_
diff --git a/sys/dev/harp/if_harp.c b/sys/dev/harp/if_harp.c
index ca1113847494..080292746aa0 100644
--- a/sys/dev/harp/if_harp.c
+++ b/sys/dev/harp/if_harp.c
@@ -31,10 +31,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/harp/if_harp.c,v 1.7 2005/06/10 16:49:09 brooks Exp $");
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/harp/if_harp.c,v 1.7 2005/06/10 16:49:09 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c
index 37263f548d74..a54ae04f8b29 100644
--- a/sys/dev/hatm/if_hatm.c
+++ b/sys/dev/hatm/if_hatm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.24.2.2 2005/10/09 04:15:12 delphij Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index 750364a8971c..0f91044f51cf 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.18.2.2 2005/08/25 05:01:10 rwatson Exp $");
 
 /*
  * ForeHE driver.
diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c
index 5e37b5dc75ea..e38d6e2a94a9 100644
--- a/sys/dev/hatm/if_hatm_ioctl.c
+++ b/sys/dev/hatm/if_hatm_ioctl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_ioctl.c,v 1.12.2.1 2005/08/25 05:01:10 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c
index b79b2fcd7c02..f6dbfd9a8522 100644
--- a/sys/dev/hatm/if_hatm_rx.c
+++ b/sys/dev/hatm/if_hatm_rx.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_rx.c,v 1.9.2.1 2005/08/25 05:01:10 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c
index 868b5a3d43d6..6d5918364150 100644
--- a/sys/dev/hatm/if_hatm_tx.c
+++ b/sys/dev/hatm/if_hatm_tx.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_tx.c,v 1.13.2.1 2005/08/25 05:01:10 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatmconf.h b/sys/dev/hatm/if_hatmconf.h
index 5402697410d7..cd4978c56a0f 100644
--- a/sys/dev/hatm/if_hatmconf.h
+++ b/sys/dev/hatm/if_hatmconf.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmconf.h,v 1.2 2005/01/06 01:42:43 imp Exp $
  *
  * Default configuration
  */
diff --git a/sys/dev/hatm/if_hatmreg.h b/sys/dev/hatm/if_hatmreg.h
index 9085f07f5a4b..135adea97933 100644
--- a/sys/dev/hatm/if_hatmreg.h
+++ b/sys/dev/hatm/if_hatmreg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmreg.h,v 1.2 2005/01/06 01:42:43 imp Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hatm/if_hatmvar.h b/sys/dev/hatm/if_hatmvar.h
index d19fd0eabd74..0007d963e46a 100644
--- a/sys/dev/hatm/if_hatmvar.h
+++ b/sys/dev/hatm/if_hatmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmvar.h,v 1.18 2005/06/22 06:42:03 harti Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 8f0a17f58a9c..cdd536cc1184 100644
--- a/sys/dev/hfa/fore.h
+++ b/sys/dev/hfa/fore.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore.h,v 1.6 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index 93fbf5d587e2..6ea1f46c14c0 100644
--- a/sys/dev/hfa/fore_aali.h
+++ b/sys/dev/hfa/fore_aali.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_aali.h,v 1.5 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 491733af197f..ab94442e395f 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.15 2004/02/21 19:08:23 harti Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.15 2004/02/21 19:08:23 harti Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index c7e38892e460..79aa102eb204 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.19 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.19 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index 1f68f7d3e44c..b076e29e4e7f 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.12 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.12 2003/08/24 17:46:08 obrien Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 51bbd0fb6933..b70d4f7cf7fc 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.13 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.13 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index 93062f451f63..dced564173cd 100644
--- a/sys/dev/hfa/fore_include.h
+++ b/sys/dev/hfa/fore_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.7 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index ccaed3f0e085..b462219dcb7d 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.17 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.17 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 8454b93f2464..59f6307b4a1d 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.12 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -54,7 +54,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.12 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index 3910186c309e..28360ea2c156 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.20 2005/06/10 16:49:09 brooks Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.20 2005/06/10 16:49:09 brooks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index 758f06911cb8..3441ef46ef74 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.24 2005/06/10 16:49:09 brooks Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.24 2005/06/10 16:49:09 brooks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 33d73c21dced..5ac02b4aca02 100644
--- a/sys/dev/hfa/fore_slave.h
+++ b/sys/dev/hfa/fore_slave.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_slave.h,v 1.4 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index 4126c1f0635c..4cb306c37c3b 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.14 2005/01/06 01:42:43 imp Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.14 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 32095164d8e4..914928011990 100644
--- a/sys/dev/hfa/fore_stats.h
+++ b/sys/dev/hfa/fore_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.h,v 1.3 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 51745ac9336f..b8fed778f291 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.9 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.9 2003/08/24 17:46:08 obrien Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index e22f696a40b1..2781fd549f0a 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.14 2005/06/10 16:49:09 brooks Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.14 2005/06/10 16:49:09 brooks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 57cedb3a761f..0d38913b280c 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.11 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 95bc6524be99..22cdb7e35cc4 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.11 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.11 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/hfa_eisa.c b/sys/dev/hfa/hfa_eisa.c
index 6c42fb8634e3..d305c5e20e63 100644
--- a/sys/dev/hfa/hfa_eisa.c
+++ b/sys/dev/hfa/hfa_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_eisa.c,v 1.2 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  *
diff --git a/sys/dev/hfa/hfa_freebsd.c b/sys/dev/hfa/hfa_freebsd.c
index 9b8d69caac41..fa090df45dc1 100644
--- a/sys/dev/hfa/hfa_freebsd.c
+++ b/sys/dev/hfa/hfa_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.10 2005/05/29 04:42:20 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/hfa/hfa_freebsd.h b/sys/dev/hfa/hfa_freebsd.h
index 75400162eda9..79e97ee64cdc 100644
--- a/sys/dev/hfa/hfa_freebsd.h
+++ b/sys/dev/hfa/hfa_freebsd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.h,v 1.2 2003/07/31 14:52:44 harti Exp $
  */
 
 struct hfa_softc {
diff --git a/sys/dev/hfa/hfa_pci.c b/sys/dev/hfa/hfa_pci.c
index fb28478fac6c..1e9d679c981d 100644
--- a/sys/dev/hfa/hfa_pci.c
+++ b/sys/dev/hfa/hfa_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_pci.c,v 1.6 2005/05/29 04:42:20 nyan Exp $");
 
 /*
  *
diff --git a/sys/dev/hfa/hfa_sbus.c b/sys/dev/hfa/hfa_sbus.c
index 990803cb19d7..93f69cbb43b2 100644
--- a/sys/dev/hfa/hfa_sbus.c
+++ b/sys/dev/hfa/hfa_sbus.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_sbus.c,v 1.3 2003/08/24 17:46:08 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index a0c4d48cf908..9f2655ce2d95 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.34 2005/06/05 22:57:32 imp Exp $");
 
 /*
  * Driver for various Hifn encryption processors.
diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h
index a1022887f2d7..de3a186617f4 100644
--- a/sys/dev/hifn/hifn7751reg.h
+++ b/sys/dev/hifn/hifn7751reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.6 2005/01/19 17:03:35 sam Exp $ */
 /*	$OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/hifn/hifn7751var.h b/sys/dev/hifn/hifn7751var.h
index 046d204d8314..ffa029130a43 100644
--- a/sys/dev/hifn/hifn7751var.h
+++ b/sys/dev/hifn/hifn7751var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/hifn/hifn7751var.h,v 1.7 2005/01/19 17:03:35 sam Exp $ */
 /*	$OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index 2d90a13e0729..86881337f3e7 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.37.2.4 2005/09/28 14:10:00 kensmith Exp $");
 
 /*
  * HME Ethernet module driver.
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index ade6e19d631b..f65fbdcdaca0 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.22 2005/07/10 10:36:45 marius Exp $");
 
 /*
  * PCI front-end device driver for the HME ethernet device.
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 300abc1466c0..7d674c56571c 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.17 2005/06/10 16:49:10 brooks Exp $");
 
 /*
  * SBus front-end device driver for the HME ethernet device.
diff --git a/sys/dev/hme/if_hmereg.h b/sys/dev/hme/if_hmereg.h
index c3d205be0a6f..9579eddb286a 100644
--- a/sys/dev/hme/if_hmereg.h
+++ b/sys/dev/hme/if_hmereg.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: hmereg.h,v 1.16 2003/11/02 11:07:45 wiz Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hme/if_hmereg.h,v 1.6 2004/08/05 02:52:33 yongari Exp $
  */
 
 /*
diff --git a/sys/dev/hme/if_hmevar.h b/sys/dev/hme/if_hmevar.h
index 25b0552548ca..4481766f9a57 100644
--- a/sys/dev/hme/if_hmevar.h
+++ b/sys/dev/hme/if_hmevar.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: hmevar.h,v 1.5 2000/06/25 01:10:04 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hme/if_hmevar.h,v 1.8 2005/06/10 16:49:10 brooks Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/hptmv/access601.h b/sys/dev/hptmv/access601.h
index 26eaab283b95..602328bdf3b2 100644
--- a/sys/dev/hptmv/access601.h
+++ b/sys/dev/hptmv/access601.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/access601.h,v 1.2.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 #ifndef _ACCESS601_H_
 #define _ACCESS601_H_
diff --git a/sys/dev/hptmv/amd64-elf.raid.o.uu b/sys/dev/hptmv/amd64-elf.raid.o.uu
index 5b439c9f9836..d596ac86dcc8 100644
--- a/sys/dev/hptmv/amd64-elf.raid.o.uu
+++ b/sys/dev/hptmv/amd64-elf.raid.o.uu
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/amd64-elf.raid.o.uu,v 1.1.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 begin 644 hptmvraid.o
 M?T5,1@(!`0D```````````$`/@`!`````````````````````````"#=````
diff --git a/sys/dev/hptmv/array.h b/sys/dev/hptmv/array.h
index 14d627af5832..912a3677c044 100644
--- a/sys/dev/hptmv/array.h
+++ b/sys/dev/hptmv/array.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/array.h,v 1.2.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 
 #ifndef _ARRAY_H_
diff --git a/sys/dev/hptmv/atapi.h b/sys/dev/hptmv/atapi.h
index b00100a900e9..96c052c6bbc4 100644
--- a/sys/dev/hptmv/atapi.h
+++ b/sys/dev/hptmv/atapi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/atapi.h,v 1.2.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 
 #ifndef _ATAPI_H_
diff --git a/sys/dev/hptmv/command.h b/sys/dev/hptmv/command.h
index 12eb694af81d..88b39d1f62bc 100644
--- a/sys/dev/hptmv/command.h
+++ b/sys/dev/hptmv/command.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/command.h,v 1.2.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 #ifndef _COMMAND_H_
 #define _COMMAND_H_
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 6b7631e2db37..27203251b9a7 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/entry.c,v 1.8.2.1 2005/10/06 18:47:57 delphij Exp $
  */
  
 #include <sys/param.h>
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index 4e6a0d0e668f..0657e2f94cca 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/global.h,v 1.3.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
diff --git a/sys/dev/hptmv/gui_lib.c b/sys/dev/hptmv/gui_lib.c
index 13def6ba9240..40b6e64a3f34 100644
--- a/sys/dev/hptmv/gui_lib.c
+++ b/sys/dev/hptmv/gui_lib.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/gui_lib.c,v 1.4.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 /*
  * gui_lib.c
diff --git a/sys/dev/hptmv/hptintf.h b/sys/dev/hptmv/hptintf.h
index 34477a258524..1599ffb40579 100644
--- a/sys/dev/hptmv/hptintf.h
+++ b/sys/dev/hptmv/hptintf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/hptintf.h,v 1.2.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 
 #ifndef HPT_INTF_H
diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
index a179e320d55e..f6109f789cc7 100644
--- a/sys/dev/hptmv/hptproc.c
+++ b/sys/dev/hptmv/hptproc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/hptproc.c,v 1.5.2.1 2005/10/06 18:47:57 delphij Exp $
  */
 /*
  * hptproc.c  sysctl support
diff --git a/sys/dev/hptmv/i386-elf.raid.o.uu b/sys/dev/hptmv/i386-elf.raid.o.uu
index a7462b8f1ef2..76253e9de0de 100644
--- a/sys/dev/hptmv/i386-elf.raid.o.uu
+++ b/sys/dev/hptmv/i386-elf.raid.o.uu
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/i386-elf.raid.o.uu,v 1.4.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 begin 644 hptmvraid.o
 M?T5,1@$!`0D```````````$``P`!``````````````#(O@```````#0`````
diff --git a/sys/dev/hptmv/ioctl.c b/sys/dev/hptmv/ioctl.c
index 5c3796a68d4b..33d9c92f6e7b 100644
--- a/sys/dev/hptmv/ioctl.c
+++ b/sys/dev/hptmv/ioctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/ioctl.c,v 1.4.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 /*
  * ioctl.c   ioctl interface implementation
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index f9f41ffb75da..e63c69ec735e 100644
--- a/sys/dev/hptmv/mv.c
+++ b/sys/dev/hptmv/mv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mv.c,v 1.2.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hptmv/mvOs.h b/sys/dev/hptmv/mvOs.h
index ef78c94644f5..4f7308a0473a 100644
--- a/sys/dev/hptmv/mvOs.h
+++ b/sys/dev/hptmv/mvOs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mvOs.h,v 1.3.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 #ifndef __INCmvOsBsdh
 #define __INCmvOsBsdh
diff --git a/sys/dev/hptmv/mvSata.h b/sys/dev/hptmv/mvSata.h
index bf77fbfcb234..e6ee97c74062 100644
--- a/sys/dev/hptmv/mvSata.h
+++ b/sys/dev/hptmv/mvSata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mvSata.h,v 1.2.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 #ifndef __INCmvSatah
 #define __INCmvSatah
diff --git a/sys/dev/hptmv/mvStorageDev.h b/sys/dev/hptmv/mvStorageDev.h
index 48aad93651f9..12ca0c7d313b 100644
--- a/sys/dev/hptmv/mvStorageDev.h
+++ b/sys/dev/hptmv/mvStorageDev.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mvStorageDev.h,v 1.3.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 #ifndef __INCmvStorageDevh
 #define __INCmvStorageDevh
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index a07f51dbc8d7..758aa93732be 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/osbsd.h,v 1.4.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 #ifndef _OSBSD_H_
 #define _OSBSD_H_
diff --git a/sys/dev/hptmv/raid5n.h b/sys/dev/hptmv/raid5n.h
index 135177a9bbbc..dd2793809dc3 100644
--- a/sys/dev/hptmv/raid5n.h
+++ b/sys/dev/hptmv/raid5n.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/raid5n.h,v 1.2.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 #ifdef _RAID5N_
 
diff --git a/sys/dev/hptmv/readme.txt b/sys/dev/hptmv/readme.txt
index 6d21e98c98b8..ddba44f319c6 100644
--- a/sys/dev/hptmv/readme.txt
+++ b/sys/dev/hptmv/readme.txt
@@ -1,6 +1,6 @@
 RocketRAID 182x Driver for FreeBSD
 Copyright (C) 2004-2005 HighPoint Technologies, Inc. All rights reserved.
-$FreeBSD$
+$FreeBSD: src/sys/dev/hptmv/readme.txt,v 1.2.2.1 2005/10/06 18:47:58 delphij Exp $
 
 #############################################################################
 Revision History:
diff --git a/sys/dev/hptmv/vdevice.h b/sys/dev/hptmv/vdevice.h
index 8d06f1032109..032c39cbb882 100644
--- a/sys/dev/hptmv/vdevice.h
+++ b/sys/dev/hptmv/vdevice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/vdevice.h,v 1.2.2.1 2005/10/06 18:47:58 delphij Exp $
  */
 
 #ifndef _VDEVICE_H_
diff --git a/sys/dev/hwpmc/hwpmc_alpha.c b/sys/dev/hwpmc/hwpmc_alpha.c
index af905b66924e..75bd2919253b 100644
--- a/sys/dev/hwpmc/hwpmc_alpha.c
+++ b/sys/dev/hwpmc/hwpmc_alpha.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_alpha.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c
index 3d9282986390..1b5c2236f484 100644
--- a/sys/dev/hwpmc/hwpmc_amd.c
+++ b/sys/dev/hwpmc/hwpmc_amd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.c,v 1.9.2.1 2005/09/15 15:48:16 jkoshy Exp $");
 
 /* Support for the AMD K7 and later processors */
 
diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h
index aa6417b81d7a..8418f3a0eec0 100644
--- a/sys/dev/hwpmc/hwpmc_amd.h
+++ b/sys/dev/hwpmc/hwpmc_amd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_arm.c b/sys/dev/hwpmc/hwpmc_arm.c
index af905b66924e..5f211849a1e4 100644
--- a/sys/dev/hwpmc/hwpmc_arm.c
+++ b/sys/dev/hwpmc/hwpmc_arm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_arm.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_ia64.c b/sys/dev/hwpmc/hwpmc_ia64.c
index af905b66924e..1786b2c014bb 100644
--- a/sys/dev/hwpmc/hwpmc_ia64.c
+++ b/sys/dev/hwpmc/hwpmc_ia64.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ia64.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c
index 8b6f376b2f02..00f9c7d359b9 100644
--- a/sys/dev/hwpmc/hwpmc_logging.c
+++ b/sys/dev/hwpmc/hwpmc_logging.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_logging.c,v 1.3 2005/07/09 17:29:36 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c
index ecd83d2a4e08..ebd9d4f59e5d 100644
--- a/sys/dev/hwpmc/hwpmc_mod.c
+++ b/sys/dev/hwpmc/hwpmc_mod.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.10.2.4 2005/08/26 19:49:32 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/eventhandler.h>
diff --git a/sys/dev/hwpmc/hwpmc_pentium.c b/sys/dev/hwpmc/hwpmc_pentium.c
index fc26b5252649..10adbe237d7c 100644
--- a/sys/dev/hwpmc/hwpmc_pentium.c
+++ b/sys/dev/hwpmc/hwpmc_pentium.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_pentium.c,v 1.4 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/hwpmc/hwpmc_pentium.h b/sys/dev/hwpmc/hwpmc_pentium.h
index 36ecc64b60a6..f999f4e38406 100644
--- a/sys/dev/hwpmc/hwpmc_pentium.h
+++ b/sys/dev/hwpmc/hwpmc_pentium.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_pentium.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_piv.c b/sys/dev/hwpmc/hwpmc_piv.c
index 0b8ccd6c98a2..6d7d71986b98 100644
--- a/sys/dev/hwpmc/hwpmc_piv.c
+++ b/sys/dev/hwpmc/hwpmc_piv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.c,v 1.9 2005/07/09 17:29:36 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/hwpmc/hwpmc_piv.h b/sys/dev/hwpmc/hwpmc_piv.h
index 0837b263b639..767829ae78d9 100644
--- a/sys/dev/hwpmc/hwpmc_piv.h
+++ b/sys/dev/hwpmc/hwpmc_piv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c
index af905b66924e..df403eb144b9 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.c
+++ b/sys/dev/hwpmc/hwpmc_powerpc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_powerpc.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_ppro.c b/sys/dev/hwpmc/hwpmc_ppro.c
index 993a2bf26560..b89dd798b0b2 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.c
+++ b/sys/dev/hwpmc/hwpmc_ppro.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.c,v 1.8.2.1 2005/07/29 03:01:40 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/hwpmc/hwpmc_ppro.h b/sys/dev/hwpmc/hwpmc_ppro.h
index f750735c85ea..469f99c494fc 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.h
+++ b/sys/dev/hwpmc/hwpmc_ppro.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_sparc64.c b/sys/dev/hwpmc/hwpmc_sparc64.c
index af905b66924e..77f35f8b2e13 100644
--- a/sys/dev/hwpmc/hwpmc_sparc64.c
+++ b/sys/dev/hwpmc/hwpmc_sparc64.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_sparc64.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c
index a742effc2a52..1c12513429c8 100644
--- a/sys/dev/hwpmc/hwpmc_x86.c
+++ b/sys/dev/hwpmc/hwpmc_x86.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.2.2.1 2005/08/26 19:49:32 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
index 23fc9dcb1a21..ac8073c07581 100644
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/pmc_events.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 #ifndef _DEV_HWPMC_PMC_EVENTS_H_
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index 90672c4ee7e6..6e3693a02e9c 100644
--- a/sys/dev/ic/cd1400.h
+++ b/sys/dev/ic/cd1400.h
@@ -27,7 +27,7 @@
  * 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/sys/dev/ic/cd1400.h,v 1.6 1999/08/28 00:45:12 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ic/cd180.h b/sys/dev/ic/cd180.h
index ae46a4809b68..118e1f1b912e 100644
--- a/sys/dev/ic/cd180.h
+++ b/sys/dev/ic/cd180.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/cd180.h,v 1.5 2005/01/06 01:42:44 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index b8f903782395..7b256b5432e9 100644
--- a/sys/dev/ic/esp.h
+++ b/sys/dev/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/esp.h,v 1.6 2001/06/10 04:20:37 nyan Exp $
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index 3399e0a0de57..f99633c35cdc 100644
--- a/sys/dev/ic/hd64570.h
+++ b/sys/dev/ic/hd64570.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/hd64570.h,v 1.7 2005/01/06 01:42:44 imp Exp $
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index 5d4b3f4c8ffc..3f6c74bc2cec 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8237.h,v 1.10 2005/05/14 10:14:56 nyan Exp $
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/i8251.h b/sys/dev/ic/i8251.h
index fab1ea437869..1f4f844d32e7 100644
--- a/sys/dev/ic/i8251.h
+++ b/sys/dev/ic/i8251.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8251.h,v 1.2 2004/04/07 20:45:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i8253reg.h b/sys/dev/ic/i8253reg.h
index d41d3b2af0a6..ac32ecc2d746 100644
--- a/sys/dev/ic/i8253reg.h
+++ b/sys/dev/ic/i8253reg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8253reg.h,v 1.2 2005/05/14 10:26:31 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index d594730a0dd5..ac6e2af5509c 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i82586.h,v 1.11 2003/03/28 06:27:07 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i8259.h b/sys/dev/ic/i8259.h
index 91270a0715cc..53c5194720a2 100644
--- a/sys/dev/ic/i8259.h
+++ b/sys/dev/ic/i8259.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8259.h,v 1.1 2004/01/06 18:59:37 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 1e0561a5ee66..9137792b010d 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/nec765.h,v 1.11 2004/04/07 20:45:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index 29b32c5b6ad7..acffeba361cc 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.16 2004/11/20 23:19:42 marcel Exp $
  */
 
 /*
diff --git a/sys/dev/ic/rsa.h b/sys/dev/ic/rsa.h
index 6f9376af2f23..b6535d05f1bb 100644
--- a/sys/dev/ic/rsa.h
+++ b/sys/dev/ic/rsa.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/rsa.h,v 1.1 2001/06/10 04:28:38 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ic/sab82532.h b/sys/dev/ic/sab82532.h
index e570c6a9ae5f..b36491e37991 100644
--- a/sys/dev/ic/sab82532.h
+++ b/sys/dev/ic/sab82532.h
@@ -34,7 +34,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/sab82532.h,v 1.3 2005/01/06 01:42:44 imp Exp $
  */
 
 #ifndef _DEV_IC_SAB82532_H_
diff --git a/sys/dev/ic/wd33c93reg.h b/sys/dev/ic/wd33c93reg.h
index 8e536cd1d32d..e67676bbdd98 100644
--- a/sys/dev/ic/wd33c93reg.h
+++ b/sys/dev/ic/wd33c93reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ic/wd33c93reg.h,v 1.2 2005/01/06 01:42:44 imp Exp $ */
 /*	$NecBSD: wd33c93reg.h,v 1.21.24.1 2001/06/13 05:52:05 honda Exp $	*/
 /*	$NetBSD$	*/
 /*-
diff --git a/sys/dev/ic/z8530.h b/sys/dev/ic/z8530.h
index d86a662a1d0b..5f31b67da435 100644
--- a/sys/dev/ic/z8530.h
+++ b/sys/dev/ic/z8530.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/sys/dev/ic/z8530.h,v 1.3 2005/01/06 01:42:44 imp Exp $
  */
 
 #ifndef _DEV_IC_Z8530_H_
diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index 9361c7ee88e6..47b98cf04a19 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.13.2.1 2005/08/19 18:38:55 brian Exp $");
 
 /*
  * Support for the SMBus controller logical device which is part of the
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index 54c3b97cdf95..916742333e01 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.16.2.1 2005/08/19 18:38:55 brian Exp $");
 
 /*
  * Support for the SMBus controller logical device which is part of the
diff --git a/sys/dev/ichsmb/ichsmb_reg.h b/sys/dev/ichsmb/ichsmb_reg.h
index a031607f4fdc..c64eb2f4e7cd 100644
--- a/sys/dev/ichsmb/ichsmb_reg.h
+++ b/sys/dev/ichsmb/ichsmb_reg.h
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_reg.h,v 1.2 2005/01/06 01:42:45 imp Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_REG_H_
diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h
index a7d0dcb234f9..87bdeb1354bb 100644
--- a/sys/dev/ichsmb/ichsmb_var.h
+++ b/sys/dev/ichsmb/ichsmb_var.h
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_var.h,v 1.4 2005/06/10 16:12:43 takawata Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_VAR_H
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 893efbd722d4..625c4cda061f 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.5 2005/01/06 01:42:45 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index ef08b2ff7ef5..577f48f27923 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.2 2005/01/06 01:42:45 imp Exp $
  */
 
 #ifndef _ICHWD_H_
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 663b816a71d8..deaad0cbc8a0 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida.c,v 1.42 2005/05/29 04:42:20 nyan Exp $");
 
 /*
  * Generic driver for Compaq SMART RAID adapters.
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 2446dddbe185..3512b6d72252 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/ida_disk.c,v 1.46 2005/05/29 04:42:20 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index 864b1700a010..c99f765f098a 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida_eisa.c,v 1.19 2005/05/29 04:42:20 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 3c9810537c2f..e9f665ba8288 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida_pci.c,v 1.34 2005/05/29 04:42:20 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ida/idaio.h b/sys/dev/ida/idaio.h
index b30f2eae1ac7..652833db1df6 100644
--- a/sys/dev/ida/idaio.h
+++ b/sys/dev/ida/idaio.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/idaio.h,v 1.1 2004/01/15 06:37:52 mdodd Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index a25a768c564e..7c072eb0ddd1 100644
--- a/sys/dev/ida/idareg.h
+++ b/sys/dev/ida/idareg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/idareg.h,v 1.10 2005/04/13 05:09:49 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 9666b0e80e73..088ee731b236 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/idavar.h,v 1.17 2005/04/13 05:06:57 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index 51b197be9632..f37765421ae7 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt.c,v 1.11 2005/06/10 16:49:10 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idt_harp.c b/sys/dev/idt/idt_harp.c
index 84e52eb7b071..db955ee05f04 100644
--- a/sys/dev/idt/idt_harp.c
+++ b/sys/dev/idt/idt_harp.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt_harp.c,v 1.8 2005/05/29 04:42:21 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idt_pci.c b/sys/dev/idt/idt_pci.c
index 1a77c4bb060e..dfdad0f2ddb2 100644
--- a/sys/dev/idt/idt_pci.c
+++ b/sys/dev/idt/idt_pci.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt_pci.c,v 1.7 2005/05/29 04:42:21 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idtreg.h b/sys/dev/idt/idtreg.h
index 230bbbb1c78c..bb3ddf1155d5 100644
--- a/sys/dev/idt/idtreg.h
+++ b/sys/dev/idt/idtreg.h
@@ -37,7 +37,7 @@
  *
  ******************************************************************************
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/idt/idtreg.h,v 1.2 2005/01/06 01:42:46 imp Exp $
  */
 
 #define	IDT_VERSION	"IDT 1.101"
diff --git a/sys/dev/idt/idtvar.h b/sys/dev/idt/idtvar.h
index b98ee1af2dad..ce054b28e1a6 100644
--- a/sys/dev/idt/idtvar.h
+++ b/sys/dev/idt/idtvar.h
@@ -47,7 +47,7 @@
  *
  ******************************************************************************
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/idt/idtvar.h,v 1.3 2005/01/06 01:42:46 imp Exp $
  */
 
 /*******************************************************************************
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index c3dcdee09cc9..c13447662854 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.102.2.3 2005/10/09 04:15:12 delphij Exp $");
 
 /*
  * Intel 82586 Ethernet chip
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 7bcc500aa61d..5eeff15d3047 100644
--- a/sys/dev/ie/if_ie507.h
+++ b/sys/dev/ie/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_ie507.h,v 1.5 2003/03/28 06:27:08 mdodd Exp $
  * Definitions for 3C507
  */
 
diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c
index 564176f17df6..2260cb0e40cc 100644
--- a/sys/dev/ie/if_ie_isa.c
+++ b/sys/dev/ie/if_ie_isa.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie_isa.c,v 1.4 2005/06/10 16:49:10 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ie/if_iee16.h b/sys/dev/ie/if_iee16.h
index 1196676cfed2..4b2d869dc91d 100644
--- a/sys/dev/ie/if_iee16.h
+++ b/sys/dev/ie/if_iee16.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/sys/dev/ie/if_iee16.h,v 1.4 2005/01/06 01:42:46 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index d3b0f228f957..2808fe2bf6f0 100644
--- a/sys/dev/ie/if_iereg.h
+++ b/sys/dev/ie/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_iereg.h,v 1.6 2003/03/29 13:36:41 mdodd Exp $
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/dev/ie/if_ievar.h b/sys/dev/ie/if_ievar.h
index 2d3851f9cdf2..a1ca3bb87572 100644
--- a/sys/dev/ie/if_ievar.h
+++ b/sys/dev/ie/if_ievar.h
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_ievar.h,v 1.3 2005/06/10 16:49:10 brooks Exp $
  */
 
 enum ie_hardware {
diff --git a/sys/dev/ieee488/ibfoo.c b/sys/dev/ieee488/ibfoo.c
index 537443dbf091..ef1870a3d1fc 100644
--- a/sys/dev/ieee488/ibfoo.c
+++ b/sys/dev/ieee488/ibfoo.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/ibfoo.c,v 1.5 2005/03/07 11:05:46 phk Exp $");
 
 #  define	IBDEBUG
 #  undef	IBDEBUG
diff --git a/sys/dev/ieee488/ibfoo_int.h b/sys/dev/ieee488/ibfoo_int.h
index 28f72897a9df..be08ee021816 100644
--- a/sys/dev/ieee488/ibfoo_int.h
+++ b/sys/dev/ieee488/ibfoo_int.h
@@ -26,7 +26,7 @@
  * This file defines the ABI between the userland gpib library and the
  * kernel.  This file should not be used anywhere else.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/ibfoo_int.h,v 1.2 2005/02/12 21:07:09 phk Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/ieee488/pcii.c b/sys/dev/ieee488/pcii.c
index d575f6927d59..1f1ca35354df 100644
--- a/sys/dev/ieee488/pcii.c
+++ b/sys/dev/ieee488/pcii.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/pcii.c,v 1.5 2005/02/12 17:39:50 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ieee488/ugpib.h b/sys/dev/ieee488/ugpib.h
index 726a70219dd8..42a1f26a25b3 100644
--- a/sys/dev/ieee488/ugpib.h
+++ b/sys/dev/ieee488/ugpib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/ugpib.h,v 1.5 2005/02/12 23:52:44 phk Exp $
  *
  */
 
diff --git a/sys/dev/ieee488/upd7210.c b/sys/dev/ieee488/upd7210.c
index e4b50ace490a..72f68a4510a2 100644
--- a/sys/dev/ieee488/upd7210.c
+++ b/sys/dev/ieee488/upd7210.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/upd7210.c,v 1.7 2005/04/04 17:37:35 phk Exp $");
 
 #  define	GPIB_DEBUG
 #  undef	GPIB_DEBUG
diff --git a/sys/dev/ieee488/upd7210.h b/sys/dev/ieee488/upd7210.h
index 7ba0f8eb8d10..8c6681327263 100644
--- a/sys/dev/ieee488/upd7210.h
+++ b/sys/dev/ieee488/upd7210.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/upd7210.h,v 1.3 2005/02/12 23:52:44 phk Exp $
  *
  * Locating an actual µPD7210 data book has proven quite impossible for me.
  * There are a fair number of newer chips which are supersets of the µPD7210
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 097221fac66c..161689ded300 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.99.2.2.2.1 2005/10/27 17:08:56 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index b0846e892b6c..b6a7b2a07418 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.13 2005/05/08 23:19:20 wpaul Exp $");
 
 #include <sys/ctype.h>
 #include <sys/param.h>
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index e54cb618fce4..cb7eeaf6051a 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.17 2005/05/08 23:19:20 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index b5a694337b7e..8b18e8e057d3 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.5 2005/04/24 20:21:22 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
index 13d517cf3075..96986ed8496d 100644
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ b/sys/dev/if_ndis/if_ndisvar.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/if_ndis/if_ndisvar.h,v 1.23.4.1 2005/10/27 17:08:56 wpaul Exp $
  */
 
 #define NDIS_DEFAULT_NODENAME	"FreeBSD NDIS node"
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 5c6e05b45791..c167d636948a 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.23.2.1 2005/08/25 05:01:11 rwatson Exp $");
 
 /*
  * I2C bus IP driver
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 3a879d8d0d37..e7f9f0e87735 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.32 2004/06/16 09:46:45 phk Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h
index 5d362c1a2dd4..8026fcb138dd 100644
--- a/sys/dev/iicbus/iic.h
+++ b/sys/dev/iicbus/iic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iic.h,v 1.3 1999/08/28 00:44:16 peter Exp $
  *
  */
 #ifndef __IIC_H
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index 53ecdceb947f..c2ad09afe6fd 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbb.c,v 1.13 2003/08/24 17:49:13 obrien Exp $");
 
 /*
  * Generic I2C bit-banging code
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index 7d10fe748b22..bf9e2480f5c2 100644
--- a/sys/dev/iicbus/iicbb_if.m
+++ b/sys/dev/iicbus/iicbb_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbb_if.m,v 1.6 2005/01/06 01:42:47 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index aae8a76ce51c..d377e1c70698 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.20 2004/05/27 13:29:09 joerg Exp $");
 
 /*
  * Autoconfiguration and support routines for the Philips serial I2C bus
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 59bbaef4d3fe..a97af7f6275f 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicbus.h,v 1.4 1999/08/28 00:41:58 peter Exp $
  *
  */
 #ifndef __IICBUS_H
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index 068cf4d86ff3..5c99309b438c 100644
--- a/sys/dev/iicbus/iicbus_if.m
+++ b/sys/dev/iicbus/iicbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbus_if.m,v 1.6 2005/01/06 01:42:47 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 6753db9bc49b..ca85b0d53d12 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.14 2003/08/24 17:49:13 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 3a9e7e34807f..971510eec89f 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iiconf.h,v 1.8 2003/06/19 02:50:08 jmg Exp $
  */
 #ifndef __IICONF_H
 #define __IICONF_H
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 966063f2a13b..548c90d97d58 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.12 2003/08/10 14:28:24 ticso Exp $
  *
  */
 
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index 4e3cef6b902e..606a19240005 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.13 2005/05/29 04:42:21 nyan Exp $");
 
 #define _IIR_C_
 
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index ad5528d8bc7c..d117a80ebdce 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/iir/iir.h,v 1.13 2005/03/02 21:33:23 joerg Exp $ */
 /*-
  *       Copyright (c) 2000-04 ICP vortex GmbH
  *       Copyright (c) 2002-04 Intel Corporation
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c
index 206b6ffb4208..bfd22133bbff 100644
--- a/sys/dev/iir/iir_ctrl.c
+++ b/sys/dev/iir/iir_ctrl.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.17 2005/05/06 02:32:34 cperciva Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index 4ad5d0cbf4d5..f4ec07e06330 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -31,7 +31,7 @@
 
 #ident "$Id: iir_pci.c 1.2 2003/08/26 12:29:55 achim Exp $"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.15 2005/05/29 04:42:21 nyan Exp $");
 
 /*
  *  iir_pci.c:  PCI Bus Attachment for Intel Integrated RAID Controller driver
diff --git a/sys/dev/io/iodev.c b/sys/dev/io/iodev.c
index 33f6c1d099b9..92bfed947b8d 100644
--- a/sys/dev/io/iodev.c
+++ b/sys/dev/io/iodev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/io/iodev.c,v 1.2 2004/08/02 20:42:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/ips/ips.c b/sys/dev/ips/ips.c
index 9229857999fd..ca017dd9da68 100644
--- a/sys/dev/ips/ips.c
+++ b/sys/dev/ips/ips.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.17 2005/04/26 13:38:29 scottl Exp $");
 
 #include <dev/ips/ips.h>
 #include <sys/stat.h>
diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h
index 829bb46d6ad9..5136ff50a3f2 100644
--- a/sys/dev/ips/ips.h
+++ b/sys/dev/ips/ips.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ips/ips.h,v 1.14 2005/05/29 04:42:21 nyan Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_commands.c b/sys/dev/ips/ips_commands.c
index bbaed7168bc0..4b97ae3c14aa 100644
--- a/sys/dev/ips/ips_commands.c
+++ b/sys/dev/ips/ips_commands.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_commands.c,v 1.12 2005/01/28 05:02:13 scottl Exp $");
 
 #include <dev/ips/ips.h>
 
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 7a8f5fd85ac8..968f4f26efa6 100644
--- a/sys/dev/ips/ips_disk.c
+++ b/sys/dev/ips/ips_disk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_disk.c,v 1.8 2005/01/30 17:45:45 scottl Exp $");
 
 #include <dev/ips/ips.h>
 #include <dev/ips/ips_disk.h>
diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h
index b841eeaeea2f..c98f811ebf74 100644
--- a/sys/dev/ips/ips_disk.h
+++ b/sys/dev/ips/ips_disk.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ips/ips_disk.h,v 1.4 2005/05/29 04:42:21 nyan Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_ioctl.c b/sys/dev/ips/ips_ioctl.c
index d3cee20ebdaa..71b397427364 100644
--- a/sys/dev/ips/ips_ioctl.c
+++ b/sys/dev/ips/ips_ioctl.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_ioctl.c,v 1.6 2005/01/28 05:02:13 scottl Exp $");
 
 #include <dev/ips/ips.h>
 #include <dev/ips/ips_ioctl.h>
diff --git a/sys/dev/ips/ips_ioctl.h b/sys/dev/ips/ips_ioctl.h
index ef0691e92846..84be407dbe23 100644
--- a/sys/dev/ips/ips_ioctl.h
+++ b/sys/dev/ips/ips_ioctl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ips/ips_ioctl.h,v 1.1 2003/05/11 06:36:49 scottl Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index 569c60f09825..055c33c6392c 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.13 2005/03/05 18:17:34 imp Exp $");
 
 #include <dev/ips/ips.h>
 
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index 4a33fa644224..65a66e48a258 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.7.2.3 2005/09/03 22:46:42 sam Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.7.2.3 2005/09/03 22:46:42 sam Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2100 MiniPCI driver
diff --git a/sys/dev/ipw/if_ipwreg.h b/sys/dev/ipw/if_ipwreg.h
index 9cbd62f45cae..e6ebdac0952a 100644
--- a/sys/dev/ipw/if_ipwreg.h
+++ b/sys/dev/ipw/if_ipwreg.h
@@ -1,4 +1,4 @@
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/ipw/if_ipwreg.h,v 1.1 2005/04/18 18:47:36 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h
index e1f3ea1f6916..98bb801545c7 100644
--- a/sys/dev/ipw/if_ipwvar.h
+++ b/sys/dev/ipw/if_ipwvar.h
@@ -1,4 +1,4 @@
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/ipw/if_ipwvar.h,v 1.3 2005/06/10 16:49:11 brooks Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
diff --git a/sys/dev/isp/DriverManual.txt b/sys/dev/isp/DriverManual.txt
index ea1968f9f883..fc35af47d07a 100644
--- a/sys/dev/isp/DriverManual.txt
+++ b/sys/dev/isp/DriverManual.txt
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/DriverManual.txt,v 1.1 2001/10/07 18:26:47 mjacob Exp $ */
 
 		Driver Theory of Operation Manual
 
diff --git a/sys/dev/isp/Hardware.txt b/sys/dev/isp/Hardware.txt
index 75f01bf7dd36..00593d82aa38 100644
--- a/sys/dev/isp/Hardware.txt
+++ b/sys/dev/isp/Hardware.txt
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/Hardware.txt,v 1.2 2003/01/01 18:48:50 schweikh Exp $ */
 
 	Hardware that is Known To or Should Work with This Driver
 
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index d009cd7273ec..60a2bf8676b7 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.113 2005/01/23 06:26:45 mjacob Exp $ */
 /*-
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 4132b5a0d205..acb445a9a0e6 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.105 2005/01/23 22:33:59 scottl Exp $");
 
 #include <dev/isp/isp_freebsd.h>
 #include <sys/unistd.h>
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index ede1fe14b2d3..0b787ea112d6 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.79 2005/05/29 04:42:22 nyan Exp $ */
 /*-
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
  * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
diff --git a/sys/dev/isp/isp_inline.h b/sys/dev/isp/isp_inline.h
index c09ec9cd25dd..02e7dfcfbc21 100644
--- a/sys/dev/isp/isp_inline.h
+++ b/sys/dev/isp/isp_inline.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.32 2005/05/11 03:00:50 mjacob Exp $ */
 /*-
  * Qlogic Host Adapter Inline Functions
  *
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index 921272aa2490..90af44bd7e07 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.12 2005/01/06 01:42:48 imp Exp $ */
 /*-
  * Copyright (c) 2001 by Matthew Jacob
  *
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 55a0ef7058ac..9673661b82dc 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.104 2005/05/29 04:42:22 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 5f87f3dbb08e..4a9f37d67633 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.15 2004/08/12 17:41:29 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index 1d4b397bbad5..45c3808414d1 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.32 2005/01/23 06:28:08 mjacob Exp $ */
 /*-
  * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
  *
diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h
index dff513dd5a1c..12d062bf93d2 100644
--- a/sys/dev/isp/isp_target.h
+++ b/sys/dev/isp/isp_target.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.23 2005/01/23 06:28:49 mjacob Exp $ */
 /*-
  * Qlogic Target Mode Structure and Flag Definitions
  *
diff --git a/sys/dev/isp/isp_tpublic.h b/sys/dev/isp/isp_tpublic.h
index a2773323d68e..15a583da6e1d 100644
--- a/sys/dev/isp/isp_tpublic.h
+++ b/sys/dev/isp/isp_tpublic.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.10 2005/01/06 01:42:48 imp Exp $ */
 /*-
  * Qlogic ISP Host Adapter Public Target Interface Structures && Routines
  *---------------------------------------
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 4834fd32c79b..d31c82a75603 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.47 2005/01/06 01:42:48 imp Exp $ */
 /*-
  * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 163ac9894d90..a0646439c152 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispreg.h,v 1.23 2005/01/06 01:42:48 imp Exp $ */
 /*-
  * Machine Independent (well, as best as possible) register
  * definitions for Qlogic ISP SCSI adapters.
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index e71a952cf8fd..43717042309c 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.71 2005/05/11 00:22:17 mjacob Exp $ */
 /*-
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/ispfw/asm_1000.h b/sys/dev/ispfw/asm_1000.h
index fb064094d30b..52a41632c2d4 100644
--- a/sys/dev/ispfw/asm_1000.h
+++ b/sys/dev/ispfw/asm_1000.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1000.h,v 1.2 2005/01/06 01:42:49 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_1040.h b/sys/dev/ispfw/asm_1040.h
index 9e78a56e5c11..f9aead4dc8c4 100644
--- a/sys/dev/ispfw/asm_1040.h
+++ b/sys/dev/ispfw/asm_1040.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1040.h,v 1.4 2005/01/06 01:42:49 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_1080.h b/sys/dev/ispfw/asm_1080.h
index edb0ad711a28..42f23e183bf3 100644
--- a/sys/dev/ispfw/asm_1080.h
+++ b/sys/dev/ispfw/asm_1080.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1080.h,v 1.3 2005/01/06 01:42:49 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_12160.h b/sys/dev/ispfw/asm_12160.h
index bc1d42089853..6d799ff8ef20 100644
--- a/sys/dev/ispfw/asm_12160.h
+++ b/sys/dev/ispfw/asm_12160.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_12160.h,v 1.6 2005/01/06 01:42:50 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2100.h b/sys/dev/ispfw/asm_2100.h
index 399707d57543..e7fe40bcd829 100644
--- a/sys/dev/ispfw/asm_2100.h
+++ b/sys/dev/ispfw/asm_2100.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2100.h,v 1.6 2005/01/06 01:42:50 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2200.h b/sys/dev/ispfw/asm_2200.h
index 3d92bf7c99e4..5faba6e14da5 100644
--- a/sys/dev/ispfw/asm_2200.h
+++ b/sys/dev/ispfw/asm_2200.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2200.h,v 1.7 2005/01/06 01:42:50 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2300.h b/sys/dev/ispfw/asm_2300.h
index 6e144a3453bc..1ea60e61000b 100644
--- a/sys/dev/ispfw/asm_2300.h
+++ b/sys/dev/ispfw/asm_2300.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2300.h,v 1.8 2005/01/29 01:12:37 mjacob Exp $ */
 /*-
  * Copyright (C) 2001, 2002, 2003 by Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c
index a78570b99576..11d8ec7cee44 100644
--- a/sys/dev/ispfw/ispfw.c
+++ b/sys/dev/ispfw/ispfw.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.14 2005/01/23 06:37:28 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index 40e716d199e9..4a4ac2d71fe0 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.8.2.4 2005/09/26 17:31:36 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.8.2.4 2005/09/26 17:31:36 damien Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
diff --git a/sys/dev/iwi/if_iwireg.h b/sys/dev/iwi/if_iwireg.h
index e77d437422a2..76c2bc84274a 100644
--- a/sys/dev/iwi/if_iwireg.h
+++ b/sys/dev/iwi/if_iwireg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.2.2.1 2005/09/26 17:31:36 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
diff --git a/sys/dev/iwi/if_iwivar.h b/sys/dev/iwi/if_iwivar.h
index 82d5e93b69dc..c8eff3a87806 100644
--- a/sys/dev/iwi/if_iwivar.h
+++ b/sys/dev/iwi/if_iwivar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/iwi/if_iwivar.h,v 1.4.2.1 2005/09/26 17:31:36 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
diff --git a/sys/dev/ixgb/LICENSE b/sys/dev/ixgb/LICENSE
index 501764514696..333a0fce9950 100644
--- a/sys/dev/ixgb/LICENSE
+++ b/sys/dev/ixgb/LICENSE
@@ -1,4 +1,4 @@
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/LICENSE,v 1.2 2005/01/06 01:42:53 imp Exp $*/
 /*-
 
 Copyright (c) 2001-2004, Intel Corporation
diff --git a/sys/dev/ixgb/README b/sys/dev/ixgb/README
index 1508eac95c44..d46628f71269 100644
--- a/sys/dev/ixgb/README
+++ b/sys/dev/ixgb/README
@@ -1,4 +1,4 @@
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/README,v 1.1.10.1 2005/10/07 14:00:04 glebius Exp $*/
 FreeBSD Driver for Intel(R) PRO/10GbE Server Adapters
 =====================================================
 
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index 4c79d0179327..6b352ca6b877 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.c,v 1.10.2.4 2005/10/07 14:00:04 glebius Exp $*/
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/ixgb/if_ixgb.h b/sys/dev/ixgb/if_ixgb.h
index 5d7b4d95bcf7..99f2c35fe622 100644
--- a/sys/dev/ixgb/if_ixgb.h
+++ b/sys/dev/ixgb/if_ixgb.h
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.h,v 1.7 2005/06/10 16:49:11 brooks Exp $*/
 
 #ifndef _IXGB_H_DEFINED_
 #define _IXGB_H_DEFINED_
diff --git a/sys/dev/ixgb/if_ixgb_osdep.h b/sys/dev/ixgb/if_ixgb_osdep.h
index 4e9cd0fe8dd9..4e10f8d3c3ef 100644
--- a/sys/dev/ixgb/if_ixgb_osdep.h
+++ b/sys/dev/ixgb/if_ixgb_osdep.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb_osdep.h,v 1.3 2005/03/27 16:38:08 mux Exp $*/
 
 #ifndef _FREEBSD_OS_H_
 #define _FREEBSD_OS_H_
diff --git a/sys/dev/ixgb/ixgb_ee.c b/sys/dev/ixgb/ixgb_ee.c
index 861a99a13997..c7ec7b729fb2 100644
--- a/sys/dev/ixgb/ixgb_ee.c
+++ b/sys/dev/ixgb/ixgb_ee.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ee.c,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 #include <dev/ixgb/ixgb_hw.h> 
 #include <dev/ixgb/ixgb_ee.h> 
diff --git a/sys/dev/ixgb/ixgb_ee.h b/sys/dev/ixgb/ixgb_ee.h
index 6a1163aab61b..d30667aa72e8 100644
--- a/sys/dev/ixgb/ixgb_ee.h
+++ b/sys/dev/ixgb/ixgb_ee.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ee.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 #ifndef _IXGB_EE_H_
 #define _IXGB_EE_H_
 
diff --git a/sys/dev/ixgb/ixgb_hw.c b/sys/dev/ixgb/ixgb_hw.c
index 23b0b2846e59..131c9d685f79 100644
--- a/sys/dev/ixgb/ixgb_hw.c
+++ b/sys/dev/ixgb/ixgb_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_hw.c,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 /* ixgb_hw.c
  * Shared functions for accessing and configuring the adapter
diff --git a/sys/dev/ixgb/ixgb_hw.h b/sys/dev/ixgb/ixgb_hw.h
index 2194544e04ee..88c13bbe55e7 100644
--- a/sys/dev/ixgb/ixgb_hw.h
+++ b/sys/dev/ixgb/ixgb_hw.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_hw.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 #ifndef _IXGB_HW_H_
 #define _IXGB_HW_H_
 
diff --git a/sys/dev/ixgb/ixgb_ids.h b/sys/dev/ixgb/ixgb_ids.h
index a224f6300fa2..d33ba85719be 100644
--- a/sys/dev/ixgb/ixgb_ids.h
+++ b/sys/dev/ixgb/ixgb_ids.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ids.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 #ifndef _IXGB_IDS_H_
 #define _IXGB_IDS_H_
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 0568febed341..dfdae7ae8495 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy.c,v 1.53 2004/06/16 09:46:48 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joy_isa.c b/sys/dev/joy/joy_isa.c
index efb1e29280dc..80c54645e40d 100644
--- a/sys/dev/joy/joy_isa.c
+++ b/sys/dev/joy/joy_isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy_isa.c,v 1.3 2003/08/24 17:49:14 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joy_pccard.c b/sys/dev/joy/joy_pccard.c
index d94819a8c4c2..cee216eb7209 100644
--- a/sys/dev/joy/joy_pccard.c
+++ b/sys/dev/joy/joy_pccard.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy_pccard.c,v 1.5 2004/05/27 03:49:42 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joyvar.h b/sys/dev/joy/joyvar.h
index 966fe78abb60..3a566e0205b8 100644
--- a/sys/dev/joy/joyvar.h
+++ b/sys/dev/joy/joyvar.h
@@ -25,7 +25,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/sys/dev/joy/joyvar.h,v 1.3 2004/06/16 09:46:48 phk Exp $
  */
 
 struct joy_softc {
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 978644139277..28ad24e82314 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.43.2.1 2005/07/20 18:56:20 emax Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 184c607a015a..1d12486e88f3 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.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/sys/dev/kbd/kbdreg.h,v 1.17.8.1 2005/07/20 18:56:20 emax Exp $
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 5ff744c0c716..6a6704cb4b66 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,7 +25,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/sys/dev/kbd/kbdtables.h,v 1.50 2005/05/12 13:39:31 nyan Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c
index f052a8ed9aff..4ee9b4f25221 100644
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.2.2.1 2005/07/21 16:40:07 kensmith Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/dev/led/led.c b/sys/dev/led/led.c
index 11c8d3ad8c21..4713f8812ef6 100644
--- a/sys/dev/led/led.c
+++ b/sys/dev/led/led.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.16 2005/03/07 11:05:46 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/led/led.h b/sys/dev/led/led.h
index 866311b9809a..0276b5e91942 100644
--- a/sys/dev/led/led.h
+++ b/sys/dev/led/led.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/led/led.h,v 1.5 2004/06/16 09:46:49 phk Exp $
  */
 
 #ifndef _DEV_LED_H
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index f134b985a226..9595f8695733 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.39.2.3 2005/10/06 20:20:12 jhb Exp $");
 
 /*
  * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public
diff --git a/sys/dev/lge/if_lgereg.h b/sys/dev/lge/if_lgereg.h
index 77f4b4a1d926..dd31a4d571a0 100644
--- a/sys/dev/lge/if_lgereg.h
+++ b/sys/dev/lge/if_lgereg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/lge/if_lgereg.h,v 1.5.2.1 2005/10/06 20:20:12 jhb Exp $
  */
 
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 1d26ad67522c..b41cb780af8c 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.111.2.3 2005/10/09 04:18:17 delphij Exp $");
 
 /*
 #define DIAGNOSTIC
diff --git a/sys/dev/lnc/if_lnc_cbus.c b/sys/dev/lnc/if_lnc_cbus.c
index 7132aff37fa9..c4f21de8623d 100644
--- a/sys/dev/lnc/if_lnc_cbus.c
+++ b/sys/dev/lnc/if_lnc_cbus.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_cbus.c,v 1.9 2005/06/10 16:49:11 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/lnc/if_lnc_isa.c b/sys/dev/lnc/if_lnc_isa.c
index ac0cf97ebd35..30a8f19e4723 100644
--- a/sys/dev/lnc/if_lnc_isa.c
+++ b/sys/dev/lnc/if_lnc_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_isa.c,v 1.20 2005/06/10 16:49:11 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index f221d281ed4c..df45a8220145 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_pci.c,v 1.37 2005/06/10 16:49:11 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/lnc/if_lncreg.h b/sys/dev/lnc/if_lncreg.h
index 86e1d8b021a9..e23d1ec5665a 100644
--- a/sys/dev/lnc/if_lncreg.h
+++ b/sys/dev/lnc/if_lncreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/lnc/if_lncreg.h,v 1.7 2001/07/04 13:00:19 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index a34d83e58e22..720f7c360517 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/lnc/if_lncvar.h,v 1.28 2005/06/10 16:49:11 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/mc146818/mc146818.c b/sys/dev/mc146818/mc146818.c
index 3bd4ce321384..d5e67d96fcd3 100644
--- a/sys/dev/mc146818/mc146818.c
+++ b/sys/dev/mc146818/mc146818.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mc146818/mc146818.c,v 1.4 2005/06/04 23:24:50 marius Exp $");
 
 /*
  * mc146818 and compatible time of day chip subroutines
diff --git a/sys/dev/mc146818/mc146818reg.h b/sys/dev/mc146818/mc146818reg.h
index 3aab55f56a5a..08f8b47b12ce 100644
--- a/sys/dev/mc146818/mc146818reg.h
+++ b/sys/dev/mc146818/mc146818reg.h
@@ -24,7 +24,7 @@
  *
  *	from: NetBSD: mc146818reg.h,v 1.5 2003/11/02 11:07:45 wiz Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mc146818/mc146818reg.h,v 1.6 2005/01/06 01:42:54 imp Exp $
  */
 
 /*
diff --git a/sys/dev/mc146818/mc146818var.h b/sys/dev/mc146818/mc146818var.h
index 4c6ff099e892..8574bff28b7b 100644
--- a/sys/dev/mc146818/mc146818var.h
+++ b/sys/dev/mc146818/mc146818var.h
@@ -25,7 +25,7 @@
  *
  *	from: NetBSD: mc146818var.h,v 1.3 2003/11/24 06:20:40 tsutsui Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mc146818/mc146818var.h,v 1.3 2005/05/19 21:20:42 marius Exp $
  */
 
 struct mc146818_softc {
diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c
index efa70d29b8a6..f6e4f89f99dd 100644
--- a/sys/dev/mca/mca_bus.c
+++ b/sys/dev/mca/mca_bus.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mca/mca_bus.c,v 1.13 2003/08/24 17:54:09 obrien Exp $");
 
 /*
  * References:
diff --git a/sys/dev/mca/mca_busreg.h b/sys/dev/mca/mca_busreg.h
index e818b68b8023..6b9324ec4191 100644
--- a/sys/dev/mca/mca_busreg.h
+++ b/sys/dev/mca/mca_busreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mca/mca_busreg.h,v 1.1 1999/09/03 03:40:00 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/mca/mca_busvar.h b/sys/dev/mca/mca_busvar.h
index db11d67699f6..6555c47f4298 100644
--- a/sys/dev/mca/mca_busvar.h
+++ b/sys/dev/mca/mca_busvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mca/mca_busvar.h,v 1.2 1999/09/26 07:02:05 mdodd Exp $
  */
 
 typedef u_int16_t mca_id_t;
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 86e40c474436..a34a589301ef 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mcd/mcd.c,v 1.147 2005/05/29 04:42:22 nyan Exp $");
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include <sys/param.h>
diff --git a/sys/dev/mcd/mcd_isa.c b/sys/dev/mcd/mcd_isa.c
index 8b71f105977d..9a6376dd92cb 100644
--- a/sys/dev/mcd/mcd_isa.c
+++ b/sys/dev/mcd/mcd_isa.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mcd/mcd_isa.c,v 1.9 2005/05/29 04:42:22 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index 451fc5de76c3..1fb1c7ae1cc6 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mcd/mcdreg.h,v 1.18 2005/03/02 21:33:24 joerg Exp $
  */
 
 #ifndef MCD_H
diff --git a/sys/dev/mcd/mcdvar.h b/sys/dev/mcd/mcdvar.h
index adfd4a4f4191..162906369e96 100644
--- a/sys/dev/mcd/mcdvar.h
+++ b/sys/dev/mcd/mcdvar.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mcd/mcdvar.h,v 1.4 2004/06/16 09:46:49 phk Exp $
  */
 
 struct mcd_mbx {
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index ac617758c945..8569391c9621 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/md/md.c,v 1.153.2.4 2005/10/07 15:08:41 phk Exp $
  *
  */
 
diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c
index 9fb33d2c4d48..6e8ba71d00de 100644
--- a/sys/dev/mem/memdev.c
+++ b/sys/dev/mem/memdev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mem/memdev.c,v 1.3 2004/08/04 18:30:31 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c
index f514f50bedb6..61030b3ef8f4 100644
--- a/sys/dev/mem/memutil.c
+++ b/sys/dev/mem/memutil.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mem/memutil.c,v 1.1 2004/08/04 18:30:31 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index aba0b26f9bdf..75a693bb745f 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/acphy.c,v 1.16 2005/01/06 01:42:55 imp Exp $");
 
 /*
  * Driver for Altima AC101 10/100 PHY
diff --git a/sys/dev/mii/acphyreg.h b/sys/dev/mii/acphyreg.h
index 827aba68f157..0712a62ffd82 100644
--- a/sys/dev/mii/acphyreg.h
+++ b/sys/dev/mii/acphyreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/acphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $
  */
 
 #ifndef _DEV_MII_ACPHYREG_H_
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index dac0938ec1ba..f67c871afce3 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/amphy.c,v 1.17 2005/01/06 01:42:55 imp Exp $");
 
 /*
  * driver for AMD AM79c873 PHYs
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index 6cdbc95647b5..91732dc1fbc6 100644
--- a/sys/dev/mii/amphyreg.h
+++ b/sys/dev/mii/amphyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/amphyreg.h,v 1.2 2005/01/06 01:42:55 imp Exp $
  */
 
 #ifndef _DEV_MII_AMTPHYREG_H_
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index b086c8680ef3..4879743491b1 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/bmtphy.c,v 1.9 2005/01/06 01:42:55 imp Exp $");
 
 /*
  * Driver for the Broadcom BCM5201/BCM5202 "Mini-Theta" PHYs.  This also
diff --git a/sys/dev/mii/bmtphyreg.h b/sys/dev/mii/bmtphyreg.h
index 223d631a54d5..7b8abe16259a 100644
--- a/sys/dev/mii/bmtphyreg.h
+++ b/sys/dev/mii/bmtphyreg.h
@@ -35,7 +35,7 @@
  *
  *	from NetBSD: bmtphyreg.h,v 1.1 2001/06/02 21:42:10 thorpej Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/bmtphyreg.h,v 1.2 2005/01/06 01:42:55 imp Exp $
  */
 
 #ifndef _DEV_MII_BMTPHYREG_H_
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 31e1696cf306..343ca84ae8d9 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.34.4.1 2005/10/28 01:07:54 grehan Exp $");
 
 /*
  * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index bb9636d882fb..0f104d5f1e77 100644
--- a/sys/dev/mii/brgphyreg.h
+++ b/sys/dev/mii/brgphyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/brgphyreg.h,v 1.6 2005/01/06 01:42:55 imp Exp $
  */
 
 #ifndef _DEV_MII_BRGPHYREG_H_
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 86567c004715..63e11791ab4d 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -29,11 +29,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/ciphy.c,v 1.2 2005/01/06 01:42:55 imp Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.2 2005/01/06 01:42:55 imp Exp $");
 
 /*
  * Driver for the Cicada CS8201 10/100/1000 copper PHY.
diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h
index 8c0a8a46cc61..727441ab1b42 100644
--- a/sys/dev/mii/ciphyreg.h
+++ b/sys/dev/mii/ciphyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/ciphyreg.h,v 1.2 2005/01/06 01:42:55 imp Exp $
  */
 
 #ifndef _DEV_MII_CIPHYREG_H_
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 3a6a5de27e4e..2ba12df00c7a 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/dcphy.c,v 1.28 2005/05/29 04:42:22 nyan Exp $");
 
 /*
  * Pseudo-driver for internal NWAY support on DEC 21143 and workalike
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 7894e95f06be..5175844e95b8 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.14 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY.
diff --git a/sys/dev/mii/e1000phyreg.h b/sys/dev/mii/e1000phyreg.h
index 14bf6124e69a..4f32ee2b8625 100644
--- a/sys/dev/mii/e1000phyreg.h
+++ b/sys/dev/mii/e1000phyreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.3 2005/01/06 01:42:56 imp Exp $ */
 /*-
  * Principal Author: Parag Patel
  * Copyright (c) 2001
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index afb90137388b..92565ed2d00d 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/exphy.c,v 1.19 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for 3Com internal PHYs
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index b2a3d8168614..29d8341570c8 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/inphy.c,v 1.14 2004/05/30 17:57:40 phk Exp $");
 
 /*
  * driver for Intel 82553 and 82555 PHYs
diff --git a/sys/dev/mii/inphyreg.h b/sys/dev/mii/inphyreg.h
index 4b7d1f113051..c7a9888ced80 100644
--- a/sys/dev/mii/inphyreg.h
+++ b/sys/dev/mii/inphyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mii/inphyreg.h,v 1.1 2001/03/12 02:41:57 jlemon Exp $
  */
 
 #define MII_INPHY_SCR           0x10    /* status and control register */
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index e4d0c1916748..d2b84d69deb9 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.14 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for Level One's LXT-970 ethernet 10/100 PHY
diff --git a/sys/dev/mii/lxtphyreg.h b/sys/dev/mii/lxtphyreg.h
index 662bd34b280e..efcb0dbf74cc 100644
--- a/sys/dev/mii/lxtphyreg.h
+++ b/sys/dev/mii/lxtphyreg.h
@@ -1,6 +1,6 @@
 /*	OpenBSD: lxtphyreg.h,v 1.1 1998/11/11 19:34:47 jason Exp 	*/
 /*	NetBSD: lxtphyreg.h,v 1.1 1998/10/24 00:33:17 thorpej Exp 	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/mii/lxtphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index c640e1358eba..b65c5094434d 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mii.c,v 1.26 2005/06/11 00:20:38 brooks Exp $");
 
 /*
  * MII bus layer, glues MII-capable network interface drivers to sharable
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 0f1a4426e6fe..d9883b6c40c0 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/mii.h,v 1.5 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_MII_H_
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index fdeddabb4ab6..d94fa44a1387 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mii_physubr.c,v 1.22 2005/02/15 06:02:34 imp Exp $");
 
 /*
  * Subroutines common to all PHYs.
diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m
index 017812f4dfb0..0931059fba7e 100644
--- a/sys/dev/mii/miibus_if.m
+++ b/sys/dev/mii/miibus_if.m
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/mii/miibus_if.m,v 1.4 2001/09/29 18:40:06 jlemon Exp $
 
 #include <sys/bus.h>
 
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index b694036dad04..e272bc5c3a9d 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.30 2005/05/19 21:08:58 ps Exp $
 /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
 
 /*-
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index f6c759c40e93..da1d6a586975 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/miivar.h,v 1.15 2002/05/04 11:00:30 phk Exp $
  */
 
 #ifndef _DEV_MII_MIIVAR_H_
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 9b2693314ba5..d5b8c2fc72c5 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mlphy.c,v 1.20 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for Micro Linear 6692 PHYs
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 259739e15a81..a72ca5b82d3f 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.19 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * Driver for the National Semiconductor DP83891 and DP83861
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index 44899191715e..14f33cc39caa 100644
--- a/sys/dev/mii/nsgphyreg.h
+++ b/sys/dev/mii/nsgphyreg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/nsgphyreg.h,v 1.4 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_NSGPHYREG_H_
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 05941492947d..93294fe12b0c 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.23 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for National Semiconductor's DP83840A ethernet 10/100 PHY
diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h
index 5ff0490b1dfe..5e8d3478e854 100644
--- a/sys/dev/mii/nsphyreg.h
+++ b/sys/dev/mii/nsphyreg.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/nsphyreg.h,v 1.2 1999/08/28 00:42:16 peter Exp $
  */
 
 #ifndef _DEV_MII_NSPHYREG_H_
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 6f3ab65a9deb..be42f718699a 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.15 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for homePNA PHYs
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 98d269a34e6b..1f2802e06d7e 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/pnphy.c,v 1.18 2005/05/29 04:42:22 nyan Exp $");
 
 /*
  * Pseudo-driver for media selection on the Lite-On PNIC 82c168
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 9c92ed8a5de3..640edb4141ca 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.14 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for Quality Semiconductor's QS6612 ethernet 10/100 PHY
diff --git a/sys/dev/mii/qsphyreg.h b/sys/dev/mii/qsphyreg.h
index a69786596a29..29a32b045a33 100644
--- a/sys/dev/mii/qsphyreg.h
+++ b/sys/dev/mii/qsphyreg.h
@@ -1,6 +1,6 @@
 /*	OpenBSD: qsphyreg.h,v 1.2 1999/03/09 00:02:45 jason Exp 	*/
 /*	NetBSD: qsphyreg.h,v 1.1 1998/08/11 00:01:03 thorpej Exp 	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/mii/qsphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index ad384a93e82e..4a7dd3381bb9 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.6 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * Driver for the RealTek 8169S/8110S internal 10/100/1000 PHY.
diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h
index 0ce44dfcd9ac..4e7371b5e6c8 100644
--- a/sys/dev/mii/rgephyreg.h
+++ b/sys/dev/mii/rgephyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/rgephyreg.h,v 1.2 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_RGEPHYREG_H_
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index f9c9b5e3102c..fb3e547c0609 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.21 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for RealTek 8139 internal PHYs
diff --git a/sys/dev/mii/ruephy.c b/sys/dev/mii/ruephy.c
index 282dcdd344b1..bb593677252b 100644
--- a/sys/dev/mii/ruephy.c
+++ b/sys/dev/mii/ruephy.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ruephy.c,v 1.4 2004/05/30 17:57:40 phk Exp $");
 
 /*
  * driver for RealTek RTL8150 internal PHY
diff --git a/sys/dev/mii/ruephyreg.h b/sys/dev/mii/ruephyreg.h
index 5f3911bebd5d..4690df15c244 100644
--- a/sys/dev/mii/ruephyreg.h
+++ b/sys/dev/mii/ruephyreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/ruephyreg.h,v 1.1 2003/05/03 10:16:56 akiyama Exp $
  */
 
 #ifndef _RUEPHYREG_H_
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 8ae7b0506d01..a14cfe246c7c 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tdkphy.c,v 1.16 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * Driver for the TDK 78Q2120 MII
diff --git a/sys/dev/mii/tdkphyreg.h b/sys/dev/mii/tdkphyreg.h
index 4429c9481ec7..5986335a893e 100644
--- a/sys/dev/mii/tdkphyreg.h
+++ b/sys/dev/mii/tdkphyreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/tdkphyreg.h,v 1.2 2005/01/06 01:42:56 imp Exp $
  */
 
 /*
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index f07e33e16c43..481635b7963f 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.18 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * Driver for Texas Instruments's ThunderLAN PHYs
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index a016f4cc6910..6689f76c3075 100644
--- a/sys/dev/mii/tlphyreg.h
+++ b/sys/dev/mii/tlphyreg.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/sys/dev/mii/tlphyreg.h,v 1.3 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_TLPHYREG_H_
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 2d87b565c241..4ce5a9c77116 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.17 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for generic unknown PHYs
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 123d52913179..7f812399e4b9 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy_subr.c,v 1.8 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Subroutines shared by the ukphy driver and other PHY drivers.
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index c6d2ee9b383a..03779ecffdc4 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.17 2005/01/06 01:42:56 imp Exp $");
 
 /*
  * driver for the XaQti XMAC II's internal PHY. This is sort of
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 1e828e1681a1..3eba00358c41 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/xmphyreg.h,v 1.4 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_XMPHYREG_H_
diff --git a/sys/dev/mk48txx/mk48txx.c b/sys/dev/mk48txx/mk48txx.c
index 634a64426f19..2987e0155a66 100644
--- a/sys/dev/mk48txx/mk48txx.c
+++ b/sys/dev/mk48txx/mk48txx.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.6 2005/05/19 21:16:50 marius Exp $");
 
 /*
  * Mostek MK48T02, MK48T08, MK48T18, MK48T59 time-of-day chip subroutines.
diff --git a/sys/dev/mk48txx/mk48txxreg.h b/sys/dev/mk48txx/mk48txxreg.h
index 25b9cb392086..91b37324ced5 100644
--- a/sys/dev/mk48txx/mk48txxreg.h
+++ b/sys/dev/mk48txx/mk48txxreg.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: mk48txxreg.h,v 1.7 2003/11/01 22:41:42 tsutsui Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mk48txx/mk48txxreg.h,v 1.5 2005/05/19 21:16:50 marius Exp $
  */
 
 /*
diff --git a/sys/dev/mk48txx/mk48txxvar.h b/sys/dev/mk48txx/mk48txxvar.h
index f7c3d3195062..8334732c4aba 100644
--- a/sys/dev/mk48txx/mk48txxvar.h
+++ b/sys/dev/mk48txx/mk48txxvar.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: mk48txxvar.h,v 1.1 2003/11/01 22:41:42 tsutsui Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mk48txx/mk48txxvar.h,v 1.2 2005/05/19 21:16:50 marius Exp $
  */
 
 typedef uint8_t (*mk48txx_nvrd_t)(device_t, int);
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index d8cc79ac7b36..299eb89ea054 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlx.c,v 1.53 2005/05/29 04:42:23 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx_compat.h b/sys/dev/mlx/mlx_compat.h
index 7160c3d1639b..176c6439ead9 100644
--- a/sys/dev/mlx/mlx_compat.h
+++ b/sys/dev/mlx/mlx_compat.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mlx/mlx_compat.h,v 1.3 2003/03/08 08:01:29 phk Exp $
  */
 /*
  * Portability and compatibility interfaces.
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index db86bf85e2e7..9102ee60087d 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mlx/mlx_disk.c,v 1.34 2004/11/25 12:15:49 scottl Exp $");
 
 /*
  * Disk driver for Mylex DAC960 RAID adapters.
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index b39a6b87d092..22e66bccf9c3 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mlx/mlx_pci.c,v 1.23.2.1 2005/07/31 00:41:53 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mlx/mlxio.h b/sys/dev/mlx/mlxio.h
index f091befad2d0..43c51cb66966 100644
--- a/sys/dev/mlx/mlxio.h
+++ b/sys/dev/mlx/mlxio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlxio.h,v 1.3 2000/04/11 02:52:44 msmith Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/mlx/mlxreg.h b/sys/dev/mlx/mlxreg.h
index 16fdd0cf8ed3..dd2856a925dd 100644
--- a/sys/dev/mlx/mlxreg.h
+++ b/sys/dev/mlx/mlxreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlxreg.h,v 1.9 2004/11/25 12:15:49 scottl Exp $
  */
 
 #define MLX_BLKSIZE	512		/* fixed feature */
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index 345cf9933c22..dc9c7e368ae9 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlxvar.h,v 1.22 2004/06/16 09:46:50 phk Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 074d6fa20176..66440cbfc482 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mly.c,v 1.38 2005/05/29 04:42:23 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/mly/mly_tables.h b/sys/dev/mly/mly_tables.h
index 433a1cb1036e..2f04c87c1f5b 100644
--- a/sys/dev/mly/mly_tables.h
+++ b/sys/dev/mly/mly_tables.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mly_tables.h,v 1.3 2002/02/27 23:57:18 peter Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mlyio.h b/sys/dev/mly/mlyio.h
index 504b5040b532..554544d347fd 100644
--- a/sys/dev/mly/mlyio.h
+++ b/sys/dev/mly/mlyio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mlyio.h,v 1.2 2001/07/14 00:12:22 msmith Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/mly/mlyreg.h b/sys/dev/mly/mlyreg.h
index a4106a57b003..944998eb9ec8 100644
--- a/sys/dev/mly/mlyreg.h
+++ b/sys/dev/mly/mlyreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mlyreg.h,v 1.2 2002/09/23 18:54:30 alfred Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mlyvar.h b/sys/dev/mly/mlyvar.h
index e1c7a50e9167..58f1a8d016c8 100644
--- a/sys/dev/mly/mlyvar.h
+++ b/sys/dev/mly/mlyvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mlyvar.h,v 1.6 2004/06/16 09:46:51 phk Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/mpt/mpilib/fc_log.h b/sys/dev/mpt/mpilib/fc_log.h
index 23018ab1147f..a196f6ece93c 100644
--- a/sys/dev/mpt/mpilib/fc_log.h
+++ b/sys/dev/mpt/mpilib/fc_log.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/fc_log.h,v 1.5 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi.h b/sys/dev/mpt/mpilib/mpi.h
index 3b3f6e9821cd..5629564f40b0 100644
--- a/sys/dev/mpt/mpilib/mpi.h
+++ b/sys/dev/mpt/mpilib/mpi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.6 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_cnfg.h b/sys/dev/mpt/mpilib/mpi_cnfg.h
index 7ab0a9f06584..e9b4571a106e 100644
--- a/sys/dev/mpt/mpilib/mpi_cnfg.h
+++ b/sys/dev/mpt/mpilib/mpi_cnfg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.6 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_fc.h b/sys/dev/mpt/mpilib/mpi_fc.h
index 4067fc33e52f..f66653d39c68 100644
--- a/sys/dev/mpt/mpilib/mpi_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_fc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_fc.h,v 1.5 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_init.h b/sys/dev/mpt/mpilib/mpi_init.h
index a3dfa42478a9..b2ee5880ef88 100644
--- a/sys/dev/mpt/mpilib/mpi_init.h
+++ b/sys/dev/mpt/mpilib/mpi_init.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_init.h,v 1.6 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_ioc.h b/sys/dev/mpt/mpilib/mpi_ioc.h
index 78d20bca2d85..64cf5b5f9330 100644
--- a/sys/dev/mpt/mpilib/mpi_ioc.h
+++ b/sys/dev/mpt/mpilib/mpi_ioc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.6 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_lan.h b/sys/dev/mpt/mpilib/mpi_lan.h
index a7551c621064..adf106ab0363 100644
--- a/sys/dev/mpt/mpilib/mpi_lan.h
+++ b/sys/dev/mpt/mpilib/mpi_lan.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_lan.h,v 1.5 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_raid.h b/sys/dev/mpt/mpilib/mpi_raid.h
index 97dcd20e4acb..0b9a8f4238ce 100644
--- a/sys/dev/mpt/mpilib/mpi_raid.h
+++ b/sys/dev/mpt/mpilib/mpi_raid.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_raid.h,v 1.6 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_targ.h b/sys/dev/mpt/mpilib/mpi_targ.h
index 2642a67d13d3..88c4cf750516 100644
--- a/sys/dev/mpt/mpilib/mpi_targ.h
+++ b/sys/dev/mpt/mpilib/mpi_targ.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_targ.h,v 1.5 2005/07/10 15:05:39 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h
index c505388ca6d7..1accb6699b3d 100644
--- a/sys/dev/mpt/mpilib/mpi_type.h
+++ b/sys/dev/mpt/mpilib/mpi_type.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.7 2005/07/10 15:05:39 scottl Exp $ */
 /*
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c
index 8c7dbc994d9f..70ab045aa57a 100644
--- a/sys/dev/mpt/mpt.c
+++ b/sys/dev/mpt/mpt.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.12.4.1 2005/10/27 18:58:37 scottl Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h> /* XXX For static handler registration */
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index c7a7ed0faab7..2fda05b06ba4 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.6.4.1 2005/10/27 18:58:37 scottl Exp $ */
 /*-
  * Generic defines for LSI '909 FC  adapters.
  * FreeBSD Version.
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index b9437ef87780..fa3bad1b878b 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -60,7 +60,7 @@
  * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.1.4.1 2005/10/27 18:58:37 scottl Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h>
diff --git a/sys/dev/mpt/mpt_cam.h b/sys/dev/mpt/mpt_cam.h
index 39492c9e5246..1110371fc328 100644
--- a/sys/dev/mpt/mpt_cam.h
+++ b/sys/dev/mpt/mpt_cam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_cam.h,v 1.1.4.1 2005/10/27 18:58:37 scottl Exp $ */
 /*-
  * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *
diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c
index 0dce5f77834c..517724475b77 100644
--- a/sys/dev/mpt/mpt_debug.c
+++ b/sys/dev/mpt/mpt_debug.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.8 2005/07/10 15:05:38 scottl Exp $");
 
 #include <dev/mpt/mpt.h>
 
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index ebc1ac31f203..648c94bfd1a1 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.20.2.1.2.1 2005/10/27 18:58:37 scottl Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h>
diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c
index c62b3af1d3da..785e5ebcfad9 100644
--- a/sys/dev/mpt/mpt_raid.c
+++ b/sys/dev/mpt/mpt_raid.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.1.4.1 2005/10/27 18:58:37 scottl Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_raid.h>
diff --git a/sys/dev/mpt/mpt_raid.h b/sys/dev/mpt/mpt_raid.h
index 310ac6df6d8c..0ced3f3283fe 100644
--- a/sys/dev/mpt/mpt_raid.h
+++ b/sys/dev/mpt/mpt_raid.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.1.4.1 2005/10/27 18:58:37 scottl Exp $ */
 /*-
  * Definitions for the integrated RAID features LSI MPT Fusion adapters.
  *
diff --git a/sys/dev/mpt/mpt_reg.h b/sys/dev/mpt/mpt_reg.h
index 6403b527c596..941b88a1a181 100644
--- a/sys/dev/mpt/mpt_reg.h
+++ b/sys/dev/mpt/mpt_reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_reg.h,v 1.1 2005/07/10 15:05:38 scottl Exp $ */
 /*-
  * Generic defines for LSI '909 FC  adapters.
  * FreeBSD Version.
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 1c2a986b9583..3475fababfdd 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/mse.c,v 1.72 2005/04/08 05:22:58 imp Exp $
  */
 
 /*
diff --git a/sys/dev/mse/mse_cbus.c b/sys/dev/mse/mse_cbus.c
index e5e06b5f184d..6428df35df19 100644
--- a/sys/dev/mse/mse_cbus.c
+++ b/sys/dev/mse/mse_cbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/mse_cbus.c,v 1.4 2005/04/08 05:22:58 imp Exp $
  */
 
 /*-
diff --git a/sys/dev/mse/mse_isa.c b/sys/dev/mse/mse_isa.c
index 9e2996aaa54e..10a99560003f 100644
--- a/sys/dev/mse/mse_isa.c
+++ b/sys/dev/mse/mse_isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/mse_isa.c,v 1.4 2005/04/08 05:22:58 imp Exp $
  */
 
 /*-
diff --git a/sys/dev/mse/msevar.h b/sys/dev/mse/msevar.h
index 2c2b856c4421..40a150660663 100644
--- a/sys/dev/mse/msevar.h
+++ b/sys/dev/mse/msevar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/msevar.h,v 1.4 2005/03/29 09:22:40 imp Exp $
  */
 
 /*-
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index bc5568e8b7ff..d8bf254c4353 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.29.2.3 2005/08/29 20:00:31 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/my/if_myreg.h b/sys/dev/my/if_myreg.h
index a552de51cfd4..adece97525bc 100644
--- a/sys/dev/my/if_myreg.h
+++ b/sys/dev/my/if_myreg.h
@@ -25,7 +25,7 @@
  *
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/my/if_myreg.h,v 1.3.2.1 2005/08/29 20:00:31 jhb Exp $
  *
  * Myson MTD80x register definitions.
  *
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index 32bd9021fac1..6b43d270747a 100644
--- a/sys/dev/ncv/ncr53c500.c
+++ b/sys/dev/ncv/ncr53c500.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.12 2005/05/29 04:42:23 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index 6c4533de1240..b8bd60e3e079 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.26 2005/06/24 14:36:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/dev/ncv/ncr53c500hw.h b/sys/dev/ncv/ncr53c500hw.h
index 7a4b337b8985..0f89a1c331e2 100644
--- a/sys/dev/ncv/ncr53c500hw.h
+++ b/sys/dev/ncv/ncr53c500hw.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.4 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500hwtab.h b/sys/dev/ncv/ncr53c500hwtab.h
index 47406b1947e4..e1dd84376833 100644
--- a/sys/dev/ncv/ncr53c500hwtab.h
+++ b/sys/dev/ncv/ncr53c500hwtab.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500hwtab.h,v 1.3 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500hwtab.h,v 1.2.18.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500reg.h b/sys/dev/ncv/ncr53c500reg.h
index 2a9906e44cdf..7dbba7589f30 100644
--- a/sys/dev/ncv/ncr53c500reg.h
+++ b/sys/dev/ncv/ncr53c500reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500reg.h,v 1.3 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500reg.h,v 1.5.14.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500var.h b/sys/dev/ncv/ncr53c500var.h
index b3aff4660f0d..e60f4a9d01f9 100644
--- a/sys/dev/ncv/ncr53c500var.h
+++ b/sys/dev/ncv/ncr53c500var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500var.h,v 1.9 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500var.h,v 1.11.18.1 2001/06/08 06:27:45 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index fba8bcb62fd3..ae2dc6d641e3 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.75.2.3 2005/10/07 14:00:04 glebius Exp $");
 
 /*
  * National Semiconductor DP83820/DP83821 gigabit ethernet driver
diff --git a/sys/dev/nge/if_ngereg.h b/sys/dev/nge/if_ngereg.h
index 91b191f825fc..434b88c8ccb5 100644
--- a/sys/dev/nge/if_ngereg.h
+++ b/sys/dev/nge/if_ngereg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.13 2005/06/10 16:49:12 brooks Exp $
  */
 
 #define NGE_CSR			0x00
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 1c118d2960f6..3c22652dbdaa 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.35.2.1 2005/08/13 21:24:15 rwatson Exp $");
 
 /*
  * Pseudo-nulmodem driver
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index cad74162fe56..d8c33a845d52 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.14 2005/05/29 04:42:24 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c
index 5d1a3dccd6e4..713e1e594b6a 100644
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.23 2005/06/24 14:36:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/nsp/nspreg.h b/sys/dev/nsp/nspreg.h
index 81512c91a609..43db0f80d2c3 100644
--- a/sys/dev/nsp/nspreg.h
+++ b/sys/dev/nsp/nspreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/nsp/nspreg.h,v 1.3 2005/01/06 01:43:00 imp Exp $	*/
 /*	$NecBSD: nspreg.h,v 1.4.14.3 2001/06/29 06:27:53 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/nsp/nspvar.h b/sys/dev/nsp/nspvar.h
index 59af783ade02..b70b942bf317 100644
--- a/sys/dev/nsp/nspvar.h
+++ b/sys/dev/nsp/nspvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/nsp/nspvar.h,v 1.8 2005/01/06 01:43:00 imp Exp $	*/
 /*	$NecBSD: nspvar.h,v 1.7.14.5 2001/06/29 06:27:54 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index ee42a1cdb462..3da4a25c7ce0 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.31 2005/02/27 22:00:45 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index 0d8267a9b154..fb30c784fc24 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.7.2.4 2005/10/09 04:18:17 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/nve/if_nvereg.h b/sys/dev/nve/if_nvereg.h
index ae6303e4e7c1..a67b1f309e57 100644
--- a/sys/dev/nve/if_nvereg.h
+++ b/sys/dev/nve/if_nvereg.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $Id: if_nvreg.h,v 1.6 2004/08/12 14:00:05 q Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.3 2005/06/10 16:49:12 brooks Exp $
  */
  
 #ifndef _IF_NVEREG_H_
diff --git a/sys/dev/ofw/ofw_bus.h b/sys/dev/ofw/ofw_bus.h
index 3f4fbae9754d..443eccd88d6b 100644
--- a/sys/dev/ofw/ofw_bus.h
+++ b/sys/dev/ofw/ofw_bus.h
@@ -23,7 +23,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/ofw_bus.h,v 1.1 2004/08/12 17:41:29 marius Exp $
  */
 
 #ifndef	_DEV_OFW_OFW_BUS_H_
diff --git a/sys/dev/ofw/ofw_bus_if.m b/sys/dev/ofw/ofw_bus_if.m
index edeee5f655b0..c81153cacf05 100644
--- a/sys/dev/ofw/ofw_bus_if.m
+++ b/sys/dev/ofw/ofw_bus_if.m
@@ -23,7 +23,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/ofw/ofw_bus_if.m,v 1.2 2005/01/06 01:43:00 imp Exp $
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 08609944190e..80d80fdd2e16 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.31 2005/01/06 01:43:00 imp Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_ofw.h"
diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index 5c759d1cee68..786b93550e94 100644
--- a/sys/dev/ofw/ofw_disk.c
+++ b/sys/dev/ofw/ofw_disk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.17 2005/01/06 01:43:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/ofw_pci.h b/sys/dev/ofw/ofw_pci.h
index ef48ee96ab63..0a143a47608d 100644
--- a/sys/dev/ofw/ofw_pci.h
+++ b/sys/dev/ofw/ofw_pci.h
@@ -36,7 +36,7 @@
  *
  *	from: NetBSD: ofw_pci.h,v 1.5 2003/10/22 09:04:39 mjl Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/ofw_pci.h,v 1.2 2005/02/12 19:12:17 marius Exp $
  */
 
 #ifndef _DEV_OFW_OFW_PCI_H_
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index f7ef330597b3..4a7dfa1c35e7 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.14 2005/01/06 01:43:00 imp Exp $");
 /*-
  * Copyright (C) 2000 Benno Rice.
  * All rights reserved.
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index 28b95b339761..9c244be1fd0b 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -54,7 +54,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/sys/dev/ofw/openfirm.h,v 1.11 2005/01/06 01:43:00 imp Exp $
  */
 
 #ifndef _OPENFIRM_H_
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index d9272d1145d3..f2ac858597c2 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: openfirmio.c,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirmio.c,v 1.13 2005/01/06 01:43:00 imp Exp $");
 
 /*-
  * Copyright (c) 1992, 1993
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index 676cfb8007d0..62f0244af237 100644
--- a/sys/dev/ofw/openfirmio.h
+++ b/sys/dev/ofw/openfirmio.h
@@ -34,7 +34,7 @@
  *
  *	@(#)openpromio.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/openfirmio.h,v 1.6 2005/05/19 15:22:16 marius Exp $
  */
 
 #ifndef _DEV_OFW_OPENFIRMIO_H_
diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c
index ca6aba741af7..d7c674288b16 100644
--- a/sys/dev/ofw/openpromio.c
+++ b/sys/dev/ofw/openpromio.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openpromio.c,v 1.7 2005/05/19 15:23:17 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/openpromio.h b/sys/dev/ofw/openpromio.h
index 5233d29eb870..35e6a50d6372 100644
--- a/sys/dev/ofw/openpromio.h
+++ b/sys/dev/ofw/openpromio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/openpromio.h,v 1.1 2003/06/19 01:40:11 jake Exp $
  */
 
 #ifndef	_DEV_OFW_OPENPROMIO_H_
diff --git a/sys/dev/owi/if_ieee80211.h b/sys/dev/owi/if_ieee80211.h
index 0e67c58a20f6..02900369e7ec 100644
--- a/sys/dev/owi/if_ieee80211.h
+++ b/sys/dev/owi/if_ieee80211.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_ieee80211.h,v 1.5 2000/07/21 04:47:40 onoe Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/owi/if_ieee80211.h,v 1.1 2003/08/24 05:42:48 imp Exp $ */
 
 #ifndef _NET_IF_IEEE80211_H_
 #define _NET_IF_IEEE80211_H_
diff --git a/sys/dev/owi/if_owi.c b/sys/dev/owi/if_owi.c
index b0f546968348..73087a381cb4 100644
--- a/sys/dev/owi/if_owi.c
+++ b/sys/dev/owi/if_owi.c
@@ -100,7 +100,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.9.2.3 2005/08/25 05:01:13 rwatson Exp $";
 #endif
 
 static void wi_intr(void *);
diff --git a/sys/dev/owi/if_owi_pccard.c b/sys/dev/owi/if_owi_pccard.c
index 65b49b2e969e..b6500292935f 100644
--- a/sys/dev/owi/if_owi_pccard.c
+++ b/sys/dev/owi/if_owi_pccard.c
@@ -71,7 +71,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/owi/if_owi_pccard.c,v 1.6.2.1 2005/08/09 01:25:32 avatar Exp $";
 #endif
 
 static int wi_pccard_probe(device_t);
diff --git a/sys/dev/owi/if_wireg.h b/sys/dev/owi/if_wireg.h
index 697463fffcad..8dbf99196c41 100644
--- a/sys/dev/owi/if_wireg.h
+++ b/sys/dev/owi/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/owi/if_wireg.h,v 1.2 2005/01/06 01:43:01 imp Exp $
  */
 
 #define WI_DELAY	5
diff --git a/sys/dev/owi/if_wivar.h b/sys/dev/owi/if_wivar.h
index dfdb6ea6bd84..004f194d1183 100644
--- a/sys/dev/owi/if_wivar.h
+++ b/sys/dev/owi/if_wivar.h
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/owi/if_wivar.h,v 1.4 2005/06/10 16:49:12 brooks Exp $
  */
 
 #define WICACHE			/* turn on signal strength cache code */  
diff --git a/sys/dev/patm/genrtab/Makefile b/sys/dev/patm/genrtab/Makefile
index a4f50329795b..d4c538f9dfe9 100644
--- a/sys/dev/patm/genrtab/Makefile
+++ b/sys/dev/patm/genrtab/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.6 2004/12/21 08:47:19 ru Exp $
 #
 # This program is used to generate the if_patm_rtables.c file
 # for the idt77252 driver. It is not installed.
diff --git a/sys/dev/patm/genrtab/genrtab.c b/sys/dev/patm/genrtab/genrtab.c
index 8d696cfa8ef6..7de217cfd483 100644
--- a/sys/dev/patm/genrtab/genrtab.c
+++ b/sys/dev/patm/genrtab/genrtab.c
@@ -31,7 +31,7 @@
  * IDT manual.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/genrtab/genrtab.c,v 1.2 2005/01/06 01:43:02 imp Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -445,7 +445,7 @@ main(int argc, char *argv[])
 	printf(" */\n");
 	printf("\n");
 	printf("#include <sys/cdefs.h>\n");
-	printf("__FBSDID(\"$FreeBSD$\");\n");
+	printf("__FBSDID(\"$FreeBSD: src/sys/dev/patm/genrtab/genrtab.c,v 1.2 2005/01/06 01:43:02 imp Exp $\");\n");
 	printf("\n");
 	printf("#include <sys/types.h>\n");
 	printf("\n");
diff --git a/sys/dev/patm/idt77252reg.h b/sys/dev/patm/idt77252reg.h
index 13013a2f1056..78c66bf0e9fa 100644
--- a/sys/dev/patm/idt77252reg.h
+++ b/sys/dev/patm/idt77252reg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/patm/idt77252reg.h,v 1.2 2005/01/06 01:43:01 imp Exp $
  *
  * Register definitions for the IDT77252 chip.
  */
diff --git a/sys/dev/patm/if_patm.c b/sys/dev/patm/if_patm.c
index 279afde1d440..d76a0a481bfa 100644
--- a/sys/dev/patm/if_patm.c
+++ b/sys/dev/patm/if_patm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm.c,v 1.8.2.1 2005/08/25 05:01:13 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index 0402d62ba250..88f50b27fe6f 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_attach.c,v 1.11.2.1 2005/10/09 04:18:18 delphij Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_intr.c b/sys/dev/patm/if_patm_intr.c
index 9f44d583d5b7..deccd0a49d5d 100644
--- a/sys/dev/patm/if_patm_intr.c
+++ b/sys/dev/patm/if_patm_intr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_intr.c,v 1.5.2.1 2005/08/25 05:01:13 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_ioctl.c b/sys/dev/patm/if_patm_ioctl.c
index 2ed466d81f2b..86857a21ddd4 100644
--- a/sys/dev/patm/if_patm_ioctl.c
+++ b/sys/dev/patm/if_patm_ioctl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_ioctl.c,v 1.9.2.1 2005/08/25 05:01:13 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_rtables.c b/sys/dev/patm/if_patm_rtables.c
index f945276690b4..410b25ac9fba 100644
--- a/sys/dev/patm/if_patm_rtables.c
+++ b/sys/dev/patm/if_patm_rtables.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rtables.c,v 1.3 2004/03/10 17:03:27 bms Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/dev/patm/if_patm_rx.c b/sys/dev/patm/if_patm_rx.c
index 1a012a90b072..a57966bc6cc2 100644
--- a/sys/dev/patm/if_patm_rx.c
+++ b/sys/dev/patm/if_patm_rx.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rx.c,v 1.7 2005/06/10 16:49:13 brooks Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_tx.c b/sys/dev/patm/if_patm_tx.c
index cb40aa530fc5..b2076f5f56b2 100644
--- a/sys/dev/patm/if_patm_tx.c
+++ b/sys/dev/patm/if_patm_tx.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_tx.c,v 1.9.2.1 2005/08/25 05:01:13 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patmvar.h b/sys/dev/patm/if_patmvar.h
index e934784aec09..d5cd244320b4 100644
--- a/sys/dev/patm/if_patmvar.h
+++ b/sys/dev/patm/if_patmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/patm/if_patmvar.h,v 1.5 2005/06/10 16:49:13 brooks Exp $
  *
  * Driver for IDT77252 (ABR) based cards like ProSum's.
  */
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
index 32f50a9cd8f8..7f804ffd6023 100644
--- a/sys/dev/pbio/pbio.c
+++ b/sys/dev/pbio/pbio.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pbio/pbio.c,v 1.9 2005/05/29 04:42:24 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pbio/pbioio.h b/sys/dev/pbio/pbioio.h
index 9a08bfab0254..d1bd57f0c255 100644
--- a/sys/dev/pbio/pbioio.h
+++ b/sys/dev/pbio/pbioio.h
@@ -25,7 +25,7 @@
  *  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/sys/dev/pbio/pbioio.h,v 1.3 2005/01/06 01:43:02 imp Exp $
  *
  */
 
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index 434389e2875e..c6216ed627dc 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/card_if.m,v 1.29.2.1 2005/09/17 04:01:04 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index ad7276976a7a..032fce88c8dc 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.105.2.2 2005/09/27 18:42:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index ce2c23d88726..991e60c707e3 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -1,5 +1,5 @@
 /* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis.c,v 1.34.2.2 2005/09/27 18:42:19 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h
index d6b9c3899f86..85388d38d972 100644
--- a/sys/dev/pccard/pccard_cis.h
+++ b/sys/dev/pccard/pccard_cis.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis.h,v 1.3.2.1 2005/09/17 04:01:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c
index 57e8b4ab6e8c..06bfdfb135ca 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.15.2.1 2005/09/27 18:42:20 imp Exp $");
 
 #define	PCCARDDEBUG
 
diff --git a/sys/dev/pccard/pccard_device.c b/sys/dev/pccard/pccard_device.c
index 807ed7984187..969e64b256f9 100644
--- a/sys/dev/pccard/pccard_device.c
+++ b/sys/dev/pccard/pccard_device.c
@@ -26,7 +26,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_device.c,v 1.3.2.1 2005/09/27 18:42:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 06d80286e31a..5ceb606a8afd 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.109.2.1 2005/09/17 04:01:04 imp Exp $
 /* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */
 /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
 
diff --git a/sys/dev/pccard/pccardreg.h b/sys/dev/pccard/pccardreg.h
index e0f6647771bc..d386cb755a6c 100644
--- a/sys/dev/pccard/pccardreg.h
+++ b/sys/dev/pccard/pccardreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciareg.h,v 1.7 1998/10/29 09:45:52 enami Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardreg.h,v 1.3 2005/01/06 01:43:03 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index e040dc86b2b2..8c068f5ab366 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.53.2.2 2005/09/27 18:42:20 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccardvarp.h b/sys/dev/pccard/pccardvarp.h
index 66441c027ace..b43cc89815f5 100644
--- a/sys/dev/pccard/pccardvarp.h
+++ b/sys/dev/pccard/pccardvarp.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccard/pccardvarp.h,v 1.1.2.1.2.1 2005/10/23 18:23:27 imp Exp $
  */
 
 #ifndef _PCCARD_PCCARDVARP_H
diff --git a/sys/dev/pccard/power_if.m b/sys/dev/pccard/power_if.m
index a85fd01e50e0..f03340d47ec9 100644
--- a/sys/dev/pccard/power_if.m
+++ b/sys/dev/pccard/power_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/power_if.m,v 1.4 2005/01/06 01:43:03 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 2633ac77d282..b6e01b3963a4 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.121 2005/01/13 19:05:25 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index 13025a615d2a..cb8128aaf30d 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_isa.c,v 1.4 2005/01/11 05:33:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index ab3bc889df51..876f2ef63459 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.9 2005/06/06 06:05:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index 6db43829cde0..c9876a05ae48 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccbb/pccbbdevid.h,v 1.19 2005/01/11 05:33:18 imp Exp $
  */
 
 /* Vendor/Device IDs */
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index 4b33c873f177..854be0533b63 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccbb/pccbbreg.h,v 1.16 2005/01/13 19:05:25 imp Exp $
  */
 
 /*
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 455f7643efd2..223e5e96daee 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccbb/pccbbvar.h,v 1.23 2005/01/13 19:05:25 imp Exp $
  */
 
 /*
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c
index 25a163c77902..d22472dbda49 100644
--- a/sys/dev/pcf/envctrl.c
+++ b/sys/dev/pcf/envctrl.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/envctrl.c,v 1.5 2005/06/04 20:29:28 marius Exp $");
 
 /*
  * Device specific driver for the SUNW,envctrl device found on some
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 032095855f59..862185850c69 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf.c,v 1.25 2004/05/31 14:24:21 nsouch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c
index 3ea2051b9ff5..7540248cdb12 100644
--- a/sys/dev/pcf/pcf_ebus.c
+++ b/sys/dev/pcf/pcf_ebus.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_ebus.c,v 1.4 2005/06/04 20:29:28 marius Exp $");
 
 /*
  * Device specific driver for the EBus i2c devices found on some sun4u
diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c
index a4a2a5099f53..1d48651fe31c 100644
--- a/sys/dev/pcf/pcf_isa.c
+++ b/sys/dev/pcf/pcf_isa.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.5 2004/08/11 21:19:31 marius Exp $");
 
 /*
  * Hardware driver for a Philips PCF8584 I2C bus controller sitting
diff --git a/sys/dev/pcf/pcfvar.h b/sys/dev/pcf/pcfvar.h
index ed4d9d8cb9a9..c000ec10aeee 100644
--- a/sys/dev/pcf/pcfvar.h
+++ b/sys/dev/pcf/pcfvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pcf/pcfvar.h,v 1.3 2004/08/11 21:19:31 marius Exp $
  */
 
 #define IO_PCFSIZE	2
diff --git a/sys/dev/pci/eisa_pci.c b/sys/dev/pci/eisa_pci.c
index 61027a1cbc67..092438551210 100644
--- a/sys/dev/pci/eisa_pci.c
+++ b/sys/dev/pci/eisa_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/eisa_pci.c,v 1.6 2004/05/30 20:08:37 phk Exp $");
 
 /*
  * PCI:EISA bridge support
diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c
index 56e6df59e68f..b896d388f480 100644
--- a/sys/dev/pci/fixup_pci.c
+++ b/sys/dev/pci/fixup_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/fixup_pci.c,v 1.6 2004/05/30 17:57:41 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c
index 1ae9d34545c1..0445c6490da3 100644
--- a/sys/dev/pci/ignore_pci.c
+++ b/sys/dev/pci/ignore_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/ignore_pci.c,v 1.4 2004/05/30 17:57:41 phk Exp $");
 
 /*
  * 'Ignore' driver - eats devices that show up errnoeously on PCI
diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c
index 073aff7a8095..9baff99e3338 100644
--- a/sys/dev/pci/isa_pci.c
+++ b/sys/dev/pci/isa_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/isa_pci.c,v 1.12.8.1 2005/10/06 20:21:03 jhb Exp $");
 
 /*
  * PCI:ISA bridge support
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index c1b8aa81135f..5ef7c24d64a7 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.292.2.4.2.1 2005/10/27 16:44:06 wpaul Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/dev/pci/pci_if.m b/sys/dev/pci/pci_if.m
index 107746b25f0a..6d87fc96e38d 100644
--- a/sys/dev/pci/pci_if.m
+++ b/sys/dev/pci/pci_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pci/pci_if.m,v 1.7 2005/01/06 01:43:05 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 29a82e1f5909..a17889f39ef8 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.37 2005/04/29 06:22:41 imp Exp $");
 
 /*
  * PCI:PCI bridge support.
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index 9a9bd2bab0ee..6c13b9dbb64b 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.h
@@ -25,7 +25,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/sys/dev/pci/pci_private.h,v 1.14 2005/02/28 01:14:15 imp Exp $
  *
  */
 
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index 6122ba576733..2af5ebf83ccb 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.19.2.1 2005/09/16 17:58:06 ps Exp $");
 
 #include "opt_bus.h"	/* XXX trim includes */
 #include "opt_compat.h"
diff --git a/sys/dev/pci/pcib_if.m b/sys/dev/pci/pcib_if.m
index 51c917a4af18..4ad739b3e99b 100644
--- a/sys/dev/pci/pcib_if.m
+++ b/sys/dev/pci/pcib_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pci/pcib_if.m,v 1.7 2005/04/13 19:10:27 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h
index a4acaabe13a9..344f8d143eb3 100644
--- a/sys/dev/pci/pcib_private.h
+++ b/sys/dev/pci/pcib_private.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.6 2004/01/11 06:52:31 imp Exp $
  */
 
 #ifndef __PCIB_PRIVATE_H__
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 12e7e9de2e72..41fdd8126099 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.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/sys/dev/pci/pcireg.h,v 1.45 2005/06/05 23:08:59 imp Exp $
  *
  */
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index c90d6591983e..f92f7948e1aa 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.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/sys/dev/pci/pcivar.h,v 1.66 2005/04/29 02:03:11 marcel Exp $
  *
  */
 
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 68dbf139e5a2..a99e4bf4df7d 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,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/sys/dev/pdq/if_fea.c,v 1.28 2005/06/10 16:49:13 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 1cca08e668ae..756473fb0ddd 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.25 2005/06/10 16:49:13 brooks Exp $");
 
 /*
  * DEC PDQ FDDI Controller; code for BSD derived operating systems
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index 2f4443954d0c..0fa8ea076dc9 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq.c,v 1.11 2005/06/10 16:49:13 brooks Exp $");
 
 /*
  * DEC PDQ FDDI Controller O/S independent code
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index ef38138ecc04..58ea9be5de61 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.10 2005/06/10 16:49:13 brooks Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 409779a7df5d..0e7b4c53b0ba 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.26.2.2 2005/08/25 05:01:13 rwatson Exp $");
 
 /*
  * DEC PDQ FDDI Controller; code for BSD derived operating systems
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index 95781957e1a0..c52f7e50ed42 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqreg.h,v 1.11 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqreg.h,v 1.4 2002/03/29 11:22:19 mdodd Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index de576ba18b39..4851575b3139 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.12 2005/06/10 16:49:13 brooks Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 8a35336ea99b..65bdab9ba709 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.37.2.1 2005/08/25 05:01:14 rwatson Exp $");
 
 /*
  * Parallel port TCP/IP interfaces added.  I looked at the driver from
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 7bb9ad463929..2efdead5dcb1 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/immio.c,v 1.17 2003/08/24 17:54:16 obrien Exp $");
 
 /*
  * Iomega ZIP+ Matchmaker Parallel Port Interface driver
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index a9b3667c4129..21e80e6ca6b3 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpbb.c,v 1.18 2004/03/18 21:10:11 guido Exp $");
 
 /*
  * I2C Bit-Banging over parallel port
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index e096cadadee2..af3e137fd03d 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.36 2005/03/17 09:32:37 phk Exp $");
 
 /*
  * Device Driver for AT parallel printer port
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 9075b4ec6e5a..da1a527ee5b8 100644
--- a/sys/dev/ppbus/lpt.h
+++ b/sys/dev/ppbus/lpt.h
@@ -34,7 +34,7 @@
  *	Id: lptreg.h,v 1.6 1997/02/22 09:36:52 peter Exp 
  *	From Id: nlpt.h,v 1.3 1999/01/10 12:04:54 nsouch Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lpt.h,v 1.4 1999/08/28 00:42:23 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index e8471d396d20..e9ee722b68df 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lptio.h,v 1.9 2005/01/06 01:43:06 imp Exp $
  */
 
 #ifndef	_DEV_PPBUS_LPT_H_
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 0a650552aece..cb84a16db6a2 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/pcfclock.c,v 1.20 2005/01/06 01:43:06 imp Exp $");
 
 #include "opt_pcfclock.h"
 
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 566350301cbe..96121cc88def 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_1284.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 
 /*
  * General purpose routines for the IEEE1284-1994 Standard
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index 5c4010f88bf5..39657494dd7c 100644
--- a/sys/dev/ppbus/ppb_1284.h
+++ b/sys/dev/ppbus/ppb_1284.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_1284.h,v 1.7 2000/01/14 08:03:14 nsouch Exp $
  *
  */
 #ifndef __1284_H
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index f54dae1e44ec..117ad8615ff7 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_base.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 533ab5f4603a..553babad0c24 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_msq.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 #include <machine/stdarg.h>
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 1ee55e56d4bf..59dc74a6a922 100644
--- a/sys/dev/ppbus/ppb_msq.h
+++ b/sys/dev/ppbus/ppb_msq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_msq.h,v 1.9 2002/11/09 12:55:05 alfred Exp $
  *
  */
 #ifndef __PPB_MSQ_H
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 1ad27f8febd3..37eda7fd2e53 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.23 2003/08/24 17:54:16 obrien Exp $");
 #include "opt_ppb_1284.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index eb1f64ec68ae..07f11b39b5a4 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppbconf.h,v 1.19 2003/08/07 15:04:25 jhb Exp $
  *
  */
 #ifndef __PPBCONF_H
diff --git a/sys/dev/ppbus/ppbio.h b/sys/dev/ppbus/ppbio.h
index 2794eddc1dea..b288fc892ed5 100644
--- a/sys/dev/ppbus/ppbio.h
+++ b/sys/dev/ppbus/ppbio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppbio.h,v 1.1 2000/01/14 00:17:57 nsouch Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/ppbus_if.m b/sys/dev/ppbus/ppbus_if.m
index ccc308d23f36..5e72b555927f 100644
--- a/sys/dev/ppbus/ppbus_if.m
+++ b/sys/dev/ppbus/ppbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/ppbus/ppbus_if.m,v 1.3 2005/01/06 01:43:06 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 77a8f8f4c2ac..cb68a017dc3f 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.38 2004/07/09 16:56:46 cognet Exp $");
 #include "opt_ppb_1284.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 8ff2fb48c4ad..e5b9994cdbce 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppi.h,v 1.5 1999/12/29 04:35:43 peter Exp $
  *
  */
 #ifndef __PPI_H
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 7a14fd14f698..9ea198622322 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/pps.c,v 1.50 2005/04/14 15:56:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index f01c0d12791b..0ea267dbd2ab 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.33 2004/07/09 16:56:46 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 128fdc7e56f0..33159ab20d18 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpoio.c,v 1.18 2003/08/24 17:54:16 obrien Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index fe66fa5299be..64d2ccbe7637 100644
--- a/sys/dev/ppbus/vpoio.h
+++ b/sys/dev/ppbus/vpoio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/vpoio.h,v 1.5 2001/01/02 21:29:06 nsouch Exp $
  *
  */
 #ifndef __VP0IO_H
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 7ae988bd9644..80bebf9ef59c 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.45 2005/04/12 23:32:26 imp Exp $");
 
 #include "opt_ppc.h"
 
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index 2b41bfebca1d..1f97c4ea0c24 100644
--- a/sys/dev/ppc/ppc_puc.c
+++ b/sys/dev/ppc/ppc_puc.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppc/ppc_puc.c,v 1.2 2004/05/30 20:08:37 phk Exp $
  *
  */
 
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index ea12ead9c417..96a29cac5ee8 100644
--- a/sys/dev/ppc/ppcreg.h
+++ b/sys/dev/ppc/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppc/ppcreg.h,v 1.15 2001/06/23 06:52:54 nsouch Exp $
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index 9bef9080aa7a..50d50cb8d277 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppc/ppcvar.h,v 1.2 2005/01/06 01:43:07 imp Exp $
  *
  */
 
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index 1b017fd865c8..c7dfc6a92691 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/sys/dev/pst/pst-iop.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-iop.c,v 1.7 2004/10/03 16:06:46 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pst/pst-iop.h b/sys/dev/pst/pst-iop.h
index 59314ce0bb33..e402c2371314 100644
--- a/sys/dev/pst/pst-iop.h
+++ b/sys/dev/pst/pst-iop.h
@@ -25,7 +25,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/sys/dev/pst/pst-iop.h,v 1.6 2004/10/03 16:06:46 stefanf Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index c5f4a8592160..feb4d770ed30 100644
--- a/sys/dev/pst/pst-pci.c
+++ b/sys/dev/pst/pst-pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-pci.c,v 1.8 2005/03/05 18:10:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index f14be91904d2..046d7c5cad46 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.14 2004/09/15 15:39:28 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 86e2a0caed52..6c50b043a0f4 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.39 2005/03/04 22:23:21 marius Exp $");
 
 /*
  * PCI "universal" communication card device driver, glues com, lpt,
diff --git a/sys/dev/puc/puc_ebus.c b/sys/dev/puc/puc_ebus.c
index 1e6696ce0da9..5a07949029e5 100644
--- a/sys/dev/puc/puc_ebus.c
+++ b/sys/dev/puc/puc_ebus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.5 2005/06/04 20:29:28 marius Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c
index c01db42e6537..e9bb3d05b213 100644
--- a/sys/dev/puc/puc_pccard.c
+++ b/sys/dev/puc/puc_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.9 2004/05/30 20:08:38 phk Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index 2be23cf5c16d..51dfdef3eb74 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.14 2005/03/05 18:10:49 imp Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_sbus.c b/sys/dev/puc/puc_sbus.c
index 8bd36d0c4387..0c520aa68479 100644
--- a/sys/dev/puc/puc_sbus.c
+++ b/sys/dev/puc/puc_sbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.8 2005/02/26 00:25:43 marius Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 678db5ff8677..72ac24a8dba2 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.51 2005/04/22 07:49:35 imp Exp $");
 
 /*
  * PCI "universal" communications card driver configuration data (used to
diff --git a/sys/dev/puc/pucvar.h b/sys/dev/puc/pucvar.h
index bf9bb7f4f5d0..afd191534cb4 100644
--- a/sys/dev/puc/pucvar.h
+++ b/sys/dev/puc/pucvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pucvar.h,v 1.2 1999/02/06 06:29:54 cgd Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/puc/pucvar.h,v 1.15 2005/01/11 06:24:40 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 JF Hay.  All rights reserved.
diff --git a/sys/dev/ral/if_ral.c b/sys/dev/ral/if_ral.c
index b7b7316238f1..815b81e7834a 100644
--- a/sys/dev/ral/if_ral.c
+++ b/sys/dev/ral/if_ral.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ral.c,v 1.10.2.4 2005/10/09 04:15:59 delphij Exp $	*/
 
 /*-
  * Copyright (c) 2005
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral.c,v 1.10.2.4 2005/10/09 04:15:59 delphij Exp $");
 
 /*-
  * Ralink Technology RT2500 chipset driver
diff --git a/sys/dev/ral/if_ral_pccard.c b/sys/dev/ral/if_ral_pccard.c
index 8ec59ad6610b..40fc72420277 100644
--- a/sys/dev/ral/if_ral_pccard.c
+++ b/sys/dev/ral/if_ral_pccard.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ral_pccard.c,v 1.2 2005/06/24 14:36:53 imp Exp $	*/
 
 /*-
  * Copyright (c) 2005
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral_pccard.c,v 1.2 2005/06/24 14:36:53 imp Exp $");
 
 /*
  * CardBus front-end for the Ralink RT2500 driver.
diff --git a/sys/dev/ral/if_ral_pci.c b/sys/dev/ral/if_ral_pci.c
index 362f92db5614..235ca7ae9ff3 100644
--- a/sys/dev/ral/if_ral_pci.c
+++ b/sys/dev/ral/if_ral_pci.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.1.2.1 2005/08/25 05:01:14 rwatson Exp $	*/
 
 /*-
  * Copyright (c) 2005
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.1.2.1 2005/08/25 05:01:14 rwatson Exp $");
 
 /*
  * PCI front-end for the Ralink RT2500 driver.
diff --git a/sys/dev/ral/if_ralrate.c b/sys/dev/ral/if_ralrate.c
index b8922ba0da04..92b6e08fb583 100644
--- a/sys/dev/ral/if_ralrate.c
+++ b/sys/dev/ral/if_ralrate.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ralrate.c,v 1.1 2005/04/18 18:47:36 damien Exp $	*/
 /* $NetBSD: ieee80211_rssadapt.c,v 1.9 2005/02/26 22:45:09 perry Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
diff --git a/sys/dev/ral/if_ralrate.h b/sys/dev/ral/if_ralrate.h
index 50eee4429bc3..787dbc7c8534 100644
--- a/sys/dev/ral/if_ralrate.h
+++ b/sys/dev/ral/if_ralrate.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ralrate.h,v 1.1 2005/04/18 18:47:36 damien Exp $	*/
 /* $NetBSD: ieee80211_rssadapt.h,v 1.4 2005/02/26 22:45:09 perry Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
diff --git a/sys/dev/ral/if_ralreg.h b/sys/dev/ral/if_ralreg.h
index bccd0dbadc3f..f80b565e7174 100644
--- a/sys/dev/ral/if_ralreg.h
+++ b/sys/dev/ral/if_ralreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ralreg.h,v 1.1 2005/04/18 18:47:37 damien Exp $	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/ral/if_ralvar.h b/sys/dev/ral/if_ralvar.h
index 9bf024cf0ac8..a51c9a6d2fd6 100644
--- a/sys/dev/ral/if_ralvar.h
+++ b/sys/dev/ral/if_ralvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ralvar.h,v 1.2 2005/06/10 16:49:13 brooks Exp $	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c
index d78306524ff9..da541a952a31 100644
--- a/sys/dev/random/harvest.c
+++ b/sys/dev/random/harvest.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/harvest.c,v 1.25 2004/10/18 19:29:13 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kthread.h>
diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 611f866c4242..2057053d1182 100644
--- a/sys/dev/random/hash.c
+++ b/sys/dev/random/hash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/hash.c,v 1.13 2005/03/11 15:42:50 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/hash.h b/sys/dev/random/hash.h
index 8580d145d683..9c31976bc8f8 100644
--- a/sys/dev/random/hash.h
+++ b/sys/dev/random/hash.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/sys/dev/random/hash.h,v 1.5 2004/04/09 15:47:09 markm Exp $
  */
 
 #define KEYSIZE		32		/* (in bytes) 32 bytes == 256 bits */
diff --git a/sys/dev/random/nehemiah.c b/sys/dev/random/nehemiah.c
index 9780dbd2755a..39f51abe7bc7 100644
--- a/sys/dev/random/nehemiah.c
+++ b/sys/dev/random/nehemiah.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/nehemiah.c,v 1.3 2005/03/02 21:33:25 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/dev/random/nehemiah.h b/sys/dev/random/nehemiah.h
index b35fb3fb2262..90af99b159d0 100644
--- a/sys/dev/random/nehemiah.h
+++ b/sys/dev/random/nehemiah.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/sys/dev/random/nehemiah.h,v 1.1 2004/04/09 15:47:09 markm Exp $
  */
 
 extern struct random_systat random_nehemiah;
diff --git a/sys/dev/random/probe.c b/sys/dev/random/probe.c
index e5f15fe72667..37b26aef536b 100644
--- a/sys/dev/random/probe.c
+++ b/sys/dev/random/probe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/probe.c,v 1.4 2005/05/30 05:01:44 scottl Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index e18be5a0b2a6..1d072e1dba71 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/randomdev.c,v 1.59 2004/12/22 17:29:37 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/randomdev.h b/sys/dev/random/randomdev.h
index bf13e1b8568b..e0ed94a31ff0 100644
--- a/sys/dev/random/randomdev.h
+++ b/sys/dev/random/randomdev.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/sys/dev/random/randomdev.h,v 1.6 2004/04/16 17:10:54 markm Exp $
  */
 
 /* This header contains only those definitions that are global
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index 3c5f8310b79e..7f51357e6310 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/yarrow.c,v 1.45 2005/03/11 15:42:50 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/random/yarrow.h b/sys/dev/random/yarrow.h
index 558354d27f73..098065fdc599 100644
--- a/sys/dev/random/yarrow.h
+++ b/sys/dev/random/yarrow.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/sys/dev/random/yarrow.h,v 1.18 2004/04/09 15:47:09 markm Exp $
  */
 
 /* This contains Yarrow-specific declarations.
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 9ea6680289ad..14669cfbc970 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ray/if_ray.c,v 1.79.2.2 2005/08/25 05:01:14 rwatson Exp $");
 
 /*
  * Card configuration
diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h
index 4981da6b85fe..1afdc2bd8cd7 100644
--- a/sys/dev/ray/if_raydbg.h
+++ b/sys/dev/ray/if_raydbg.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_raydbg.h,v 1.13 2005/01/06 01:43:09 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_raymib.h b/sys/dev/ray/if_raymib.h
index de3bb1641131..599b6ebe9e43 100644
--- a/sys/dev/ray/if_raymib.h
+++ b/sys/dev/ray/if_raymib.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_raymib.h,v 1.13 2005/01/06 01:43:09 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayreg.h b/sys/dev/ray/if_rayreg.h
index 562279f7aa3d..eeecb78a8ea6 100644
--- a/sys/dev/ray/if_rayreg.h
+++ b/sys/dev/ray/if_rayreg.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_rayreg.h,v 1.11 2005/01/06 01:43:09 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
index 7376405bb19a..50fbbd7f9a24 100644
--- a/sys/dev/ray/if_rayvar.h
+++ b/sys/dev/ray/if_rayvar.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_rayvar.h,v 1.21.2.1 2005/08/25 05:01:14 rwatson Exp $
  *
  */
 
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 071dbc777efc..5a21b960f662 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rc/rc.c,v 1.99 2005/01/06 01:43:09 imp Exp $
  */
 
 /*
diff --git a/sys/dev/rc/rcreg.h b/sys/dev/rc/rcreg.h
index 8ba287e7251c..e23576548f67 100644
--- a/sys/dev/rc/rcreg.h
+++ b/sys/dev/rc/rcreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rc/rcreg.h,v 1.6 2005/01/06 01:43:10 imp Exp $
  */
 
 /*
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index d6374896d183..bfb0374db25f 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.46.2.7 2005/10/08 07:35:10 glebius Exp $");
 
 /*
  * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 15ddcceeb59c..e9207dab66af 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rndtest/rndtest.c,v 1.5 2005/01/06 01:43:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rndtest/rndtest.h b/sys/dev/rndtest/rndtest.h
index 5a284e9a91de..83d6fd94f0e7 100644
--- a/sys/dev/rndtest/rndtest.h
+++ b/sys/dev/rndtest/rndtest.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/rndtest/rndtest.h,v 1.2 2005/01/06 01:43:10 imp Exp $	*/
 /*	$OpenBSD$	*/
 
 /*-
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index e336bca461d1..eff8b1def4a1 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.67 2005/01/06 01:43:11 imp Exp $");
 
 /* 
  * rp.c - for RocketPort FreeBSD
diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c
index ebefe4f8b3ad..30e85e128641 100644
--- a/sys/dev/rp/rp_isa.c
+++ b/sys/dev/rp/rp_isa.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp_isa.c,v 1.7 2005/01/06 01:43:11 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c
index f7a080c96ca7..29318a000b9c 100644
--- a/sys/dev/rp/rp_pci.c
+++ b/sys/dev/rp/rp_pci.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp_pci.c,v 1.11 2005/03/25 03:10:51 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rp/rpreg.h b/sys/dev/rp/rpreg.h
index 7ab041d3ccb8..debca6c5e4a6 100644
--- a/sys/dev/rp/rpreg.h
+++ b/sys/dev/rp/rpreg.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rp/rpreg.h,v 1.7 2005/01/06 01:43:11 imp Exp $
  */
 
 /*
diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h
index 66aa21966c7b..1b154a0d9e13 100644
--- a/sys/dev/rp/rpvar.h
+++ b/sys/dev/rp/rpvar.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rp/rpvar.h,v 1.8 2005/01/06 01:43:11 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index a41d3282f9a4..074cc3867f0f 100644
--- a/sys/dev/sab/sab.c
+++ b/sys/dev/sab/sab.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.39 2005/06/04 20:29:28 marius Exp $");
 
 /*
  * SAB82532 Dual UART driver
diff --git a/sys/dev/sab/sab82532reg.h b/sys/dev/sab/sab82532reg.h
index 77e48216357f..2a76eb80b892 100644
--- a/sys/dev/sab/sab82532reg.h
+++ b/sys/dev/sab/sab82532reg.h
@@ -34,7 +34,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sab/sab82532reg.h,v 1.2 2005/01/06 01:43:12 imp Exp $
  */
 
 /*
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 9d012f172de9..c89e78d19f0c 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.8 2005/03/01 08:58:04 imp Exp $");
 
 /*
  * SafeNet SafeXcel-1141 hardware crypto accelerator
diff --git a/sys/dev/safe/safereg.h b/sys/dev/safe/safereg.h
index 6d07999eb10e..c38c3d203acd 100644
--- a/sys/dev/safe/safereg.h
+++ b/sys/dev/safe/safereg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/safe/safereg.h,v 1.1 2003/07/21 21:46:07 sam Exp $
  */
 #ifndef _SAFE_SAFEREG_H_
 #define	_SAFE_SAFEREG_H_
diff --git a/sys/dev/safe/safevar.h b/sys/dev/safe/safevar.h
index fd1ee389a2a7..d9f120239975 100644
--- a/sys/dev/safe/safevar.h
+++ b/sys/dev/safe/safevar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/safe/safevar.h,v 1.1 2003/07/21 21:46:07 sam Exp $
  */
 #ifndef _SAFE_SAFEVAR_H_
 #define	_SAFE_SAFEVAR_H_
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index 580d37aff64e..0905196442c2 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.20.2.1 2005/08/25 05:01:15 rwatson Exp $");
 
 /*
  * Device driver for Granch SBNI12 leased line adapters
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index 35658291f9f2..4d8e0d00427c 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.14 2005/06/10 16:49:14 brooks Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c
index 92e864e9c4a7..afda60d0d692 100644
--- a/sys/dev/sbni/if_sbni_pci.c
+++ b/sys/dev/sbni/if_sbni_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.11 2004/03/17 17:50:41 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sbni/if_sbnireg.h b/sys/dev/sbni/if_sbnireg.h
index 4fec30c62f1f..53ad92fecf69 100644
--- a/sys/dev/sbni/if_sbnireg.h
+++ b/sys/dev/sbni/if_sbnireg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sbni/if_sbnireg.h,v 1.2 2005/01/06 01:43:12 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sbni/if_sbnivar.h b/sys/dev/sbni/if_sbnivar.h
index 91fb363a49ee..0766bc2fdb09 100644
--- a/sys/dev/sbni/if_sbnivar.h
+++ b/sys/dev/sbni/if_sbnivar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sbni/if_sbnivar.h,v 1.5 2005/06/10 16:49:14 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c
index 03cff465cb41..b7449d3baa56 100644
--- a/sys/dev/sbsh/if_sbsh.c
+++ b/sys/dev/sbsh/if_sbsh.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.12.2.2 2005/08/25 05:01:15 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sbsh/if_sbshreg.h b/sys/dev/sbsh/if_sbshreg.h
index 94cb0aac46c9..19c7968c9211 100644
--- a/sys/dev/sbsh/if_sbshreg.h
+++ b/sys/dev/sbsh/if_sbshreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sbsh/if_sbshreg.h,v 1.2 2005/01/06 01:43:13 imp Exp $
  */
 
 /* SBNI16 controller chip definitions */
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 136c900973e8..a2b40e519c6e 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scd/scd.c,v 1.85 2005/05/29 04:42:25 nyan Exp $");
 
 
 #undef	SCD_DEBUG
diff --git a/sys/dev/scd/scd_isa.c b/sys/dev/scd/scd_isa.c
index 082d0d8461af..d0ad54e88249 100644
--- a/sys/dev/scd/scd_isa.c
+++ b/sys/dev/scd/scd_isa.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scd/scd_isa.c,v 1.5 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index c98c6ca630a6..5a09fc5a3958 100644
--- a/sys/dev/scd/scdreg.h
+++ b/sys/dev/scd/scdreg.h
@@ -25,7 +25,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/sys/dev/scd/scdreg.h,v 1.8 2005/03/02 21:33:25 joerg Exp $
  *
  */
 
diff --git a/sys/dev/scd/scdvar.h b/sys/dev/scd/scdvar.h
index 773a78be1fb6..e94e20cba623 100644
--- a/sys/dev/scd/scdvar.h
+++ b/sys/dev/scd/scdvar.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/scd/scdvar.h,v 1.3 2004/06/16 09:46:55 phk Exp $
  */
 
 struct scd_mbx {
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 2f9f872668c8..0e9b0a408206 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si.c,v 1.135 2005/01/06 01:43:13 imp Exp $");
 
 #ifndef lint
 static const char si_copyright1[] =  "@(#) Copyright (C) Specialix International, 1990,1992,1998",
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index c9adefb788e9..4df57aad61da 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si.h,v 1.20 2005/01/06 01:43:13 imp Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/si/si2_z280.c b/sys/dev/si/si2_z280.c
index 6caaf3d577a3..e93c3ccabddd 100644
--- a/sys/dev/si/si2_z280.c
+++ b/sys/dev/si/si2_z280.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si2_z280.c,v 1.6 2005/01/06 01:43:13 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/si/si3_t225.c b/sys/dev/si/si3_t225.c
index 17980075a658..63fd32fa4630 100644
--- a/sys/dev/si/si3_t225.c
+++ b/sys/dev/si/si3_t225.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si3_t225.c,v 1.8 2005/01/06 01:43:13 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/si/si_eisa.c b/sys/dev/si/si_eisa.c
index edb0a8ef0359..f5d6ee62a3ac 100644
--- a/sys/dev/si/si_eisa.c
+++ b/sys/dev/si/si_eisa.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_eisa.c,v 1.6 2005/01/06 01:43:14 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/si/si_isa.c b/sys/dev/si/si_isa.c
index 5758a8391d4b..194880a73b32 100644
--- a/sys/dev/si/si_isa.c
+++ b/sys/dev/si/si_isa.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_isa.c,v 1.7 2005/01/06 01:43:14 imp Exp $");
 
 #include "opt_debug_si.h"
 
diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c
index e1dbfe9d454b..19f8f9f4158e 100644
--- a/sys/dev/si/si_pci.c
+++ b/sys/dev/si/si_pci.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_pci.c,v 1.7 2005/03/01 08:58:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 4b4ef6ad6063..6308eb397d7b 100644
--- a/sys/dev/si/sireg.h
+++ b/sys/dev/si/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/sireg.h,v 1.10 2005/01/06 01:43:14 imp Exp $
  */
 
 /*
diff --git a/sys/dev/si/sivar.h b/sys/dev/si/sivar.h
index e479f470faf4..eb9927ef0199 100644
--- a/sys/dev/si/sivar.h
+++ b/sys/dev/si/sivar.h
@@ -17,7 +17,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/sivar.h,v 1.4 2005/01/06 01:43:14 imp Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 4dfabc0c8883..a1f4b98acd43 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.459 2005/05/29 04:42:25 nyan Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index afb6fac79cff..33343ab9d872 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.16 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
index b71582842eea..0fab27c6ba9b 100644
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pccard.c,v 1.15 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c
index 459baa169366..a727d70edbd3 100644
--- a/sys/dev/sio/sio_pci.c
+++ b/sys/dev/sio/sio_pci.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.21 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c
index dd80e68f5d3b..d92de6319ecd 100644
--- a/sys/dev/sio/sio_puc.c
+++ b/sys/dev/sio/sio_puc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.9 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index 7b00452c88ce..51e09ed2b6d9 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sio/sioreg.h,v 1.24 2004/04/07 20:45:58 imp Exp $
  */
 
 /* Receiver clock frequency for "standard" pc serial ports. */
diff --git a/sys/dev/sio/siovar.h b/sys/dev/sio/siovar.h
index 22a6019d8e62..094bdd14fe21 100644
--- a/sys/dev/sio/siovar.h
+++ b/sys/dev/sio/siovar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sio/siovar.h,v 1.6 2004/04/07 20:45:58 imp Exp $
  */
 
 #ifdef PC98
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 4c1c5b199f91..7bdb7ce6599f 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smb.c,v 1.34 2004/06/16 09:46:56 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smb.h b/sys/dev/smbus/smb.h
index 387515f62a55..23d1378ccff3 100644
--- a/sys/dev/smbus/smb.h
+++ b/sys/dev/smbus/smb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smb.h,v 1.4 2004/05/16 21:18:45 joerg Exp $
  *
  */
 #ifndef __SMB_H
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 8a8500924a26..324d2c85e241 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/smbus/smbconf.c,v 1.13 2003/08/24 18:03:44 obrien Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index 64b0a3354c36..7c96366ba15a 100644
--- a/sys/dev/smbus/smbconf.h
+++ b/sys/dev/smbus/smbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbconf.h,v 1.7 2002/03/23 15:47:28 nsouch Exp $
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index ed9c468e66e3..6cbc00a2e409 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/smbus/smbus.c,v 1.18 2003/09/06 13:58:06 dfr Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index 9f96b9dfe172..dadb052f38ed 100644
--- a/sys/dev/smbus/smbus.h
+++ b/sys/dev/smbus/smbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbus.h,v 1.2 1999/08/28 00:42:30 peter Exp $
  *
  */
 #ifndef __SMBUS_H
diff --git a/sys/dev/smbus/smbus_if.m b/sys/dev/smbus/smbus_if.m
index 6b213e1f4c23..5badbc2d1d7d 100644
--- a/sys/dev/smbus/smbus_if.m
+++ b/sys/dev/smbus/smbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/smbus/smbus_if.m,v 1.7 2005/01/06 01:43:15 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index b4dbd2e76397..fdd86f04eccd 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.45.2.3 2005/09/17 04:01:04 imp Exp $");
 
 /*
  * This is a driver for SMC's 9000 series of Ethernet adapters.
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index eb7bda71b03e..39efd0dde61a 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_isa.c,v 1.14 2005/07/06 15:59:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index 034f51a70456..df3b499c83a1 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.32.2.1 2005/09/17 04:01:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/sn/if_snreg.h b/sys/dev/sn/if_snreg.h
index 3f5efd01f5a7..07e1c880d5a2 100644
--- a/sys/dev/sn/if_snreg.h
+++ b/sys/dev/sn/if_snreg.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/sys/dev/sn/if_snreg.h,v 1.5 2005/01/06 01:43:15 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sn/if_snvar.h b/sys/dev/sn/if_snvar.h
index 048f23a41fc0..c3862515b485 100644
--- a/sys/dev/sn/if_snvar.h
+++ b/sys/dev/sn/if_snvar.h
@@ -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/sys/dev/sn/if_snvar.h,v 1.8.2.1 2005/09/17 04:01:04 imp Exp $
  */
 
 #ifndef _IF_SNVAR_H
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index bbc1e97380fd..df6620fe3b4f 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932.c,v 1.19.2.2 2005/08/25 05:01:15 rwatson Exp $	*/
 /*	$NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $	*/
 /*	$NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $	*/
 
diff --git a/sys/dev/snc/dp83932reg.h b/sys/dev/snc/dp83932reg.h
index 31ab550b83ca..be6cf5e8516a 100644
--- a/sys/dev/snc/dp83932reg.h
+++ b/sys/dev/snc/dp83932reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932reg.h,v 1.2 2005/01/06 01:43:15 imp Exp $	*/
 /*	$NecBSD: dp83932reg.h,v 1.2 1999/02/12 05:50:13 kmatsuda Exp $	*/
 /*      $NetBSD: if_snreg.h,v 1.4 1997/06/15 20:20:12 scottr Exp $	*/
 
diff --git a/sys/dev/snc/dp83932subr.c b/sys/dev/snc/dp83932subr.c
index 064cb2c3d614..f905766d8978 100644
--- a/sys/dev/snc/dp83932subr.c
+++ b/sys/dev/snc/dp83932subr.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.7 2005/01/06 01:43:15 imp Exp $");
 /*
  * Routines of NEC PC-9801-83, 84, 103, 104, PC-9801N-25 and PC-9801N-J02, J02R 
  * Ethernet interface for NetBSD/pc98, ported by Kouichi Matsuda.
diff --git a/sys/dev/snc/dp83932subr.h b/sys/dev/snc/dp83932subr.h
index f5df4f97970f..ad9ef0ca5e5e 100644
--- a/sys/dev/snc/dp83932subr.h
+++ b/sys/dev/snc/dp83932subr.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932subr.h,v 1.3 2005/01/06 01:43:15 imp Exp $	*/
 /*	$NecBSD: dp83932subr.h,v 1.5 1999/02/02 00:47:25 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/snc/dp83932var.h b/sys/dev/snc/dp83932var.h
index 9570162ed8cc..5fddc152c31b 100644
--- a/sys/dev/snc/dp83932var.h
+++ b/sys/dev/snc/dp83932var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932var.h,v 1.5 2005/06/10 16:49:14 brooks Exp $	*/
 /*	$NecBSD: dp83932var.h,v 1.3 1999/01/24 01:39:51 kmatsuda Exp $	*/
 /*	$NetBSD: if_snvar.h,v 1.12 1998/05/01 03:42:47 scottr Exp $	*/
 
diff --git a/sys/dev/snc/if_snc.c b/sys/dev/snc/if_snc.c
index 7cbdd804f7ba..67227b190dce 100644
--- a/sys/dev/snc/if_snc.c
+++ b/sys/dev/snc/if_snc.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc.c,v 1.7 2005/01/06 01:43:15 imp Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_snc_cbus.c b/sys/dev/snc/if_snc_cbus.c
index 1b9ef3ef5655..4c82d8776b58 100644
--- a/sys/dev/snc/if_snc_cbus.c
+++ b/sys/dev/snc/if_snc_cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_cbus.c,v 1.6 2005/01/06 01:43:15 imp Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_snc_pccard.c b/sys/dev/snc/if_snc_pccard.c
index 64e2faf782c0..bb3b7ba75218 100644
--- a/sys/dev/snc/if_snc_pccard.c
+++ b/sys/dev/snc/if_snc_pccard.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.8.2.1 2005/08/25 05:01:15 rwatson Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_sncreg.h b/sys/dev/snc/if_sncreg.h
index 888aa4f3ceb3..d3ab86cbe6aa 100644
--- a/sys/dev/snc/if_sncreg.h
+++ b/sys/dev/snc/if_sncreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.2 2005/01/06 01:43:15 imp Exp $	*/
 /*	$NecBSD: if_snreg.h,v 1.3 1999/01/24 01:39:52 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
   
diff --git a/sys/dev/snc/if_sncvar.h b/sys/dev/snc/if_sncvar.h
index 8b6a75b99812..5c58ebe835aa 100644
--- a/sys/dev/snc/if_sncvar.h
+++ b/sys/dev/snc/if_sncvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/snc/if_sncvar.h,v 1.3 2005/01/06 01:43:15 imp Exp $
  */
 
 /*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 4008baee85b5..47068f654d17 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.99.2.2 2005/09/23 23:22:22 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h
index 012910c978d3..5acbb18f12df 100644
--- a/sys/dev/sound/chip.h
+++ b/sys/dev/sound/chip.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/chip.h,v 1.2 2000/01/03 02:51:14 tanimura Exp $
  */
 
 /*
diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c
index 7da109923b16..2d5aa5cc9692 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/driver.c,v 1.13 2005/01/06 01:43:17 imp Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index 696b1a37cb17..beaf6fe04a10 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -33,7 +33,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.37 2005/03/01 08:58:04 imp Exp $");
 
 struct ad1816_info;
 
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index 3fe4a3dc3ff1..7d80a4fe2a69 100644
--- a/sys/dev/sound/isa/ad1816.h
+++ b/sys/dev/sound/isa/ad1816.h
@@ -4,7 +4,7 @@
  * This file contains information and macro definitions for
  * the ad1816 chip
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.2 2005/01/06 01:43:17 imp Exp $
  */
 
 /* AD1816 register macros */
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index bc89ca4b3bba..807b50db0023 100644
--- a/sys/dev/sound/isa/es1888.c
+++ b/sys/dev/sound/isa/es1888.c
@@ -29,7 +29,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/es1888.c,v 1.15 2005/01/06 01:43:17 imp Exp $");
 
 #ifdef __alpha__
 static int
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 248aebe833ba..14cecc75742a 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.34 2005/01/06 01:43:17 imp Exp $");
 
 #define ESS_BUFFSIZE (4096)
 #define ABS(x) (((x) < 0)? -(x) : (x))
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index cb1b1ade4e9a..d92ec03802fb 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -45,7 +45,7 @@
 #include <alpha/isa/isavar.h>
 #endif
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.16 2005/01/06 01:43:17 imp Exp $");
 
 #define LOGICALID_NOPNP 0
 #define LOGICALID_PCM   0x0000561e
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 5ff38fc22f96..cfd93ae69d79 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -29,7 +29,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.95.2.1 2005/07/18 19:46:38 jhb Exp $");
 
 /* board-specific include files */
 #include <dev/sound/isa/mss.h>
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index d9247f93b7e6..f4508b5d2536 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/mss.h,v 1.12 2005/01/06 01:43:17 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h
index ddcb863f5de6..d9459c7282a4 100644
--- a/sys/dev/sound/isa/sb.h
+++ b/sys/dev/sound/isa/sb.h
@@ -1,6 +1,6 @@
 /*
  * file: sbcard.h
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/sb.h,v 1.15 2004/05/13 11:32:54 truckman Exp $
  */
 
 #ifndef SB_H
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index 58cb46ff5def..679a71c8f2ea 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.90 2005/01/06 01:43:17 imp Exp $");
 
 #define SB16_BUFFSIZE	4096
 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16)
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index eefe02544536..f79c23363e29 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.79 2005/01/06 01:43:17 imp Exp $");
 
 #define SB_DEFAULT_BUFSZ	4096
 
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index d41cf1029307..f33d415c62fa 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -30,7 +30,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.44 2005/01/06 01:43:17 imp Exp $");
 
 #define IO_MAX	3
 #define IRQ_MAX	1
diff --git a/sys/dev/sound/isa/sndbuf_dma.c b/sys/dev/sound/isa/sndbuf_dma.c
index 9e45cde9636d..d073f847568e 100644
--- a/sys/dev/sound/isa/sndbuf_dma.c
+++ b/sys/dev/sound/isa/sndbuf_dma.c
@@ -28,7 +28,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sndbuf_dma.c,v 1.3 2005/01/06 01:43:17 imp Exp $");
 
 int
 sndbuf_dmasetup(struct snd_dbuf *b, struct resource *drq)
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index a7ebac1dc949..95f37ca249f8 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -42,7 +42,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.18 2005/03/01 08:58:05 imp Exp $");
 
 /* Debugging macro's */
 #undef DEB
diff --git a/sys/dev/sound/pci/als4000.h b/sys/dev/sound/pci/als4000.h
index 00661a039b45..4dfa9f112bf3 100644
--- a/sys/dev/sound/pci/als4000.h
+++ b/sys/dev/sound/pci/als4000.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/als4000.h,v 1.3 2005/01/06 01:43:18 imp Exp $
  */
 
 #define ALS_PCI_ID0 		0x40004005
diff --git a/sys/dev/sound/pci/au88x0.c b/sys/dev/sound/pci/au88x0.c
index b1442245b77c..91c489076086 100644
--- a/sys/dev/sound/pci/au88x0.c
+++ b/sys/dev/sound/pci/au88x0.c
@@ -25,7 +25,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/sys/dev/sound/pci/au88x0.c,v 1.10 2005/03/01 08:58:05 imp Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/au88x0.h b/sys/dev/sound/pci/au88x0.h
index 15f7b767a0c7..bae2c032bb03 100644
--- a/sys/dev/sound/pci/au88x0.h
+++ b/sys/dev/sound/pci/au88x0.h
@@ -25,7 +25,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/sys/dev/sound/pci/au88x0.h,v 1.2 2003/10/12 11:33:39 des Exp $
  */
 
 #ifndef _AU88X0_H_INCLUDED
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index 35f91f1b6309..475744193298 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -31,7 +31,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.32 2005/03/01 08:58:05 imp Exp $");
 
 /* PCI IDs of supported chips */
 #define AU8820_PCI_ID 0x000112eb
diff --git a/sys/dev/sound/pci/aureal.h b/sys/dev/sound/pci/aureal.h
index e835c7119fcb..038b148958ae 100644
--- a/sys/dev/sound/pci/aureal.h
+++ b/sys/dev/sound/pci/aureal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/aureal.h,v 1.4 2005/01/06 01:43:18 imp Exp $
  */
 
 #ifndef _AU8820_REG_H
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index c6798d0534f1..7af0d6bcbdd8 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -51,7 +51,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.32 2005/03/01 08:58:05 imp Exp $");
 
 /* Supported chip ID's */
 #define CMI8338A_PCI_ID   0x010013f6
diff --git a/sys/dev/sound/pci/cmireg.h b/sys/dev/sound/pci/cmireg.h
index 5c468b55ed8b..cda5e07b0fbc 100644
--- a/sys/dev/sound/pci/cmireg.h
+++ b/sys/dev/sound/pci/cmireg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/cmireg.h,v 1.3 2005/01/06 01:43:19 imp Exp $
  */
 
 /* C-Media CMI8x38 Audio Chip Support */
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index 2859f3838230..17ee18ef4f81 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -37,7 +37,7 @@
 
 #include <dev/sound/pci/cs4281.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.22 2005/03/01 08:58:05 imp Exp $");
 
 #define CS4281_DEFAULT_BUFSZ 16384
 
diff --git a/sys/dev/sound/pci/cs4281.h b/sys/dev/sound/pci/cs4281.h
index c7b3799ab89d..69d0ad193b27 100644
--- a/sys/dev/sound/pci/cs4281.h
+++ b/sys/dev/sound/pci/cs4281.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/cs4281.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _CS4281_H_
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 314275356647..1975e15d249b 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -48,7 +48,7 @@
 
 #include <gnu/dev/sound/pci/csaimg.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.33 2005/06/27 07:43:57 glebius Exp $");
 
 /* This is the pci device id. */
 #define CS4610_PCI_ID 0x60011013
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 05e800130d4a..8bad7b55339b 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -38,7 +38,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.34 2005/06/27 07:43:57 glebius Exp $");
 
 /* Buffer size on dma transfer. Fixed for CS416x. */
 #define CS461x_BUFFSIZE   (4 * 1024)
diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h
index c6767fbe1d70..87843cdaae55 100644
--- a/sys/dev/sound/pci/csareg.h
+++ b/sys/dev/sound/pci/csareg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/csareg.h,v 1.4 2005/06/27 07:43:57 glebius Exp $
  */
 
 #ifndef _CSA_REG_H
diff --git a/sys/dev/sound/pci/csavar.h b/sys/dev/sound/pci/csavar.h
index c8e3697ba948..4968833afdf3 100644
--- a/sys/dev/sound/pci/csavar.h
+++ b/sys/dev/sound/pci/csavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/csavar.h,v 1.5 2005/06/27 07:43:57 glebius Exp $
  */
 
 #ifndef _CSA_VAR_H
diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h
index a34d2338954c..abbe9c389d86 100644
--- a/sys/dev/sound/pci/ds1-fw.h
+++ b/sys/dev/sound/pci/ds1-fw.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ds1-fw.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 #ifndef _HWMCODE_
 #define _HWMCODE_
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 978ed14024e7..ab4cffd31989 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -33,7 +33,7 @@
 #include <dev/sound/pci/ds1.h>
 #include <dev/sound/pci/ds1-fw.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.43 2005/03/01 08:58:05 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ds1.h b/sys/dev/sound/pci/ds1.h
index ad4e829cbfee..8cccf33d1808 100644
--- a/sys/dev/sound/pci/ds1.h
+++ b/sys/dev/sound/pci/ds1.h
@@ -5,7 +5,7 @@
  *	author		: Taichi Sugiyama
  *	create Data     : 28/Sep/99
  * =======================================================================
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ds1.h,v 1.1 2000/05/31 03:21:36 cg Exp $
  */
 
 
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index ec32226e7bc7..9ad2f38f9ffa 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -35,7 +35,7 @@
 #include <dev/pci/pcivar.h>
 #include <sys/queue.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.55 2005/03/01 08:58:05 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 627b3ac07fba..5c46e65d5ecc 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -59,7 +59,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.55 2005/04/13 06:42:43 mdodd Exp $");
 
 static int debug = 0;
 SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, "");
diff --git a/sys/dev/sound/pci/es137x.h b/sys/dev/sound/pci/es137x.h
index 8d9b9915050a..b18a79b79dc3 100644
--- a/sys/dev/sound/pci/es137x.h
+++ b/sys/dev/sound/pci/es137x.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/es137x.h,v 1.5 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 63611805bf70..3a5fd59d94dc 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -29,7 +29,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.27 2005/03/01 08:58:05 imp Exp $");
 
 #define PCI_VENDOR_FORTEMEDIA	0x1319
 #define PCI_DEVICE_FORTEMEDIA1	0x08011319
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 506cd1d2c1be..7ea5cbbb7596 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -32,7 +32,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.53 2005/05/29 23:22:23 tanimura Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h
index be3f3fca3b4a..01e8dad05347 100644
--- a/sys/dev/sound/pci/ich.h
+++ b/sys/dev/sound/pci/ich.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ich.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #define PCIR_NAMBAR 0x10
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index a1773491c8ca..35b3f5d08de2 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -54,7 +54,7 @@
 
 #include <dev/sound/pci/maestro_reg.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.28 2005/03/01 08:58:05 imp Exp $");
 
 
 #define inline __inline
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index c1b89a364973..ba62f3c2dc66 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -61,7 +61,7 @@
 #include <gnu/dev/sound/pci/maestro3_reg.h>
 #include <gnu/dev/sound/pci/maestro3_dsp.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.28.2.1 2005/09/21 03:18:30 yongari Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h
index ab3542368484..bc27cd8a0088 100644
--- a/sys/dev/sound/pci/maestro_reg.h
+++ b/sys/dev/sound/pci/maestro_reg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	maestro_reg.h,v 1.13 2001/11/11 18:29:46 taku Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/maestro_reg.h,v 1.3 2004/11/10 04:29:09 julian Exp $
  */
 
 #ifndef	MAESTRO_REG_H_INCLUDED
diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h
index 2fec6427ae14..4547f54b90e9 100644
--- a/sys/dev/sound/pci/neomagic-coeff.h
+++ b/sys/dev/sound/pci/neomagic-coeff.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/neomagic-coeff.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #define NM_TOTAL_COEFF_COUNT 0x3158
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 3ed79e5cfb88..ec26431e11af 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -34,7 +34,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/neomagic.c,v 1.34 2005/01/06 01:43:19 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index 0b87f99cbf97..4cc3c56fc8a2 100644
--- a/sys/dev/sound/pci/neomagic.h
+++ b/sys/dev/sound/pci/neomagic.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/neomagic.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _NM256_H_
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index 8cbda9e66599..f7ba49b99479 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -33,7 +33,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.35 2005/03/01 08:58:05 imp Exp $");
 
 #define SOLO_DEFAULT_BUFSZ 16384
 #define ABS(x) (((x) < 0)? -(x) : (x))
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 9a6001195cf9..16e2af4015a2 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -31,7 +31,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.48 2005/03/01 08:58:05 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index 4a2ec626c508..066b160660da 100644
--- a/sys/dev/sound/pci/t4dwave.h
+++ b/sys/dev/sound/pci/t4dwave.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/t4dwave.h,v 1.7 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _T4DWAVE_REG_H
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 241baea42bc9..8f9f52f8cee4 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -44,7 +44,7 @@
 
 #include <dev/sound/pci/via8233.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via8233.c,v 1.20 2005/03/01 08:58:05 imp Exp $");
 
 #define VIA8233_PCI_ID 0x30591106
 
diff --git a/sys/dev/sound/pci/via8233.h b/sys/dev/sound/pci/via8233.h
index a38afc96255c..43d159975efe 100644
--- a/sys/dev/sound/pci/via8233.h
+++ b/sys/dev/sound/pci/via8233.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/via8233.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _SYS_SOUND_PCI_VIA8233_H_
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 0ae12041eb38..c44607011ec8 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -33,7 +33,7 @@
 
 #include <dev/sound/pci/via82c686.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.34 2005/03/01 08:58:05 imp Exp $");
 
 #define VIA_PCI_ID 0x30581106
 #define	NSEGS		4	/* Number of segments in SGD table */
diff --git a/sys/dev/sound/pci/via82c686.h b/sys/dev/sound/pci/via82c686.h
index ac6750e71b08..a4a9a086fd44 100644
--- a/sys/dev/sound/pci/via82c686.h
+++ b/sys/dev/sound/pci/via82c686.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/via82c686.h,v 1.6 2003/03/26 05:35:38 orion Exp $
  */
 
 #ifndef _VIA_H
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index dd580acd7fb7..1c6f006d536e 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -36,7 +36,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.19 2005/03/01 08:58:05 imp Exp $");
 
 /* ------------------------------------------------------------------------- */
 /* Constants */
diff --git a/sys/dev/sound/pci/vibes.h b/sys/dev/sound/pci/vibes.h
index d1eac407efbe..f2b1baf4f3cd 100644
--- a/sys/dev/sound/pci/vibes.h
+++ b/sys/dev/sound/pci/vibes.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/vibes.h,v 1.2 2005/01/06 01:43:19 imp Exp $
  */
 
 /* ------------------------------------------------------------------------- */
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index e0cc5b550db3..08c46c66d532 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -30,7 +30,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.53 2005/04/10 14:45:27 scottl Exp $");
 
 MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
 
diff --git a/sys/dev/sound/pcm/ac97.h b/sys/dev/sound/pcm/ac97.h
index 2d2db4b22f5e..381d352558db 100644
--- a/sys/dev/sound/pcm/ac97.h
+++ b/sys/dev/sound/pcm/ac97.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/ac97.h,v 1.16 2005/01/06 01:43:20 imp Exp $
  */
 
 #define AC97_MUTE	0x8080
diff --git a/sys/dev/sound/pcm/ac97_if.m b/sys/dev/sound/pcm/ac97_if.m
index 19f7378d1c6d..3a01f5f61ff8 100644
--- a/sys/dev/sound/pcm/ac97_if.m
+++ b/sys/dev/sound/pcm/ac97_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/ac97_if.m,v 1.4 2005/01/06 01:43:20 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c
index 05c73d7553a7..099f700f81f3 100644
--- a/sys/dev/sound/pcm/ac97_patch.c
+++ b/sys/dev/sound/pcm/ac97_patch.c
@@ -27,7 +27,7 @@
 #include <dev/sound/pcm/ac97.h>
 #include <dev/sound/pcm/ac97_patch.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97_patch.c,v 1.3 2005/01/06 01:43:20 imp Exp $");
 
 void ad1886_patch(struct ac97_info* codec)
 {
diff --git a/sys/dev/sound/pcm/ac97_patch.h b/sys/dev/sound/pcm/ac97_patch.h
index d0184c4c6be2..682e906e8d82 100644
--- a/sys/dev/sound/pcm/ac97_patch.h
+++ b/sys/dev/sound/pcm/ac97_patch.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/ac97_patch.h,v 1.3 2005/01/06 01:43:20 imp Exp $
  */
 
 typedef void (*ac97_patch)(struct ac97_info*);
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index 9ca6a3238441..a5dfce2ac790 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/buffer.c,v 1.25 2005/01/06 01:43:20 imp Exp $");
 
 struct snd_dbuf *
 sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel)
diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
index 7b2bffbe127b..c4b98f60d3e9 100644
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/buffer.h,v 1.10 2005/01/06 01:43:20 imp Exp $
  */
 
 #define SND_DMA(b) (sndbuf_getflags((b)) & SNDBUF_F_DMA)
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index b43680cb3f8e..97f9ee43c025 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -31,7 +31,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.99 2005/06/10 21:33:14 marius Exp $");
 
 #define MIN_CHUNK_SIZE 		256	/* for uiomove etc. */
 #define	DMA_ALIGN_THRESHOLD	4
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 23cd7199f58b..ac36c8f67d5f 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/channel.h,v 1.31 2005/01/06 01:43:20 imp Exp $
  */
 
 struct pcmchan_children {
diff --git a/sys/dev/sound/pcm/channel_if.m b/sys/dev/sound/pcm/channel_if.m
index cdc6a3b6f2b3..313097d51b60 100644
--- a/sys/dev/sound/pcm/channel_if.m
+++ b/sys/dev/sound/pcm/channel_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/channel_if.m,v 1.5 2005/01/06 01:43:20 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 689e598c62c9..98707e9921eb 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -29,7 +29,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.80.2.1 2005/08/13 21:24:16 rwatson Exp $");
 
 #define OLDPCM_IOCTL
 
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index 0d067ededb1a..a8d722f41e2d 100644
--- a/sys/dev/sound/pcm/dsp.h
+++ b/sys/dev/sound/pcm/dsp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/dsp.h,v 1.9 2005/01/06 01:43:20 imp Exp $
  */
 
 extern struct cdevsw dsp_cdevsw;
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index ba9c4b641303..934110ceac38 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -26,7 +26,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/fake.c,v 1.14 2005/01/06 01:43:21 imp Exp $");
 
 static u_int32_t fk_fmt[] = {
 	AFMT_U8,
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 5bc7b81ae2b9..287f4c51800e 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.33 2005/01/06 01:43:21 imp Exp $");
 
 MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
 
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 1a9c37b751aa..ae18e3e9ab42 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/feeder.h,v 1.12 2005/01/06 01:43:21 imp Exp $
  */
 
 struct pcm_feederdesc {
diff --git a/sys/dev/sound/pcm/feeder_fmt.c b/sys/dev/sound/pcm/feeder_fmt.c
index 7eb66f515fd1..d3aaf01177bd 100644
--- a/sys/dev/sound/pcm/feeder_fmt.c
+++ b/sys/dev/sound/pcm/feeder_fmt.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.14 2005/01/06 01:43:21 imp Exp $");
 
 MALLOC_DEFINE(M_FMTFEEDER, "fmtfeed", "pcm format feeder");
 
diff --git a/sys/dev/sound/pcm/feeder_if.m b/sys/dev/sound/pcm/feeder_if.m
index 83c0fb073b53..7de23a60d38b 100644
--- a/sys/dev/sound/pcm/feeder_if.m
+++ b/sys/dev/sound/pcm/feeder_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/feeder_if.m,v 1.6 2005/01/06 01:43:21 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index 55d51fc1e2dc..20e29227f46b 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -48,7 +48,7 @@
 #include <dev/sound/pcm/sound.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_rate.c,v 1.11 2005/01/06 01:43:21 imp Exp $");
 
 #endif /* _KERNEL */
 
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index e7e3e0ccd42e..c96fbf5b1264 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -28,7 +28,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.43.2.1.2.1 2005/10/26 21:17:40 ariff Exp $");
 
 MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 2c8dff753e36..863d148b68eb 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/mixer.h,v 1.14 2005/01/06 01:43:21 imp Exp $
  */
 
 int mixer_init(device_t dev, kobj_class_t cls, void *devinfo);
diff --git a/sys/dev/sound/pcm/mixer_if.m b/sys/dev/sound/pcm/mixer_if.m
index 9bd974ce7d9e..1f92f6478647 100644
--- a/sys/dev/sound/pcm/mixer_if.m
+++ b/sys/dev/sound/pcm/mixer_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.6 2005/01/06 01:43:21 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index 5ccf0b7a6d72..c4d9ba2805e6 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -30,7 +30,7 @@
 #include <sys/sx.h>
 #endif
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sndstat.c,v 1.20.2.1 2005/09/21 02:44:09 yongari Exp $");
 
 #define	SS_TYPE_MODULE		0
 #define	SS_TYPE_FIRST		1
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 64441d73d1eb..35d2399d20e6 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -32,7 +32,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.93.4.1 2005/10/26 21:18:09 ariff Exp $");
 
 devclass_t pcm_devclass;
 
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 56b76f0f6b89..8ff23616b176 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.63 2005/02/27 22:14:23 phk Exp $
  */
 
 /*
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index 9b9e102f8f92..3610abc4993e 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -28,7 +28,7 @@
 #include <dev/sound/pcm/vchan.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/vchan.c,v 1.17.4.1 2005/10/26 21:18:41 ariff Exp $");
 
 struct vchinfo {
 	u_int32_t spd, fmt, blksz, bps, run;
diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h
index cb9e1c8ea17c..ce6a0d256c77 100644
--- a/sys/dev/sound/pcm/vchan.h
+++ b/sys/dev/sound/pcm/vchan.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/vchan.h,v 1.4 2005/01/06 01:43:21 imp Exp $
  */
 
 int vchan_create(struct pcm_channel *parent);
diff --git a/sys/dev/sound/sbus/apcdmareg.h b/sys/dev/sound/sbus/apcdmareg.h
index d4296adbe9fe..aef9b83333b1 100644
--- a/sys/dev/sound/sbus/apcdmareg.h
+++ b/sys/dev/sound/sbus/apcdmareg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/sound/sbus/apcdmareg.h,v 1.2 2005/01/06 01:43:22 imp Exp $	*/
 /*	$OpenBSD: apcdmareg.h,v 1.2 2003/06/02 18:53:18 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/sound/sbus/cs4231.c b/sys/dev/sound/sbus/cs4231.c
index af85c8adc3ad..396aedb3a63d 100644
--- a/sys/dev/sound/sbus/cs4231.c
+++ b/sys/dev/sound/sbus/cs4231.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sound/sbus/cs4231.c,v 1.4 2005/05/19 18:13:49 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/sbus/cs4231.h b/sys/dev/sound/sbus/cs4231.h
index 26ca399a0fe0..b98f7bbac447 100644
--- a/sys/dev/sound/sbus/cs4231.h
+++ b/sys/dev/sound/sbus/cs4231.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/sound/sbus/cs4231.h,v 1.2 2005/01/06 01:43:22 imp Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 12bab41874aa..58dc5b67b24a 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.14 2005/04/27 17:16:27 julian Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h
index d233f5988411..f0e88880d38c 100644
--- a/sys/dev/sound/usb/uaudio.h
+++ b/sys/dev/sound/usb/uaudio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.6 2005/04/27 17:16:27 julian Exp $ */
 
 /*-
  * Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index 134fc7c97658..589c796bb09c 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.15 2005/04/27 17:16:27 julian Exp $ */
 
 /*-
  * Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h
index 3cc09ba5ae45..114725fcb861 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.4 2005/01/06 01:43:22 imp Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 0260b1255aa4..321836244a03 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr.c,v 1.69.2.1 2005/08/25 05:01:16 rwatson Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/sr/if_sr.h b/sys/dev/sr/if_sr.h
index c66f667f0023..197bf46101af 100644
--- a/sys/dev/sr/if_sr.h
+++ b/sys/dev/sr/if_sr.h
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sr/if_sr.h,v 1.4 2005/01/06 01:43:22 imp Exp $
  */
 
 #ifndef _I386_ISA_IF_SR_H_
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 3f68e001295b..22ea395b321d 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr_isa.c,v 1.51 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 8f62513b360f..694323b5e7c3 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr_pci.c,v 1.23 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 16925e6e581e..b1ba98d5fab4 100644
--- a/sys/dev/sr/if_srregs.h
+++ b/sys/dev/sr/if_srregs.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sr/if_srregs.h,v 1.9 2005/01/06 01:43:22 imp Exp $
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index a0e7139b4969..d1ff008589a9 100644
--- a/sys/dev/stg/tmc18c30.c
+++ b/sys/dev/stg/tmc18c30.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.14 2005/05/29 04:42:26 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30.h b/sys/dev/stg/tmc18c30.h
index 8a1848c6b5bf..0033a822bb2c 100644
--- a/sys/dev/stg/tmc18c30.h
+++ b/sys/dev/stg/tmc18c30.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/stg/tmc18c30.h,v 1.1 2003/04/07 10:13:25 mdodd Exp $
  */
 
 extern devclass_t stg_devclass;
diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c
index 7165a817db90..752c98375ff6 100644
--- a/sys/dev/stg/tmc18c30_isa.c
+++ b/sys/dev/stg/tmc18c30_isa.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_isa.c,v 1.12 2005/05/29 04:42:26 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index d0c732f1d69e..d6a24db71cfd 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.24 2005/06/24 14:36:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c
index 1edda5af141a..3ee157d3a17d 100644
--- a/sys/dev/stg/tmc18c30_pci.c
+++ b/sys/dev/stg/tmc18c30_pci.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pci.c,v 1.6 2005/05/29 04:42:26 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30_subr.c b/sys/dev/stg/tmc18c30_subr.c
index 152fd11bbbdf..9e977abf615a 100644
--- a/sys/dev/stg/tmc18c30_subr.c
+++ b/sys/dev/stg/tmc18c30_subr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_subr.c,v 1.5 2005/05/29 04:42:26 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30reg.h b/sys/dev/stg/tmc18c30reg.h
index 93c9940ba649..341ba030e3b3 100644
--- a/sys/dev/stg/tmc18c30reg.h
+++ b/sys/dev/stg/tmc18c30reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/stg/tmc18c30reg.h,v 1.3 2005/01/06 01:43:23 imp Exp $	*/
 /*	$NecBSD: tmc18c30reg.h,v 1.4.24.1 2001/06/08 06:27:50 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/stg/tmc18c30var.h b/sys/dev/stg/tmc18c30var.h
index 69e837fc6786..ea2201816025 100644
--- a/sys/dev/stg/tmc18c30var.h
+++ b/sys/dev/stg/tmc18c30var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/stg/tmc18c30var.h,v 1.8 2005/01/06 01:43:23 imp Exp $	*/
 /*	$NecBSD: tmc18c30var.h,v 1.12.18.2 2001/06/13 05:51:23 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 65fd83a44c95..0810b9645cc7 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.50 2005/02/07 18:22:20 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sx/cd1865.h b/sys/dev/sx/cd1865.h
index 297a415ff698..ce5acd97e9aa 100644
--- a/sys/dev/sx/cd1865.h
+++ b/sys/dev/sx/cd1865.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/cd1865.h,v 1.2 2005/01/06 01:43:24 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sx.c b/sys/dev/sx/sx.c
index 8821c374af87..893f99bb5a14 100644
--- a/sys/dev/sx/sx.c
+++ b/sys/dev/sx/sx.c
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx.c,v 1.14 2005/01/06 01:43:24 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sx.h b/sys/dev/sx/sx.h
index 0e035ddbfb16..06b7c8429052 100644
--- a/sys/dev/sx/sx.h
+++ b/sys/dev/sx/sx.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx.h,v 1.5 2005/01/06 01:43:24 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sx/sx_pci.c b/sys/dev/sx/sx_pci.c
index 79eb4d1717d8..f9d9ee9438f0 100644
--- a/sys/dev/sx/sx_pci.c
+++ b/sys/dev/sx/sx_pci.c
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx_pci.c,v 1.6 2005/03/01 08:58:06 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sx/sx_util.c b/sys/dev/sx/sx_util.c
index 0eeb8aeb7549..7e7107436334 100644
--- a/sys/dev/sx/sx_util.c
+++ b/sys/dev/sx/sx_util.c
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx_util.c,v 1.2 2005/01/06 01:43:24 imp Exp $
  */
 
 #include "opt_debug_sx.h"
diff --git a/sys/dev/sx/sx_util.h b/sys/dev/sx/sx_util.h
index 57f42c9f7517..ec670e871b37 100644
--- a/sys/dev/sx/sx_util.h
+++ b/sys/dev/sx/sx_util.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx_util.h,v 1.2 2005/01/06 01:43:24 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sxvar.h b/sys/dev/sx/sxvar.h
index fa33e371ec90..4a518aefc2a6 100644
--- a/sys/dev/sx/sxvar.h
+++ b/sys/dev/sx/sxvar.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sxvar.h,v 1.2 2005/01/06 01:43:24 imp Exp $
  */
 
 
diff --git a/sys/dev/sym/README.sym b/sys/dev/sym/README.sym
index d310cd4d150f..25f29f86302d 100644
--- a/sys/dev/sym/README.sym
+++ b/sys/dev/sym/README.sym
@@ -54,7 +54,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sym/README.sym,v 1.6 2005/01/06 01:43:24 imp Exp $
  */
 
 README.sym
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index 768baa7b10a5..c445595e5f54 100644
--- a/sys/dev/sym/sym_conf.h
+++ b/sys/dev/sym/sym_conf.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_conf.h,v 1.9 2005/01/06 01:43:24 imp Exp $ */
 
 #ifndef SYM_CONF_H
 #define SYM_CONF_H
diff --git a/sys/dev/sym/sym_defs.h b/sys/dev/sym/sym_defs.h
index ad1481f71af3..aaaef2b96be9 100644
--- a/sys/dev/sym/sym_defs.h
+++ b/sys/dev/sym/sym_defs.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_defs.h,v 1.11 2005/01/06 01:43:24 imp Exp $ */
 
 #ifndef SYM_DEFS_H
 #define SYM_DEFS_H
diff --git a/sys/dev/sym/sym_fw.h b/sys/dev/sym/sym_fw.h
index a274bbcee430..4a219801662d 100644
--- a/sys/dev/sym/sym_fw.h
+++ b/sys/dev/sym/sym_fw.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw.h,v 1.5 2005/01/06 01:43:24 imp Exp $ */
 
 #ifndef	SYM_FW_H
 #define	SYM_FW_H
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index 9a43dc431f0d..695d783cfd41 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw1.h,v 1.7 2005/01/06 01:43:24 imp Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 5ff740aa3cd9..892b18227200 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw2.h,v 1.8 2005/01/06 01:43:24 imp Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index e8f10f0f05bb..2810fd62405c 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.55 2005/05/29 04:42:26 nyan Exp $");
 
 #define SYM_DRIVER_NAME	"sym-1.6.5-20000902"
 
diff --git a/sys/dev/syscons/apm/apm_saver.c b/sys/dev/syscons/apm/apm_saver.c
index cdd5969c9806..8e28de64f5d7 100644
--- a/sys/dev/syscons/apm/apm_saver.c
+++ b/sys/dev/syscons/apm/apm_saver.c
@@ -25,7 +25,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/sys/dev/syscons/apm/apm_saver.c,v 1.10 2005/04/04 05:28:19 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 960acca5a512..03c6df0780d8 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,7 +25,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/sys/dev/syscons/blank/blank_saver.c,v 1.17 1999/08/28 00:47:45 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 92d807f9ed99..5017ea1eed8b 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,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/sys/dev/syscons/daemon/daemon_saver.c,v 1.23 2005/05/15 08:59:00 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/dragon/dragon_saver.c b/sys/dev/syscons/dragon/dragon_saver.c
index f8fa51b5e08b..f847f3f7eabc 100644
--- a/sys/dev/syscons/dragon/dragon_saver.c
+++ b/sys/dev/syscons/dragon/dragon_saver.c
@@ -25,7 +25,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/sys/dev/syscons/dragon/dragon_saver.c,v 1.2 2003/07/21 13:04:54 nyan Exp $
  */
 
 #include	<sys/param.h>
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index d7793b6dd96f..3b057c8ae7da 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,7 +25,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/sys/dev/syscons/fade/fade_saver.c,v 1.19 2003/05/31 20:29:34 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index 0bc031cad7cb..3ec42cb5cd66 100644
--- a/sys/dev/syscons/fire/fire_saver.c
+++ b/sys/dev/syscons/fire/fire_saver.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/sys/dev/syscons/fire/fire_saver.c,v 1.10 2003/07/21 13:04:54 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index d6cfe80da689..f37d377eac73 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,7 +25,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/sys/dev/syscons/green/green_saver.c,v 1.17 1999/08/28 00:47:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/logo/logo.c b/sys/dev/syscons/logo/logo.c
index ea3f46e5c3a7..f9d3b419c88c 100644
--- a/sys/dev/syscons/logo/logo.c
+++ b/sys/dev/syscons/logo/logo.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/syscons/logo/logo.c,v 1.3 2001/08/09 00:02:30 peter Exp $ */
 
 #define logo_width 88
 #define logo_height 88
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 0a75886388ba..9ad2c6f1f9a1 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -25,7 +25,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/sys/dev/syscons/logo/logo_saver.c,v 1.12 2003/07/21 13:04:54 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 80e2212ee3c7..0987e2e22e75 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -25,7 +25,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/sys/dev/syscons/rain/rain_saver.c,v 1.12 2003/02/02 13:52:25 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index fa522f8e5e8f..18512ae98e6d 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.22.2.1 2005/10/05 21:48:02 marius Exp $");
 
 #include "opt_syscons.h"
 #include "opt_gfb.h"
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index c83048e13f04..880bbcfb16e9 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/schistory.c,v 1.19 2004/01/21 05:08:51 grehan Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 73455f315884..44ffedb48d26 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.37.2.3 2005/10/05 21:48:02 marius Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c
index 4e93a6af1b0d..360a0278eba1 100644
--- a/sys/dev/syscons/scterm-dumb.c
+++ b/sys/dev/syscons/scterm-dumb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-dumb.c,v 1.6 2004/01/21 05:08:51 grehan Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c
index 96059d482948..ef6a3a14941d 100644
--- a/sys/dev/syscons/scterm-sc.c
+++ b/sys/dev/syscons/scterm-sc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.21 2004/05/30 20:08:42 phk Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index 0b9135a4a007..f167ad32a335 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm.c,v 1.6 2003/08/24 18:17:24 obrien Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/sctermvar.h b/sys/dev/syscons/sctermvar.h
index b1c01af1f800..5d24deef6e06 100644
--- a/sys/dev/syscons/sctermvar.h
+++ b/sys/dev/syscons/sctermvar.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/sys/dev/syscons/sctermvar.h,v 1.4 2002/10/20 22:50:13 robert Exp $
  */
 
 #ifndef _DEV_SYSCONS_SCTERMVAR_H_
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index a556dc01d01a..a6c7eed608f3 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.22.2.1 2005/09/02 15:31:03 rodrigc Exp $");
 
 #include "opt_vga.h"
 
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 81498ecad167..d161e7e099b6 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.19.2.1 2005/10/05 21:48:02 marius Exp $");
 
 #include "opt_syscons.h"
 #include "opt_vga.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index f2debe35e824..d7844af2cfe4 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.34.2.3 2005/10/05 21:48:02 marius Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 8d2b224b36dd..134d5d26a5b2 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvtb.c,v 1.13 2005/05/21 20:28:15 marius Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 6a7b7dadba85..3abe350acdd5 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,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/sys/dev/syscons/snake/snake_saver.c,v 1.31 2005/05/15 09:07:42 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 3963e083a813..8508fd7bc935 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,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/sys/dev/syscons/star/star_saver.c,v 1.26 2005/05/15 09:07:04 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index adba5a1009be..a0d67faa03f8 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.436.2.3 2005/10/05 21:48:02 marius Exp $");
 
 #include "opt_syscons.h"
 #include "opt_splash.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 45e96aec7a30..316f5e955bd2 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.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/sys/dev/syscons/syscons.h,v 1.83.2.2 2005/10/05 21:48:02 marius Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 0f6cec526182..9939147c262f 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.27 2005/02/27 21:16:11 phk Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index 050790d8a391..049fd4956915 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.c
@@ -25,7 +25,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/sys/dev/syscons/warp/warp_saver.c,v 1.13 2003/07/21 13:04:54 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/tdfx/tdfx_io.h b/sys/dev/tdfx/tdfx_io.h
index faec61e11771..27d44a4787d2 100644
--- a/sys/dev/tdfx/tdfx_io.h
+++ b/sys/dev/tdfx/tdfx_io.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/sys/dev/tdfx/tdfx_io.h,v 1.4 2005/01/06 01:43:24 imp Exp $
  */
 
 /* This code originally came from <shocking@prth.pgs.com>
diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h
index a3235cc8ba02..23127fd74056 100644
--- a/sys/dev/tdfx/tdfx_linux.h
+++ b/sys/dev/tdfx/tdfx_linux.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/sys/dev/tdfx/tdfx_linux.h,v 1.6 2005/01/06 01:43:24 imp Exp $
  */
 
 
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index c0d71259547e..8baa2e24fed9 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.37 2005/03/01 07:50:10 imp Exp $");
 
 /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
  *
diff --git a/sys/dev/tdfx/tdfx_pci.h b/sys/dev/tdfx/tdfx_pci.h
index 0c60e5a2b6c1..bea33e64a73a 100644
--- a/sys/dev/tdfx/tdfx_pci.h
+++ b/sys/dev/tdfx/tdfx_pci.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/sys/dev/tdfx/tdfx_pci.h,v 1.4 2005/01/06 01:43:25 imp Exp $
  */
 
 /* tdfx_pci.h -- Prototypes for tdfx device methods */
diff --git a/sys/dev/tdfx/tdfx_vars.h b/sys/dev/tdfx/tdfx_vars.h
index 1e10e3c3a669..a7d2629bf639 100644
--- a/sys/dev/tdfx/tdfx_vars.h
+++ b/sys/dev/tdfx/tdfx_vars.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/sys/dev/tdfx/tdfx_vars.h,v 1.10 2005/01/06 01:43:25 imp Exp $
  */
 
 /* tdfx_vars.h -- constants and structs used in the tdfx driver
diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c
index 47f32f438526..bccf93c96f33 100644
--- a/sys/dev/tga/tga_pci.c
+++ b/sys/dev/tga/tga_pci.c
@@ -30,7 +30,7 @@
 #include "opt_fb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tga/tga_pci.c,v 1.14 2005/05/29 04:42:26 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/tga/tga_pci.h b/sys/dev/tga/tga_pci.h
index 21dc74e37417..c8fe5730378d 100644
--- a/sys/dev/tga/tga_pci.h
+++ b/sys/dev/tga/tga_pci.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/tga/tga_pci.h,v 1.2 2005/01/06 01:43:25 imp Exp $
  */
 
 #ifndef _PCI_TGA_H_
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 500c3076f6b1..2936c99a6f95 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.26 2005/05/29 04:42:26 nyan Exp $");
 
 /*
  *	HISTORY:					
diff --git a/sys/dev/trm/trm.h b/sys/dev/trm/trm.h
index 21248835a510..ac744e10298b 100644
--- a/sys/dev/trm/trm.h
+++ b/sys/dev/trm/trm.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.	
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/trm/trm.h,v 1.5 2005/01/06 01:43:25 imp Exp $
  */
 
 #ifndef trm_H
diff --git a/sys/dev/twa/tw_cl.h b/sys/dev/twa/tw_cl.h
index d30b02dcd17b..7780734662f6 100644
--- a/sys/dev/twa/tw_cl.h
+++ b/sys/dev/twa/tw_cl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl.h,v 1.1 2005/04/12 22:07:08 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_externs.h b/sys/dev/twa/tw_cl_externs.h
index dde65e6970bf..cd8f91909f80 100644
--- a/sys/dev/twa/tw_cl_externs.h
+++ b/sys/dev/twa/tw_cl_externs.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_externs.h,v 1.1 2005/04/12 22:07:08 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_fwif.h b/sys/dev/twa/tw_cl_fwif.h
index 4688cf37cd04..6340ce6a4b90 100644
--- a/sys/dev/twa/tw_cl_fwif.h
+++ b/sys/dev/twa/tw_cl_fwif.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_fwif.h,v 1.1 2005/04/12 22:07:08 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_fwimg.c b/sys/dev/twa/tw_cl_fwimg.c
index 40919ba7e39a..a04a57206523 100644
--- a/sys/dev/twa/tw_cl_fwimg.c
+++ b/sys/dev/twa/tw_cl_fwimg.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_fwimg.c,v 1.1 2005/04/12 22:07:08 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_init.c b/sys/dev/twa/tw_cl_init.c
index 11d848d32099..b17bf22f11b2 100644
--- a/sys/dev/twa/tw_cl_init.c
+++ b/sys/dev/twa/tw_cl_init.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_init.c,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_intr.c b/sys/dev/twa/tw_cl_intr.c
index 3271d59f7239..1c5e8cba04af 100644
--- a/sys/dev/twa/tw_cl_intr.c
+++ b/sys/dev/twa/tw_cl_intr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_intr.c,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_io.c b/sys/dev/twa/tw_cl_io.c
index dd394c7a8704..a69eb3f94373 100644
--- a/sys/dev/twa/tw_cl_io.c
+++ b/sys/dev/twa/tw_cl_io.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_io.c,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_ioctl.h b/sys/dev/twa/tw_cl_ioctl.h
index f476566ea5db..3cbd183cc863 100644
--- a/sys/dev/twa/tw_cl_ioctl.h
+++ b/sys/dev/twa/tw_cl_ioctl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_ioctl.h,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_misc.c b/sys/dev/twa/tw_cl_misc.c
index 8b01ff374d84..e67a7d854d5c 100644
--- a/sys/dev/twa/tw_cl_misc.c
+++ b/sys/dev/twa/tw_cl_misc.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_misc.c,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_share.h b/sys/dev/twa/tw_cl_share.h
index 6ba4f23bea6b..ee0aa93b3017 100644
--- a/sys/dev/twa/tw_cl_share.h
+++ b/sys/dev/twa/tw_cl_share.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_share.h,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl.h b/sys/dev/twa/tw_osl.h
index f22074058d2f..1d36c0ca48c4 100644
--- a/sys/dev/twa/tw_osl.h
+++ b/sys/dev/twa/tw_osl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_cam.c b/sys/dev/twa/tw_osl_cam.c
index d82f91e2c71d..7ee105558e14 100644
--- a/sys/dev/twa/tw_osl_cam.c
+++ b/sys/dev/twa/tw_osl_cam.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_cam.c,v 1.3 2005/06/11 00:14:23 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_externs.h b/sys/dev/twa/tw_osl_externs.h
index 2e726b3bcc08..e094b4f46271 100644
--- a/sys/dev/twa/tw_osl_externs.h
+++ b/sys/dev/twa/tw_osl_externs.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_externs.h,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c
index 5a2f26176f4d..3495959211f1 100644
--- a/sys/dev/twa/tw_osl_freebsd.c
+++ b/sys/dev/twa/tw_osl_freebsd.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_includes.h b/sys/dev/twa/tw_osl_includes.h
index aec2254f1d9f..8f6a0f8c82e4 100644
--- a/sys/dev/twa/tw_osl_includes.h
+++ b/sys/dev/twa/tw_osl_includes.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_includes.h,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_ioctl.h b/sys/dev/twa/tw_osl_ioctl.h
index 35fd1967567d..2a97d40514dd 100644
--- a/sys/dev/twa/tw_osl_ioctl.h
+++ b/sys/dev/twa/tw_osl_ioctl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_ioctl.h,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_share.h b/sys/dev/twa/tw_osl_share.h
index c19024d0f74a..453455e492e9 100644
--- a/sys/dev/twa/tw_osl_share.h
+++ b/sys/dev/twa/tw_osl_share.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.2 2005/06/11 00:14:23 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_types.h b/sys/dev/twa/tw_osl_types.h
index 5eeb5e235f60..b7fe74c75a40 100644
--- a/sys/dev/twa/tw_osl_types.h
+++ b/sys/dev/twa/tw_osl_types.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_types.h,v 1.1 2005/04/12 22:07:09 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 96dc538eb471..d1011fef688a 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twe.c,v 1.25 2005/02/17 19:05:42 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index 1bd46f0022ae..c8fc8b713653 100644
--- a/sys/dev/twe/twe_compat.h
+++ b/sys/dev/twe/twe_compat.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/twe/twe_compat.h,v 1.14 2005/05/29 04:42:26 nyan Exp $
  */
 /*
  * Portability and compatibility interfaces.
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index addc7f45016b..28983d6ae9c3 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.42 2005/03/06 20:57:54 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_tables.h b/sys/dev/twe/twe_tables.h
index 3ba83c972c4b..c8871a280213 100644
--- a/sys/dev/twe/twe_tables.h
+++ b/sys/dev/twe/twe_tables.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twe_tables.h,v 1.4 2003/12/02 07:57:20 ps Exp $
  */
 
 /*
diff --git a/sys/dev/twe/tweio.h b/sys/dev/twe/tweio.h
index 1b78472495ab..202de992b28f 100644
--- a/sys/dev/twe/tweio.h
+++ b/sys/dev/twe/tweio.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/tweio.h,v 1.5 2005/02/17 19:05:42 vkashyap Exp $
  */
 
 
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index f6e7db6e1a03..2f77bc85cce7 100644
--- a/sys/dev/twe/twereg.h
+++ b/sys/dev/twe/twereg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/twe/twereg.h,v 1.11 2004/05/12 04:10:37 vkashyap Exp $
  */
 
 /* 
diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h
index 90391ad95dfc..3245e10fbc05 100644
--- a/sys/dev/twe/twevar.h
+++ b/sys/dev/twe/twevar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twevar.h,v 1.13 2004/06/11 18:42:44 vkashyap Exp $
  */
 
 #define TWE_DRIVER_VERSION_STRING	"1.50.01.002"
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 34b26ec89c38..3ea8cece8fe8 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.89.2.2 2005/08/25 05:01:16 rwatson Exp $");
 
 /*
  * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie)
diff --git a/sys/dev/tx/if_txreg.h b/sys/dev/tx/if_txreg.h
index 63891cda2457..291f06e354d6 100644
--- a/sys/dev/tx/if_txreg.h
+++ b/sys/dev/tx/if_txreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/tx/if_txreg.h,v 1.14 2003/09/02 17:30:39 jhb Exp $
  */
 
 #define	EPIC_MAX_MTU		1600	/* This is experiment-derived value */
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index a1322c90060a..ed5bbbc76ba7 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/tx/if_txvar.h,v 1.19 2005/06/10 16:49:15 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/txp/3c990img.h b/sys/dev/txp/3c990img.h
index 6e75f5d83cf0..6a39870ffd15 100644
--- a/sys/dev/txp/3c990img.h
+++ b/sys/dev/txp/3c990img.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: 3c990img.h,v 1.2 2001/06/05 02:15:17 jason Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/txp/3c990img.h,v 1.2 2005/01/06 01:43:26 imp Exp $ */
 
 /*-
  * Copyright (C) 1999-2001 3Com, Inc.
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 4205a9b844e0..739f3b2c8e26 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -35,14 +35,14 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.31.2.2 2005/08/25 05:01:16 rwatson Exp $");
 
 /*
  * Driver for 3c990 (Typhoon) Ethernet ASIC
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.31.2.2 2005/08/25 05:01:16 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.31.2.2 2005/08/25 05:01:16 rwatson Exp $";
 #endif
 
 /*
diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index df37b5170369..3ed0c75d818e 100644
--- a/sys/dev/txp/if_txpreg.h
+++ b/sys/dev/txp/if_txpreg.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/txp/if_txpreg.h,v 1.4 2005/06/10 16:49:15 brooks Exp $ */
 
 /*-
  * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index 101304ed6871..61930ea3c657 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.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/sys/dev/uart/uart.h,v 1.4 2005/01/06 01:43:26 imp Exp $
  */
 
 #ifndef _DEV_UART_H_
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
index 9fd84e9eca6c..73372487faa8 100644
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.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/sys/dev/uart/uart_bus.h,v 1.9 2005/01/06 01:43:26 imp Exp $
  */
 
 #ifndef _DEV_UART_BUS_H_
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index 042dfef5d219..61ef8a7624d5 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_acpi.c,v 1.3 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_ebus.c b/sys/dev/uart/uart_bus_ebus.c
index 6da03a1c351f..ea93cbd37c5f 100644
--- a/sys/dev/uart/uart_bus_ebus.c
+++ b/sys/dev/uart/uart_bus_ebus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.6.4.1 2005/10/27 20:58:50 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 51713ad25a62..8667144cc336 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.6 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c
index a1ca4c2e292c..ea25af24ba53 100644
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pccard.c,v 1.9 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index fb2fc6d1bfe1..4e483954a6f3 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.5 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index 7277df99fc41..db158a448170 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_puc.c,v 1.2 2003/09/26 05:14:56 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
index 7b068187e565..e1d2945def05 100644
--- a/sys/dev/uart/uart_core.c
+++ b/sys/dev/uart/uart_core.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.13 2005/03/02 11:30:14 marius Exp $");
 
 #ifndef KLD_MODULE
 #include "opt_comconsole.h"
diff --git a/sys/dev/uart/uart_cpu.h b/sys/dev/uart/uart_cpu.h
index 702ee5ec5d93..b3de144e6833 100644
--- a/sys/dev/uart/uart_cpu.h
+++ b/sys/dev/uart/uart_cpu.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/sys/dev/uart/uart_cpu.h,v 1.8 2005/01/06 01:43:26 imp Exp $
  */
 
 #ifndef _DEV_UART_CPU_H_
diff --git a/sys/dev/uart/uart_cpu_alpha.c b/sys/dev/uart/uart_cpu_alpha.c
index f7a2f8bb5d4a..fc2c95164417 100644
--- a/sys/dev/uart/uart_cpu_alpha.c
+++ b/sys/dev/uart/uart_cpu_alpha.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_alpha.c,v 1.11 2005/06/16 18:06:38 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_amd64.c b/sys/dev/uart/uart_cpu_amd64.c
index 498496b86b90..29579917e061 100644
--- a/sys/dev/uart/uart_cpu_amd64.c
+++ b/sys/dev/uart/uart_cpu_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_amd64.c,v 1.10 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_i386.c b/sys/dev/uart/uart_cpu_i386.c
index 673dde54b25a..4395ed0d5f49 100644
--- a/sys/dev/uart/uart_cpu_i386.c
+++ b/sys/dev/uart/uart_cpu_i386.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_i386.c,v 1.10 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c
index cf1e7e178e98..e5472fdb18c2 100644
--- a/sys/dev/uart/uart_cpu_ia64.c
+++ b/sys/dev/uart/uart_cpu_ia64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.11 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_pc98.c b/sys/dev/uart/uart_cpu_pc98.c
index 0ae255967727..1a2ba0ee4b5d 100644
--- a/sys/dev/uart/uart_cpu_pc98.c
+++ b/sys/dev/uart/uart_cpu_pc98.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.15 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_sparc64.c b/sys/dev/uart/uart_cpu_sparc64.c
index fcda227a6c17..0235df48cda4 100644
--- a/sys/dev/uart/uart_cpu_sparc64.c
+++ b/sys/dev/uart/uart_cpu_sparc64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.19.2.1 2005/08/27 15:52:05 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dbg.c b/sys/dev/uart/uart_dbg.c
index 51d9ec59bdde..8ff090120260 100644
--- a/sys/dev/uart/uart_dbg.c
+++ b/sys/dev/uart/uart_dbg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dbg.c,v 1.2 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 5b53a8999fd1..0ce737cac472 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.14 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_sab82532.c b/sys/dev/uart/uart_dev_sab82532.c
index 112dca43f54a..59ba53221370 100644
--- a/sys/dev/uart/uart_dev_sab82532.c
+++ b/sys/dev/uart/uart_dev_sab82532.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.10 2005/01/30 22:14:30 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index 917842312489..dd492f877952 100644
--- a/sys/dev/uart/uart_dev_z8530.c
+++ b/sys/dev/uart/uart_dev_z8530.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.12 2005/04/27 21:57:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_if.m b/sys/dev/uart/uart_if.m
index 0bb145490ed4..572733797a98 100644
--- a/sys/dev/uart/uart_if.m
+++ b/sys/dev/uart/uart_if.m
@@ -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/sys/dev/uart/uart_if.m,v 1.3 2005/01/06 01:43:26 imp Exp $
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c
index 4d024d2ea878..f637e675c467 100644
--- a/sys/dev/uart/uart_kbd_sun.c
+++ b/sys/dev/uart/uart_kbd_sun.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.5 2005/06/04 21:54:31 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/uart/uart_kbd_sun.h b/sys/dev/uart/uart_kbd_sun.h
index 603d257432df..9443f9b2a0a9 100644
--- a/sys/dev/uart/uart_kbd_sun.h
+++ b/sys/dev/uart/uart_kbd_sun.h
@@ -32,7 +32,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_kbd_sun.h,v 1.2 2005/01/06 01:43:26 imp Exp $
  */
 
 /* keyboard commands (host->kbd) */
diff --git a/sys/dev/uart/uart_kbd_sun_tables.h b/sys/dev/uart/uart_kbd_sun_tables.h
index e7dc61205104..5a3a0e3d82ca 100644
--- a/sys/dev/uart/uart_kbd_sun_tables.h
+++ b/sys/dev/uart/uart_kbd_sun_tables.h
@@ -2,7 +2,7 @@
  * Automatically generated from sun.us.unix.kbd.
  * DO NOT EDIT!
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_kbd_sun_tables.h,v 1.1 2003/11/11 07:33:24 jake Exp $
  */
 static keymap_t keymap_sun_us_unix_kbd = { 0x80, {
 /*                                                         alt
diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c
index 14ce64b1b84f..8b047e724eea 100644
--- a/sys/dev/uart/uart_subr.c
+++ b/sys/dev/uart/uart_subr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.4 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index 6eb573be44fb..9b06505ff561 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.22 2005/05/08 20:25:09 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 338ce6341d54..1e2ac9bef04f 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.31 2005/03/01 07:50:11 imp Exp $");
 
 /*
  * uBsec 5[56]01, 58xx hardware crypto accelerator
diff --git a/sys/dev/ubsec/ubsecreg.h b/sys/dev/ubsec/ubsecreg.h
index 2ba1f937d06e..b6c6fdd9205b 100644
--- a/sys/dev/ubsec/ubsecreg.h
+++ b/sys/dev/ubsec/ubsecreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ubsec/ubsecreg.h,v 1.6 2005/01/06 01:43:27 imp Exp $ */
 /*	$OpenBSD: ubsecreg.h,v 1.27 2002/09/11 22:40:31 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/ubsec/ubsecvar.h b/sys/dev/ubsec/ubsecvar.h
index 448403b14c01..3271fa25a26c 100644
--- a/sys/dev/ubsec/ubsecvar.h
+++ b/sys/dev/ubsec/ubsecvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ubsec/ubsecvar.h,v 1.8 2005/01/06 01:43:27 imp Exp $ */
 /*	$OpenBSD: ubsecvar.h,v 1.35 2002/09/24 18:33:26 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/usb/FILES b/sys/dev/usb/FILES
index 5bccdb79939f..64d9f72a4cd4 100644
--- a/sys/dev/usb/FILES
+++ b/sys/dev/usb/FILES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/FILES,v 1.7 2004/12/08 22:02:58 rsm Exp $
 
 A small roadmap of the USB files:
 
diff --git a/sys/dev/usb/dsbr100io.h b/sys/dev/usb/dsbr100io.h
index 811c3a72b8e2..31e668210271 100644
--- a/sys/dev/usb/dsbr100io.h
+++ b/sys/dev/usb/dsbr100io.h
@@ -28,7 +28,7 @@
  * its contributors.
  */
 
-/*  $FreeBSD$ */
+/*  $FreeBSD: src/sys/dev/usb/dsbr100io.h,v 1.2 2005/01/06 01:36:28 imp Exp $ */
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/ioccom.h>
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 5870c4fa8f58..f0841eeef9f0 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.36 2005/05/29 04:42:27 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c
index 439a3f5c9878..10a3fefd9e8f 100644
--- a/sys/dev/usb/ehci_pci.c
+++ b/sys/dev/usb/ehci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.18 2005/06/10 08:28:22 benno Exp $");
 
 /*
  * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
diff --git a/sys/dev/usb/ehcireg.h b/sys/dev/usb/ehcireg.h
index 304b4ae2d92a..ce5e393666b5 100644
--- a/sys/dev/usb/ehcireg.h
+++ b/sys/dev/usb/ehcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ehcireg.h,v 1.17 2004/06/23 06:45:56 mycroft Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.7 2005/01/06 01:43:27 imp Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h
index fe791ec36d43..69b9d89c62eb 100644
--- a/sys/dev/usb/ehcivar.h
+++ b/sys/dev/usb/ehcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ehcivar.h,v 1.12 2001/12/31 12:16:57 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ehcivar.h,v 1.9 2005/03/19 19:08:46 iedowse Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index ba78ec2d7c5b..1e4f48a98d1d 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.25 2005/02/06 12:41:00 obrien Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index a4ab7d2b2969..803560b55479 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hid.h,v 1.6 2000/06/01 14:28:57 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/hid.h,v 1.13 2005/01/06 01:43:27 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 4793c4d1316d..469ca2b5241a 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.90.2.3 2005/10/09 03:59:36 delphij Exp $");
 
 /*
  * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver.
diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h
index d161acdc6a17..77f508a8418a 100644
--- a/sys/dev/usb/if_auereg.h
+++ b/sys/dev/usb/if_auereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_auereg.h,v 1.22 2005/06/10 16:49:15 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 65d10c3d4fa7..4b5c0689d273 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.30.2.3 2005/10/09 03:59:36 delphij Exp $");
 
 /*
  * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
diff --git a/sys/dev/usb/if_axereg.h b/sys/dev/usb/if_axereg.h
index c89ac275dcd1..dd6690036eea 100644
--- a/sys/dev/usb/if_axereg.h
+++ b/sys/dev/usb/if_axereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.8 2005/06/10 16:49:15 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 67cd0a6116f9..53fc1dec47fb 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.7.2.3 2005/10/09 03:59:36 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/if_cdcereg.h b/sys/dev/usb/if_cdcereg.h
index 73433154d645..a9bcd046a90a 100644
--- a/sys/dev/usb/if_cdcereg.h
+++ b/sys/dev/usb/if_cdcereg.h
@@ -29,7 +29,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/sys/dev/usb/if_cdcereg.h,v 1.5 2005/06/10 16:49:15 brooks Exp $
  */
 
 #ifndef _USB_IF_CDCEREG_H_
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 0d6ce719ef44..6b9aab8b9169 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.57.2.3 2005/10/09 03:59:36 delphij Exp $");
 
 /*
  * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate
diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h
index f20aeed586c9..f7227f0225ee 100644
--- a/sys/dev/usb/if_cuereg.h
+++ b/sys/dev/usb/if_cuereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 7c5a7006c42a..dfd18966dbbf 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.64.2.3 2005/10/09 03:59:36 delphij Exp $");
 
 /*
  * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver.
diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h
index 904ef12112b4..d1824aec4721 100644
--- a/sys/dev/usb/if_kuereg.h
+++ b/sys/dev/usb/if_kuereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index 088c747f3e17..db63cd93e101 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/dev/usb/if_rue.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.21.2.3 2005/10/09 03:56:37 delphij Exp $");
 
 /*
  * RealTek RTL8150 USB to fast ethernet controller driver.
diff --git a/sys/dev/usb/if_ruereg.h b/sys/dev/usb/if_ruereg.h
index 5a1b5f7754b8..8fcaf57e441f 100644
--- a/sys/dev/usb/if_ruereg.h
+++ b/sys/dev/usb/if_ruereg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_ruereg.h,v 1.6 2005/06/10 16:49:15 brooks Exp $
  */
 
 #ifndef _IF_RUEREG_H_
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index cd090461a58f..587ca492ce74 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.14.2.3 2005/10/09 03:59:36 delphij Exp $	*/
 /*-
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.14.2.3 2005/10/09 03:59:36 delphij Exp $");
 
 #include "opt_inet.h"
 #if defined(__NetBSD__)
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h
index 5982857bfc75..2d511e2812c9 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/dev/usb/if_udavreg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $	*/
 /*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_udavreg.h,v 1.5 2005/06/10 16:49:15 brooks Exp $	*/
 /*-
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index 6ec1596427a6..c03e1bc3d003 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.10.2.4 2005/09/26 17:21:15 damien Exp $	*/
 
 /*-
  * Copyright (c) 2005
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.10.2.4 2005/09/26 17:21:15 damien Exp $");
 
 /*-
  * Ralink Technology RT2500USB chipset driver
diff --git a/sys/dev/usb/if_uralreg.h b/sys/dev/usb/if_uralreg.h
index 8062fa5431ff..60d1493be308 100644
--- a/sys/dev/usb/if_uralreg.h
+++ b/sys/dev/usb/if_uralreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_uralreg.h,v 1.1 2005/04/18 18:47:37 damien Exp $	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/usb/if_uralvar.h b/sys/dev/usb/if_uralvar.h
index 160ad0d5c7d4..82e30c33e1bf 100644
--- a/sys/dev/usb/if_uralvar.h
+++ b/sys/dev/usb/if_uralvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.3 2005/07/08 19:19:06 damien Exp $	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/usb/kue_fw.h b/sys/dev/usb/kue_fw.h
index 659dc6bb78f3..d70acf3df3a2 100644
--- a/sys/dev/usb/kue_fw.h
+++ b/sys/dev/usb/kue_fw.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/kue_fw.h,v 1.3 2005/01/06 01:43:27 imp Exp $
  */
 
 /*
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 4821cc6a625b..7d62fef7f794 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -13,7 +13,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.154 2005/05/29 04:42:27 nyan Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c
index e07c3acd5080..3db239f7ca71 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/dev/usb/ohci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.44 2005/06/05 22:53:09 imp Exp $");
 
 /*
  * USB Open Host Controller driver.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index c255a4b28f34..60d711cc0dfe 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcireg.h,v 1.17 2000/04/01 09:27:35 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.22 2005/01/06 01:43:28 imp Exp $	*/
 
 
 /*-
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 7cdca0af4616..28b4240258d9 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcivar.h,v 1.30 2001/12/31 12:20:35 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.40 2005/03/19 19:08:46 iedowse Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/rio500_usb.h b/sys/dev/usb/rio500_usb.h
index f2c2081ccc9d..14e111a5d00c 100644
--- a/sys/dev/usb/rio500_usb.h
+++ b/sys/dev/usb/rio500_usb.h
@@ -20,7 +20,7 @@
 
     ---------------------------------------------------------------------- */
 
-/*  $FreeBSD$ */
+/*  $FreeBSD: src/sys/dev/usb/rio500_usb.h,v 1.2 2005/01/06 01:43:28 imp Exp $ */
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/ioccom.h>
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 271c1729b511..8658736b8e34 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.17 2005/01/06 01:43:28 imp Exp $");
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
index 8158f47ad297..9d076bf470d9 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/dev/usb/ubser.c
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubser.c,v 1.16 2005/03/17 22:47:18 ticso Exp $");
 
 /*
  * BWCT serial adapter driver
diff --git a/sys/dev/usb/ubser.h b/sys/dev/usb/ubser.h
index f256d4a403d8..afb9360b8241 100644
--- a/sys/dev/usb/ubser.h
+++ b/sys/dev/usb/ubser.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/ubser.h,v 1.3 2005/03/17 22:47:18 ticso Exp $
  */
 
 #ifndef UBSER_H
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 0260cb6d8c9f..81c3c3d9cd66 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.57 2005/04/12 00:26:40 iedowse Exp $");
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index e8a51fe3fd21..33b86f0986c7 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/dev/usb/ucomvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.7 2005/01/06 01:43:28 imp Exp $	*/
 
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 2c32a80b4937..a23eb8691187 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -25,7 +25,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/sys/dev/usb/ucycom.c,v 1.3 2004/10/12 09:21:03 phk Exp $
  */
 
 /*
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ucycom.c,v 1.3 2004/10/12 09:21:03 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 1ad11bccfb56..f7f9b6b6ddd7 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.29 2005/01/06 01:43:28 imp Exp $");
 
 /* Driver for arbitrary double bulk pipe devices.
  * The driver assumes that there will be the same driver on the other side.
diff --git a/sys/dev/usb/udbp.h b/sys/dev/usb/udbp.h
index 97ef9455b664..9f86afb9d5a8 100644
--- a/sys/dev/usb/udbp.h
+++ b/sys/dev/usb/udbp.h
@@ -34,7 +34,7 @@
  * This file was derived from src/sys/netgraph/ng_sample.h, revision 1.1
  * written by Julian Elischer, Whistle Communications.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/udbp.h,v 1.4 2005/01/06 01:43:28 imp Exp $
  */
 
 #ifndef _NETGRAPH_UDBP_H_
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 8439abb2cad2..0112cd054bdf 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ufm.c,v 1.23 2005/01/06 01:43:28 imp Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 15318cefce34..67b054b3252f 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.22 2005/04/05 22:09:18 ticso Exp $");
 
 /*
  * FTDI FT8U100AX serial adapter driver
diff --git a/sys/dev/usb/uftdireg.h b/sys/dev/usb/uftdireg.h
index a7c6edcb6005..11bab9c98774 100644
--- a/sys/dev/usb/uftdireg.h
+++ b/sys/dev/usb/uftdireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uftdireg.h,v 1.6 2002/07/11 21:14:28 augustss Exp $ */
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uftdireg.h,v 1.2 2004/07/01 17:16:20 brooks Exp $	*/
 
 /*
  * Definitions for the FTDI USB Single Port Serial Converter -
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 7d0131b8c410..c758e5c00934 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.103 2005/01/06 01:43:28 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/dev/usb/ugraphire_rdesc.h
index 295f2a0db785..bd5a3a0fcc47 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/dev/usb/ugraphire_rdesc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb/ugraphire_rdesc.h,v 1.1 2000/12/29 01:47:49 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/ugraphire_rdesc.h,v 1.2 2005/01/06 01:43:28 imp Exp $ */
 /*-
  * Copyright (c) 2000 Nick Hibma <n_hibma@freebsd.org>
  * All rights reserved.
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 05fdd1eddb18..20a42dd073d0 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.162 2005/05/29 04:42:27 nyan Exp $");
 
 
 /*-
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index c92273c590f5..ba809042df07 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.57 2005/03/01 07:50:11 imp Exp $");
 
 /* Universal Host Controller Interface
  *
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index 512dd2d7d3c0..e897f07313d0 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcireg.h,v 1.15 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.22 2005/01/06 01:43:28 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 3100db756c86..6dde4af7c1e7 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcivar.h,v 1.33 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.40 2005/03/19 19:08:46 iedowse Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 634d0e0f5efe..7dfb2f4a3870 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.77 2005/01/06 01:43:28 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index da10744094c8..4a099d863da9 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhub.c,v 1.69 2005/05/11 15:21:22 imp Exp $");
 
 /*
  * USB spec: http://www.usb.org/developers/docs/usbspec.zip
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 9699d4fd211d..fd32b5e113ce 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.52 2005/03/30 08:32:41 iedowse Exp $");
 
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 9716b65ea9ff..8f8c0d4d02a9 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.66 2005/01/06 01:43:28 imp Exp $");
 
 /*
  * Printer Class spec: http://www.usb.org/developers/data/devclass/usbprint109.PDF
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 71b9f6410c8f..f72b8177cf8c 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/usb/umass.c,v 1.122.2.1 2005/07/29 15:39:26 delphij Exp $
  *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
  */
 
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index c04f4734f856..83b94f83db49 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/umct.c,v 1.9 2004/10/05 04:03:00 scottl Exp $");
 
 /*
  * Driver for the MCT (Magic Control Technology) USB-RS232 Converter.
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index dd3e19ff4c7b..0b97301e596d 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.57 2005/01/31 13:58:10 akiyama Exp $");
 /*-
  * Copyright (c) 2003, M. Warner Losh <imp@freebsd.org>.
  * All rights reserved.
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 1955aebf3752..2770d42985af 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.77.2.1 2005/08/11 00:22:28 iedowse Exp $");
 
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 9e853c200894..bdacc91662d0 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.29 2005/07/03 23:51:16 hrs Exp $");
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 68efc9c19e54..9ee77bda8a2a 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/urio.c,v 1.35 2005/01/06 01:43:29 imp Exp $");
 
 
 /*
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 6be1d33a8636..9fc7afb748ca 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.106 2005/03/27 15:31:23 iedowse Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index f4559c1ea633..acc7bf7e3b31 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $	*/
-/*	$FreeBSD$    */
+/*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.39 2005/01/06 01:43:29 imp Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index 90eff91e51d6..36960f722f85 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.20 2005/03/25 12:42:30 sobomax Exp $");
 
 /*
  * Callbacks in the USB code operate at splusb() (actually splbio()
diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/dev/usb/usb_ethersubr.h
index 5c31ddc2c809..a69a12cc1145 100644
--- a/sys/dev/usb/usb_ethersubr.h
+++ b/sys/dev/usb/usb_ethersubr.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/usb_ethersubr.h,v 1.10 2005/03/25 13:22:58 sobomax Exp $
  */
 
 #ifndef _USB_ETHERSUBR_H_
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index b04c8a45a4c4..24566dc7d0c4 100644
--- a/sys/dev/usb/usb_if.m
+++ b/sys/dev/usb/usb_if.m
@@ -25,7 +25,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/sys/dev/usb/usb_if.m,v 1.10 2005/01/06 01:43:29 imp Exp $
 #
 
 # USB interface description
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index f9a59eb3c6d9..d649dd0f03a2 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.7 2005/01/06 01:43:29 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.7 2005/01/06 01:43:29 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 6fe63f3e3385..e92fbe905e77 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_mem.h,v 1.18 2002/05/28 17:45:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.21 2005/01/06 01:43:29 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index dc2c64888f0c..8e93d1ad7232 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */
 /*	$NetBSD: usb_port.h,v 1.54 2002/03/28 21:49:19 ichiro Exp $	*/
-/*	$FreeBSD$       */
+/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.74 2005/01/20 05:03:28 imp Exp $       */
 
 /* Also already merged from NetBSD:
  *	$NetBSD: usb_port.h,v 1.57 2002/09/27 20:42:01 thorpej Exp $
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 01c155f753cb..daf304122a39 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.41 2005/01/06 01:43:29 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index 4977bf605b40..e29b75b06daf 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/dev/usb/usb_quirks.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_quirks.h,v 1.20 2001/04/15 09:38:01 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.17 2005/01/06 01:43:29 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 6b11b448a34c..c59ed3547322 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.76 2005/03/01 08:01:22 sobomax Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index d68410874303..ea0b05f2b23a 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbcdc.h,v 1.9 2004/10/23 13:24:24 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.12 2005/03/01 06:35:04 sobomax Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 19d1a611d69d..709bbba0f650 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.232.2.1 2005/10/01 16:26:25 ume Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index adefde3057d9..04a4bbfb599d 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: usbdi.c,v 1.106 2004/10/24 12:52:40 augustss Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.91 2005/03/01 08:01:22 sobomax Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 902b1bd47627..b2d95721bacc 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.64 2004/10/23 13:26:34 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.59 2005/05/16 06:58:43 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index b275778203dd..05ca0c284292 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.34 2005/03/01 08:01:22 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index 82ea13b1c303..6edc85b35c34 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi_util.h,v 1.31 2004/12/03 08:53:40 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.19 2005/03/01 08:01:22 sobomax Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 69f236638b1a..e1a2cc99bd7a 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.43 2005/01/06 01:43:29 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 8e0ecd579907..575202ced0d7 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbhid.h,v 1.9 2000/09/03 19:09:14 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/usbhid.h,v 1.15 2005/01/06 01:43:29 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index aaabaf630a22..87f69c75fa6c 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.63 2005/01/06 01:43:29 imp Exp $");
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index fe6f05c70d9b..4a7f6fb02e39 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $	*/
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.24 2005/05/04 00:46:24 julian Exp $	*/
 
 /* Also already merged from NetBSD:
  *	$NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 79f8b44dca4d..73d8d56ca06f 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uvscom.c,v 1.25 2005/01/31 13:58:10 akiyama Exp $");
 
 /*
  * uvscom: SUNTAC Slipper U VS-10U driver.
diff --git a/sys/dev/utopia/idtphy.c b/sys/dev/utopia/idtphy.c
index 5aaa576abb23..9bdd55cc2edf 100644
--- a/sys/dev/utopia/idtphy.c
+++ b/sys/dev/utopia/idtphy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/utopia/idtphy.c,v 1.1 2005/02/24 16:56:36 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/idtphy.h b/sys/dev/utopia/idtphy.h
index 1451d0561fa3..b49df52b1313 100644
--- a/sys/dev/utopia/idtphy.h
+++ b/sys/dev/utopia/idtphy.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/idtphy.h,v 1.3 2005/01/06 01:43:31 imp Exp $
  *
  * Register definitions for the following chips:
  *	IDT 77105
diff --git a/sys/dev/utopia/suni.c b/sys/dev/utopia/suni.c
index ffc49e8e84da..707676469bb5 100644
--- a/sys/dev/utopia/suni.c
+++ b/sys/dev/utopia/suni.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/utopia/suni.c,v 1.1 2005/02/24 16:56:36 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/suni.h b/sys/dev/utopia/suni.h
index fd1be7e13e39..e73476115eb9 100644
--- a/sys/dev/utopia/suni.h
+++ b/sys/dev/utopia/suni.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/suni.h,v 1.2 2005/01/06 01:43:31 imp Exp $
  *
  * Register definitions for the following chips:
  *	PMC-Sierra PMC-5346 (S/UNI-LITE)
diff --git a/sys/dev/utopia/utopia.c b/sys/dev/utopia/utopia.c
index 7480efc3da6f..5cdd4a342bfc 100644
--- a/sys/dev/utopia/utopia.c
+++ b/sys/dev/utopia/utopia.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/utopia/utopia.c,v 1.11 2005/06/22 06:51:52 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/utopia.h b/sys/dev/utopia/utopia.h
index 6e42e99b2e51..054ec84f7e4e 100644
--- a/sys/dev/utopia/utopia.h
+++ b/sys/dev/utopia/utopia.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/utopia.h,v 1.5 2005/02/24 16:56:36 harti Exp $
  */
 #ifndef _DEV_UTOPIA_UTOPIA_H
 #define	_DEV_UTOPIA_UTOPIA_H
diff --git a/sys/dev/utopia/utopia_priv.h b/sys/dev/utopia/utopia_priv.h
index cbb242cb9991..41397af815f1 100644
--- a/sys/dev/utopia/utopia_priv.h
+++ b/sys/dev/utopia/utopia_priv.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/utopia_priv.h,v 1.1 2005/02/24 16:56:36 harti Exp $
  *
  * Private include file for the interface between chip files and
  * the utopia main stuff.
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 3ed3081094ed..002ca1bd217b 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.14.2.4 2005/10/09 04:15:12 delphij Exp $");
 
 /*
  * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h
index 8d11a9c3e1f6..c097c3be99ff 100644
--- a/sys/dev/vge/if_vgereg.h
+++ b/sys/dev/vge/if_vgereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vge/if_vgereg.h,v 1.2 2005/01/06 01:43:31 imp Exp $
  */
 
 /*
diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h
index 5d240a33a9ed..52cd072f54e7 100644
--- a/sys/dev/vge/if_vgevar.h
+++ b/sys/dev/vge/if_vgevar.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vge/if_vgevar.h,v 1.4 2005/06/10 16:49:16 brooks Exp $
  */
 
 #if !defined(__i386__)
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index b399726cb202..8038b5793a44 100644
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: vkbd.c,v 1.20 2004/11/15 23:53:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vkbd/vkbd.c,v 1.7.2.2 2005/08/13 21:24:16 rwatson Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/dev/vkbd/vkbd_var.h b/sys/dev/vkbd/vkbd_var.h
index 51e7ff467d17..24f8ed0cd35e 100644
--- a/sys/dev/vkbd/vkbd_var.h
+++ b/sys/dev/vkbd/vkbd_var.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: vkbd_var.h,v 1.4 2004/08/17 17:43:14 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vkbd/vkbd_var.h,v 1.2 2005/01/06 01:43:32 imp Exp $
  */
 
 #ifndef _VKBD_VAR_H_
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 142f17410657..e90e0ab1b650 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.56.2.2 2005/09/28 16:46:17 ru Exp $");
 
 /*
  * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index bbccb5ba1077..2eff150e79bc 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.24 2005/01/06 01:43:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index c0694f1978da..6380812e7af4 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.34 2005/05/29 04:42:28 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h
index b876782ca8cb..620a88cbb82a 100644
--- a/sys/dev/vx/if_vxreg.h
+++ b/sys/dev/vx/if_vxreg.h
@@ -19,7 +19,7 @@
  * 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/sys/dev/vx/if_vxreg.h,v 1.13 2005/01/06 01:43:32 imp Exp $
  */
 
 /*
diff --git a/sys/dev/vx/if_vxvar.h b/sys/dev/vx/if_vxvar.h
index 014d058c5ec7..fdee83df0108 100644
--- a/sys/dev/vx/if_vxvar.h
+++ b/sys/dev/vx/if_vxvar.h
@@ -19,7 +19,7 @@
  * 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/sys/dev/vx/if_vxvar.h,v 1.5 2005/06/10 16:49:16 brooks Exp $
  *
  October 2, 1994
 
diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c
index 782388588089..2a49a7ff75d2 100644
--- a/sys/dev/watchdog/watchdog.c
+++ b/sys/dev/watchdog/watchdog.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/watchdog/watchdog.c,v 1.2 2004/06/16 09:47:02 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index 384dd08be1c3..c743d47a5a47 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wds/wd7000.c,v 1.9 2005/01/06 01:43:33 imp Exp $");
 
 /* All bugs are subject to removal without further notice */
 
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index 585edaa237fa..0c40de1547fd 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.19 2005/01/06 01:43:33 imp Exp $
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 28f02088a39f..92202f5bba28 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.180.2.7 2005/10/05 13:16:29 avatar Exp $");
 
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 765e31dcd619..f412f78e340e 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.57 2005/07/10 02:00:35 imp Exp $");
 
 #include "opt_wi.h"
 
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index cddc9298d50b..ccd1c992e2f2 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wi_pci.c,v 1.25.2.1 2005/08/25 05:01:17 rwatson Exp $
  */
 
 /*
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 7992f891c481..a31bbd858292 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wireg.h,v 1.44 2005/01/06 01:43:33 imp Exp $
  */
 
 #define WI_DELAY	5
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index 38038fcdbefc..a7ee62c87445 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.25.2.1 2005/10/05 13:13:46 avatar Exp $
  */
 
 #if 0
diff --git a/sys/dev/wi/spectrum24t_cf.h b/sys/dev/wi/spectrum24t_cf.h
index ce053fa1930c..374fefee02b5 100644
--- a/sys/dev/wi/spectrum24t_cf.h
+++ b/sys/dev/wi/spectrum24t_cf.h
@@ -1,5 +1,5 @@
 /*	$NetBSD$	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/wi/spectrum24t_cf.h,v 1.2 2005/01/06 01:43:33 imp Exp $ */
 
 /*-
  * Copyright (c) 2001 Symbol Technologies Inc. -- http://www.symbol.com
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index aa57433eb936..9d7c09a3a734 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -173,7 +173,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.66.2.2 2005/08/25 05:01:18 rwatson Exp $");
 
 
 /*
diff --git a/sys/dev/wl/if_wl.h b/sys/dev/wl/if_wl.h
index e883b782b046..b177c4c114e4 100644
--- a/sys/dev/wl/if_wl.h
+++ b/sys/dev/wl/if_wl.h
@@ -18,7 +18,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/sys/dev/wl/if_wl.h,v 1.7 2005/01/06 01:43:34 imp Exp $
  */
 /* Definitions for WaveLAN driver */
 
diff --git a/sys/dev/wl/if_wl_i82586.h b/sys/dev/wl/if_wl_i82586.h
index fc08adcc5226..712ff9262e85 100644
--- a/sys/dev/wl/if_wl_i82586.h
+++ b/sys/dev/wl/if_wl_i82586.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wl/if_wl_i82586.h,v 1.1 2005/05/09 04:47:57 nyan Exp $
  */
 /*
   Copyright 1988, 1989 by Olivetti Advanced Technology Center, Inc.,
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 54d3cdc4d8ef..8198d96a5696 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.55.2.3 2005/09/17 04:01:05 imp Exp $");
 
 /*		
  * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters.  The
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index 4e6b2a43ae82..5cae6cafeeaa 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe_pccard.c,v 1.26.2.2 2005/09/17 04:01:05 imp Exp $");
 
 /* xe pccard interface driver */
 
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index 9b3c39a611a0..80c07fc4bcb5 100644
--- a/sys/dev/xe/if_xereg.h
+++ b/sys/dev/xe/if_xereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/xe/if_xereg.h,v 1.6 2003/10/14 22:51:35 rsm Exp $
  */
 #ifndef DEV_XE_IF_XEREG_H
 #define DEV_XE_IF_XEREG_H
diff --git a/sys/dev/xe/if_xevar.h b/sys/dev/xe/if_xevar.h
index 0e6610219ca1..46defb37034d 100644
--- a/sys/dev/xe/if_xevar.h
+++ b/sys/dev/xe/if_xevar.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/xe/if_xevar.h,v 1.6 2005/06/10 16:49:17 brooks Exp $
  */
 #ifndef DEV_XE_IF_XEDEV_H
 #define DEV_XE_IF_XEDEV_H
diff --git a/sys/dev/zs/z8530reg.h b/sys/dev/zs/z8530reg.h
index b471c9c4deb5..df5a5cf4429c 100644
--- a/sys/dev/zs/z8530reg.h
+++ b/sys/dev/zs/z8530reg.h
@@ -39,7 +39,7 @@
  *
  *	@(#)zsreg.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/zs/z8530reg.h,v 1.4 2005/01/06 01:43:34 imp Exp $
  */
 
 /*
diff --git a/sys/dev/zs/z8530var.h b/sys/dev/zs/z8530var.h
index 1e5fef7d3282..9da92d6b6c6a 100644
--- a/sys/dev/zs/z8530var.h
+++ b/sys/dev/zs/z8530var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/zs/z8530var.h,v 1.2 2004/06/16 09:47:02 phk Exp $
  */
 
 #ifndef _DEV_ZS_ZSVAR_H_
diff --git a/sys/dev/zs/zs.c b/sys/dev/zs/zs.c
index 41c6d8662957..7b30ab92885d 100644
--- a/sys/dev/zs/zs.c
+++ b/sys/dev/zs/zs.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.30 2004/10/20 16:22:00 jhb Exp $");
 /*-
  * Copyright (c) 2003 Jake Burkholder.
  * All rights reserved.
diff --git a/sys/dev/zs/zs_macio.c b/sys/dev/zs/zs_macio.c
index 3879a9edf5d1..b483dd8cc5c6 100644
--- a/sys/dev/zs/zs_macio.c
+++ b/sys/dev/zs/zs_macio.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs_macio.c,v 1.6 2004/08/12 17:41:30 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/doc/Doxyfile b/sys/doc/Doxyfile
index 146afc32ba0f..ec8512cff496 100644
--- a/sys/doc/Doxyfile
+++ b/sys/doc/Doxyfile
@@ -1,5 +1,5 @@
 # Doxyfile 1.3.6
-# $FreeBSD$
+# $FreeBSD: src/sys/doc/Doxyfile,v 1.1 2004/07/11 16:13:57 dfr Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/sys/doc/Makefile b/sys/doc/Makefile
index ec665a7b0256..4edd34e977ed 100644
--- a/sys/doc/Makefile
+++ b/sys/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/doc/Makefile,v 1.1 2004/07/11 16:13:57 dfr Exp $
 
 .PATH:	${.CURDIR}/../kern
 
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index e1740718eef4..1d68d8a448fd 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/deadfs/dead_vnops.c,v 1.48 2005/03/13 12:06:20 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h
index 37136be02f23..2048d6e0f34d 100644
--- a/sys/fs/devfs/devfs.h
+++ b/sys/fs/devfs/devfs.h
@@ -33,7 +33,7 @@
  *	@(#)kernfs.h	8.6 (Berkeley) 3/29/95
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs.h 1.14
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.22.2.2 2005/09/26 14:36:52 phk Exp $
  */
 
 #ifndef _FS_DEVFS_DEVFS_H_
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 5b06b8cc24ca..0ec3160d9a5f 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -25,7 +25,7 @@
  *
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.36.2.3 2005/09/26 14:36:52 phk Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h
index 41cc0c2553a5..44f2e2eff328 100644
--- a/sys/fs/devfs/devfs_int.h
+++ b/sys/fs/devfs/devfs_int.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.1.2.2 2005/09/26 14:36:52 phk Exp $
  */
 
 /*
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index 840f9f970e74..7769e2520aae 100644
--- a/sys/fs/devfs/devfs_rule.c
+++ b/sys/fs/devfs/devfs_rule.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_rule.c,v 1.14.2.2 2005/09/26 14:36:52 phk Exp $
  */
 
 /*
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index bb3458646ea2..bec95470835b 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -31,7 +31,7 @@
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.44.2.3 2005/09/26 14:36:52 phk Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 7fbcad0281a3..64ba2f8b7654 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -31,7 +31,7 @@
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.114.2.5.2.1 2005/10/19 21:26:02 phk Exp $
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index fb7d9528a4b3..e82029a9fea4 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -31,7 +31,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.20 2005/02/10 12:09:15 phk Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index ebd17a4601fa..108389cbf435 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.53 2005/03/24 07:36:13 jeff Exp $
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 613442664a66..8121d7329ddd 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.99 2005/03/13 12:18:23 jeff Exp $
  */
 
 /*
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index da85ae23d86b..6d62759c5443 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fifofs/fifo.h,v 1.20 2005/01/06 18:10:38 imp Exp $
  */
 
 /*
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 37dfcb942f52..f170bb8f6447 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.113.2.17 2005/10/04 15:33:06 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs.h b/sys/fs/hpfs/hpfs.h
index b56d6b651ba8..2f5c951d3025 100644
--- a/sys/fs/hpfs/hpfs.h
+++ b/sys/fs/hpfs/hpfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs.h,v 1.19 2005/03/16 07:21:38 phk Exp $
  */
 
 /*#define HPFS_DEBUG 10*/
diff --git a/sys/fs/hpfs/hpfs_alsubr.c b/sys/fs/hpfs/hpfs_alsubr.c
index 226865fd1e2d..48b0c06641e7 100644
--- a/sys/fs/hpfs/hpfs_alsubr.c
+++ b/sys/fs/hpfs/hpfs_alsubr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_alsubr.c,v 1.3 2003/03/04 00:04:42 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_ioctl.h b/sys/fs/hpfs/hpfs_ioctl.h
index 7f60729b1ba3..fb6a65b5b5a0 100644
--- a/sys/fs/hpfs/hpfs_ioctl.h
+++ b/sys/fs/hpfs/hpfs_ioctl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_ioctl.h,v 1.1 1999/12/09 19:09:59 semenu Exp $
  */
 
 #ifndef _HPFS_IOCTL_H_
diff --git a/sys/fs/hpfs/hpfs_lookup.c b/sys/fs/hpfs/hpfs_lookup.c
index 88542cb2160b..cde396abf830 100644
--- a/sys/fs/hpfs/hpfs_lookup.c
+++ b/sys/fs/hpfs/hpfs_lookup.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_lookup.c,v 1.2 2000/05/05 09:57:53 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_subr.c b/sys/fs/hpfs/hpfs_subr.c
index 6844545ae239..3471c762b673 100644
--- a/sys/fs/hpfs/hpfs_subr.c
+++ b/sys/fs/hpfs/hpfs_subr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_subr.c,v 1.7 2004/12/06 20:14:20 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_subr.h b/sys/fs/hpfs/hpfs_subr.h
index 4cddcf705bab..8676049738fc 100644
--- a/sys/fs/hpfs/hpfs_subr.h
+++ b/sys/fs/hpfs/hpfs_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/sys/fs/hpfs/hpfs_subr.h,v 1.3 2004/12/06 20:14:20 phk Exp $
  */
 
 #define	hpfs_bmmarkfree(hpmp, bn,bl) hpfs_bmmark(hpmp, bn, bl, 1)
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index b07898d70558..dc7ce7cc3e0d 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.53.2.1 2005/09/30 06:26:41 delphij Exp $
  */
 
 
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index e099fe7899f3..0b2a3204e13f 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.66 2005/04/13 10:59:07 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfsmount.h b/sys/fs/hpfs/hpfsmount.h
index 3566776b96ad..7ccc96c9e3b3 100644
--- a/sys/fs/hpfs/hpfsmount.h
+++ b/sys/fs/hpfs/hpfsmount.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfsmount.h,v 1.1 1999/12/09 19:10:00 semenu Exp $
  */
 
 #define HPFSMNT_TABLES		0x0001
diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 9e8aa9767b90..33bfe55a3379 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.12.2.1 2005/10/04 13:13:57 peadar Exp $ */
 /*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index 6ba9670c00fc..3c3a54b3229a 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/bpb.h,v 1.11 2005/01/06 18:10:38 imp Exp $ */
 /*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index cbba8e79af11..47baf7f34b60 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.33 2005/04/07 07:55:37 phk Exp $ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index 47e1257cb18c..b156f9adcfdf 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/direntry.h,v 1.21 2005/01/06 18:10:38 imp Exp $ */
 /*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index cd6b7d18b811..2d196d5cc904 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/fat.h,v 1.14 2005/01/06 18:10:38 imp Exp $ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 2da772392683..9cf3718a6cda 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_conv.c,v 1.44.2.1 2005/07/23 17:02:04 imura Exp $ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 449d3dd66a62..c7f93b56828b 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.88.2.1 2005/10/09 03:33:52 delphij Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 31cf977f17ed..107911bc0832 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.37 2005/01/06 18:10:38 imp Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_fileno.c b/sys/fs/msdosfs/msdosfs_fileno.c
index ad6d4a7f8c6c..5181cee06e86 100644
--- a/sys/fs/msdosfs/msdosfs_fileno.c
+++ b/sys/fs/msdosfs/msdosfs_fileno.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_fileno.c,v 1.1 2004/07/03 13:22:38 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/msdosfs/msdosfs_iconv.c b/sys/fs/msdosfs/msdosfs_iconv.c
index 26ef1a4a0002..baf5d00a4c4d 100644
--- a/sys/fs/msdosfs/msdosfs_iconv.c
+++ b/sys/fs/msdosfs/msdosfs_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.2 2003/12/26 17:24:37 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index a16881e9a8fc..27cff52a0052 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_lookup.c,v 1.46 2005/04/16 23:47:19 das Exp $ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index bc59b44fd53a..f3689d0d743f 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.144.2.2 2005/10/04 13:13:57 peadar Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 5c85b9204cc2..e1c45bc2fcfd 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.160 2005/02/27 21:16:26 phk Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index f7f2dffc2f88..4809a7a4f531 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.37 2005/03/15 20:57:25 phk Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/ntfs/ntfs.h b/sys/fs/ntfs/ntfs.h
index 5618b67938ce..e1f6a24abb7f 100644
--- a/sys/fs/ntfs/ntfs.h
+++ b/sys/fs/ntfs/ntfs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.19 2004/12/06 20:22:16 phk Exp $
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index 6816220c0e5c..e25ec1f65add 100644
--- a/sys/fs/ntfs/ntfs_compr.c
+++ b/sys/fs/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_compr.c,v 1.13 2001/11/26 23:45:12 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_compr.h b/sys/fs/ntfs/ntfs_compr.h
index e51bc09f2fda..3ede7027aa95 100644
--- a/sys/fs/ntfs/ntfs_compr.h
+++ b/sys/fs/ntfs/ntfs_compr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_compr.h,v 1.6 1999/12/03 20:37:38 semenu Exp $
  */
 
 #define NTFS_COMPBLOCK_SIZE	0x1000
diff --git a/sys/fs/ntfs/ntfs_iconv.c b/sys/fs/ntfs/ntfs_iconv.c
index 347306e88536..cffe5cc88a2f 100644
--- a/sys/fs/ntfs/ntfs_iconv.c
+++ b/sys/fs/ntfs/ntfs_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/ntfs/ntfs_iconv.c,v 1.1 2003/09/26 20:26:23 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index a84574e4d552..cb10a5c3c716 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.21 2005/01/06 18:10:39 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index 7df7495c770a..f39053de6a9a 100644
--- a/sys/fs/ntfs/ntfs_ihash.h
+++ b/sys/fs/ntfs/ntfs_ihash.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.h,v 1.8 2004/06/16 09:47:04 phk Exp $
  */
 
 extern struct lock ntfs_hashlock;
diff --git a/sys/fs/ntfs/ntfs_inode.h b/sys/fs/ntfs/ntfs_inode.h
index c11cfa1f6317..62c4ca075b4f 100644
--- a/sys/fs/ntfs/ntfs_inode.h
+++ b/sys/fs/ntfs/ntfs_inode.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_inode.h,v 1.12 2004/06/16 09:47:04 phk Exp $
  */
 
 /* These flags are kept in i_flag. */
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index a4db53a380b3..76b6c39d34c5 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.38 2005/05/06 00:15:57 robert Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index c0ecc75e5dc4..c4dd67a3a69d 100644
--- a/sys/fs/ntfs/ntfs_subr.h
+++ b/sys/fs/ntfs/ntfs_subr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.h,v 1.13 2003/09/26 20:26:23 fjoe Exp $
  */
 
 #define	VA_LOADED		0x0001
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index cfa70a36faa6..d598bcfcd69f 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.78.2.1 2005/09/30 06:26:42 delphij Exp $
  */
 
 
diff --git a/sys/fs/ntfs/ntfs_vfsops.h b/sys/fs/ntfs/ntfs_vfsops.h
index adb737d4e54b..09001e4c0bb9 100644
--- a/sys/fs/ntfs/ntfs_vfsops.h
+++ b/sys/fs/ntfs/ntfs_vfsops.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.h,v 1.8 2005/02/10 12:09:49 phk Exp $
  */
 #define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
 				/* ntfs_loadntnode() on ntnode, even if */
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 48db359af248..a20c295982db 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.55 2005/03/28 14:26:01 jeff Exp $
  *
  */
 
diff --git a/sys/fs/ntfs/ntfsmount.h b/sys/fs/ntfs/ntfsmount.h
index 5497ad9f2176..bf62f0f86f6e 100644
--- a/sys/fs/ntfs/ntfsmount.h
+++ b/sys/fs/ntfs/ntfsmount.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfsmount.h,v 1.8 2003/09/26 20:26:23 fjoe Exp $
  */
 
 #define	NTFS_MFLAG_CASEINS	0x00000001
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index c8fc5de3c838..95e09a19c2ef 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -31,7 +31,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null.h,v 1.23 2005/03/15 13:49:33 jeff Exp $
  */
 
 struct null_mount {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index f0ab73ac7398..2bbec40c45e0 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -31,7 +31,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.48 2005/04/11 11:17:20 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 2d3ac6ec90b3..8315a23fc4a2 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -32,7 +32,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.72.4.1 2005/10/25 20:33:59 kris Exp $
  */
 
 /*
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 8515c7e2d111..d3632ac82f0d 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -36,7 +36,7 @@
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.87.2.2 2005/09/17 15:51:41 delphij Exp $
  */
 
 /*
diff --git a/sys/fs/nwfs/nwfs.h b/sys/fs/nwfs/nwfs.h
index d7b2f6299e2f..7700002f935c 100644
--- a/sys/fs/nwfs/nwfs.h
+++ b/sys/fs/nwfs/nwfs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs.h,v 1.9 2005/01/14 08:09:42 phk Exp $
  */
 
 #ifndef _NWFS_H_
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 0b697560ccd9..f0ef8e456722 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.41 2005/03/13 12:18:24 jeff Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/fs/nwfs/nwfs_ioctl.c b/sys/fs/nwfs/nwfs_ioctl.c
index 0fd55319493d..eb5a794ee707 100644
--- a/sys/fs/nwfs/nwfs_ioctl.c
+++ b/sys/fs/nwfs/nwfs_ioctl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_ioctl.c,v 1.8 2005/01/06 18:10:39 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/nwfs/nwfs_mount.h b/sys/fs/nwfs/nwfs_mount.h
index a6f9568bb666..395b2dd9693b 100644
--- a/sys/fs/nwfs/nwfs_mount.h
+++ b/sys/fs/nwfs/nwfs_mount.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_mount.h,v 1.8 2005/01/06 18:10:39 imp Exp $
  */
 #ifndef _NWFS_MOUNT_H_
 #define	_NWFS_MOUNT_H_
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index 29ce5d3ac9f0..cf3d977620bd 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.36 2005/03/13 12:18:24 jeff Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/nwfs/nwfs_node.h b/sys/fs/nwfs/nwfs_node.h
index f2e0adae58ac..8a6af9030c0e 100644
--- a/sys/fs/nwfs/nwfs_node.h
+++ b/sys/fs/nwfs/nwfs_node.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_node.h,v 1.10 2005/01/06 18:10:39 imp Exp $
  */
 #ifndef _NWFS_NODE_H_
 #define _NWFS_NODE_H_
diff --git a/sys/fs/nwfs/nwfs_subr.c b/sys/fs/nwfs/nwfs_subr.c
index 4a2c65ca6af3..6b2e4f1f9d2d 100644
--- a/sys/fs/nwfs/nwfs_subr.c
+++ b/sys/fs/nwfs/nwfs_subr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.c,v 1.13 2005/05/11 19:08:38 kan Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/nwfs/nwfs_subr.h b/sys/fs/nwfs/nwfs_subr.h
index 683a94379d97..d1a7f2847993 100644
--- a/sys/fs/nwfs/nwfs_subr.h
+++ b/sys/fs/nwfs/nwfs_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.h,v 1.5 2005/01/06 18:10:39 imp Exp $
  */
 #ifndef _NWFS_SUBR_H_
 #define _NWFS_SUBR_H_
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index 2f0ba1fc93c9..2914454d893f 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.40.2.1 2005/10/01 17:39:50 phk Exp $
  */
 #include "opt_ncp.h"
 #ifndef NCP
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index 1dd2ae5c1652..9ec68024dcd1 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_vnops.c,v 1.41.4.1 2005/10/19 20:20:42 truckman Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index 6606ccc014c3..f1efaf984928 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -31,7 +31,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/portalfs/portal.h,v 1.10 2005/01/06 18:10:40 imp Exp $
  */
 
 struct portal_args {
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index a106544e682d..cea2ac723091 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.57 2005/03/24 07:36:14 jeff Exp $
  */
 
 /*
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 680d1fb6d15d..b9f0a3c009f4 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.70 2005/03/28 09:33:52 jeff Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/README b/sys/fs/procfs/README
index f816b321b432..e7a941f288cd 100644
--- a/sys/fs/procfs/README
+++ b/sys/fs/procfs/README
@@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself
 "attach".  as before, the child will hit a breakpoint on the first
 instruction in any newly exec'd image.
 
-$FreeBSD$
+$FreeBSD: src/sys/fs/procfs/README,v 1.4 1999/08/28 00:46:53 peter Exp $
diff --git a/sys/fs/procfs/procfs.c b/sys/fs/procfs/procfs.c
index f2b5bf512407..1368c708f860 100644
--- a/sys/fs/procfs/procfs.c
+++ b/sys/fs/procfs/procfs.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.12 2005/01/06 18:10:40 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 48d4bca84b48..4f23f3fefbb7 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -33,7 +33,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.47 2005/01/06 18:10:40 imp Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index efe18c7931a2..a7104b96a022 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_ctl.c,v 1.51 2003/12/07 17:40:00 des Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.53 2005/01/06 18:10:40 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index c30f231c67a9..913b2a470e05 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -40,7 +40,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.26 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index cb9797b0081e..31914529c717 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.32 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_ioctl.c b/sys/fs/procfs/procfs_ioctl.c
index 7acf7d25333d..42fb6b1ca3bf 100644
--- a/sys/fs/procfs/procfs_ioctl.c
+++ b/sys/fs/procfs/procfs_ioctl.c
@@ -25,7 +25,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/sys/fs/procfs/procfs_ioctl.c,v 1.12 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index b98d207ad386..920cb683d7c7 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -32,7 +32,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.38 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index d4a789635b01..f4304a9e46f6 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -33,7 +33,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_mem.c,v 1.60 2005/01/06 18:10:40 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index 16c917e78795..2ad11287b0a9 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -32,7 +32,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_note.c,v 1.9 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index cba2b7bc14a4..a9d08d6e3e39 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.31 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 3885f566f6ea..ae6c87a32baa 100644
--- a/sys/fs/procfs/procfs_rlimit.c
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_rlimit.c,v 1.10 2005/01/06 18:10:40 imp Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 1579037166b2..d5e8708f2bdf 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_status.c,v 1.56 2005/03/15 11:05:11 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index c19bf9d9c7c0..0826d1f7ac16 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_type.c,v 1.12 2005/01/06 18:10:40 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index 1fe0371711ee..dca2e4f2467f 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.26 2005/03/24 07:36:15 jeff Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h
index 8eaa13735d31..e9e54599d985 100644
--- a/sys/fs/pseudofs/pseudofs.h
+++ b/sys/fs/pseudofs/pseudofs.h
@@ -25,7 +25,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/sys/fs/pseudofs/pseudofs.h,v 1.30 2005/03/24 07:36:15 jeff Exp $
  */
 
 #ifndef _PSEUDOFS_H_INCLUDED
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index 9ddca9dae7a1..c26d856417d4 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_fileno.c,v 1.12 2005/03/19 08:22:36 phk Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/pseudofs/pseudofs_internal.h b/sys/fs/pseudofs/pseudofs_internal.h
index 7cbc86d2d3ae..d11cd21c0704 100644
--- a/sys/fs/pseudofs/pseudofs_internal.h
+++ b/sys/fs/pseudofs/pseudofs_internal.h
@@ -25,7 +25,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/sys/fs/pseudofs/pseudofs_internal.h,v 1.4 2005/03/19 08:22:36 phk Exp $
  */
 
 #ifndef _PSEUDOFS_INTERNAL_H_INCLUDED
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index 4ce29af704d5..4e61c69aa7ae 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.32 2005/07/07 07:33:10 jeff Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index ad221f189684..db61492857da 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.56.2.1 2005/10/09 08:59:34 delphij Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/smbfs/smbfs.h b/sys/fs/smbfs/smbfs.h
index 59693e3cd602..fcd5e78cc0f5 100644
--- a/sys/fs/smbfs/smbfs.h
+++ b/sys/fs/smbfs/smbfs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs.h,v 1.12 2005/01/14 08:52:55 phk Exp $
  */
 #ifndef _SMBFS_SMBFS_H_
 #define _SMBFS_SMBFS_H_
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index a5161945c923..78d4243690ac 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.33 2005/03/13 12:18:24 jeff Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index 7ad977b2c758..9e424d436627 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.28 2005/03/13 12:18:24 jeff Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/smbfs/smbfs_node.h b/sys/fs/smbfs/smbfs_node.h
index 4e923936adbb..76dd51059351 100644
--- a/sys/fs/smbfs/smbfs_node.h
+++ b/sys/fs/smbfs/smbfs_node.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_node.h,v 1.7 2005/01/06 18:10:41 imp Exp $
  */
 #ifndef _FS_SMBFS_NODE_H_
 #define _FS_SMBFS_NODE_H_
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index f45d2ace476f..1eb9e05a72c6 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_smb.c,v 1.15 2005/05/04 15:05:46 takawata Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/smbfs/smbfs_subr.c b/sys/fs/smbfs/smbfs_subr.c
index a91cc799a00a..ff51f5cd35b4 100644
--- a/sys/fs/smbfs/smbfs_subr.c
+++ b/sys/fs/smbfs/smbfs_subr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_subr.c,v 1.8 2005/05/06 20:47:09 anholt Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/smbfs/smbfs_subr.h b/sys/fs/smbfs/smbfs_subr.h
index a72b9e657a5f..c9916278ad4a 100644
--- a/sys/fs/smbfs/smbfs_subr.h
+++ b/sys/fs/smbfs/smbfs_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_subr.h,v 1.6 2005/05/04 15:05:46 takawata Exp $
  */
 #ifndef _FS_SMBFS_SMBFS_SUBR_H_
 #define _FS_SMBFS_SMBFS_SUBR_H_
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index b774443cbdb3..d301920fe8ee 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.34 2005/03/24 07:36:15 jeff Exp $
  */
 #include "opt_netsmb.h"
 #ifndef NETSMB
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index d741c060e229..77252e604da0 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.61 2005/04/13 10:59:08 jeff Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/udf/ecma167-udf.h b/sys/fs/udf/ecma167-udf.h
index bd78da4b7971..057cfa542a7a 100644
--- a/sys/fs/udf/ecma167-udf.h
+++ b/sys/fs/udf/ecma167-udf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/ecma167-udf.h,v 1.5 2005/04/14 14:40:09 brueffer Exp $
  */
 
 /* ecma167-udf.h */
diff --git a/sys/fs/udf/osta.c b/sys/fs/udf/osta.c
index 81c72862d45f..8780edc2ec34 100644
--- a/sys/fs/udf/osta.c
+++ b/sys/fs/udf/osta.c
@@ -3,7 +3,7 @@
  * each code segment.  Slight whitespace modifications have been made for
  * formatting purposes.  Typos/bugs have been fixed.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/osta.c,v 1.4 2005/01/06 18:10:41 imp Exp $
  */
 
 #include <fs/udf/osta.h>
diff --git a/sys/fs/udf/osta.h b/sys/fs/udf/osta.h
index a5e3b8625a14..26c6cf095b4d 100644
--- a/sys/fs/udf/osta.h
+++ b/sys/fs/udf/osta.h
@@ -1,7 +1,7 @@
 /*
  * Prototypes for the OSTA functions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/osta.h,v 1.2 2003/11/05 06:55:23 scottl Exp $
  */
 
 #ifndef UNIX
diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h
index a43f0cd68901..643e960b38f6 100644
--- a/sys/fs/udf/udf.h
+++ b/sys/fs/udf/udf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf.h,v 1.13 2005/03/16 08:09:52 phk Exp $
  */
 
 #define UDF_HASHTBLSIZE 100
diff --git a/sys/fs/udf/udf_iconv.c b/sys/fs/udf/udf_iconv.c
index 934516986c85..812baef2a6f9 100644
--- a/sys/fs/udf/udf_iconv.c
+++ b/sys/fs/udf/udf_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/udf/udf_iconv.c,v 1.1 2003/11/05 06:56:08 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/iconv.h>
diff --git a/sys/fs/udf/udf_mount.h b/sys/fs/udf/udf_mount.h
index 1c34694c3d4c..a04888144a68 100644
--- a/sys/fs/udf/udf_mount.h
+++ b/sys/fs/udf/udf_mount.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf_mount.h,v 1.3 2003/11/05 06:56:08 scottl Exp $
  */
 
 #define	UDFMNT_KICONV	0x00000001
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 2b97c30fbbaa..899580fa1835 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.33.2.1 2005/09/30 06:26:42 delphij Exp $
  */
 
 /* udf_vfsops.c */
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index cd0dc0715fd5..8e1faa5fa635 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.58 2005/07/09 13:52:49 tanimura Exp $
  */
 
 /* udf_vnops.c */
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index d32b42860eb1..aa1d4855639e 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -31,7 +31,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/umapfs/umap.h,v 1.19 2005/01/06 18:10:41 imp Exp $
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 90f19d975911..c03bfca9ce1a 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -31,7 +31,7 @@
  *
  *	@(#)umap_subr.c	8.9 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/umapfs/umap_subr.c,v 1.34 2005/01/06 18:10:41 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 1d3c74c65391..e5d50778ff5f 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)umap_vfsops.c	8.8 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/umapfs/umap_vfsops.c,v 1.63 2005/03/24 07:36:15 jeff Exp $
  */
 
 /*
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 92a3bc480612..39055e22a6f4 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.47 2005/03/13 12:18:25 jeff Exp $
  */
 
 /*
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index ff3db84a39ff..392ef7e3a2e1 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union.h,v 1.31 2005/01/06 18:10:42 imp Exp $
  */
 
 #define UNMNT_ABOVE	0x0001		/* Target appears above mount point */
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 6c6351903264..532633458035 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.86 2005/04/27 09:06:06 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 61c78831990e..317c9de23c48 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.76 2005/04/27 09:07:13 jeff Exp $
  */
 
 /*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 037923576d4c..9a8c6f5a22ac 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.132 2005/05/03 11:05:33 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gdb/gdb.h b/sys/gdb/gdb.h
index 6fd75583b4c0..b2fd7676c0e1 100644
--- a/sys/gdb/gdb.h
+++ b/sys/gdb/gdb.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/sys/gdb/gdb.h,v 1.2 2005/01/06 18:27:29 imp Exp $
  */
 
 #ifndef _GDB_GDB_H_
diff --git a/sys/gdb/gdb_int.h b/sys/gdb/gdb_int.h
index c9e1bdcb117e..fcb770e0b96c 100644
--- a/sys/gdb/gdb_int.h
+++ b/sys/gdb/gdb_int.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/sys/gdb/gdb_int.h,v 1.2 2005/01/06 18:27:29 imp Exp $
  */
 
 #ifndef _GDB_GDB_INT_H_
diff --git a/sys/gdb/gdb_main.c b/sys/gdb/gdb_main.c
index 9e361c811046..9f3d1db6e0bf 100644
--- a/sys/gdb/gdb_main.c
+++ b/sys/gdb/gdb_main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_main.c,v 1.5 2005/03/28 18:31:18 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/gdb/gdb_packet.c b/sys/gdb/gdb_packet.c
index a4bbe24ee817..304e0af25cda 100644
--- a/sys/gdb/gdb_packet.c
+++ b/sys/gdb/gdb_packet.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_packet.c,v 1.2 2005/01/06 18:27:29 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index 90aaf7a44b83..662c7467f8b1 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde.c,v 1.29 2005/03/11 15:42:51 ume Exp $
  *
  */
 
diff --git a/sys/geom/bde/g_bde.h b/sys/geom/bde/g_bde.h
index 9332c6b27061..efd3d9fce658 100644
--- a/sys/geom/bde/g_bde.h
+++ b/sys/geom/bde/g_bde.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde.h,v 1.6 2003/10/07 09:28:07 phk Exp $
  */
 
 #ifndef _SYS_GEOM_BDE_G_BDE_H_
diff --git a/sys/geom/bde/g_bde_crypt.c b/sys/geom/bde/g_bde_crypt.c
index c5de0b932394..319d154a0ece 100644
--- a/sys/geom/bde/g_bde_crypt.c
+++ b/sys/geom/bde/g_bde_crypt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.22.2.1 2005/10/09 03:30:30 delphij Exp $
  */
 /* This source file contains the functions responsible for the crypto, keying
  * and mapping operations on the I/O requests.
diff --git a/sys/geom/bde/g_bde_lock.c b/sys/geom/bde/g_bde_lock.c
index d699cc32fcab..e850249e86c1 100644
--- a/sys/geom/bde/g_bde_lock.c
+++ b/sys/geom/bde/g_bde_lock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.16 2005/03/11 15:42:51 ume Exp $
  */
 /* This souce file contains routines which operates on the lock sectors, both
  * for the kernel and the userland program gbde(1).
diff --git a/sys/geom/bde/g_bde_work.c b/sys/geom/bde/g_bde_work.c
index e0e58ca591f3..e3756ecf54e1 100644
--- a/sys/geom/bde/g_bde_work.c
+++ b/sys/geom/bde/g_bde_work.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_work.c,v 1.26 2005/03/11 15:42:51 ume Exp $
  */
 /*
  * This source file contains the state-engine which makes things happen in the
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index bb5b23288bbb..abed7ecf92e4 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.24.2.1 2005/07/20 13:12:19 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/concat/g_concat.h b/sys/geom/concat/g_concat.h
index d5c40de868e7..ad76b9ae3846 100644
--- a/sys/geom/concat/g_concat.h
+++ b/sys/geom/concat/g_concat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.11 2005/02/27 23:07:46 pjd Exp $
  */
 
 #ifndef	_G_CONCAT_H_
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 230156a937b9..464cceeeb56c 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.3.2.4 2005/09/15 14:17:31 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/eli/g_eli.h b/sys/geom/eli/g_eli.h
index f78ba198f00e..6ee830058a49 100644
--- a/sys/geom/eli/g_eli.h
+++ b/sys/geom/eli/g_eli.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/eli/g_eli.h,v 1.1.2.4 2005/10/06 18:17:29 pjd Exp $
  */
 
 #ifndef	_G_ELI_H_
diff --git a/sys/geom/eli/g_eli_crypto.c b/sys/geom/eli/g_eli_crypto.c
index d4ec8897d907..2b31e61a3f49 100644
--- a/sys/geom/eli/g_eli_crypto.c
+++ b/sys/geom/eli/g_eli_crypto.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_crypto.c,v 1.1.2.1 2005/08/05 19:58:14 pjd Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/eli/g_eli_ctl.c b/sys/geom/eli/g_eli_ctl.c
index 9ce3064f888a..339cc53bd25c 100644
--- a/sys/geom/eli/g_eli_ctl.c
+++ b/sys/geom/eli/g_eli_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_ctl.c,v 1.1.2.2 2005/08/30 15:27:30 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/eli/g_eli_key.c b/sys/geom/eli/g_eli_key.c
index 79a04e82307c..2a976583f6b7 100644
--- a/sys/geom/eli/g_eli_key.c
+++ b/sys/geom/eli/g_eli_key.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_key.c,v 1.1.2.1 2005/08/05 19:58:14 pjd Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/eli/pkcs5v2.c b/sys/geom/eli/pkcs5v2.c
index 5fcd04793c3c..25a9eaf3ded4 100644
--- a/sys/geom/eli/pkcs5v2.c
+++ b/sys/geom/eli/pkcs5v2.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/pkcs5v2.c,v 1.1.2.1 2005/08/05 19:58:14 pjd Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/eli/pkcs5v2.h b/sys/geom/eli/pkcs5v2.h
index 83691ac9f254..585524387c57 100644
--- a/sys/geom/eli/pkcs5v2.h
+++ b/sys/geom/eli/pkcs5v2.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/eli/pkcs5v2.h,v 1.1.2.1 2005/08/05 19:58:14 pjd Exp $
  */
 
 #ifndef _PKCS5V2_H_
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index 9734cbe35924..31739723cf26 100644
--- a/sys/geom/gate/g_gate.c
+++ b/sys/geom/gate/g_gate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/gate/g_gate.c,v 1.21 2005/07/10 21:10:20 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/geom/gate/g_gate.h b/sys/geom/gate/g_gate.h
index 5e655d568fa5..f8130203b299 100644
--- a/sys/geom/gate/g_gate.h
+++ b/sys/geom/gate/g_gate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/gate/g_gate.h,v 1.7 2005/07/10 21:10:20 pjd Exp $
  */
 
 #ifndef _G_GATE_H_
diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index 35255e8de71c..5c6ef001f075 100644
--- a/sys/geom/geom.h
+++ b/sys/geom/geom.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom.h,v 1.90 2004/12/21 18:32:46 pjd Exp $
  */
 
 #ifndef _GEOM_GEOM_H_
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index de7e1c63e5c9..ea4820247d8f 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_aes.c,v 1.28 2005/03/11 15:42:50 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c
index 04f5cac1af80..c7a6d0774085 100644
--- a/sys/geom/geom_apple.c
+++ b/sys/geom/geom_apple.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_apple.c,v 1.16 2004/08/08 07:57:51 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c
index 6b2220d00b2b..f82ba02f625e 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd.c,v 1.73 2005/03/16 20:48:13 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_bsd_enc.c b/sys/geom/geom_bsd_enc.c
index a526cac48719..c2b800b808d2 100644
--- a/sys/geom/geom_bsd_enc.c
+++ b/sys/geom/geom_bsd_enc.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd_enc.c,v 1.6 2005/01/06 18:27:29 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index bfa125dc0d0b..49a87a72c6f8 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_ccd.c,v 1.153 2005/01/06 18:27:29 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index a60e4cd80bd9..794fba28b8aa 100644
--- a/sys/geom/geom_ctl.c
+++ b/sys/geom/geom_ctl.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.35 2005/04/08 09:28:08 pjd Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_ctl.h b/sys/geom/geom_ctl.h
index fd68bdaa428a..32221cddbf0e 100644
--- a/sys/geom/geom_ctl.h
+++ b/sys/geom/geom_ctl.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_ctl.h,v 1.5 2003/06/01 13:47:51 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_CTL_H_
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index bbb4b3afe035..7ec96a0bd22b 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.89 2005/03/18 06:57:58 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 53c8c15f25d0..92c8c7d5ccd0 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.96 2005/03/18 07:01:31 phk Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h
index 42f5b60e3cc3..bd0fe0768f74 100644
--- a/sys/geom/geom_disk.h
+++ b/sys/geom/geom_disk.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_disk.h,v 1.4 2005/03/15 10:47:38 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_DISK_H_
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c
index fd7001f65787..283ba5f23974 100644
--- a/sys/geom/geom_dump.c
+++ b/sys/geom/geom_dump.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_dump.c,v 1.31 2004/03/10 08:49:08 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/sbuf.h>
diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c
index 32351c328fa8..9ee7b930c6ef 100644
--- a/sys/geom/geom_event.c
+++ b/sys/geom/geom_event.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_event.c,v 1.53.2.1 2005/10/07 15:06:27 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/geom/geom_fox.c b/sys/geom/geom_fox.c
index 2eef7cdd69c3..98a207ec95d1 100644
--- a/sys/geom/geom_fox.c
+++ b/sys/geom/geom_fox.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_fox.c,v 1.9 2005/01/06 18:27:29 imp Exp $
  */
 
 /* This is a GEOM module for handling path selection for multi-path
diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c
index 77317b11ae25..a72f01fad132 100644
--- a/sys/geom/geom_gpt.c
+++ b/sys/geom/geom_gpt.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_gpt.c,v 1.32 2005/03/18 07:03:56 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_int.h b/sys/geom/geom_int.h
index cb69df3183ed..50f3a2ab5b25 100644
--- a/sys/geom/geom_int.h
+++ b/sys/geom/geom_int.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_int.h,v 1.29 2004/10/25 12:28:28 phk Exp $
  */
 
 LIST_HEAD(class_list_head, g_class);
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index d86b75a04a1f..3c781fbeeed8 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.64.2.2 2005/09/26 19:49:12 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c
index 1308799f2ab3..a8c805f58c54 100644
--- a/sys/geom/geom_kern.c
+++ b/sys/geom/geom_kern.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_kern.c,v 1.39 2005/04/19 06:23:58 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c
index 9fbb3c712010..24a67e5695ff 100644
--- a/sys/geom/geom_mbr.c
+++ b/sys/geom/geom_mbr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_mbr.c,v 1.65.2.1 2005/08/16 22:44:39 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/geom/geom_mbr_enc.c b/sys/geom/geom_mbr_enc.c
index e3e3977582b4..07f14e5d772b 100644
--- a/sys/geom/geom_mbr_enc.c
+++ b/sys/geom/geom_mbr_enc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_mbr_enc.c,v 1.3 2005/01/06 18:27:29 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/diskmbr.h>
diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c
index 77c4ac207198..7881c7732133 100644
--- a/sys/geom/geom_pc98.c
+++ b/sys/geom/geom_pc98.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_pc98.c,v 1.53.2.1 2005/08/19 12:40:32 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_pc98_enc.c b/sys/geom/geom_pc98_enc.c
index cf0f7f3fe7bc..6e2fe2a28621 100644
--- a/sys/geom/geom_pc98_enc.c
+++ b/sys/geom/geom_pc98_enc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_pc98_enc.c,v 1.3 2005/05/01 09:44:50 nyan Exp $");
 
 #include <sys/types.h>
 #include <sys/diskpc98.h>
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index e618430cace0..ca3086f50836 100644
--- a/sys/geom/geom_slice.c
+++ b/sys/geom/geom_slice.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.57.2.1 2005/10/08 22:11:38 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_slice.h b/sys/geom/geom_slice.h
index 4003c8fa0ad8..6aa628f62a9e 100644
--- a/sys/geom/geom_slice.h
+++ b/sys/geom/geom_slice.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_slice.h,v 1.17 2003/05/31 19:25:05 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_SLICE_H_
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index 4af0d4a129f1..956f43514b6e 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.87 2005/03/26 21:07:35 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index 4c453cd813d5..3b811e8f2524 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_sunlabel.c,v 1.44 2005/04/12 08:14:15 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_sunlabel_enc.c b/sys/geom/geom_sunlabel_enc.c
index 7463e01172d8..47183ccaa9e2 100644
--- a/sys/geom/geom_sunlabel_enc.c
+++ b/sys/geom/geom_sunlabel_enc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_sunlabel_enc.c,v 1.6 2005/03/30 09:33:09 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c
index d8f6c1d02494..80a8ec6d5eba 100644
--- a/sys/geom/geom_vfs.c
+++ b/sys/geom/geom_vfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_vfs.c,v 1.9 2005/02/19 11:44:56 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_vfs.h b/sys/geom/geom_vfs.h
index 806ec1ca089a..4d5f8febbb6d 100644
--- a/sys/geom/geom_vfs.h
+++ b/sys/geom/geom_vfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_vfs.h,v 1.3 2005/02/10 12:10:35 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_VFS_H_
diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c
index d90222f7f6e7..df685636e63b 100644
--- a/sys/geom/geom_vol_ffs.c
+++ b/sys/geom/geom_vol_ffs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_vol_ffs.c,v 1.14 2005/02/08 08:04:23 des Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index f04a4b584eec..bf01819e0bf3 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.13.2.2 2005/08/30 15:16:14 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h
index 814483819b9f..50546955cb5a 100644
--- a/sys/geom/label/g_label.h
+++ b/sys/geom/label/g_label.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/label/g_label.h,v 1.4.2.1 2005/08/16 08:20:47 pjd Exp $
  */
 
 #ifndef	_G_LABEL_H_
diff --git a/sys/geom/label/g_label_ext2fs.c b/sys/geom/label/g_label_ext2fs.c
index 379785f54558..5f3d4270383f 100644
--- a/sys/geom/label/g_label_ext2fs.c
+++ b/sys/geom/label/g_label_ext2fs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ext2fs.c,v 1.1.2.2 2005/08/30 15:18:54 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_iso9660.c b/sys/geom/label/g_label_iso9660.c
index 0a2fa8e36b57..5859f422fd6a 100644
--- a/sys/geom/label/g_label_iso9660.c
+++ b/sys/geom/label/g_label_iso9660.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_iso9660.c,v 1.1.8.1 2005/08/30 15:18:54 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_msdosfs.c b/sys/geom/label/g_label_msdosfs.c
index ff0d7c3b7e14..50bc49c5016a 100644
--- a/sys/geom/label/g_label_msdosfs.c
+++ b/sys/geom/label/g_label_msdosfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_msdosfs.c,v 1.1 2004/07/02 19:40:34 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_reiserfs.c b/sys/geom/label/g_label_reiserfs.c
index c2bee7165c45..18c3e5daac91 100644
--- a/sys/geom/label/g_label_reiserfs.c
+++ b/sys/geom/label/g_label_reiserfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_reiserfs.c,v 1.1.2.2 2005/08/30 15:18:54 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c
index 1be6b853e3ed..e06036e09be5 100644
--- a/sys/geom/label/g_label_ufs.c
+++ b/sys/geom/label/g_label_ufs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.3 2005/04/19 21:55:28 wollman Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index 4d5af3f95f52..ff18936f4462 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.66 2005/05/25 15:54:17 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h
index 963931edcd6a..e940286cb6dc 100644
--- a/sys/geom/mirror/g_mirror.h
+++ b/sys/geom/mirror/g_mirror.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/mirror/g_mirror.h,v 1.17 2005/04/19 21:47:25 pjd Exp $
  */
 
 #ifndef	_G_MIRROR_H_
diff --git a/sys/geom/mirror/g_mirror_ctl.c b/sys/geom/mirror/g_mirror_ctl.c
index 798139c23eb2..942ea60f4ebf 100644
--- a/sys/geom/mirror/g_mirror_ctl.c
+++ b/sys/geom/mirror/g_mirror_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror_ctl.c,v 1.11 2005/04/25 10:41:26 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 1a2cb3b058ba..49e551a4310b 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/nop/g_nop.c,v 1.11 2004/09/16 15:28:48 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/nop/g_nop.h b/sys/geom/nop/g_nop.h
index 378c3eff490f..3020d3bc430d 100644
--- a/sys/geom/nop/g_nop.h
+++ b/sys/geom/nop/g_nop.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/nop/g_nop.h,v 1.4 2004/07/30 08:19:22 pjd Exp $
  */
 
 #ifndef	_G_NOP_H_
diff --git a/sys/geom/notes b/sys/geom/notes
index 4fcacaefbc40..f160a355e57c 100644
--- a/sys/geom/notes
+++ b/sys/geom/notes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/geom/notes,v 1.5 2004/09/05 21:15:58 phk Exp $
 
 For the lack of a better place to put them, this file will contain
 notes on some of the more intricate details of geom.
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index 65f4c0f03dc7..eeede87b2844 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.40.2.1.2.1 2005/10/28 20:27:53 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h
index b666c8a157ce..190a3c7cd80f 100644
--- a/sys/geom/raid3/g_raid3.h
+++ b/sys/geom/raid3/g_raid3.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/raid3/g_raid3.h,v 1.11.2.1 2005/08/05 19:43:29 pjd Exp $
  */
 
 #ifndef	_G_RAID3_H_
diff --git a/sys/geom/raid3/g_raid3_ctl.c b/sys/geom/raid3/g_raid3_ctl.c
index 2edbe46da02b..4ffa7f822527 100644
--- a/sys/geom/raid3/g_raid3_ctl.c
+++ b/sys/geom/raid3/g_raid3_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3_ctl.c,v 1.11 2005/05/11 19:36:56 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c
index acfa8fb7231d..b23dbe54fca4 100644
--- a/sys/geom/shsec/g_shsec.c
+++ b/sys/geom/shsec/g_shsec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/shsec/g_shsec.c,v 1.3 2005/02/27 23:07:47 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/shsec/g_shsec.h b/sys/geom/shsec/g_shsec.h
index af2e8a701d59..bddf582309c0 100644
--- a/sys/geom/shsec/g_shsec.h
+++ b/sys/geom/shsec/g_shsec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/shsec/g_shsec.h,v 1.3 2005/02/27 23:07:47 pjd Exp $
  */
 
 #ifndef	_G_SHSEC_H_
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index eea2ad183a79..c5829faa06e9 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/stripe/g_stripe.c,v 1.25.2.2 2005/08/30 15:14:40 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/stripe/g_stripe.h b/sys/geom/stripe/g_stripe.h
index 1b6e2e5d5adb..9045858a1ad3 100644
--- a/sys/geom/stripe/g_stripe.h
+++ b/sys/geom/stripe/g_stripe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/stripe/g_stripe.h,v 1.7.2.1 2005/08/30 15:14:40 pjd Exp $
  */
 
 #ifndef	_G_STRIPE_H_
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index ae37353d6cf6..f4b0b8a13ced 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/uzip/g_uzip.c,v 1.4.2.1 2005/10/02 11:22:28 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c
index 7cddd3a09722..096b254fab47 100644
--- a/sys/geom/vinum/geom_vinum.c
+++ b/sys/geom/vinum/geom_vinum.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.16.2.1 2005/08/19 08:48:04 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum.h b/sys/geom/vinum/geom_vinum.h
index 15216dc09549..629bbf3eca1c 100644
--- a/sys/geom/vinum/geom_vinum.h
+++ b/sys/geom/vinum/geom_vinum.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.9 2004/11/26 12:31:04 le Exp $
  */
 
 #ifndef	_GEOM_VINUM_H_
diff --git a/sys/geom/vinum/geom_vinum_drive.c b/sys/geom/vinum/geom_vinum_drive.c
index 04a53cbb9217..aea57d58908a 100644
--- a/sys/geom/vinum/geom_vinum_drive.c
+++ b/sys/geom/vinum/geom_vinum_drive.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.18.2.2 2005/10/09 04:34:29 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_init.c b/sys/geom/vinum/geom_vinum_init.c
index b3d744e3b00f..a575897856d6 100644
--- a/sys/geom/vinum/geom_vinum_init.c
+++ b/sys/geom/vinum/geom_vinum_init.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_init.c,v 1.10.2.1 2005/10/09 04:36:44 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_list.c b/sys/geom/vinum/geom_vinum_list.c
index cb4ccfa5a45f..33f7e6006d43 100644
--- a/sys/geom/vinum/geom_vinum_list.c
+++ b/sys/geom/vinum/geom_vinum_list.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_list.c,v 1.3 2005/01/06 18:27:30 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c
index 6f68dd9bfd22..0469e677bb5d 100644
--- a/sys/geom/vinum/geom_vinum_plex.c
+++ b/sys/geom/vinum/geom_vinum_plex.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.15.2.1 2005/08/19 08:48:04 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_raid5.c b/sys/geom/vinum/geom_vinum_raid5.c
index 789db193ecbd..d35e24053af2 100644
--- a/sys/geom/vinum/geom_vinum_raid5.c
+++ b/sys/geom/vinum/geom_vinum_raid5.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.10 2004/11/26 11:59:51 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_raid5.h b/sys/geom/vinum/geom_vinum_raid5.h
index 747307d05d80..ac50b3d14182 100644
--- a/sys/geom/vinum/geom_vinum_raid5.h
+++ b/sys/geom/vinum/geom_vinum_raid5.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.h,v 1.6 2005/01/06 18:27:30 imp Exp $
  */
 
 #ifndef _GEOM_VINUM_RAID5_H_
diff --git a/sys/geom/vinum/geom_vinum_rm.c b/sys/geom/vinum/geom_vinum_rm.c
index 44b611053d5b..910b05d92222 100644
--- a/sys/geom/vinum/geom_vinum_rm.c
+++ b/sys/geom/vinum/geom_vinum_rm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.6.2.2 2005/10/09 04:37:34 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_share.c b/sys/geom/vinum/geom_vinum_share.c
index 1219f0e1bb7e..3fe1d07ed698 100644
--- a/sys/geom/vinum/geom_vinum_share.c
+++ b/sys/geom/vinum/geom_vinum_share.c
@@ -41,7 +41,7 @@
 /* This file is shared between kernel and userland. */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_share.c,v 1.4 2004/11/15 12:30:59 le Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/vinum/geom_vinum_share.h b/sys/geom/vinum/geom_vinum_share.h
index f15f45df667c..b48952c47940 100644
--- a/sys/geom/vinum/geom_vinum_share.h
+++ b/sys/geom/vinum/geom_vinum_share.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_share.h,v 1.2 2004/11/15 12:30:59 le Exp $
  */
 
 #ifndef _GEOM_VINUM_SHARE_H_
diff --git a/sys/geom/vinum/geom_vinum_state.c b/sys/geom/vinum/geom_vinum_state.c
index 81e305a346ee..0c16c90f4403 100644
--- a/sys/geom/vinum/geom_vinum_state.c
+++ b/sys/geom/vinum/geom_vinum_state.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.7 2005/01/21 18:27:23 le Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c
index ff91196e7823..35d02469fa82 100644
--- a/sys/geom/vinum/geom_vinum_subr.c
+++ b/sys/geom/vinum/geom_vinum_subr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.13 2005/01/19 13:57:09 le Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index 3de2b44a3901..2e01a6fa9685 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -35,7 +35,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/sys/geom/vinum/geom_vinum_var.h,v 1.8.2.1 2005/08/19 08:48:04 le Exp $
  */
 
 #ifndef	_GEOM_VINUM_VAR_H_
diff --git a/sys/geom/vinum/geom_vinum_volume.c b/sys/geom/vinum/geom_vinum_volume.c
index 510d3f06ee92..7c38330a9f83 100644
--- a/sys/geom/vinum/geom_vinum_volume.c
+++ b/sys/geom/vinum/geom_vinum_volume.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_volume.c,v 1.8.2.2 2005/10/09 04:35:42 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c
index d45837918963..5099feaa3be4 100644
--- a/sys/geom/zero/g_zero.c
+++ b/sys/geom/zero/g_zero.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/zero/g_zero.c,v 1.1.2.1 2005/07/30 06:22:24 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/dev/sound/pci/csaimg.h b/sys/gnu/dev/sound/pci/csaimg.h
index ba3ba14914f6..6d87f3ae834f 100755
--- a/sys/gnu/dev/sound/pci/csaimg.h
+++ b/sys/gnu/dev/sound/pci/csaimg.h
@@ -19,7 +19,7 @@
  *     Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
  *     USA.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/dev/sound/pci/csaimg.h,v 1.2 2005/01/06 18:27:30 imp Exp $
  *
  ***************************************************************************/
 
diff --git a/sys/gnu/dev/sound/pci/emu10k1-ac97.h b/sys/gnu/dev/sound/pci/emu10k1-ac97.h
index 4f4b072ed2b7..3e72827e9a34 100644
--- a/sys/gnu/dev/sound/pci/emu10k1-ac97.h
+++ b/sys/gnu/dev/sound/pci/emu10k1-ac97.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/emu10k1-ac97.h,v 1.2 2004/01/09 05:08:32 obrien Exp $ */
 
 #ifndef _AC97_CODEC_H_
 #define _AC97_CODEC_H_
diff --git a/sys/gnu/dev/sound/pci/emu10k1-alsa.h b/sys/gnu/dev/sound/pci/emu10k1-alsa.h
index cd0fa1ffeabe..9433dd9e4139 100644
--- a/sys/gnu/dev/sound/pci/emu10k1-alsa.h
+++ b/sys/gnu/dev/sound/pci/emu10k1-alsa.h
@@ -23,7 +23,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/emu10k1-alsa.h,v 1.2 2005/01/06 18:26:37 imp Exp $ */
 
 #ifdef __KERNEL__
 
diff --git a/sys/gnu/dev/sound/pci/emu10k1.h b/sys/gnu/dev/sound/pci/emu10k1.h
index 95e2fa422631..138cee6b0f59 100644
--- a/sys/gnu/dev/sound/pci/emu10k1.h
+++ b/sys/gnu/dev/sound/pci/emu10k1.h
@@ -33,7 +33,7 @@
  *
  *
  **********************************************************************
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/dev/sound/pci/emu10k1.h,v 1.8 2005/01/06 18:27:30 imp Exp $
  */
 
 
diff --git a/sys/gnu/dev/sound/pci/maestro3_dsp.h b/sys/gnu/dev/sound/pci/maestro3_dsp.h
index 908abca55a8b..85fca1ad32b9 100644
--- a/sys/gnu/dev/sound/pci/maestro3_dsp.h
+++ b/sys/gnu/dev/sound/pci/maestro3_dsp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/maestro3_dsp.h,v 1.5 2005/01/06 18:27:30 imp Exp $ */
 /*-
  *      ESS Technology allegro audio driver.
  *
diff --git a/sys/gnu/dev/sound/pci/maestro3_reg.h b/sys/gnu/dev/sound/pci/maestro3_reg.h
index 2e60a1c32af8..39603a435f2c 100644
--- a/sys/gnu/dev/sound/pci/maestro3_reg.h
+++ b/sys/gnu/dev/sound/pci/maestro3_reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/maestro3_reg.h,v 1.5 2005/01/06 18:27:30 imp Exp $ */
 /*-
  *      ESS Technology allegro audio driver.
  *
diff --git a/sys/gnu/fs/ext2fs/COPYRIGHT.INFO b/sys/gnu/fs/ext2fs/COPYRIGHT.INFO
index 699f519c02a8..9364b7041c31 100644
--- a/sys/gnu/fs/ext2fs/COPYRIGHT.INFO
+++ b/sys/gnu/fs/ext2fs/COPYRIGHT.INFO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO,v 1.3 2000/01/01 11:27:50 bde Exp $
 
 Most of the files in this directory are written by Godmar Back or modified
 by him using the CSRG sources.  Those files are covered by the Berkeley-style
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index 8acfda8f1536..bb5a35643f5a 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_alloc.c,v 1.42 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index f15a9606ea68..0fa156851a72 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_balloc.c,v 1.21 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bitops.h b/sys/gnu/fs/ext2fs/ext2_bitops.h
index 47d76cf5d7e9..4302bfe13ff7 100644
--- a/sys/gnu/fs/ext2fs/ext2_bitops.h
+++ b/sys/gnu/fs/ext2fs/ext2_bitops.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/sys/gnu/fs/ext2fs/ext2_bitops.h,v 1.2 2005/01/06 18:27:30 imp Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_BITOPS_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 9d5e37bf3948..97111cc79b43 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_bmap.c,v 1.63 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h
index 24c8f4572948..67330fdbeb60 100644
--- a/sys/gnu/fs/ext2fs/ext2_extern.h
+++ b/sys/gnu/fs/ext2fs/ext2_extern.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_extern.h,v 1.35 2005/03/14 13:30:05 phk Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_EXTERN_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_fs.h b/sys/gnu/fs/ext2fs/ext2_fs.h
index 1b2f3c2de9af..b7b904103928 100644
--- a/sys/gnu/fs/ext2fs/ext2_fs.h
+++ b/sys/gnu/fs/ext2fs/ext2_fs.h
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_fs.h,v 1.15 2005/06/16 06:51:38 imp Exp $
  */
 /*-
  *  linux/include/linux/ext2_fs.h
diff --git a/sys/gnu/fs/ext2fs/ext2_fs_sb.h b/sys/gnu/fs/ext2fs/ext2_fs_sb.h
index 89d829e5539c..7e5046908271 100644
--- a/sys/gnu/fs/ext2fs/ext2_fs_sb.h
+++ b/sys/gnu/fs/ext2fs/ext2_fs_sb.h
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_fs_sb.h,v 1.6 2005/06/16 06:51:38 imp Exp $
  */
 /*-
  *  linux/include/linux/ext2_fs_sb.h
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 8f1b21e76de4..c196ff80cc96 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.5 (Berkeley) 12/30/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_inode.c,v 1.56 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
index de30739fc51f..0e50336dc0a9 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
@@ -19,7 +19,7 @@
  * improvements that they make and grant CSL redistribution rights.
  *
  *      Utah $Hdr$
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c,v 1.15 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 /*
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
index 2c9a6dabf205..537cea666c4a 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c,v 1.25 2005/06/16 06:51:38 imp Exp $
  */
 /*-
  *  linux/fs/ext2/balloc.c
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
index 95e21facd5bd..4c509e0ae5b5 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c,v 1.24 2005/06/16 06:51:38 imp Exp $
  */
 /*-
  *  linux/fs/ext2/ialloc.c
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index a23887860c9a..99810c7b541f 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_lookup.c,v 1.50 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 6be0c7d950fb..d9e799b80444 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_mount.h,v 1.31 2005/01/06 18:27:30 imp Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_readwrite.c b/sys/gnu/fs/ext2fs/ext2_readwrite.c
index e533392fd2da..243d25b36af3 100644
--- a/sys/gnu/fs/ext2fs/ext2_readwrite.c
+++ b/sys/gnu/fs/ext2fs/ext2_readwrite.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.7 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_readwrite.c,v 1.31 2005/01/06 18:27:30 imp Exp $
  */
 
 #define	BLKSIZE(a, b, c)	blksize(a, b, c)
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 561784294b7b..3bf100714c36 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.2 (Berkeley) 9/21/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_subr.c,v 1.30 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 84d1809b1419..f39c7218f701 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.151.2.2 2005/10/06 18:27:27 delphij Exp $
  */
 
 /*-
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 4a8482e9145a..c3cec7d9af25 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -39,7 +39,7 @@
  *
  *	@(#)ufs_vnops.c	8.7 (Berkeley) 2/3/94
  *	@(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vnops.c,v 1.103.4.1 2005/10/28 18:44:00 cracauer Exp $
  */
 
 #include "opt_suiddir.h"
diff --git a/sys/gnu/fs/ext2fs/fs.h b/sys/gnu/fs/ext2fs/fs.h
index 341371d53173..186e41a481ac 100644
--- a/sys/gnu/fs/ext2fs/fs.h
+++ b/sys/gnu/fs/ext2fs/fs.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/fs.h,v 1.17.2.1 2005/09/11 19:06:50 truckman Exp $
  */
 
 /*
diff --git a/sys/gnu/fs/ext2fs/i386-bitops.h b/sys/gnu/fs/ext2fs/i386-bitops.h
index 001c51db7fb9..3764bd523a29 100644
--- a/sys/gnu/fs/ext2fs/i386-bitops.h
+++ b/sys/gnu/fs/ext2fs/i386-bitops.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/fs/ext2fs/i386-bitops.h,v 1.7 2005/06/16 06:51:38 imp Exp $ */
 /*
  * this is mixture of i386/bitops.h and asm/string.h
  * taken from the Linux source tree 
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 9ba55462ee5d..75141b61c80f 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/inode.h,v 1.44 2005/03/16 08:09:52 phk Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_INODE_H_
diff --git a/sys/gnu/fs/ext2fs/sparc64-bitops.h b/sys/gnu/fs/ext2fs/sparc64-bitops.h
index 26cb578358b7..664ee07d7e07 100644
--- a/sys/gnu/fs/ext2fs/sparc64-bitops.h
+++ b/sys/gnu/fs/ext2fs/sparc64-bitops.h
@@ -19,7 +19,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/fs/ext2fs/sparc64-bitops.h,v 1.3 2005/06/16 06:51:38 imp Exp $ */
 #ifndef _SPARC64_BITOPS_H
 #define _SPARC64_BITOPS_H
 
diff --git a/sys/gnu/fs/reiserfs/README b/sys/gnu/fs/reiserfs/README
index f3917c1be08a..35ff09320f03 100644
--- a/sys/gnu/fs/reiserfs/README
+++ b/sys/gnu/fs/reiserfs/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/gnu/fs/reiserfs/README,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
 
 [LICENSING] 
 
diff --git a/sys/gnu/fs/reiserfs/reiserfs_fs.h b/sys/gnu/fs/reiserfs/reiserfs_fs.h
index e32ae23c2274..8f52b2a893b2 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_fs.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_fs.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs.h,v 1.2 2005/06/21 10:11:13 dumbbell Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_FS_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_fs_i.h b/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
index a9aa7e53f2d7..3e3d73e01f6c 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs_i.h,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_FS_I_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h b/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
index 184e01c85957..b51708919e60 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_FS_SB_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_hashes.c b/sys/gnu/fs/reiserfs/reiserfs_hashes.c
index c42bbe2fd30c..67eb163c0151 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_hashes.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_hashes.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_hashes.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_inode.c b/sys/gnu/fs/reiserfs/reiserfs_inode.c
index 13f88da7bdf4..0038b2b2ad99 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_inode.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_inode.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_inode.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_item_ops.c b/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
index 7b10183a79fb..ebfced7d62ce 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_item_ops.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_mount.h b/sys/gnu/fs/reiserfs/reiserfs_mount.h
index f47c97610fca..9bb23da26d1c 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_mount.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_mount.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_mount.h,v 1.2 2005/06/21 10:11:13 dumbbell Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_MOUNT_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_namei.c b/sys/gnu/fs/reiserfs/reiserfs_namei.c
index 6234d1fbee9a..93d91eed9aa1 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_namei.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_namei.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_namei.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_prints.c b/sys/gnu/fs/reiserfs/reiserfs_prints.c
index e48433ba0014..5f4e1e53ebd6 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_prints.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_prints.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_prints.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_stree.c b/sys/gnu/fs/reiserfs/reiserfs_stree.c
index 5d5e4c412bc1..4a217273f866 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_stree.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_stree.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_stree.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
index db9511260ee0..e65c7cdd17a9 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c,v 1.1.2.1 2005/09/30 06:26:42 delphij Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_vnops.c b/sys/gnu/fs/reiserfs/reiserfs_vnops.c
index 9b0ba7d2e509..de2483482a1a 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_vnops.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_vnops.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_vnops.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index b7d021a7d3d1..f33c7a5af6f9 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/Makefile,v 1.11 2002/06/21 06:18:02 mckusick Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/i386/acpica/Makefile b/sys/i386/acpica/Makefile
index 17269d8819c5..b094c26bf7a6 100644
--- a/sys/i386/acpica/Makefile
+++ b/sys/i386/acpica/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/acpica/Makefile,v 1.6 2004/04/13 13:43:11 des Exp $
 
 # Correct path for kernel builds
 # Don't rely on the kernel's .depend file
diff --git a/sys/i386/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c
index 6cb3e9eea095..73e7dfd88260 100644
--- a/sys/i386/acpica/OsdEnvironment.c
+++ b/sys/i386/acpica/OsdEnvironment.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/OsdEnvironment.c,v 1.10 2004/05/06 02:18:58 njl Exp $");
 
 /*
  * 6.1 : Environmental support
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 8b2efd0ba4ca..72da1c3eab5c 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.28.2.1 2005/07/29 16:27:07 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S
index c2d30397545d..dfab41aff89f 100644
--- a/sys/i386/acpica/acpi_wakecode.S
+++ b/sys/i386/acpica/acpi_wakecode.S
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.10 2005/04/22 09:53:04 iedowse Exp $
  */
 
 #define LOCORE
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index fa5e784eba3d..100f450f317e 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.39 2005/03/02 21:33:25 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/acpica/genwakecode.sh b/sys/i386/acpica/genwakecode.sh
index caffbf8642ae..c6c6771f6a06 100644
--- a/sys/i386/acpica/genwakecode.sh
+++ b/sys/i386/acpica/genwakecode.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/acpica/genwakecode.sh,v 1.3 2004/12/12 06:59:14 njl Exp $
 #
 file2c 'static char wakecode[] = {' '};' <acpi_wakecode.bin
 
diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c
index e1f20c0e2bbb..76feedcdd403 100644
--- a/sys/i386/acpica/madt.c
+++ b/sys/i386/acpica/madt.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.19 2005/04/14 17:59:57 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index b9b446d3208c..7005dc6bf9fb 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.145 2005/04/12 20:14:56 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/apm.h b/sys/i386/bios/apm.h
index ce87c546aa8c..a71e69e6bb79 100644
--- a/sys/i386/bios/apm.h
+++ b/sys/i386/bios/apm.h
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/bios/apm.h,v 1.5 2005/01/06 22:18:15 imp Exp $
  */
 
 #define APM_NEVENTS 16
diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c
index 4b78c13693a9..4fe94d1c9365 100644
--- a/sys/i386/bios/mca_machdep.c
+++ b/sys/i386/bios/mca_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/mca_machdep.c,v 1.9 2004/08/31 21:51:51 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/mca_machdep.h b/sys/i386/bios/mca_machdep.h
index c639b5b74044..b1d48581b858 100644
--- a/sys/i386/bios/mca_machdep.h
+++ b/sys/i386/bios/mca_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/bios/mca_machdep.h,v 1.1 1999/09/03 02:04:28 mdodd Exp $
  */
 
 extern int	MCA_system;
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index 9879c90334de..f455277b2346 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/smapi.c,v 1.13 2004/06/16 09:47:07 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/smapi_bios.S b/sys/i386/bios/smapi_bios.S
index 3a280055902b..60c3f84c7eb8 100644
--- a/sys/i386/bios/smapi_bios.S
+++ b/sys/i386/bios/smapi_bios.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/smapi_bios.S,v 1.4 2003/06/13 00:36:03 mdodd Exp $");
 
 #include <machine/asmacros.h>
 
diff --git a/sys/i386/bios/smbios.c b/sys/i386/bios/smbios.c
index c620b4cc0644..900dcbb131aa 100644
--- a/sys/i386/bios/smbios.c
+++ b/sys/i386/bios/smbios.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/smbios.c,v 1.4.8.1 2005/10/06 20:43:44 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/vpd.c b/sys/i386/bios/vpd.c
index 735efe760e64..58a62e62bc0d 100644
--- a/sys/i386/bios/vpd.c
+++ b/sys/i386/bios/vpd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/vpd.c,v 1.5 2004/08/31 21:45:30 mdodd Exp $");
 
 /*
  * VPD decoder for IBM systems (Thinkpads)
diff --git a/sys/i386/compile/.cvsignore b/sys/i386/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/i386/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/i386/conf/.cvsignore b/sys/i386/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/i386/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index 60cb04a5e979..3dbec185b0b5 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/i386
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.1.4.1 2005/10/28 19:22:41 jhb Exp $
 
 # Not yet, this would break all existing configs
 #machine		i386
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index e5bb2c100395..7545286f8c80 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.3.2.1 2005/10/28 19:22:41 jhb Exp $
 
 machine		i386
 cpu		I486_CPU
diff --git a/sys/i386/conf/GENERIC.hints b/sys/i386/conf/GENERIC.hints
index 7fdc9b78984e..6ad36f11ff77 100644
--- a/sys/i386/conf/GENERIC.hints
+++ b/sys/i386/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.14 2005/01/14 06:54:59 imp Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
diff --git a/sys/i386/conf/Makefile b/sys/i386/conf/Makefile
index 2c006e9c2c80..0284f84e82b5 100644
--- a/sys/i386/conf/Makefile
+++ b/sys/i386/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 1708f6b1c365..269eff90f63f 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1202.2.2 2005/10/07 14:00:05 glebius Exp $
 #
 
 #
diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE
index ca88418fa937..dc6dbf297291 100644
--- a/sys/i386/conf/PAE
+++ b/sys/i386/conf/PAE
@@ -1,7 +1,7 @@
 #
 # PAE -- Generic kernel configuration file for FreeBSD/i386 PAE
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/PAE,v 1.16.2.1 2005/07/29 16:02:27 imura Exp $
 
 include GENERIC
 
diff --git a/sys/i386/conf/SMP b/sys/i386/conf/SMP
index 1a40a5521098..f0865e1bfd53 100644
--- a/sys/i386/conf/SMP
+++ b/sys/i386/conf/SMP
@@ -2,7 +2,7 @@
 # SMP -- Generic kernel configuration file for FreeBSD/i386 SMP
 #	 Use this for multi-processor machines
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/SMP,v 1.5.6.1 2005/09/18 03:37:58 scottl Exp $
 
 include GENERIC
 
diff --git a/sys/i386/cpufreq/est.c b/sys/i386/cpufreq/est.c
index 51f5de8005ec..fef86349c058 100644
--- a/sys/i386/cpufreq/est.c
+++ b/sys/i386/cpufreq/est.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/est.c,v 1.7 2005/04/10 19:57:47 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/cpufreq/p4tcc.c b/sys/i386/cpufreq/p4tcc.c
index 7a2eea1f2f11..9be7d84433bb 100644
--- a/sys/i386/cpufreq/p4tcc.c
+++ b/sys/i386/cpufreq/p4tcc.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/p4tcc.c,v 1.11.6.1 2005/10/25 20:53:22 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/cpufreq/powernow.c b/sys/i386/cpufreq/powernow.c
index b9d219fa2537..331aeca76936 100644
--- a/sys/i386/cpufreq/powernow.c
+++ b/sys/i386/cpufreq/powernow.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/powernow.c,v 1.2 2005/03/31 06:11:04 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/cpufreq/smist.c b/sys/i386/cpufreq/smist.c
index 0b0c99e89201..2550ab3e2ac0 100644
--- a/sys/i386/cpufreq/smist.c
+++ b/sys/i386/cpufreq/smist.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/smist.c,v 1.1 2005/04/19 16:38:24 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s
index 99b765f1519c..98c794b4edcb 100644
--- a/sys/i386/i386/apic_vector.s
+++ b/sys/i386/i386/apic_vector.s
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.103.2.1 2005/10/04 15:15:21 jhb Exp $
  */
 
 /*
diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c
index 1b4ff7eaa693..983578a484b8 100644
--- a/sys/i386/i386/atomic.c
+++ b/sys/i386/i386/atomic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/atomic.c,v 1.6 2003/08/25 09:48:46 obrien Exp $");
 
 /* This file creates publically callable functions to perform various
  * simple arithmetic on memory which is atomic in the presence of
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 029ed2ef9dbe..d8b91a066134 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/autoconf.c,v 1.181 2005/05/29 23:44:22 marcel Exp $");
 
 /*
  * Setup the system to run on the current machine.
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 9d5df7de1609..14a9e626fb4d 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/bios.c,v 1.72.2.1 2005/08/16 22:47:14 phk Exp $");
 
 /*
  * Code for dealing with the BIOS in x86 PC systems.
diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s
index 3af198adb5e9..34393c840e1c 100644
--- a/sys/i386/i386/bioscall.s
+++ b/sys/i386/i386/bioscall.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/bioscall.s,v 1.11 2002/09/17 01:48:57 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 3c9a7e001fd1..29d4ff3e356d 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.74 2005/03/12 07:01:53 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index 66a3c4bfcbc9..27af10b39cf7 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.29 2005/01/05 19:09:59 imp Exp $");
 
 /*
  * Instruction disassembler.
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 7079e5688b85..98888c1f1611 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/db_interface.c,v 1.83 2005/01/05 19:09:59 imp Exp $");
 
 /*
  * Interface to new debugger.
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index c26ba368df08..0f5e56e60c98 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/db_trace.c,v 1.66 2005/01/18 03:48:02 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/dump_machdep.c b/sys/i386/i386/dump_machdep.c
index 670fa464392f..b6e405105388 100644
--- a/sys/i386/i386/dump_machdep.c
+++ b/sys/i386/i386/dump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.11 2005/07/02 19:57:31 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c
index 66c218f2ee4b..2c0bc273f880 100644
--- a/sys/i386/i386/elan-mmcr.c
+++ b/sys/i386/i386/elan-mmcr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.31.2.1 2005/08/16 22:47:14 phk Exp $");
 
 #include "opt_cpu.h"
 #include <sys/param.h>
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index d8756cc51fbf..e0b419d19686 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/elf_machdep.c,v 1.20 2004/08/11 02:35:05 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index 2e69ab8c7ec2..96491dd72679 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/exception.s,v 1.113.2.1 2005/07/28 03:30:53 jkoshy Exp $
  */
 
 #include "opt_apic.h"
diff --git a/sys/i386/i386/gdb_machdep.c b/sys/i386/i386/gdb_machdep.c
index a42b2b63402d..83b0171ff47c 100644
--- a/sys/i386/i386/gdb_machdep.c
+++ b/sys/i386/i386/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/gdb_machdep.c,v 1.4 2005/01/05 19:09:59 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 0cb371c652c0..5b1563134dc6 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.151 2005/04/13 22:57:17 peter Exp $");
 
 #include "opt_apic.h"
 #include "opt_compat.h"
diff --git a/sys/i386/i386/geode.c b/sys/i386/i386/geode.c
index a32d68cdd194..ba88e8d42ce5 100644
--- a/sys/i386/i386/geode.c
+++ b/sys/i386/i386/geode.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/geode.c,v 1.5.8.1 2005/08/16 22:47:14 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index 453932969e06..84a3243d900e 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/i686_mem.c,v 1.24 2004/07/01 07:46:28 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index cf5e557d0f5d..c00246943ff8 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.145 2005/06/30 06:44:34 peter Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index 412a93b69e95..453e924ca610 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.28 2005/03/02 21:33:25 joerg Exp $");
 
 /*
  * MPsafe: alfred
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index cec1fa578ca6..09169e91161b 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.52 2005/07/02 20:06:43 delphij Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/intr_machdep.c b/sys/i386/i386/intr_machdep.c
index a3d7933ec5fb..f94e52ae7ccd 100644
--- a/sys/i386/i386/intr_machdep.c
+++ b/sys/i386/i386/intr_machdep.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.14 2005/04/12 23:18:54 jhb Exp $
  */
 
 /*
diff --git a/sys/i386/i386/io.c b/sys/i386/i386/io.c
index 1c0866d30fde..1b43f0441d5c 100644
--- a/sys/i386/i386/io.c
+++ b/sys/i386/i386/io.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/io.c,v 1.1 2004/08/01 11:40:52 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/i386/i386/io_apic.c b/sys/i386/i386/io_apic.c
index 27251ce1f621..fa11f3331ffd 100644
--- a/sys/i386/i386/io_apic.c
+++ b/sys/i386/i386/io_apic.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.20.2.1 2005/08/05 19:08:25 jhb Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index ac7a55a6a924..e8ab3fbe3b91 100644
--- a/sys/i386/i386/k6_mem.c
+++ b/sys/i386/i386/k6_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.11 2003/08/25 09:48:47 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index e5f7e8e67d1f..71d72e2edd45 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/legacy.c,v 1.61 2005/02/15 07:21:20 njl Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
diff --git a/sys/i386/i386/local_apic.c b/sys/i386/i386/local_apic.c
index f1607a487bed..ff90ee72c143 100644
--- a/sys/i386/i386/local_apic.c
+++ b/sys/i386/i386/local_apic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.17.2.2 2005/10/04 15:13:06 jhb Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 7ca289c0c619..b2c9df457cc9 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/locore.s,v 1.186 2005/05/16 09:47:53 obrien Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/i386/longrun.c b/sys/i386/i386/longrun.c
index 55724ffed712..cb3dd212f31c 100644
--- a/sys/i386/i386/longrun.c
+++ b/sys/i386/i386/longrun.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/longrun.c,v 1.3 2004/12/12 05:53:57 njl Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index f413a2090e42..274d5c5968c2 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.616.2.1 2005/07/28 03:30:53 jkoshy Exp $");
 
 #include "opt_apic.h"
 #include "opt_atalk.h"
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index d093e2d47681..da64b5e03aee 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mem.c,v 1.116 2004/08/04 18:30:31 markm Exp $");
 
 /*
  * Memory special file
diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c
index 2c3dbbbe055a..af07002ebb52 100644
--- a/sys/i386/i386/mp_clock.c
+++ b/sys/i386/i386/mp_clock.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_clock.c,v 1.19 2004/05/30 20:34:57 phk Exp $");
 
 /*-
  * Just when we thought life were beautiful, reality pops its grim face over
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 8525c917b4ba..303f79d2847b 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.252.2.3 2005/10/04 15:15:21 jhb Exp $");
 
 #include "opt_apic.h"
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/mp_watchdog.c b/sys/i386/i386/mp_watchdog.c
index bc5e6d2edc67..e95026d1c0d8 100644
--- a/sys/i386/i386/mp_watchdog.c
+++ b/sys/i386/i386/mp_watchdog.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mp_watchdog.c,v 1.4 2005/02/27 22:34:07 pjd Exp $
  */
 
 #include "opt_mp_watchdog.h"
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index 5effeb9b65c2..bf010047dc46 100644
--- a/sys/i386/i386/mpboot.s
+++ b/sys/i386/i386/mpboot.s
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.24 2005/01/05 19:10:48 imp Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index cffeb1c6244d..926ff6666482 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.241 2005/04/14 17:59:58 jhb Exp $");
 
 #include "opt_mptable_force_htt.h"
 #include <sys/param.h>
diff --git a/sys/i386/i386/mptable_pci.c b/sys/i386/i386/mptable_pci.c
index 5a3437321fd9..63284882c362 100644
--- a/sys/i386/i386/mptable_pci.c
+++ b/sys/i386/i386/mptable_pci.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable_pci.c,v 1.2.8.1 2005/09/18 02:55:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index 15751bdf2745..7ee99fed5973 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/nexus.c,v 1.62 2005/05/10 12:02:15 nyan Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index d085261547c2..5c95f84acbe3 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/perfmon.c,v 1.38 2004/06/16 09:47:07 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 9addfc219298..81c575bea93c 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.523.2.1.2.1 2005/10/28 06:49:18 ade Exp $");
 
 /*
  *	Manages physical address maps.
diff --git a/sys/i386/i386/ptrace_machdep.c b/sys/i386/i386/ptrace_machdep.c
index 32105d6a6d88..6c9ddc893081 100644
--- a/sys/i386/i386/ptrace_machdep.c
+++ b/sys/i386/i386/ptrace_machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/ptrace_machdep.c,v 1.3.2.1 2005/08/11 14:28:42 tobez Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 1e970da67ca7..342359765fcd 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/support.s,v 1.107 2005/04/21 23:07:20 alc Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index f1404c3ad547..de079d7eb54f 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.148 2005/04/13 22:57:17 peter Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index c15f5049cbd0..0bb8b4d619d0 100644
--- a/sys/i386/i386/symbols.raw
+++ b/sys/i386/i386/symbols.raw
@@ -1,6 +1,6 @@
 #	@(#)symbols.raw	7.6 (Berkeley) 5/8/91
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/i386/symbols.raw,v 1.16 2004/06/10 20:30:57 jhb Exp $
 #
 
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 23e81447db8e..0e2c45fad2bc 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.102.2.1 2005/09/26 19:38:11 jhb Exp $");
 
 #include "opt_kstack_pages.h"
 #include "opt_mac.h"
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 6ab47a51046b..ab6dfe962b01 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.277.2.2 2005/10/07 14:00:05 glebius Exp $");
 
 /*
  * 386 Trap and System call handling
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 01c8d729e6d4..cfb1b50c85b0 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.204 2003/10/21 18:28:34 silby Exp $");
 
 #include "opt_clock.h"
 
diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c
index 3558ec01377a..a486934ac972 100644
--- a/sys/i386/i386/uio_machdep.c
+++ b/sys/i386/i386/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/uio_machdep.c,v 1.8 2005/02/13 23:09:36 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index e22929b5d5b3..7f36c9068e3b 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm86.c,v 1.57 2004/11/27 06:51:36 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s
index a32daf7ddc86..47691949fc45 100644
--- a/sys/i386/i386/vm86bios.s
+++ b/sys/i386/i386/vm86bios.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/vm86bios.s,v 1.31 2005/04/13 18:13:40 peter Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index aa2d3c68a7e2..eaf586382858 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.259.4.1 2005/10/20 01:03:23 ups Exp $");
 
 #include "opt_isa.h"
 #include "opt_npx.h"
diff --git a/sys/i386/ibcs2/Makefile b/sys/i386/ibcs2/Makefile
index a46885f66423..f75b69065c52 100644
--- a/sys/i386/ibcs2/Makefile
+++ b/sys/i386/ibcs2/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/ibcs2/Makefile,v 1.3 2000/11/01 08:47:34 obrien Exp $
 
 all:
 	@echo "make sysent.c, isc_sysent.c or xenix_sysent.c only"
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index a0eecd97ba95..a9f89c26e7ad 100644
--- a/sys/i386/ibcs2/coff.h
+++ b/sys/i386/ibcs2/coff.h
@@ -26,7 +26,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/sys/i386/ibcs2/coff.h,v 1.5 1999/08/28 00:43:57 peter Exp $
  */
 
 #ifndef _COFF_H
diff --git a/sys/i386/ibcs2/ibcs2_dirent.h b/sys/i386/ibcs2/ibcs2_dirent.h
index 918adf1adc8e..2784790539f6 100644
--- a/sys/i386/ibcs2/ibcs2_dirent.h
+++ b/sys/i386/ibcs2/ibcs2_dirent.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_dirent.h,v 1.2 1994/10/26 02:52:51 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_dirent.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_errno.c b/sys/i386/ibcs2/ibcs2_errno.c
index c3b385af49b5..87b666e879af 100644
--- a/sys/i386/ibcs2/ibcs2_errno.c
+++ b/sys/i386/ibcs2/ibcs2_errno.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_errno.c,v 1.6 2005/01/06 23:22:04 imp Exp $");
 
 #include <sys/errno.h>
 #include <i386/ibcs2/ibcs2_errno.h>
diff --git a/sys/i386/ibcs2/ibcs2_errno.h b/sys/i386/ibcs2/ibcs2_errno.h
index 1e38f40ef4ba..cf1a598d2470 100644
--- a/sys/i386/ibcs2/ibcs2_errno.h
+++ b/sys/i386/ibcs2/ibcs2_errno.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/sys/i386/ibcs2/ibcs2_errno.h,v 1.2 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef _IBCS2_ERRNO_H
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index fcdc714079c5..cc1d92b8b047 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.28 2005/02/07 22:02:18 jhb Exp $");
 
 #include "opt_spx_hack.h"
 
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.h b/sys/i386/ibcs2/ibcs2_fcntl.h
index 75a2b62e3836..76da232721e1 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.h
+++ b/sys/i386/ibcs2/ibcs2_fcntl.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_fcntl.h,v 1.2 1994/10/26 02:52:54 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index bbaab3919406..329afda1ef2b 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.31 2005/01/06 23:22:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index cdf44f1d246a..c0bed566818c 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_ipc.c,v 1.22 2005/01/06 23:22:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.h b/sys/i386/ibcs2/ibcs2_ipc.h
index 473d140cea74..5d6a385c1130 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.h
+++ b/sys/i386/ibcs2/ibcs2_ipc.h
@@ -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/sys/i386/ibcs2/ibcs2_ipc.h,v 1.8 2005/01/06 23:22:04 imp Exp $
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index e2638a317168..3dfa53e710bb 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_isc.c,v 1.18 2005/07/07 19:28:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/i386/ibcs2/ibcs2_isc_syscall.h b/sys/i386/ibcs2/ibcs2_isc_syscall.h
index 57ea169dcb53..a4d295ac48af 100644
--- a/sys/i386/ibcs2/ibcs2_isc_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_isc_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_isc_syscall.h,v 1.9.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.8.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index 907590f2dc88..861b6ef80762 100644
--- a/sys/i386/ibcs2/ibcs2_isc_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_isc_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_isc_sysent.c,v 1.12.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.8.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index e5ecace35bb6..2c7dcae8aa25 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.61 2005/07/07 19:29:42 jhb Exp $");
 
 /*
  * IBCS2 compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_mount.h b/sys/i386/ibcs2/ibcs2_mount.h
index 67161482c114..aab82540e4fc 100644
--- a/sys/i386/ibcs2/ibcs2_mount.h
+++ b/sys/i386/ibcs2/ibcs2_mount.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_mount.h,v 1.2 1994/10/26 02:53:00 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_mount.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index bbca3b8ff13e..6a39f039e166 100644
--- a/sys/i386/ibcs2/ibcs2_msg.c
+++ b/sys/i386/ibcs2/ibcs2_msg.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_msg.c,v 1.12 2005/02/25 20:15:11 sam Exp $");
 
 /*
  * IBCS2 message compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index 2a8c21d96a30..bb874129d336 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_other.c,v 1.17 2005/02/07 22:02:18 jhb Exp $");
 
 /*
  * IBCS2 compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_poll.h b/sys/i386/ibcs2/ibcs2_poll.h
index fecec70797ac..7548351cc049 100644
--- a/sys/i386/ibcs2/ibcs2_poll.h
+++ b/sys/i386/ibcs2/ibcs2_poll.h
@@ -21,7 +21,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/sys/i386/ibcs2/ibcs2_poll.h,v 1.5 2005/01/06 23:22:04 imp Exp $
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index ce1d422a0438..00518e91e895 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.21.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.20.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index b2f339338fc6..32bfe251af1d 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_signal.c,v 1.35 2005/02/13 17:37:18 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_signal.h b/sys/i386/ibcs2/ibcs2_signal.h
index 59070aa0640f..74d41639798e 100644
--- a/sys/i386/ibcs2/ibcs2_signal.h
+++ b/sys/i386/ibcs2/ibcs2_signal.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_signal.h,v 1.8 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef	_IBCS2_SIGNAL_H
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index 515f318cd4b8..07634bc1a805 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.21 2005/01/06 23:22:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h
index 533a4827b8d9..45724ce3ebca 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.h
+++ b/sys/i386/ibcs2/ibcs2_socksys.h
@@ -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/sys/i386/ibcs2/ibcs2_socksys.h,v 1.9 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef	_I386_IBCS2_IBCS2_SOCKSYS_H_
diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c
index 925307156354..97bf49611fcd 100644
--- a/sys/i386/ibcs2/ibcs2_stat.c
+++ b/sys/i386/ibcs2/ibcs2_stat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_stat.c,v 1.26 2005/02/07 22:02:18 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_stat.h b/sys/i386/ibcs2/ibcs2_stat.h
index 1ab76fb97e47..5610ec6dff27 100644
--- a/sys/i386/ibcs2/ibcs2_stat.h
+++ b/sys/i386/ibcs2/ibcs2_stat.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_stat.h,v 1.2 1994/10/26 02:53:03 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_stat.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_statfs.h b/sys/i386/ibcs2/ibcs2_statfs.h
index 51eb84413fd8..fbb68276e46c 100644
--- a/sys/i386/ibcs2/ibcs2_statfs.h
+++ b/sys/i386/ibcs2/ibcs2_statfs.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_statfs.h,v 1.2 1994/10/26 02:53:06 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_statfs.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_stropts.h b/sys/i386/ibcs2/ibcs2_stropts.h
index 7623da353120..f4bcb9488ff0 100644
--- a/sys/i386/ibcs2/ibcs2_stropts.h
+++ b/sys/i386/ibcs2/ibcs2_stropts.h
@@ -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/sys/i386/ibcs2/ibcs2_stropts.h,v 1.2 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef _IBCS2_STROPTS_H
diff --git a/sys/i386/ibcs2/ibcs2_syscall.h b/sys/i386/ibcs2/ibcs2_syscall.h
index bc0ad62d1d03..2114e38b1950 100644
--- a/sys/i386/ibcs2/ibcs2_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.18.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.20.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index 2573c4831fd2..63112df986aa 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.23.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.20.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index 12321d1ea0e0..d8ffd3105456 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_sysi86.c,v 1.22 2005/07/07 19:30:30 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index 74be78238e5e..040f79852da2 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_sysvec.c,v 1.30 2005/01/29 23:11:58 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/ibcs2/ibcs2_termios.h b/sys/i386/ibcs2/ibcs2_termios.h
index bce259fcb374..f1251d2b028e 100644
--- a/sys/i386/ibcs2/ibcs2_termios.h
+++ b/sys/i386/ibcs2/ibcs2_termios.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_termios.h,v 1.3 1994/10/26 02:53:07 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_termios.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_time.h b/sys/i386/ibcs2/ibcs2_time.h
index 15b23fa587b2..766d06ca7c5f 100644
--- a/sys/i386/ibcs2/ibcs2_time.h
+++ b/sys/i386/ibcs2/ibcs2_time.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_time.h,v 1.2 1994/10/26 02:53:08 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_time.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_types.h b/sys/i386/ibcs2/ibcs2_types.h
index f80a83c6cc7b..811f6d9817e1 100644
--- a/sys/i386/ibcs2/ibcs2_types.h
+++ b/sys/i386/ibcs2/ibcs2_types.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_types.h,v 1.5 1995/08/14 01:11:54 mycroft Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_types.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_unistd.h b/sys/i386/ibcs2/ibcs2_unistd.h
index 77e5afd2738e..d7be86ee04e2 100644
--- a/sys/i386/ibcs2/ibcs2_unistd.h
+++ b/sys/i386/ibcs2/ibcs2_unistd.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_unistd.h,v 1.2 1994/10/26 02:53:11 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_unistd.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_ustat.h b/sys/i386/ibcs2/ibcs2_ustat.h
index 19af5bb638c8..6367e5eff3ac 100644
--- a/sys/i386/ibcs2/ibcs2_ustat.h
+++ b/sys/i386/ibcs2/ibcs2_ustat.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_ustat.h,v 1.2 1994/10/26 02:53:13 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_ustat.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index 298fb8417a85..512c3093cfb9 100644
--- a/sys/i386/ibcs2/ibcs2_util.c
+++ b/sys/i386/ibcs2/ibcs2_util.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_util.c,v 1.19 2005/02/07 22:02:18 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_util.h b/sys/i386/ibcs2/ibcs2_util.h
index bf2513ef1f58..cedf419d2429 100644
--- a/sys/i386/ibcs2/ibcs2_util.h
+++ b/sys/i386/ibcs2/ibcs2_util.h
@@ -29,7 +29,7 @@
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_util.h,v 1.19 2005/02/07 22:02:18 jhb Exp $
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_utime.h b/sys/i386/ibcs2/ibcs2_utime.h
index b0a43498188f..94329bf013ec 100644
--- a/sys/i386/ibcs2/ibcs2_utime.h
+++ b/sys/i386/ibcs2/ibcs2_utime.h
@@ -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/sys/i386/ibcs2/ibcs2_utime.h,v 1.3 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef	_IBCS2_UTIME_H
diff --git a/sys/i386/ibcs2/ibcs2_utsname.h b/sys/i386/ibcs2/ibcs2_utsname.h
index 748c17b4c696..9466b3ba10d2 100644
--- a/sys/i386/ibcs2/ibcs2_utsname.h
+++ b/sys/i386/ibcs2/ibcs2_utsname.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_utsname.h,v 1.2 1994/10/26 02:53:14 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_utsname.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index dc8bfacd3e57..049a38f99aa4 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.35 2005/07/07 19:28:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index 4289d881c196..5d57973232eb 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.h,v 1.15.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.9.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_xenix_syscall.h b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
index e2a64c098157..bc98bc2bfee2 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix_syscall.h,v 1.11.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.9.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_xenix_sysent.c b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
index 00d037ff558e..da730d9d7fa7 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix_sysent.c,v 1.13.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.9.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index a7ab6075d648..ca0e9ed2afdf 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.65 2005/04/27 09:05:19 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index 1dce299f1f0b..7f5f2c823163 100644
--- a/sys/i386/ibcs2/syscalls.conf
+++ b/sys/i386/ibcs2/syscalls.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.conf,v 1.7 2003/12/24 00:32:07 peter Exp $
 sysnames="/dev/null"
 sysproto="ibcs2_proto.h"
 sysproto_h=_IBCS2_SYSPROTO_H_
diff --git a/sys/i386/ibcs2/syscalls.isc b/sys/i386/ibcs2/syscalls.isc
index 40892e68e693..eb195f6f5eb4 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.8.2.1 2005/07/20 17:42:15 jhb Exp $
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.isc.conf b/sys/i386/ibcs2/syscalls.isc.conf
index 61f25954a227..e60c0dfa09af 100644
--- a/sys/i386/ibcs2/syscalls.isc.conf
+++ b/sys/i386/ibcs2/syscalls.isc.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.isc.conf,v 1.6 2003/12/24 00:32:07 peter Exp $
 sysnames="/dev/null"
 #sysproto="ibcs2_isc.h"
 sysproto="/dev/null"
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index cadec1785b92..8dce0d3cb17c 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.20.2.1 2005/07/20 17:42:15 jhb Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from IBCS2).
diff --git a/sys/i386/ibcs2/syscalls.xenix b/sys/i386/ibcs2/syscalls.xenix
index 755d75f3a1bf..ba219f344fcb 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.9.2.1 2005/07/20 17:42:15 jhb Exp $
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.xenix.conf b/sys/i386/ibcs2/syscalls.xenix.conf
index 54fdd7bfa3fe..b3372936c9ec 100644
--- a/sys/i386/ibcs2/syscalls.xenix.conf
+++ b/sys/i386/ibcs2/syscalls.xenix.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.xenix.conf,v 1.6 2003/12/24 00:32:07 peter Exp $
 sysnames="/dev/null"
 sysproto="ibcs2_xenix.h"
 sysproto_h=_IBCS2_XENIX_H_
diff --git a/sys/i386/include/_bus.h b/sys/i386/include/_bus.h
index 49bdd5a30757..f1de6b211a1c 100644
--- a/sys/i386/include/_bus.h
+++ b/sys/i386/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef I386_INCLUDE__BUS_H
diff --git a/sys/i386/include/_inttypes.h b/sys/i386/include/_inttypes.h
index 7da589d8a771..ccc41f2f6e5e 100644
--- a/sys/i386/include/_inttypes.h
+++ b/sys/i386/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index 461f4c3d53e9..4b29a975e458 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_limits.h,v 1.27 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/i386/include/_stdint.h b/sys/i386/include/_stdint.h
index 0d8aedfff5d6..7b94f833e916 100644
--- a/sys/i386/include/_stdint.h
+++ b/sys/i386/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/i386/include/_types.h b/sys/i386/include/_types.h
index b272cf0f3f8f..69213f8670a2 100644
--- a/sys/i386/include/_types.h
+++ b/sys/i386/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_types.h,v 1.12 2005/07/02 23:13:31 thompsa Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/i386/include/acpica_machdep.h b/sys/i386/include/acpica_machdep.h
index 57d39cc0cb3a..907934ffd3af 100644
--- a/sys/i386/include/acpica_machdep.h
+++ b/sys/i386/include/acpica_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/acpica_machdep.h,v 1.7 2004/10/11 05:39:15 njl Exp $
  */
 
 /******************************************************************************
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index d5d5dc39ac67..b7ff0a54baf0 100644
--- a/sys/i386/include/apicreg.h
+++ b/sys/i386/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.28 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_
diff --git a/sys/i386/include/apicvar.h b/sys/i386/include/apicvar.h
index 2c1fdf1cf14e..8d63d7f511e8 100644
--- a/sys/i386/include/apicvar.h
+++ b/sys/i386/include/apicvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.13 2005/06/09 18:23:54 ups Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 5f0bafa8f038..512cf0aa9e6b 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -12,7 +12,7 @@
  *
  * Aug, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apm_bios.h,v 1.32 2005/04/03 23:26:05 imp Exp $
  */
 
 #ifndef	_MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index 2d04b9bd8e15..4296968aa5fd 100644
--- a/sys/i386/include/apm_segments.h
+++ b/sys/i386/include/apm_segments.h
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apm_segments.h,v 1.9 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index 64117d0dc65b..f007c8a81b15 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/asm.h,v 1.13 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index 9b77bd0c4ed6..f5493e836746 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/asmacros.h,v 1.26 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index 70cec8429672..6db24074b935 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/atomic.h,v 1.38.2.3 2005/10/06 18:12:05 jhb Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index 475a09e08883..9a8e8947cdd9 100644
--- a/sys/i386/include/bootinfo.h
+++ b/sys/i386/include/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/bootinfo.h,v 1.15 2003/04/04 16:35:15 phk Exp $
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h
index b3a99511e13c..efd1871e6f0c 100644
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.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/sys/i386/include/bus.h,v 1.13 2005/05/29 04:42:28 nyan Exp $
  */
 
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 95e98a7e43c2..765e80575616 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/bus_dma.h,v 1.28 2005/03/14 16:46:27 scottl Exp $ */
 
 #ifndef _I386_BUS_DMA_H_
 #define _I386_BUS_DMA_H_
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 8a14df3c34ee..3b4004fd4a7e 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/clock.h,v 1.52 2005/04/13 13:12:12 nyan Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index ec9ecd3c33b8..9f02b176d989 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cpu.h,v 1.74 2004/11/16 20:42:31 jhb Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 9a646f6cce22..bdd66af871ac 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.144 2005/05/13 00:05:56 nectar Exp $
  */
 
 /*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index 58d460ddc56e..f5ad637601a7 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -24,7 +24,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/sys/i386/include/cputypes.h,v 1.19 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/cserial.h b/sys/i386/include/cserial.h
index a05ff4b181ba..665e5e0f59f5 100644
--- a/sys/i386/include/cserial.h
+++ b/sys/i386/include/cserial.h
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cserial.h,v 1.1.2.4 2003/11/12 17:11:08 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cserial.h,v 1.2 2005/01/06 22:18:15 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index 27207a8d336b..227c3aa363b8 100644
--- a/sys/i386/include/db_machdep.h
+++ b/sys/i386/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.20 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/elan_mmcr.h b/sys/i386/include/elan_mmcr.h
index a02d4b2c90ff..38ec2a455391 100644
--- a/sys/i386/include/elan_mmcr.h
+++ b/sys/i386/include/elan_mmcr.h
@@ -32,7 +32,7 @@
  * bytes. Ignore fields with the 'pad' prefix - they are only present for
  * alignment purposes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/elan_mmcr.h,v 1.2 2005/01/06 22:05:28 imp Exp $
  */
 
 #ifndef _MACHINE_ELAN_MMCR_H_
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
index c8506ff5c406..1ac3922a8478 100644
--- a/sys/i386/include/elf.h
+++ b/sys/i386/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/elf.h,v 1.16 2004/08/02 19:12:17 dfr Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 59fa4a5e9cc5..0f5b42f54c83 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/endian.h,v 1.41 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 8d07887be252..bd7bac207f27 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/exec.h,v 1.10 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index 52b899f6e4ce..bafe449d4ada 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/float.h,v 1.15 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index cda9e46230ca..a1d874445e37 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/floatingpoint.h,v 1.14 2005/04/02 17:31:42 netchild Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 391b8749c760..97fd02d9c9bf 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/frame.h,v 1.25 2004/07/10 22:11:14 marcel Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/i386/include/gdb_machdep.h b/sys/i386/include/gdb_machdep.h
index 95af8d4a8f1f..6b9a2f5c1bdb 100644
--- a/sys/i386/include/gdb_machdep.h
+++ b/sys/i386/include/gdb_machdep.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/sys/i386/include/gdb_machdep.h,v 1.3 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/i386/include/i4b_cause.h b/sys/i386/include/i4b_cause.h
index 0e94483d48b0..582e562ab17f 100644
--- a/sys/i386/include/i4b_cause.h
+++ b/sys/i386/include/i4b_cause.h
@@ -28,7 +28,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_cause.h,v 1.9 2005/01/06 22:18:15 imp Exp $
  *
  *      last edit-date: [Sun Mar 17 10:08:21 2002]
  *
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index 38ae5ad6230e..a90cdf1f15fd 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -28,7 +28,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_debug.h,v 1.12 2005/01/06 22:18:15 imp Exp $
  *
  *      last edit-date: [Sun Mar 17 10:08:41 2002]
  *
diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h
index bcf131a01890..66bd79a676b1 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -28,7 +28,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_ioctl.h,v 1.22 2005/01/06 22:18:15 imp Exp $
  *
  *      last edit-date: [Sun Aug 11 19:19:08 2002]
  *
diff --git a/sys/i386/include/i4b_rbch_ioctl.h b/sys/i386/include/i4b_rbch_ioctl.h
index 334aa9dc9305..6f73a05e1cef 100644
--- a/sys/i386/include/i4b_rbch_ioctl.h
+++ b/sys/i386/include/i4b_rbch_ioctl.h
@@ -28,7 +28,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_rbch_ioctl.h,v 1.6 2005/01/06 22:18:15 imp Exp $
  *
  *      last edit-date: [Sun Mar 17 10:10:25 2002]
  *
diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h
index 47ffc7075f91..33095b6522da 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -28,7 +28,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_tel_ioctl.h,v 1.10 2005/01/06 22:18:15 imp Exp $
  *
  *      last edit-date: [Sun Mar 17 10:10:39 2002]
  *
diff --git a/sys/i386/include/i4b_trace.h b/sys/i386/include/i4b_trace.h
index fbd40afc2444..f5a439ae7763 100644
--- a/sys/i386/include/i4b_trace.h
+++ b/sys/i386/include/i4b_trace.h
@@ -28,7 +28,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_trace.h,v 1.9 2005/01/06 22:18:15 imp Exp $
  *
  *      last edit-date: [Sun Mar 17 10:10:52 2002]
  *
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index b22d99e0bf55..66d1ce8b0761 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ieeefp.h,v 1.11 2005/03/15 15:53:39 das Exp $
  */
 
 /*
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index c91768131394..02690d6f7a0c 100644
--- a/sys/i386/include/if_wl_wavelan.h
+++ b/sys/i386/include/if_wl_wavelan.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/if_wl_wavelan.h,v 1.7 2005/01/06 22:18:15 imp Exp $ */
 /*-
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index 062c675c8e77..08efe8ac6b19 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -29,7 +29,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.17 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/intr_machdep.h b/sys/i386/include/intr_machdep.h
index ff193467788b..d188eaecdb42 100644
--- a/sys/i386/include/intr_machdep.h
+++ b/sys/i386/include/intr_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.7 2005/01/18 20:24:47 jhb Exp $
  */
 
 #ifndef __MACHINE_INTR_MACHDEP_H__
diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h
index ca83a36cdb5a..b8c0bc3432f8 100644
--- a/sys/i386/include/ioctl_bt848.h
+++ b/sys/i386/include/ioctl_bt848.h
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ioctl_bt848.h,v 1.31 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_BT848_H_
diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h
index 0322f1ede2c1..965480d79156 100644
--- a/sys/i386/include/ioctl_meteor.h
+++ b/sys/i386/include/ioctl_meteor.h
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.16 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_METEOR_H_
diff --git a/sys/i386/include/iodev.h b/sys/i386/include/iodev.h
index 2273620ccba4..3927fba07e37 100644
--- a/sys/i386/include/iodev.h
+++ b/sys/i386/include/iodev.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/sys/i386/include/iodev.h,v 1.1 2004/08/01 11:40:53 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/i386/include/kdb.h b/sys/i386/include/kdb.h
index ae8cb4f855d4..1a47fa3a3045 100644
--- a/sys/i386/include/kdb.h
+++ b/sys/i386/include/kdb.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/sys/i386/include/kdb.h,v 1.2 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/i386/include/legacyvar.h b/sys/i386/include/legacyvar.h
index 91f784f1f143..97bd6ef0c0a3 100644
--- a/sys/i386/include/legacyvar.h
+++ b/sys/i386/include/legacyvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/legacyvar.h,v 1.6.2.1 2005/09/18 02:55:10 imp Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index 35eea1f619de..eb2c4b54f14d 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/limits.h,v 1.27 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 047f75fd6aeb..8e9c42bd510d 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/md_var.h,v 1.72 2005/06/30 06:44:34 peter Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/memdev.h b/sys/i386/include/memdev.h
index 4443e3605cbe..402e595c8222 100644
--- a/sys/i386/include/memdev.h
+++ b/sys/i386/include/memdev.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/sys/i386/include/memdev.h,v 1.1 2004/08/01 11:40:53 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/i386/include/metadata.h b/sys/i386/include/metadata.h
index 84e6f8739970..7bd215cc1304 100644
--- a/sys/i386/include/metadata.h
+++ b/sys/i386/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/metadata.h,v 1.2 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/i386/include/mp_watchdog.h b/sys/i386/include/mp_watchdog.h
index bcec051a942f..cfc0cd22a781 100644
--- a/sys/i386/include/mp_watchdog.h
+++ b/sys/i386/include/mp_watchdog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mp_watchdog.h,v 1.1 2004/08/15 18:02:09 rwatson Exp $
  */
 
 #ifndef	_MACHINE_MP_WATCHDOG_H_
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index aad99ed2d7f7..7fab459d5325 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mptable.h,v 1.222 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef __MACHINE_MPTABLE_H__
diff --git a/sys/i386/include/mutex.h b/sys/i386/include/mutex.h
index 87d47e511ffc..49ae886798a6 100644
--- a/sys/i386/include/mutex.h
+++ b/sys/i386/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mutex.h,v 1.36 2002/03/28 15:14:23 jhb Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 894b06d2063c..69e6a7fb09be 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/npx.h,v 1.29 2005/05/12 12:47:40 nyan Exp $
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 4ef1e8d90ba6..4de9f4283a7d 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/param.h,v 1.79 2004/11/20 02:29:49 das Exp $
  */
 
 /*
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index 4533de75acdc..d69ed5fd610c 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/bios.h,v 1.17.8.1 2005/08/16 22:47:14 phk Exp $
  */
 
 #ifndef _MACHINE_PC_BIOS_H_
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index cd2d5ff35b73..d4aab5b739c4 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/display.h,v 1.7 2005/04/13 13:12:12 nyan Exp $
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index 0e991cd3be43..31a8b8e5cde9 100644
--- a/sys/i386/include/pc/vesa.h
+++ b/sys/i386/include/pc/vesa.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/sys/i386/include/pc/vesa.h,v 1.8 2002/09/23 18:54:31 alfred Exp $
  */
 
 #ifndef _MACHINE_PC_VESA_H
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index 969f910f7f81..0b4e57bfc1e5 100644
--- a/sys/i386/include/pcaudioio.h
+++ b/sys/i386/include/pcaudioio.h
@@ -25,7 +25,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/sys/i386/include/pcaudioio.h,v 1.10 1999/08/28 00:44:20 peter Exp $
  */
 
 #ifndef	_MACHINE_PCAUDIOIO_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index 8a58da2e50f4..2d7d9874c4d7 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcb.h,v 1.55 2005/04/14 04:13:27 peter Exp $
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 81e1bed513b4..d69838ee94c9 100644
--- a/sys/i386/include/pcb_ext.h
+++ b/sys/i386/include/pcb_ext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.9.14.1 2005/09/26 19:38:12 jhb Exp $
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/i386/include/pci_cfgreg.h b/sys/i386/include/pci_cfgreg.h
index b246993aa6d7..2ed4719f1eb2 100644
--- a/sys/i386/include/pci_cfgreg.h
+++ b/sys/i386/include/pci_cfgreg.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/sys/i386/include/pci_cfgreg.h,v 1.14 2005/04/03 23:26:44 imp Exp $
  *
  */
 
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 6312b973834d..8747b79a0e2f 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcpu.h,v 1.44 2005/04/13 22:57:17 peter Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
diff --git a/sys/i386/include/pcvt_ioctl.h b/sys/i386/include/pcvt_ioctl.h
index 721539c6a94f..9d39a03cc4fa 100644
--- a/sys/i386/include/pcvt_ioctl.h
+++ b/sys/i386/include/pcvt_ioctl.h
@@ -49,7 +49,7 @@
  *
  *	Last Edit-Date: [Fri Mar 31 10:22:29 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcvt_ioctl.h,v 1.17 2005/01/06 22:18:15 imp Exp $
  * 
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/include/pecoff_machdep.h b/sys/i386/include/pecoff_machdep.h
index b20cb711dc69..d1056a5637a2 100644
--- a/sys/i386/include/pecoff_machdep.h
+++ b/sys/i386/include/pecoff_machdep.h
@@ -1,5 +1,5 @@
 /* $NetBSD: pecoff_machdep.h,v 1.5 2000/01/10 03:03:54 matt Exp $	 */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/pecoff_machdep.h,v 1.1 2000/12/20 12:50:50 takawata Exp $ */
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index 891c05eb1f05..ecb31f6fb367 100644
--- a/sys/i386/include/perfmon.h
+++ b/sys/i386/include/perfmon.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/perfmon.h,v 1.9 2005/01/06 22:18:15 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 03246589aa4a..15d1fdfb3c77 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -38,7 +38,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pmap.h,v 1.117 2005/06/29 22:28:45 peter Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h
index 2d4c4a363de7..874c979a1c86 100644
--- a/sys/i386/include/pmc_mdep.h
+++ b/sys/i386/include/pmc_mdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.5 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H
diff --git a/sys/i386/include/ppireg.h b/sys/i386/include/ppireg.h
index 5774757ce67a..9c67557839e3 100644
--- a/sys/i386/include/ppireg.h
+++ b/sys/i386/include/ppireg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ppireg.h,v 1.1 2005/05/14 09:10:01 nyan Exp $
  */
 
 #ifndef _MACHINE_PPIREG_H_
diff --git a/sys/i386/include/privatespace.h b/sys/i386/include/privatespace.h
index d5f2bcf3d5fc..26b8d0da5977 100644
--- a/sys/i386/include/privatespace.h
+++ b/sys/i386/include/privatespace.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/privatespace.h,v 1.3 2001/12/11 23:33:40 jhb Exp $
  */
 
 #ifndef _MACHINE_PRIVATESPACE_H_
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index ec2e6b4beefd..cbfc41899070 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/proc.h,v 1.25 2005/04/04 21:53:54 jhb Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index 06418ebad19d..8c62c04f37d8 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/profile.h,v 1.40 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 12d05c5cfdbc..427102b88f2e 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/psl.h,v 1.12 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index 24eb41128c47..052bc41a4b0d 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ptrace.h,v 1.14 2005/05/31 09:43:04 dfr Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index dbafd4b8a789..b4699879a915 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/reg.h,v 1.31 2005/05/31 09:43:04 dfr Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index 188319323399..942c956e2460 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/reloc.h,v 1.8 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/resource.h b/sys/i386/include/resource.h
index edde5eb29908..09886cb97ec1 100644
--- a/sys/i386/include/resource.h
+++ b/sys/i386/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/resource.h,v 1.4 2005/01/06 22:18:15 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/i386/include/runq.h b/sys/i386/include/runq.h
index e906fa192c6c..5643b36dd408 100644
--- a/sys/i386/include/runq.h
+++ b/sys/i386/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/runq.h,v 1.3 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index 351ff5dff8fe..6f785d79e312 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/segments.h,v 1.38 2005/04/13 22:57:17 peter Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/setjmp.h b/sys/i386/include/setjmp.h
index e6e0371d5d1b..c6d2f2c765da 100644
--- a/sys/i386/include/setjmp.h
+++ b/sys/i386/include/setjmp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/setjmp.h,v 1.7 2002/10/05 05:47:55 mike Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/i386/include/sf_buf.h b/sys/i386/include/sf_buf.h
index 9076260e0116..120ee761bc78 100644
--- a/sys/i386/include/sf_buf.h
+++ b/sys/i386/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/sf_buf.h,v 1.4 2005/02/13 06:23:13 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h
index 98be731d8f10..5f658dcac3f4 100644
--- a/sys/i386/include/sigframe.h
+++ b/sys/i386/include/sigframe.h
@@ -25,7 +25,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/sys/i386/include/sigframe.h,v 1.8 2002/10/25 19:10:56 peter Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index cdeedb21c573..4643f3cf5c51 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/signal.h,v 1.22 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/smapi.h b/sys/i386/include/smapi.h
index 63b9927016b2..1d30c1683b78 100644
--- a/sys/i386/include/smapi.h
+++ b/sys/i386/include/smapi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smapi.h,v 1.2 2003/03/24 20:44:39 mdodd Exp $
  */
 
 #ifndef _MACHINE_SMAPI_H_
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index 4c9ae76117a2..bd747337238a 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smp.h,v 1.82 2005/04/30 20:00:59 dwhite Exp $
  *
  */
 
diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h
index 3d60740b75d0..1df290fb4bb9 100644
--- a/sys/i386/include/smptests.h
+++ b/sys/i386/include/smptests.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smptests.h,v 1.47.2.1 2005/10/04 15:15:22 jhb Exp $
  */
 
 #ifndef _MACHINE_SMPTESTS_H_
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 6b1f0211e516..f14117d8c321 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/speaker.h,v 1.7 2002/10/23 10:14:30 markm Exp $
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index 4b91cf933294..482b38b5ae97 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.27 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index a8ef25e62239..6cf6b69df78f 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.20 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index 454d64cb6d63..a32f440d0884 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/sysarch.h,v 1.23 2005/04/13 22:57:17 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/timerreg.h b/sys/i386/include/timerreg.h
index 0ab7d40510a7..2ab41f4aaf27 100644
--- a/sys/i386/include/timerreg.h
+++ b/sys/i386/include/timerreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/timerreg.h,v 1.2 2005/05/28 13:40:26 nyan Exp $
  */
 
 /*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index 2a1e12015a03..9f982d6d8c22 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/trap.h,v 1.14 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index 29907d420498..8dc2910ff801 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/tss.h,v 1.14 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/ucontext.h b/sys/i386/include/ucontext.h
index ec3e0eefaea2..2e43dfff0066 100644
--- a/sys/i386/include/ucontext.h
+++ b/sys/i386/include/ucontext.h
@@ -25,7 +25,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/sys/i386/include/ucontext.h,v 1.10 2002/12/02 19:58:55 deischen Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index a71b2ffc8a04..ddf3ff0c6207 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/varargs.h,v 1.14 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 041504abab18..2b1d233031e6 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/vm86.h,v 1.17 2002/11/07 01:34:23 davidxu Exp $
  */
 
 #ifndef _MACHINE_VM86_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index a94408a5ec27..8b3660ab17df 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/vmparam.h,v 1.39 2004/08/16 08:35:22 obrien Exp $
  */
 
 
diff --git a/sys/i386/isa/atpic.c b/sys/i386/isa/atpic.c
index 8d17ec18679d..e160cb603e02 100644
--- a/sys/i386/isa/atpic.c
+++ b/sys/i386/isa/atpic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.20 2005/05/10 12:02:15 nyan Exp $");
 
 #include "opt_auto_eoi.h"
 #include "opt_isa.h"
diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s
index 52aaded17fa0..8e9ea69a7622 100644
--- a/sys/i386/isa/atpic_vector.s
+++ b/sys/i386/isa/atpic_vector.s
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.47 2004/05/26 07:43:41 bde Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h
index 72375b087db1..c84757e8b40e 100644
--- a/sys/i386/isa/ccbque.h
+++ b/sys/i386/isa/ccbque.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/sys/i386/isa/ccbque.h,v 1.10 2005/01/06 22:18:16 imp Exp $
  */
 /*
  * Common command control queue funcs.
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index a4ae751489fe..23b5cfa85a8f 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.222.2.1 2005/07/18 19:52:04 jhb Exp $");
 
 /*
  * Routines to handle clock hardware.
diff --git a/sys/i386/isa/elcr.c b/sys/i386/isa/elcr.c
index 266d78396db9..95ffec08a4b6 100644
--- a/sys/i386/isa/elcr.c
+++ b/sys/i386/isa/elcr.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/elcr.c,v 1.2 2005/01/18 20:24:47 jhb Exp $");
 
 /*
  * The ELCR is a register that controls the trigger mode and polarity of
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index 5fbfd363192b..184d450c7e87 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/elink.c,v 1.13 2005/01/06 22:18:16 imp Exp $");
 
 /*
  * Common code for dealing with 3COM ethernet cards.
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 9b27088e7899..24413c2cf999 100644
--- a/sys/i386/isa/elink.h
+++ b/sys/i386/isa/elink.h
@@ -26,7 +26,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/sys/i386/isa/elink.h,v 1.9 2005/01/06 22:18:16 imp Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index b8820221dc1b..a1be0f01102b 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/icu.h,v 1.33 2004/05/11 20:23:24 jhb Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index ad174bd165fe..6e11d75f8960 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/if_el.c,v 1.67.2.1 2005/08/25 05:01:18 rwatson Exp $");
 
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
index f7f36d99d3a4..3d68dc5eaa1c 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -5,7 +5,7 @@
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_elreg.h,v 1.9 2005/01/06 22:18:16 imp Exp $
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 175b1e872608..47ec37a1fa6f 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/isa.c,v 1.148 2005/01/06 22:18:16 imp Exp $");
 
 /*-
  * Modifications for Intel architecture by Garrett A. Wollman.
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index ac493b2d8435..30b9742f6fa9 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/isa.h,v 1.30 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/isa_dma.c b/sys/i386/isa/isa_dma.c
index ccfb9c54c77e..7ec18c602f3b 100644
--- a/sys/i386/isa/isa_dma.c
+++ b/sys/i386/isa/isa_dma.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.19 2005/05/14 10:14:56 nyan Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index db5550c63423..1b56e767ffa3 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/nmi.c,v 1.79 2004/04/07 20:46:06 imp Exp $");
 
 #include "opt_mca.h"
 
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index ae2ca9b5bfcf..1c0401c43d21 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.162 2005/07/02 20:06:44 delphij Exp $");
 
 #include "opt_cpu.h"
 #include "opt_isa.h"
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 10ef4ff075cf..fcd41f59cf5b 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/pcf.c,v 1.23 2005/02/25 23:06:25 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/pcvt/pcvt_conf.h b/sys/i386/isa/pcvt/pcvt_conf.h
index 02c229e53743..462cfb222733 100644
--- a/sys/i386/isa/pcvt/pcvt_conf.h
+++ b/sys/i386/isa/pcvt/pcvt_conf.h
@@ -41,7 +41,7 @@
  *
  *	Last Edit-Date: [Fri Mar 31 10:20:27 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_conf.h,v 1.12 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 465067e3de20..a1d7a8904b98 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -50,7 +50,7 @@
  *
  *	Last Edit-Date: [Sat Jul 15 15:06:06 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.91 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_ext.c b/sys/i386/isa/pcvt/pcvt_ext.c
index 7e2f5cf5c14e..9c253565133d 100644
--- a/sys/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/i386/isa/pcvt/pcvt_ext.c
@@ -44,7 +44,7 @@
  *
  * 	Last Edit-Date: [Fri Mar  8 19:57:55 2002]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.35 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 481c0374ba11..b9ef07fa8ba8 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -41,7 +41,7 @@
  *
  *	Last Edit-Date: [Wed Apr  5 18:21:32 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_hdr.h,v 1.55 2005/06/10 20:56:38 marius Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index 9c4d8dc27305..7d1619781ff8 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -47,7 +47,7 @@
  *
  *	Last Edit-Date: [Wed Apr  5 18:16:52 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_kbd.c,v 1.44 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.h b/sys/i386/isa/pcvt/pcvt_kbd.h
index 109dca52b546..7c004f5aa36b 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.h
+++ b/sys/i386/isa/pcvt/pcvt_kbd.h
@@ -47,7 +47,7 @@
  *
  *	Last Edit-Date: [Sun Mar 26 10:38:38 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_kbd.h,v 1.12 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index da32ec50dd07..98e23bddf305 100644
--- a/sys/i386/isa/pcvt/pcvt_out.c
+++ b/sys/i386/isa/pcvt/pcvt_out.c
@@ -44,7 +44,7 @@
  *
  *	Last Edit-Date: [Tue Jun  5 17:27:48 2001]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_out.c,v 1.27 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index a62f54dd935d..30b348617aa6 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -46,7 +46,7 @@
  *
  *	Last Edit-Date: [Wed Apr  5 17:24:20 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_sup.c,v 1.27 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pcvt/pcvt_tbl.h b/sys/i386/isa/pcvt/pcvt_tbl.h
index 8b681681bae3..940a2be2bf28 100644
--- a/sys/i386/isa/pcvt/pcvt_tbl.h
+++ b/sys/i386/isa/pcvt/pcvt_tbl.h
@@ -31,7 +31,7 @@
  *
  *	Last Edit-Date: [Sun Mar 26 10:38:49 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_tbl.h,v 1.9 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*
  *
diff --git a/sys/i386/isa/pcvt/pcvt_vtf.c b/sys/i386/isa/pcvt/pcvt_vtf.c
index ce23f394177c..9fe3505ab7c0 100644
--- a/sys/i386/isa/pcvt/pcvt_vtf.c
+++ b/sys/i386/isa/pcvt/pcvt_vtf.c
@@ -44,7 +44,7 @@
  *
  *	Last Edit-Date: [Sun Mar 26 10:38:52 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_vtf.c,v 1.15 2005/01/06 22:18:17 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i386/isa/pmtimer.c b/sys/i386/isa/pmtimer.c
index 1eeac6ddf46b..3563bb68ab15 100644
--- a/sys/i386/isa/pmtimer.c
+++ b/sys/i386/isa/pmtimer.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.5 2004/05/30 17:57:43 phk Exp $");
 
 /*
  * Timer device driver for power management events.
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index b286d7b1065a..730a14f01fec 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/prof_machdep.c,v 1.25 2005/05/20 17:16:24 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index c3b5f1e1fe9b..db9f24d32641 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/spic.c,v 1.16 2005/01/06 22:18:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/spicreg.h b/sys/i386/isa/spicreg.h
index cbbff1a7d081..1ab8023d5f31 100644
--- a/sys/i386/isa/spicreg.h
+++ b/sys/i386/isa/spicreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/spicreg.h,v 1.4 2005/01/06 22:18:16 imp Exp $
  *
  */
 
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index d265e7c4f0a9..73f2b21274d5 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/spkr.c,v 1.69 2005/05/14 09:10:01 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 5fadfbef4044..254b83701cdf 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/vesa.c,v 1.51.2.1 2005/10/05 21:48:03 marius Exp $");
 
 #include "opt_vga.h"
 #include "opt_vesa.h"
diff --git a/sys/i386/linux/Makefile b/sys/i386/linux/Makefile
index bd6b32a7d4a8..0b123724fc75 100644
--- a/sys/i386/linux/Makefile
+++ b/sys/i386/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/linux/Makefile,v 1.5 2000/11/01 08:47:33 obrien Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index cfc28e9435c4..f1fa9a7fda86 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.54 2005/04/01 20:00:10 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 6ca77b392bb8..fdb36bd7830c 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -25,7 +25,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/sys/i386/linux/linux.h,v 1.64 2005/04/13 04:31:43 mdodd Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 0ff2460d71f1..8ae754869bb7 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_dummy.c,v 1.38 2004/03/28 21:43:27 bms Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c
index 3a36432174b1..dd714850d715 100644
--- a/sys/i386/linux/linux_genassym.c
+++ b/sys/i386/linux/linux_genassym.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_genassym.c,v 1.18 2003/06/02 16:56:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
diff --git a/sys/i386/linux/linux_ipc64.h b/sys/i386/linux/linux_ipc64.h
index 04ff5f45f91b..ea27e72daaeb 100644
--- a/sys/i386/linux/linux_ipc64.h
+++ b/sys/i386/linux/linux_ipc64.h
@@ -25,7 +25,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/sys/i386/linux/linux_ipc64.h,v 1.1 2002/10/11 11:43:09 sobomax Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_IPC64_H_
diff --git a/sys/i386/linux/linux_locore.s b/sys/i386/linux/linux_locore.s
index 1c23b3a370e8..61b9dad2ed45 100644
--- a/sys/i386/linux/linux_locore.s
+++ b/sys/i386/linux/linux_locore.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/linux/linux_locore.s,v 1.11 2001/02/25 06:29:01 jake Exp $ */
 
 #include "linux_assym.h"			/* system definitions */
 #include <machine/asmacros.h>			/* miscellaneous asm macros */
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index 5aea62a7d809..72426dfca0ba 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.48.2.1 2005/08/04 23:25:32 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index f45cba07afa1..4702fb33882c 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.64.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.61.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c
index 94450287132f..2991146a1fa8 100644
--- a/sys/i386/linux/linux_ptrace.c
+++ b/sys/i386/linux/linux_ptrace.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.16 2005/07/02 20:06:44 delphij Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index 565282ef5068..afc85c1e54da 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.58.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.61.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 9ebb38df40ee..dd4dde6dfe11 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.65.2.1 2005/07/20 17:43:53 jhb Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.61.2.1 2005/07/20 17:42:15 jhb Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index c20556f70273..917c43a6dbe2 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.137 2005/02/07 18:37:51 jhb Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/i386/linux/syscalls.conf b/sys/i386/linux/syscalls.conf
index 74b687eb1201..752607432cc8 100644
--- a/sys/i386/linux/syscalls.conf
+++ b/sys/i386/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/linux/syscalls.conf,v 1.6 2003/12/24 00:32:07 peter Exp $
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 694d0121b716..716440511149 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.61.2.1 2005/07/20 17:42:15 jhb Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 0c9fc3b24691..04c5a95771d9 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.119.2.1 2005/09/18 02:55:10 imp Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index adea6dc8037d..31e23d3145c6 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.116 2005/01/06 22:18:17 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index caf5b6e4958c..6a99aa87a237 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_pir.c,v 1.117.2.1 2005/07/18 19:45:21 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/svr4/svr4_genassym.c b/sys/i386/svr4/svr4_genassym.c
index 76e1cc7eb3a9..a96ee6337dc7 100644
--- a/sys/i386/svr4/svr4_genassym.c
+++ b/sys/i386/svr4/svr4_genassym.c
@@ -1,6 +1,6 @@
 /* Derived from:  Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_genassym.c,v 1.9 2003/06/10 05:05:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s
index 6274ad2012b3..1baa65d9f71e 100644
--- a/sys/i386/svr4/svr4_locore.s
+++ b/sys/i386/svr4/svr4_locore.s
@@ -3,7 +3,7 @@
 
 #include <compat/svr4/svr4_syscall.h>		/* system call numbers */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/svr4/svr4_locore.s,v 1.14 2003/04/21 16:30:12 obrien Exp $ */
 	
 NON_GPROF_ENTRY(svr4_sigcode)
 	call	*SVR4_SIGF_HANDLER(%esp)
diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c
index 3b731a23da8e..02ba1a218173 100644
--- a/sys/i386/svr4/svr4_machdep.c
+++ b/sys/i386/svr4/svr4_machdep.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.35 2005/01/06 22:18:17 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/i386/svr4/svr4_machdep.h b/sys/i386/svr4/svr4_machdep.h
index 231ed4c5e690..534e34bd2920 100644
--- a/sys/i386/svr4/svr4_machdep.h
+++ b/sys/i386/svr4/svr4_machdep.h
@@ -25,7 +25,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/sys/i386/svr4/svr4_machdep.h,v 1.10 2005/01/06 22:18:17 imp Exp $
  */
 
 #ifndef	_I386_SVR4_MACHDEP_H_
diff --git a/sys/i4b/capi/README b/sys/i4b/capi/README
index 91685258e161..0ecebabccfcf 100644
--- a/sys/i4b/capi/README
+++ b/sys/i4b/capi/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/i4b/capi/README,v 1.1 2001/05/25 08:39:31 hm Exp $
 
 Message-ID: <3AF56886.7D92609A@cubical.fi>
 Date: Sun, 06 May 2001 18:06:47 +0300
diff --git a/sys/i4b/capi/capi.h b/sys/i4b/capi/capi.h
index c6dc9e87edd9..51b080758d91 100644
--- a/sys/i4b/capi/capi.h
+++ b/sys/i4b/capi/capi.h
@@ -25,7 +25,7 @@
 
 /* capi/capi.h		The CAPI device interface.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/capi.h,v 1.2 2005/01/06 22:18:18 imp Exp $
  */
 
 #ifndef _I4B_CAPI_H_
diff --git a/sys/i4b/capi/capi_l4if.c b/sys/i4b/capi/capi_l4if.c
index 15cdb3726714..0775bfe082de 100644
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.7 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/capi_llif.c b/sys/i4b/capi/capi_llif.c
index e9aaad857379..949dd22d3830 100644
--- a/sys/i4b/capi/capi_llif.c
+++ b/sys/i4b/capi/capi_llif.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.4 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/capi_msgs.c b/sys/i4b/capi/capi_msgs.c
index 2cdeebbbcd70..3b7e49ab95ac 100644
--- a/sys/i4b/capi/capi_msgs.c
+++ b/sys/i4b/capi/capi_msgs.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.5 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/capi_msgs.h b/sys/i4b/capi/capi_msgs.h
index 5d8b3ab1527f..b446d984356e 100644
--- a/sys/i4b/capi/capi_msgs.h
+++ b/sys/i4b/capi/capi_msgs.h
@@ -25,7 +25,7 @@
 
 /* capi/capi_msgs.h	The CAPI i4b message and handler declarations.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/capi_msgs.h,v 1.2 2005/01/06 22:18:18 imp Exp $
  */
 
 #ifndef _I4B_CAPI_MSGS_H_
diff --git a/sys/i4b/capi/iavc/iavc.h b/sys/i4b/capi/iavc/iavc.h
index cfe60a995003..29985add7036 100644
--- a/sys/i4b/capi/iavc/iavc.h
+++ b/sys/i4b/capi/iavc/iavc.h
@@ -25,7 +25,7 @@
 
 /* capi/iavc/iavc.h	The AVM ISDN controllers' common declarations.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/iavc/iavc.h,v 1.3 2005/01/06 22:18:18 imp Exp $
  */
 
 #ifndef _CAPI_IAVC_H_
diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c
index 763c8a063204..56ae8601c97c 100644
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.5 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index 4ebbe7664528..2c5d947d9c38 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.9 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/iavc/iavc_lli.c b/sys/i4b/capi/iavc/iavc_lli.c
index fb19040ab66f..847ad67ab414 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.8 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index d8bcd97a856d..ebff6d243cbb 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.10 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index adbff61e5c12..2a1a7f46f51e 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.26 2005/01/06 22:18:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index a61e1e83d4c1..eb28601db60f 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.24 2005/01/06 22:18:18 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index 7fbebc82ea3e..72b9ccc1db1d 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -55,7 +55,7 @@
  *---------------------------------------------------------------------------*/ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.34.2.1 2005/08/25 05:01:19 rwatson Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 2d9abe8b77c0..8ab094b08b4b 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.30.2.1 2005/08/25 05:01:19 rwatson Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 330d277489fb..a4da5ffd1be5 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.35 2005/01/06 22:18:18 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 6fea6cc62cda..120268e7e52e 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.36 2005/01/06 22:18:18 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 17bf91d778b4..eaf708a0469f 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.32 2005/01/06 22:18:18 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/include/i4b_global.h b/sys/i4b/include/i4b_global.h
index c7bcf319e0e0..95a852ef95a4 100644
--- a/sys/i4b/include/i4b_global.h
+++ b/sys/i4b/include/i4b_global.h
@@ -28,7 +28,7 @@
  *	i4b_global.h - i4b global include file
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_global.h,v 1.13 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sun Mar 17 09:55:26 2002]
  *
diff --git a/sys/i4b/include/i4b_isdnq931.h b/sys/i4b/include/i4b_isdnq931.h
index e5a8a2d143e9..fe92d0ff4a5e 100644
--- a/sys/i4b/include/i4b_isdnq931.h
+++ b/sys/i4b/include/i4b_isdnq931.h
@@ -28,7 +28,7 @@
  *	i4b_isdnq931.h - DSS1 layer 3 message types
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_isdnq931.h,v 1.9 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sat Mar  9 15:53:49 2002]
  *
diff --git a/sys/i4b/include/i4b_l1l2.h b/sys/i4b/include/i4b_l1l2.h
index 8638115dd7e3..3b202513411c 100644
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@@ -28,7 +28,7 @@
  *	i4b_l1l2.h - i4b layer 1 / layer 2 interactions
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l1l2.h,v 1.9 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sat Mar  9 15:54:49 2002]
  *
diff --git a/sys/i4b/include/i4b_l2l3.h b/sys/i4b/include/i4b_l2l3.h
index e866073f9ac5..50339bb860ef 100644
--- a/sys/i4b/include/i4b_l2l3.h
+++ b/sys/i4b/include/i4b_l2l3.h
@@ -28,7 +28,7 @@
  *	i4b_l2l3.h - i4b layer 2 / layer 3 interactions
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l2l3.h,v 1.9 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sat Mar  9 15:55:16 2002]
  *
diff --git a/sys/i4b/include/i4b_l3l4.h b/sys/i4b/include/i4b_l3l4.h
index 08a7c5dc0f5c..8feb4b4d4a37 100644
--- a/sys/i4b/include/i4b_l3l4.h
+++ b/sys/i4b/include/i4b_l3l4.h
@@ -28,7 +28,7 @@
  *	i4b_l3l4.h - layer 3 / layer 4 interface
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l3l4.h,v 1.14 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sun Aug 11 12:52:41 2002]
  *
diff --git a/sys/i4b/include/i4b_mbuf.h b/sys/i4b/include/i4b_mbuf.h
index dbca59067daf..29fba71daad9 100644
--- a/sys/i4b/include/i4b_mbuf.h
+++ b/sys/i4b/include/i4b_mbuf.h
@@ -28,7 +28,7 @@
  *	i4b - mbuf handling support routines
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_mbuf.h,v 1.9 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sat Mar  9 15:58:11 2002]
  *
diff --git a/sys/i4b/layer1/i4b_hdlc.c b/sys/i4b/layer1/i4b_hdlc.c
index 15c22b2f821c..e64eba530185 100644
--- a/sys/i4b/layer1/i4b_hdlc.c
+++ b/sys/i4b/layer1/i4b_hdlc.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_hdlc.c,v 1.3 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/i4b/layer1/i4b_hdlc.h b/sys/i4b/layer1/i4b_hdlc.h
index 83aaf35efc34..6370ce67509e 100644
--- a/sys/i4b/layer1/i4b_hdlc.h
+++ b/sys/i4b/layer1/i4b_hdlc.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_hdlc.h,v 1.5 2000/08/28 07:41:19 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_hdlc.h,v 1.6 2005/01/06 22:18:19 imp Exp $
  *
  *	last edit-date: [Wed Jul 19 09:41:13 2000]
  *
diff --git a/sys/i4b/layer1/i4b_l1.h b/sys/i4b/layer1/i4b_l1.h
index ac6a67162d2c..6b406a8aaea6 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -28,7 +28,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_l1.h,v 1.14 2005/01/06 22:18:19 imp Exp $
  *
  *      last edit-date: [Tue Jan 23 17:04:57 2001]
  *
diff --git a/sys/i4b/layer1/i4b_l1dmux.c b/sys/i4b/layer1/i4b_l1dmux.c
index b1586bb329d5..b3aa18a94719 100644
--- a/sys/i4b/layer1/i4b_l1dmux.c
+++ b/sys/i4b/layer1/i4b_l1dmux.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.8 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/i4b_l1lib.c b/sys/i4b/layer1/i4b_l1lib.c
index 75e9778e1ee7..a16c653e8944 100644
--- a/sys/i4b/layer1/i4b_l1lib.c
+++ b/sys/i4b/layer1/i4b_l1lib.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.5 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h b/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
index 127f1e30cb98..e4ac9ffc6e70 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_ifpi_ext.h,v 1.2 2000/06/02 16:14:36 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *      last edit-date: [Fri Jun  2 14:53:31 2000]
  *
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
index c2cec26d8579..ee15acaae377 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.8 2005/01/06 22:18:19 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
index 84e655acb251..8645920f810d 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.8 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
index 182a93243d89..c1f3c063fbd0 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.8 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index d21737db9064..4843cc466221 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.17 2005/01/06 22:18:19 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h b/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
index 84f44de94bfd..dee201b50371 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
@@ -30,7 +30,7 @@
  *
  *	$Id$
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *
  *---------------------------------------------------------------------------*/
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
index 8a5858185e49..2b6bff495a66 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.5 2005/01/06 22:18:19 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
index 4d6690546bdc..359721be9561 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
@@ -31,7 +31,7 @@
 
 /*---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *
  *---------------------------------------------------------------------------*/
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
index 6ad10a83c4a0..4fe2050af6d6 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c,v 1.6 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
index 674a054593c1..65772f7adae3 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c,v 1.5 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index 17396a039898..12ea5d252742 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.17 2005/01/06 22:18:19 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index cee08b1756bb..a0c99b4168b4 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.12 2005/01/06 22:18:19 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h b/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
index e89dacf0e545..911669af1fd3 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
@@ -31,7 +31,7 @@
  *	$Id: i4b_ifpnp_ext.h,v 1.2 2000/06/02 16:14:36 hm Exp $
  *	$Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_ext.h,v 1.4 2000/04/18 08:03:05 ust Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *      last edit-date: [Fri Jun  2 14:54:57 2000]
  *
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
index 80d88835ea01..874bcb8279f2 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.7 2005/01/06 22:18:19 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
index a235f8d79ace..1e0d46db91c4 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c,v 1.7 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
index 6f2eb4858929..b70d3b6c03fe 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c,v 1.7 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc.h b/sys/i4b/layer1/ihfc/i4b_ihfc.h
index f4d724125b7c..d685d231c608 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc.h
@@ -32,7 +32,7 @@
  *
  *	$Id: i4b_ihfc.h,v 1.9 2000/09/19 13:50:36 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 5cc4e008a4d3..02ba1e6ee2d1 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -35,7 +35,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.16 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
index 9ea6720ecdc1..da3d51da2f9e 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
@@ -32,7 +32,7 @@
  *
  *	$Id: i4b_ihfc_drv.h,v 1.7 2000/09/19 13:50:36 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 #ifndef	I4B_IHFC_DRV_H_
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h b/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
index fde0c87a8cc1..5b3c08e43c71 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
@@ -32,7 +32,7 @@
  *
  *      $Id: i4b_ihfc_ext.h,v 1.6 2000/08/20 07:14:08 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index 72b255550df1..a3528d923946 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.13 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
index ef2c76cbde0f..11ced68a8dee 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
@@ -36,7 +36,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.10 2005/01/06 22:18:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
index ac79f6028ffa..b9a78331592a 100644
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@@ -46,7 +46,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c
index 3ea7753324a0..3527f824619d 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_avm_a1.c,v 1.9 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index e43257a8a160..7e7cba4bfbc4 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_bchan.c,v 1.13 2005/01/06 22:18:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
index e1eb265a571f..50a3410d6234 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.11 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_diva.c b/sys/i4b/layer1/isic/i4b_diva.c
index 8bd332a55427..8cdf03924f61 100644
--- a/sys/i4b/layer1/isic/i4b_diva.c
+++ b/sys/i4b/layer1/isic/i4b_diva.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_diva.c,v 1.4 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c
index c4447dcca810..70b267fe382a 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_drn_ngo.c,v 1.9 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c
index 20fcab4fd1ce..6fa5f22a94d3 100644
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_dynalink.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 /*	NOTES:
 	
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index 7578ad85d0c3..253703230ee9 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.10 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
index 4d81bdbba4b2..2676298ff103 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index a8baf98d2df7..8f50aa5b4bfb 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.14 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index b9055ff08be7..7b41a5693df0 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.c,v 1.11 2005/01/06 22:18:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_hscx.h b/sys/i4b/layer1/isic/i4b_hscx.h
index 890d6b73b6b4..965f429a7540 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.h
+++ b/sys/i4b/layer1/isic/i4b_hscx.h
@@ -31,7 +31,7 @@
 
 /*---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:09:51 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_ipac.h b/sys/i4b/layer1/isic/i4b_ipac.h
index 6361b351f6a3..1ae2fa99a617 100644
--- a/sys/i4b/layer1/isic/i4b_ipac.h
+++ b/sys/i4b/layer1/isic/i4b_ipac.h
@@ -28,7 +28,7 @@
  *	i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
  *	==========================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_ipac.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:10:09 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isac.c b/sys/i4b/layer1/isic/i4b_isac.c
index fdd37e370ffc..0296e7909445 100644
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isac.h b/sys/i4b/layer1/isic/i4b_isac.h
index 7435104eee03..037fcb7541be 100644
--- a/sys/i4b/layer1/isic/i4b_isac.h
+++ b/sys/i4b/layer1/isic/i4b_isac.h
@@ -31,7 +31,7 @@
 
 /*---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:10:42 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isic.c b/sys/i4b/layer1/isic/i4b_isic.c
index 6c16c9009910..d435b21695ce 100644
--- a/sys/i4b/layer1/isic/i4b_isic.c
+++ b/sys/i4b/layer1/isic/i4b_isic.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.c,v 1.7 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isic.h b/sys/i4b/layer1/isic/i4b_isic.h
index d4c3bcec22a6..6acb3fa77f1a 100644
--- a/sys/i4b/layer1/isic/i4b_isic.h
+++ b/sys/i4b/layer1/isic/i4b_isic.h
@@ -28,7 +28,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.h,v 1.5 2005/04/08 03:37:20 nyan Exp $
  *
  *      last edit-date: [Fri Jan 26 13:55:12 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isic_ext.h b/sys/i4b/layer1/isic/i4b_isic_ext.h
index ad99114f71ef..8745cc617312 100644
--- a/sys/i4b/layer1/isic/i4b_isic_ext.h
+++ b/sys/i4b/layer1/isic/i4b_isic_ext.h
@@ -28,7 +28,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_ext.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:11:12 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isic_isa.c b/sys/i4b/layer1/isic/i4b_isic_isa.c
index f4accd73572e..768211cf1621 100644
--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_isa.c,v 1.9 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c
index 562e69adc481..0e76e47cdc56 100644
--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@@ -42,7 +42,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_pnp.c,v 1.12 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c
index efff61b2b443..42cfd61f08b1 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -59,7 +59,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_itk_ix1.c,v 1.10 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c
index f9c62b3c435f..38e4001c4f4a 100644
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_l1.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_l1fsm.c b/sys/i4b/layer1/isic/i4b_l1fsm.c
index 9ba00d688c7b..d93a95766a71 100644
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_l1fsm.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
index 50266af58bd4..9d9056cfff62 100644
--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@@ -41,7 +41,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c
index 65d29f8f7dfd..6a860cc47b20 100644
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@@ -49,7 +49,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_sws.c,v 1.8 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c
index d4f32c14e1a4..dd5b890aeca9 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s016.c,v 1.10 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c
index 4dcc5c4caacd..264cb18f33da 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s0163.c,v 1.9 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c
index 285530b04f79..f4e2623ed349 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s08.c,v 1.10 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c
index c9be86c8ff2f..9a8d24d4f240 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_usr_sti.c,v 1.9 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/itjc/i4b_hdlc.h b/sys/i4b/layer1/itjc/i4b_hdlc.h
index 09c8ddd762b7..ae918928098a 100644
--- a/sys/i4b/layer1/itjc/i4b_hdlc.h
+++ b/sys/i4b/layer1/itjc/i4b_hdlc.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_hdlc.h,v 1.5 2000/08/28 07:41:19 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_hdlc.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *	last edit-date: [Thu Jan 11 11:31:01 2001]
  *
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_ext.h b/sys/i4b/layer1/itjc/i4b_itjc_ext.h
index 4009dde5a651..e4fd7831fd08 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_ext.h
+++ b/sys/i4b/layer1/itjc/i4b_itjc_ext.h
@@ -28,7 +28,7 @@
  *      i4b_itjc - NetJet PCI for split layers
  *      ------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_ext.h,v 1.2 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 10 17:15:31 2001]
  *
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_isac.c b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
index d86bd2bf640a..1131612749ee 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.5 2005/01/06 22:18:20 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1.c b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
index 3e9806b09500..bd16862482dd 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1.c,v 1.5 2005/01/06 22:18:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
index cc6a43d3eee9..0e4184af3fed 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c,v 1.5 2005/01/06 22:18:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index 773a84d55d7b..3851c9edc21d 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.15 2005/05/29 04:42:28 nyan Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic.h b/sys/i4b/layer1/iwic/i4b_iwic.h
index f48811f79895..98df9039ae54 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic.h
+++ b/sys/i4b/layer1/iwic/i4b_iwic.h
@@ -28,7 +28,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Sun Jan 21 11:08:44 2001]
  *
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 208615c1d671..88ca2e1ec288 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.14 2005/01/06 22:18:21 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
index d5a1364c19c6..9e3fb5c630d2 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_dchan.c,v 1.8 2005/01/06 22:18:21 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_ext.h b/sys/i4b/layer1/iwic/i4b_iwic_ext.h
index 0b4389b5982e..0b249df58874 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_ext.h
+++ b/sys/i4b/layer1/iwic/i4b_iwic_ext.h
@@ -28,7 +28,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_ext.h,v 1.3 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sun Jan 21 11:09:14 2001]
  *
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
index a3802b75a2c6..e990d6305d41 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.8 2005/01/06 22:18:21 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
index 233a48aec97b..d6e63f8568c6 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_l1if.c,v 1.9 2005/01/06 22:18:21 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
index 79c36f7cfe25..4354583e0894 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.14 2005/03/19 03:00:22 murray Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_w6692.h b/sys/i4b/layer1/iwic/i4b_w6692.h
index 46e21631857d..49821fd1ac87 100644
--- a/sys/i4b/layer1/iwic/i4b_w6692.h
+++ b/sys/i4b/layer1/iwic/i4b_w6692.h
@@ -28,7 +28,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_w6692.h,v 1.3 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sun Jan 21 11:09:46 2001]
  *
diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c
index 3b4d4231bcf8..08eeea2e24b9 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_iframe.c,v 1.14 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index c6bbc9167cac..c951ca06b9cb 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2.c,v 1.20 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_l2.h b/sys/i4b/layer2/i4b_l2.h
index cb44c9304137..6cdf4c7ec3ac 100644
--- a/sys/i4b/layer2/i4b_l2.h
+++ b/sys/i4b/layer2/i4b_l2.h
@@ -28,7 +28,7 @@
  *	i4b_l2.h - ISDN layer 2 (Q.921) definitions
  *	---------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 16:12:20 2002]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index 57f8b97c9afa..8419e7e15c77 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.c,v 1.17 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_l2fsm.h b/sys/i4b/layer2/i4b_l2fsm.h
index fe47089f2a19..80c353cc14ec 100644
--- a/sys/i4b/layer2/i4b_l2fsm.h
+++ b/sys/i4b/layer2/i4b_l2fsm.h
@@ -28,7 +28,7 @@
  *      i4b_l2fsm.h - layer 2 FSM
  *      -------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 17:47:53 2002]
  *
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index 22d3a9aa4ef7..9c63a5968bfe 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2timer.c,v 1.14 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index 070b7e97cd64..1b671d47d14c 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_lme.c,v 1.15 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 9bc0b686090e..87f6ed828636 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_mbuf.c,v 1.17 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index d1527fc5baab..f9bb705deff9 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_sframe.c,v 1.15 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index b84690aa1296..be6182e12279 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_tei.c,v 1.16 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index 64205e71a584..e02685dc86a1 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_uframe.c,v 1.15 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index c935a37622fb..a0aef9643930 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_util.c,v 1.16 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c
index 9b45405759a2..d66408db1c2f 100644
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.16 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_l3.h b/sys/i4b/layer3/i4b_l3.h
index 22029934efd6..e0f455372075 100644
--- a/sys/i4b/layer3/i4b_l3.h
+++ b/sys/i4b/layer3/i4b_l3.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_l3.h,v 1.11 2000/04/27 09:25:21 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3.h,v 1.8 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Thu Apr 27 11:07:01 2000]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c
index 32f545b81343..ce57d31d83dd 100644
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.c,v 1.18 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_l3fsm.h b/sys/i4b/layer3/i4b_l3fsm.h
index b2a510212b0a..dc24c7e13468 100644
--- a/sys/i4b/layer3/i4b_l3fsm.h
+++ b/sys/i4b/layer3/i4b_l3fsm.h
@@ -28,7 +28,7 @@
  *      i4b_l3fsm.c - layer 3 FSM
  *      -------------------------
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 19:34:51 2002]
  *
diff --git a/sys/i4b/layer3/i4b_l3timer.c b/sys/i4b/layer3/i4b_l3timer.c
index 04c520aa3d9d..b18a85b97f8e 100644
--- a/sys/i4b/layer3/i4b_l3timer.c
+++ b/sys/i4b/layer3/i4b_l3timer.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l3timer.c,v 1.13 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c
index 2d3b616d4fbf..2f5f35ca0c81 100644
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l4if.c,v 1.15 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c
index 4ee17c2a0a9a..d0c9faafa13f 100644
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.18 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_q931.h b/sys/i4b/layer3/i4b_q931.h
index 99dc6efaffb3..8a8d332943ba 100644
--- a/sys/i4b/layer3/i4b_q931.h
+++ b/sys/i4b/layer3/i4b_q931.h
@@ -28,7 +28,7 @@
  *	i4b_q931.h - Q931 handling header file
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q931.h,v 1.11 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Tue Mar 26 15:04:33 2002]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c
index 118dddcffd64..b926b2bed346 100644
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_q932fac.c,v 1.14 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_q932fac.h b/sys/i4b/layer3/i4b_q932fac.h
index ae7915530800..a065f7d2875c 100644
--- a/sys/i4b/layer3/i4b_q932fac.h
+++ b/sys/i4b/layer3/i4b_q932fac.h
@@ -28,7 +28,7 @@
  *	i4b_q932fac.h - Q932 facility handling header file
  *	--------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q932fac.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 19:37:46 2002]
  *
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 16d0ade2c444..822e87de753a 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.43 2005/01/06 22:18:21 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 44a7d4086968..6f1f9505a1d6 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4.c,v 1.19 2005/01/06 22:18:21 imp Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer4/i4b_l4.h b/sys/i4b/layer4/i4b_l4.h
index b02d9ac7c97a..519eaf37f779 100644
--- a/sys/i4b/layer4/i4b_l4.h
+++ b/sys/i4b/layer4/i4b_l4.h
@@ -28,7 +28,7 @@
  *	i4b_l4.h - kernel interface to userland header file
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer4/i4b_l4.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Thu Oct 18 10:11:51 2001]
  *
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index a5cf26be3617..b30f813c40af 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.17 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer4/i4b_l4timer.c b/sys/i4b/layer4/i4b_l4timer.c
index a63472bd2c18..7f5172aedbf6 100644
--- a/sys/i4b/layer4/i4b_l4timer.c
+++ b/sys/i4b/layer4/i4b_l4timer.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4timer.c,v 1.13 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
index 7419e6f8409a..8e8ea44d7c1f 100644
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ b/sys/ia64/acpica/OsdEnvironment.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/acpica/OsdEnvironment.c,v 1.8 2004/09/19 03:50:46 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/linker_set.h>
diff --git a/sys/ia64/acpica/acpi_machdep.c b/sys/ia64/acpica/acpi_machdep.c
index 22377f8c8cb0..057606e3ed6a 100644
--- a/sys/ia64/acpica/acpi_machdep.c
+++ b/sys/ia64/acpica/acpi_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/acpica/acpi_machdep.c,v 1.5 2004/10/11 05:39:14 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/acpica/acpi_wakeup.c b/sys/ia64/acpica/acpi_wakeup.c
index 1382acc93fe0..4bb93e76762e 100644
--- a/sys/ia64/acpica/acpi_wakeup.c
+++ b/sys/ia64/acpica/acpi_wakeup.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/acpica/acpi_wakeup.c,v 1.2 2003/08/28 16:30:31 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/acpica/madt.c b/sys/ia64/acpica/madt.c
index ad1205e0f6eb..1f5742fbdfaf 100644
--- a/sys/ia64/acpica/madt.c
+++ b/sys/ia64/acpica/madt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/acpica/madt.c,v 1.18 2004/05/01 04:08:14 marcel Exp $
  */
 
 #include "acpi.h"
diff --git a/sys/ia64/compile/.cvsignore b/sys/ia64/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/ia64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/ia64/conf/.cvsignore b/sys/ia64/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/ia64/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 560e92d449c8..815e005a1720 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.72.2.2 2005/09/13 21:07:14 marcel Exp $
 
 machine		ia64
 cpu		ITANIUM
diff --git a/sys/ia64/conf/GENERIC.hints b/sys/ia64/conf/GENERIC.hints
index ee222500e0d7..8de10ee51c81 100644
--- a/sys/ia64/conf/GENERIC.hints
+++ b/sys/ia64/conf/GENERIC.hints
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.8 2004/11/14 23:42:48 marcel Exp $
 hw.uart.console="io:0x3f8"
diff --git a/sys/ia64/conf/Makefile b/sys/ia64/conf/Makefile
index 2c006e9c2c80..be768e7ffbc9 100644
--- a/sys/ia64/conf/Makefile
+++ b/sys/ia64/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/Makefile,v 1.1 2003/08/23 21:47:32 marcel Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/ia64/conf/NOTES b/sys/ia64/conf/NOTES
index 289f576ec372..3ecba3469859 100644
--- a/sys/ia64/conf/NOTES
+++ b/sys/ia64/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/NOTES,v 1.8 2005/02/25 07:10:37 delphij Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index 53bc6816437d..7cc5f4a7bc5f 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -17,7 +17,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check
 # first in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/SKI,v 1.21 2004/09/12 05:50:32 marcel Exp $
 
 machine 	ia64
 cpu		ITANIUM
diff --git a/sys/ia64/disasm/disasm.h b/sys/ia64/disasm/disasm.h
index d29e7e9b65e9..7aa9c2530e38 100644
--- a/sys/ia64/disasm/disasm.h
+++ b/sys/ia64/disasm/disasm.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/sys/ia64/disasm/disasm.h,v 1.3 2005/01/06 22:18:22 imp Exp $
  */
 
 #ifndef _DISASM_H_
diff --git a/sys/ia64/disasm/disasm_decode.c b/sys/ia64/disasm/disasm_decode.c
index 3da345b39ca8..359855893e4d 100644
--- a/sys/ia64/disasm/disasm_decode.c
+++ b/sys/ia64/disasm/disasm_decode.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/disasm/disasm_decode.c,v 1.3 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/disasm/disasm_extract.c b/sys/ia64/disasm/disasm_extract.c
index 6321ea03027c..4822d12759ba 100644
--- a/sys/ia64/disasm/disasm_extract.c
+++ b/sys/ia64/disasm/disasm_extract.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/disasm/disasm_extract.c,v 1.2 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/disasm/disasm_format.c b/sys/ia64/disasm/disasm_format.c
index ae5d4381a6c2..305997f841ae 100644
--- a/sys/ia64/disasm/disasm_format.c
+++ b/sys/ia64/disasm/disasm_format.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/disasm/disasm_format.c,v 1.2 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/disasm/disasm_int.h b/sys/ia64/disasm/disasm_int.h
index b0a8cd6ae1d5..c9ac428a8f45 100644
--- a/sys/ia64/disasm/disasm_int.h
+++ b/sys/ia64/disasm/disasm_int.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/sys/ia64/disasm/disasm_int.h,v 1.2 2005/01/06 22:18:22 imp Exp $
  */
 
 #ifndef _DISASM_INT_H_
diff --git a/sys/ia64/ia32/ia32_reg.c b/sys/ia64/ia32/ia32_reg.c
index dde8b89f8c81..ce2bac58b853 100644
--- a/sys/ia64/ia32/ia32_reg.c
+++ b/sys/ia64/ia32/ia32_reg.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:22 peter Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:22 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia32/ia32_signal.c b/sys/ia64/ia32/ia32_signal.c
index 913cd15accad..db44f11f68b2 100644
--- a/sys/ia64/ia32/ia32_signal.c
+++ b/sys/ia64/ia32/ia32_signal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia32/ia32_signal.c,v 1.7 2003/12/18 06:59:18 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/ia64/ia32/ia32_sigtramp.c b/sys/ia64/ia32/ia32_sigtramp.c
index 7934df1dde01..0a744a13d5cb 100644
--- a/sys/ia64/ia32/ia32_sigtramp.c
+++ b/sys/ia64/ia32/ia32_sigtramp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia32/ia32_sigtramp.c,v 1.1 2003/12/11 01:05:09 peter Exp $
  */
 
 char ia32_sigcode[] = {
diff --git a/sys/ia64/ia32/ia32_trap.c b/sys/ia64/ia32/ia32_trap.c
index 58a805f60079..a1c098cabc96 100644
--- a/sys/ia64/ia32/ia32_trap.c
+++ b/sys/ia64/ia32/ia32_trap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.5 2005/04/12 23:18:54 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/autoconf.c b/sys/ia64/ia64/autoconf.c
index 5a380516320b..079d11a9e9fd 100644
--- a/sys/ia64/ia64/autoconf.c
+++ b/sys/ia64/ia64/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/autoconf.c,v 1.23 2005/05/29 23:44:22 marcel Exp $
  */
 
 #include "opt_bootp.h"
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index 911e9e7a0dc0..2e3e957cdcc0 100644
--- a/sys/ia64/ia64/busdma_machdep.c
+++ b/sys/ia64/ia64/busdma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/busdma_machdep.c,v 1.39 2005/03/07 02:18:52 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c
index 434f2391b813..a34ff7f41b7b 100644
--- a/sys/ia64/ia64/clock.c
+++ b/sys/ia64/ia64/clock.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.25 2005/04/22 05:04:58 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/ia64/context.S b/sys/ia64/ia64/context.S
index 77a1821f789a..07e549c462d7 100644
--- a/sys/ia64/ia64/context.S
+++ b/sys/ia64/ia64/context.S
@@ -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/sys/ia64/ia64/context.S,v 1.4 2005/01/06 22:18:22 imp Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/db_interface.c b/sys/ia64/ia64/db_interface.c
index 6d8a188a33d4..95341ac5929b 100644
--- a/sys/ia64/ia64/db_interface.c
+++ b/sys/ia64/ia64/db_interface.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/db_interface.c,v 1.27 2005/07/02 23:52:36 marcel Exp $");
 
 /*
  * Interface to DDB.
diff --git a/sys/ia64/ia64/db_trace.c b/sys/ia64/ia64/db_trace.c
index 1dae4da1b3fe..b684abaac336 100644
--- a/sys/ia64/ia64/db_trace.c
+++ b/sys/ia64/ia64/db_trace.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/ia64/db_trace.c,v 1.23 2005/04/16 05:38:59 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/dump_machdep.c b/sys/ia64/ia64/dump_machdep.c
index 26ce91065da4..fc0127003f61 100644
--- a/sys/ia64/ia64/dump_machdep.c
+++ b/sys/ia64/ia64/dump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.13 2005/07/02 19:57:31 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/efi.c b/sys/ia64/ia64/efi.c
index a10c208c4172..f64df7fe50cc 100644
--- a/sys/ia64/ia64/efi.c
+++ b/sys/ia64/ia64/efi.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/efi.c,v 1.5 2004/09/19 03:50:46 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/elf_machdep.c b/sys/ia64/ia64/elf_machdep.c
index 51902ec4d42e..6d87c6cb17f8 100644
--- a/sys/ia64/ia64/elf_machdep.c
+++ b/sys/ia64/ia64/elf_machdep.c
@@ -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/sys/ia64/ia64/elf_machdep.c,v 1.19.8.1 2005/09/13 20:54:00 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/exception.S b/sys/ia64/ia64/exception.S
index 96ed2de8bab7..4b170042522e 100644
--- a/sys/ia64/ia64/exception.S
+++ b/sys/ia64/ia64/exception.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/exception.S,v 1.56.2.1 2005/09/13 21:07:14 marcel Exp $");
 
 #include <machine/pte.h>
 #include <assym.s>
diff --git a/sys/ia64/ia64/gdb_machdep.c b/sys/ia64/ia64/gdb_machdep.c
index a30c4aa004a9..bc13fd2562c2 100644
--- a/sys/ia64/ia64/gdb_machdep.c
+++ b/sys/ia64/ia64/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/gdb_machdep.c,v 1.4 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
index 536c8b39f3e5..32b13e3b406b 100644
--- a/sys/ia64/ia64/genassym.c
+++ b/sys/ia64/ia64/genassym.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.41 2004/11/20 02:28:14 das Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/ia64/ia64/in_cksum.c b/sys/ia64/ia64/in_cksum.c
index 6c9959fe9fa1..afd1439d3bc6 100644
--- a/sys/ia64/ia64/in_cksum.c
+++ b/sys/ia64/ia64/in_cksum.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/ia64/in_cksum.c,v 1.4 2005/01/06 22:18:22 imp Exp $ */
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
 /*-
diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c
index 0c83d97117f2..41c2bf7d24bd 100644
--- a/sys/ia64/ia64/interrupt.c
+++ b/sys/ia64/ia64/interrupt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.49.2.1 2005/09/13 21:07:14 marcel Exp $ */
 /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
 
 /*-
diff --git a/sys/ia64/ia64/locore.S b/sys/ia64/ia64/locore.S
index 29684943a451..e9120d34ce59 100644
--- a/sys/ia64/ia64/locore.S
+++ b/sys/ia64/ia64/locore.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/locore.S,v 1.38 2004/09/23 00:05:20 marcel Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index 2baf57dd006c..22b3355e5e2d 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.200.2.1 2005/09/13 21:07:14 marcel Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
index 9f67dbed1c17..11059fa290e9 100644
--- a/sys/ia64/ia64/mca.c
+++ b/sys/ia64/ia64/mca.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/sys/ia64/ia64/mca.c,v 1.10 2005/02/09 04:48:23 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c
index 6c5cbe7a9a79..fa61685783e4 100644
--- a/sys/ia64/ia64/mem.c
+++ b/sys/ia64/ia64/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/mem.c,v 1.21 2004/08/02 18:37:55 marcel Exp $");
 
 /*
  * Memory special file
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index dedc395ec5aa..de7f7bc6911f 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.55.2.1 2005/09/13 21:07:14 marcel Exp $");
 
 #include "opt_kstack_pages.h"
 
diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c
index fbdec4a86871..d2a5ab8a890f 100644
--- a/sys/ia64/ia64/nexus.c
+++ b/sys/ia64/ia64/nexus.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.11 2005/03/20 06:55:49 njl Exp $
  */
 
 /*
diff --git a/sys/ia64/ia64/pal.S b/sys/ia64/ia64/pal.S
index eca57accf404..df223ca34f19 100644
--- a/sys/ia64/ia64/pal.S
+++ b/sys/ia64/ia64/pal.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/ia64/pal.S,v 1.8 2003/07/02 12:57:07 ru Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 4fe521386d93..d4fdef7cc9cb 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.160.2.1.2.1 2005/10/28 06:49:19 ade Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/ia64/ptrace_machdep.c b/sys/ia64/ia64/ptrace_machdep.c
index c7c510480494..90e02decf903 100644
--- a/sys/ia64/ia64/ptrace_machdep.c
+++ b/sys/ia64/ia64/ptrace_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/ptrace_machdep.c,v 1.4 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/sal.c b/sys/ia64/ia64/sal.c
index 251c1ee82577..c6037b064e67 100644
--- a/sys/ia64/ia64/sal.c
+++ b/sys/ia64/ia64/sal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/sal.c,v 1.14.2.1 2005/09/13 21:07:14 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/sapic.c b/sys/ia64/ia64/sapic.c
index 0001f8c9f5c0..17a4bd47e320 100644
--- a/sys/ia64/ia64/sapic.c
+++ b/sys/ia64/ia64/sapic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/sapic.c,v 1.13 2003/09/10 22:49:38 marcel Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/ia64/ia64/setjmp.S b/sys/ia64/ia64/setjmp.S
index 82d02194e238..3b02a6f651bc 100644
--- a/sys/ia64/ia64/setjmp.S
+++ b/sys/ia64/ia64/setjmp.S
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/sys/ia64/ia64/setjmp.S,v 1.3 2005/01/06 22:18:22 imp Exp $
 
 //-
 // Copyright (c) 1999, 2000
diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c
index 6fc3a1b19057..ddec3201967d 100644
--- a/sys/ia64/ia64/ssc.c
+++ b/sys/ia64/ia64/ssc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/ia64/ssc.c,v 1.24 2004/10/18 21:51:26 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c
index 6083071fbb77..30ee863987d4 100644
--- a/sys/ia64/ia64/sscdisk.c
+++ b/sys/ia64/ia64/sscdisk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/sscdisk.c,v 1.32 2005/01/06 22:18:22 imp Exp $
  *
  */
 
diff --git a/sys/ia64/ia64/support.S b/sys/ia64/ia64/support.S
index 95686b34bcbd..c410b8c73f5f 100644
--- a/sys/ia64/ia64/support.S
+++ b/sys/ia64/ia64/support.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/support.S,v 1.25 2005/01/06 22:18:22 imp Exp $
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/ia64/ia64/sys_machdep.c b/sys/ia64/ia64/sys_machdep.c
index d4dcc1fd536a..d6d280525de6 100644
--- a/sys/ia64/ia64/sys_machdep.c
+++ b/sys/ia64/ia64/sys_machdep.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/sys_machdep.c,v 1.8 2003/10/27 22:54:34 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/syscall.S b/sys/ia64/ia64/syscall.S
index 7b279078883d..31be2b867451 100644
--- a/sys/ia64/ia64/syscall.S
+++ b/sys/ia64/ia64/syscall.S
@@ -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/sys/ia64/ia64/syscall.S,v 1.14 2005/01/06 22:18:22 imp Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index d68482413912..df0ef774bb19 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.113.2.1 2005/09/13 21:07:14 marcel Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
diff --git a/sys/ia64/ia64/uio_machdep.c b/sys/ia64/ia64/uio_machdep.c
index 30f6250b0e2e..0de5ea9f3d6b 100644
--- a/sys/ia64/ia64/uio_machdep.c
+++ b/sys/ia64/ia64/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/uio_machdep.c,v 1.5 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/ia64/uma_machdep.c b/sys/ia64/ia64/uma_machdep.c
index 2140675c28de..18e03e7d89a8 100644
--- a/sys/ia64/ia64/uma_machdep.c
+++ b/sys/ia64/ia64/uma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/uma_machdep.c,v 1.2 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/ia64/ia64/unaligned.c b/sys/ia64/ia64/unaligned.c
index 2635a9605adb..551482b90e12 100644
--- a/sys/ia64/ia64/unaligned.c
+++ b/sys/ia64/ia64/unaligned.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/unaligned.c,v 1.11 2005/01/27 06:01:44 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/unwind.c b/sys/ia64/ia64/unwind.c
index 6343ed848e1d..b273a85a7ce4 100644
--- a/sys/ia64/ia64/unwind.c
+++ b/sys/ia64/ia64/unwind.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/unwind.c,v 1.14 2005/04/16 05:38:59 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
index c29e9d73fa3f..73ca2ecdafe5 100644
--- a/sys/ia64/ia64/vm_machdep.c
+++ b/sys/ia64/ia64/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.90.2.1 2005/09/13 21:07:14 marcel Exp $
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/ia64/include/_bus.h b/sys/ia64/include/_bus.h
index 95d94b40387f..5c6afeb37d64 100644
--- a/sys/ia64/include/_bus.h
+++ b/sys/ia64/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef IA64_INCLUDE__BUS_H
diff --git a/sys/ia64/include/_inttypes.h b/sys/ia64/include/_inttypes.h
index e6b2536ff379..f4069c5eee84 100644
--- a/sys/ia64/include/_inttypes.h
+++ b/sys/ia64/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/ia64/include/_limits.h b/sys/ia64/include/_limits.h
index 581a9db34a69..5117887d360e 100644
--- a/sys/ia64/include/_limits.h
+++ b/sys/ia64/include/_limits.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/_limits.h,v 1.13 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/_regset.h b/sys/ia64/include/_regset.h
index 1abe2ab06163..42a1ca300b77 100644
--- a/sys/ia64/include/_regset.h
+++ b/sys/ia64/include/_regset.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/sys/ia64/include/_regset.h,v 1.5 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_REGSET_H_
diff --git a/sys/ia64/include/_stdint.h b/sys/ia64/include/_stdint.h
index 1aed3e3b4efc..f44eb8ba4667 100644
--- a/sys/ia64/include/_stdint.h
+++ b/sys/ia64/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_
diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h
index 8fc1be2f3873..a3c0cad40bfc 100644
--- a/sys/ia64/include/_types.h
+++ b/sys/ia64/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_types.h,v 1.9 2005/03/02 21:33:27 joerg Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/ia64/include/acpica_machdep.h b/sys/ia64/include/acpica_machdep.h
index f04efe048ea1..7596854e2e05 100644
--- a/sys/ia64/include/acpica_machdep.h
+++ b/sys/ia64/include/acpica_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.4 2004/10/11 05:39:15 njl Exp $
  */
 
 /******************************************************************************
diff --git a/sys/ia64/include/asm.h b/sys/ia64/include/asm.h
index 0e50d47ae5e8..0795ebbea58d 100644
--- a/sys/ia64/include/asm.h
+++ b/sys/ia64/include/asm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/asm.h,v 1.13 2005/01/31 08:16:12 imp Exp $ */
 /* From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp */
 
 /*-
diff --git a/sys/ia64/include/atomic.h b/sys/ia64/include/atomic.h
index f6601808a9c5..ceb86776112e 100644
--- a/sys/ia64/include/atomic.h
+++ b/sys/ia64/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/atomic.h,v 1.8.2.2 2005/10/06 18:12:05 jhb Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/ia64/include/bootinfo.h b/sys/ia64/include/bootinfo.h
index 2a065e913e6f..437aeff96234 100644
--- a/sys/ia64/include/bootinfo.h
+++ b/sys/ia64/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.8 2005/01/06 22:18:23 imp Exp $ */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/ia64/include/bus.h b/sys/ia64/include/bus.h
index 02fe8bee1056..986e5e90b065 100644
--- a/sys/ia64/include/bus.h
+++ b/sys/ia64/include/bus.h
@@ -67,7 +67,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/sys/ia64/include/bus.h,v 1.22 2005/05/29 04:42:28 nyan Exp $ */
 
 #ifndef _MACHINE_BUS_H_
 #define _MACHINE_BUS_H_
diff --git a/sys/ia64/include/bus_dma.h b/sys/ia64/include/bus_dma.h
index 0a80f2fd56d8..16f79b5894b1 100644
--- a/sys/ia64/include/bus_dma.h
+++ b/sys/ia64/include/bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/bus_dma.h,v 1.1 2005/03/14 16:46:27 scottl Exp $ */
 
 #ifndef _IA64_BUS_DMA_H_
 #define _IA64_BUS_DMA_H_
diff --git a/sys/ia64/include/clock.h b/sys/ia64/include/clock.h
index b05815830633..d10075c8c34e 100644
--- a/sys/ia64/include/clock.h
+++ b/sys/ia64/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/clock.h,v 1.10 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/ia64/include/cpu.h b/sys/ia64/include/cpu.h
index 424360acf825..755ed827a7f8 100644
--- a/sys/ia64/include/cpu.h
+++ b/sys/ia64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.46 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
 
 /*-
diff --git a/sys/ia64/include/cpufunc.h b/sys/ia64/include/cpufunc.h
index 27d66ef63947..f1480fac98e1 100644
--- a/sys/ia64/include/cpufunc.h
+++ b/sys/ia64/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/cpufunc.h,v 1.22 2005/03/02 21:33:27 joerg Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/ia64/include/db_machdep.h b/sys/ia64/include/db_machdep.h
index cbf01a70e59f..29fcccb90415 100644
--- a/sys/ia64/include/db_machdep.h
+++ b/sys/ia64/include/db_machdep.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/sys/ia64/include/db_machdep.h,v 1.12 2005/07/02 23:52:36 marcel Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/ia64/include/dig64.h b/sys/ia64/include/dig64.h
index e8362ad735cd..184a310f38e6 100644
--- a/sys/ia64/include/dig64.h
+++ b/sys/ia64/include/dig64.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/sys/ia64/include/dig64.h,v 1.2 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_DIG64_H_
diff --git a/sys/ia64/include/efi.h b/sys/ia64/include/efi.h
index fe0052367f33..81de6014605e 100644
--- a/sys/ia64/include/efi.h
+++ b/sys/ia64/include/efi.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/sys/ia64/include/efi.h,v 1.8 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_EFI_H_
diff --git a/sys/ia64/include/elf.h b/sys/ia64/include/elf.h
index 6babea9c6ca5..6bc4aa735567 100644
--- a/sys/ia64/include/elf.h
+++ b/sys/ia64/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/elf.h,v 1.11 2003/09/25 01:10:24 peter Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/ia64/include/endian.h b/sys/ia64/include/endian.h
index 5b3d9788fe69..80fae3790d67 100644
--- a/sys/ia64/include/endian.h
+++ b/sys/ia64/include/endian.h
@@ -28,7 +28,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  *	$NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/endian.h,v 1.14 2005/03/02 21:33:27 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/ia64/include/exec.h b/sys/ia64/include/exec.h
index 694dd678c8ac..953fa87d124a 100644
--- a/sys/ia64/include/exec.h
+++ b/sys/ia64/include/exec.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/exec.h,v 1.3 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/ia64/include/float.h b/sys/ia64/include/float.h
index 6f7baa2ec2cc..13b436190b75 100644
--- a/sys/ia64/include/float.h
+++ b/sys/ia64/include/float.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/float.h,v 1.8 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
 
 /*-
diff --git a/sys/ia64/include/floatingpoint.h b/sys/ia64/include/floatingpoint.h
index 22a9f485dba6..467bc421ca50 100644
--- a/sys/ia64/include/floatingpoint.h
+++ b/sys/ia64/include/floatingpoint.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/floatingpoint.h,v 1.2 2005/01/06 22:18:23 imp Exp $
  */
 
 #include <machine/ieeefp.h>
diff --git a/sys/ia64/include/fpu.h b/sys/ia64/include/fpu.h
index 7a068ddf0fcd..84b5dc90e74e 100644
--- a/sys/ia64/include/fpu.h
+++ b/sys/ia64/include/fpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/fpu.h,v 1.3 2004/12/11 06:15:12 marcel Exp $
  */
 
 #ifndef _MACHINE_FPU_H_
diff --git a/sys/ia64/include/frame.h b/sys/ia64/include/frame.h
index 262a8bfd6457..f31bc2410048 100644
--- a/sys/ia64/include/frame.h
+++ b/sys/ia64/include/frame.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/frame.h,v 1.5 2003/05/16 21:26:41 marcel Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/ia64/include/gdb_machdep.h b/sys/ia64/include/gdb_machdep.h
index bc6ec4c66a2e..74420664ab72 100644
--- a/sys/ia64/include/gdb_machdep.h
+++ b/sys/ia64/include/gdb_machdep.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/sys/ia64/include/gdb_machdep.h,v 1.4 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/ia64/include/ia64_cpu.h b/sys/ia64/include/ia64_cpu.h
index 4f5c318e4caf..c331b96db8d5 100644
--- a/sys/ia64/include/ia64_cpu.h
+++ b/sys/ia64/include/ia64_cpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/ia64_cpu.h,v 1.19.10.1 2005/09/13 21:07:14 marcel Exp $
  */
 
 #ifndef _MACHINE_IA64_CPU_H_
diff --git a/sys/ia64/include/ieee.h b/sys/ia64/include/ieee.h
index 0b1f6312bead..891bcf84bf18 100644
--- a/sys/ia64/include/ieee.h
+++ b/sys/ia64/include/ieee.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/ieee.h,v 1.3 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/ieeefp.h b/sys/ia64/include/ieeefp.h
index a97926bdcfd6..ff7575922dee 100644
--- a/sys/ia64/include/ieeefp.h
+++ b/sys/ia64/include/ieeefp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/ieeefp.h,v 1.4 2003/08/11 21:25:19 marcel Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/ia64/include/in_cksum.h b/sys/ia64/include/in_cksum.h
index 09920062a0ae..e62a1163e307 100644
--- a/sys/ia64/include/in_cksum.h
+++ b/sys/ia64/include/in_cksum.h
@@ -29,7 +29,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/in_cksum.h,v 1.3 2005/03/02 21:33:27 joerg Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/ia64/include/intr.h b/sys/ia64/include/intr.h
index 90e0974b7df2..dc6c03b726a8 100644
--- a/sys/ia64/include/intr.h
+++ b/sys/ia64/include/intr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/intr.h,v 1.3 2003/01/05 22:14:30 marcel Exp $
  */
 
 #ifndef _MACHINE_INTR_H_
diff --git a/sys/ia64/include/intrcnt.h b/sys/ia64/include/intrcnt.h
index c4f73c014306..efaadb418a28 100644
--- a/sys/ia64/include/intrcnt.h
+++ b/sys/ia64/include/intrcnt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/intrcnt.h,v 1.6 2005/01/06 22:18:23 imp Exp $ */
 /* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
 
 /*-
diff --git a/sys/ia64/include/kdb.h b/sys/ia64/include/kdb.h
index 700a0d7fb6d8..554602f6f343 100644
--- a/sys/ia64/include/kdb.h
+++ b/sys/ia64/include/kdb.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/sys/ia64/include/kdb.h,v 1.2 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/ia64/include/limits.h b/sys/ia64/include/limits.h
index 62772bcc48b1..816bccf1573e 100644
--- a/sys/ia64/include/limits.h
+++ b/sys/ia64/include/limits.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/limits.h,v 1.13 2005/03/02 21:33:27 joerg Exp $ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/mca.h b/sys/ia64/include/mca.h
index 997c2212bd9d..894d1e3f30d7 100644
--- a/sys/ia64/include/mca.h
+++ b/sys/ia64/include/mca.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/sys/ia64/include/mca.h,v 1.6 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_MCA_H_
diff --git a/sys/ia64/include/md_var.h b/sys/ia64/include/md_var.h
index eef42402bf74..b33a50477627 100644
--- a/sys/ia64/include/md_var.h
+++ b/sys/ia64/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.22 2005/07/05 17:12:18 marcel Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/ia64/include/memdev.h b/sys/ia64/include/memdev.h
index 32cc1fc1f422..6c293f847d25 100644
--- a/sys/ia64/include/memdev.h
+++ b/sys/ia64/include/memdev.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/sys/ia64/include/memdev.h,v 1.2 2004/08/01 18:51:44 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/ia64/include/mutex.h b/sys/ia64/include/mutex.h
index 96d8f3d48a82..83ec78609cc6 100644
--- a/sys/ia64/include/mutex.h
+++ b/sys/ia64/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/mutex.h,v 1.16 2001/12/18 00:27:16 jhb Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/ia64/include/nexusvar.h b/sys/ia64/include/nexusvar.h
index be38f33a0753..a942bfe5cabf 100644
--- a/sys/ia64/include/nexusvar.h
+++ b/sys/ia64/include/nexusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/nexusvar.h,v 1.2 2002/08/22 19:47:10 mux Exp $
  */
 
 #ifndef _MACHINE_NEXUSVAR_H_
diff --git a/sys/ia64/include/pal.h b/sys/ia64/include/pal.h
index 6cb865d60ed7..7d792ac2bd9d 100644
--- a/sys/ia64/include/pal.h
+++ b/sys/ia64/include/pal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/pal.h,v 1.5 2001/10/21 05:52:54 marcel Exp $
  */
 
 #ifndef _MACHINE_PAL_H_
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
index 9c849d09c08f..0b42e92149bf 100644
--- a/sys/ia64/include/param.h
+++ b/sys/ia64/include/param.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/param.h,v 1.20.2.1 2005/09/13 21:07:14 marcel Exp $ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*-
diff --git a/sys/ia64/include/pc/display.h b/sys/ia64/include/pc/display.h
index fad568c0cb81..b622d88c1885 100644
--- a/sys/ia64/include/pc/display.h
+++ b/sys/ia64/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pc/display.h,v 1.1 2000/09/29 13:48:14 dfr Exp $
  *	from: i386/include/pc display.h,v 1.4
  */
 
diff --git a/sys/ia64/include/pcb.h b/sys/ia64/include/pcb.h
index 5d250bfeefdc..60bd6c5508d7 100644
--- a/sys/ia64/include/pcb.h
+++ b/sys/ia64/include/pcb.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/pcb.h,v 1.16 2004/08/16 19:05:08 marcel Exp $
  */
 
 #ifndef _MACHINE_PCB_H_
diff --git a/sys/ia64/include/pci_cfgreg.h b/sys/ia64/include/pci_cfgreg.h
index b4d2702b54ee..121298df073f 100644
--- a/sys/ia64/include/pci_cfgreg.h
+++ b/sys/ia64/include/pci_cfgreg.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/sys/ia64/include/pci_cfgreg.h,v 1.2 2005/01/06 22:18:23 imp Exp $
  *
  */
 
diff --git a/sys/ia64/include/pcpu.h b/sys/ia64/include/pcpu.h
index beb934b1052e..f77cd1c01328 100644
--- a/sys/ia64/include/pcpu.h
+++ b/sys/ia64/include/pcpu.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pcpu.h,v 1.17 2003/11/17 03:40:41 bde Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/ia64/include/pmap.h b/sys/ia64/include/pmap.h
index 173d714b2858..d38e215ea60d 100644
--- a/sys/ia64/include/pmap.h
+++ b/sys/ia64/include/pmap.h
@@ -39,7 +39,7 @@
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
  *	from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.24.2.1 2005/09/13 21:07:14 marcel Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/ia64/include/pmc_mdep.h b/sys/ia64/include/pmc_mdep.h
index cf643c7b4f39..6a87d300c9bb 100644
--- a/sys/ia64/include/pmc_mdep.h
+++ b/sys/ia64/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/ia64/include/proc.h b/sys/ia64/include/proc.h
index 5cbc0bf89f52..546cdb7fd3ce 100644
--- a/sys/ia64/include/proc.h
+++ b/sys/ia64/include/proc.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/sys/ia64/include/proc.h,v 1.14.2.1 2005/09/13 21:07:14 marcel Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/ia64/include/profile.h b/sys/ia64/include/profile.h
index 73ce5782ee8f..b0648c93ca95 100644
--- a/sys/ia64/include/profile.h
+++ b/sys/ia64/include/profile.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/sys/ia64/include/profile.h,v 1.12 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/ia64/include/pte.h b/sys/ia64/include/pte.h
index f57cb4dd17ae..644a498c696f 100644
--- a/sys/ia64/include/pte.h
+++ b/sys/ia64/include/pte.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pte.h,v 1.5 2004/11/21 21:40:08 marcel Exp $
  */
 
 #ifndef _MACHINE_PTE_H_
diff --git a/sys/ia64/include/ptrace.h b/sys/ia64/include/ptrace.h
index d73077dabf21..0ec25e471550 100644
--- a/sys/ia64/include/ptrace.h
+++ b/sys/ia64/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/ptrace.h,v 1.6 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/ia64/include/reg.h b/sys/ia64/include/reg.h
index 453c9b831412..ea7725deeea5 100644
--- a/sys/ia64/include/reg.h
+++ b/sys/ia64/include/reg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/reg.h,v 1.13 2004/03/20 05:27:14 marcel Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/ia64/include/reloc.h b/sys/ia64/include/reloc.h
index 6e5053602772..09d30f9bcd88 100644
--- a/sys/ia64/include/reloc.h
+++ b/sys/ia64/include/reloc.h
@@ -29,5 +29,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/reloc.h,v 1.2 2005/01/06 22:18:23 imp Exp $
  */
diff --git a/sys/ia64/include/resource.h b/sys/ia64/include/resource.h
index edde5eb29908..ee64c27fbecb 100644
--- a/sys/ia64/include/resource.h
+++ b/sys/ia64/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/resource.h,v 1.2 2005/01/06 22:18:23 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/ia64/include/runq.h b/sys/ia64/include/runq.h
index f5189a15a970..9ff4fba8bc92 100644
--- a/sys/ia64/include/runq.h
+++ b/sys/ia64/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/runq.h,v 1.5 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/ia64/include/sal.h b/sys/ia64/include/sal.h
index 759cc9fb1854..f13309615286 100644
--- a/sys/ia64/include/sal.h
+++ b/sys/ia64/include/sal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sal.h,v 1.6 2004/09/19 03:50:46 marcel Exp $
  */
 
 #ifndef _MACHINE_SAL_H_
diff --git a/sys/ia64/include/sapicreg.h b/sys/ia64/include/sapicreg.h
index 8f7dfbd34a26..41467b8cbab1 100644
--- a/sys/ia64/include/sapicreg.h
+++ b/sys/ia64/include/sapicreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sapicreg.h,v 1.1 2001/10/05 10:30:08 dfr Exp $
  */
 
 #ifndef _MACHINE_SAPICREG_H_
diff --git a/sys/ia64/include/sapicvar.h b/sys/ia64/include/sapicvar.h
index 130eebb4ebfa..8a8c0bf43de7 100644
--- a/sys/ia64/include/sapicvar.h
+++ b/sys/ia64/include/sapicvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sapicvar.h,v 1.4 2003/09/10 22:49:38 marcel Exp $
  */
 
 #ifndef _MACHINE_SAPICVAR_H_
diff --git a/sys/ia64/include/setjmp.h b/sys/ia64/include/setjmp.h
index 0e7641eea403..a335bdc472e1 100644
--- a/sys/ia64/include/setjmp.h
+++ b/sys/ia64/include/setjmp.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/setjmp.h,v 1.12 2003/07/26 08:03:43 marcel Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/ia64/include/sf_buf.h b/sys/ia64/include/sf_buf.h
index 8d67542e0e57..bfe309469541 100644
--- a/sys/ia64/include/sf_buf.h
+++ b/sys/ia64/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sf_buf.h,v 1.2 2004/04/18 07:11:12 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/ia64/include/sigframe.h b/sys/ia64/include/sigframe.h
index d0e886e9bc90..022686a12598 100644
--- a/sys/ia64/include/sigframe.h
+++ b/sys/ia64/include/sigframe.h
@@ -25,7 +25,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/sys/ia64/include/sigframe.h,v 1.3 2002/10/25 19:10:57 peter Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/ia64/include/signal.h b/sys/ia64/include/signal.h
index 766579927137..9e029995b4b6 100644
--- a/sys/ia64/include/signal.h
+++ b/sys/ia64/include/signal.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/signal.h,v 1.13 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/smp.h b/sys/ia64/include/smp.h
index cf1fab31f317..3c08e0c3bfcc 100644
--- a/sys/ia64/include/smp.h
+++ b/sys/ia64/include/smp.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/smp.h,v 1.9.2.1 2005/09/13 21:07:14 marcel Exp $
  */
 #ifndef _MACHINE_SMP_H_
 #define _MACHINE_SMP_H_
diff --git a/sys/ia64/include/stdarg.h b/sys/ia64/include/stdarg.h
index 9ab18b8c0e8f..69ffb816866f 100644
--- a/sys/ia64/include/stdarg.h
+++ b/sys/ia64/include/stdarg.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/stdarg.h,v 1.8 2005/03/02 21:33:27 joerg Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/ia64/include/sysarch.h b/sys/ia64/include/sysarch.h
index a7f39de2ffe8..5cf9bddb965d 100644
--- a/sys/ia64/include/sysarch.h
+++ b/sys/ia64/include/sysarch.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sysarch.h,v 1.4 2004/01/09 16:52:08 nectar Exp $
  */
 
 #ifndef _MACHINE_SYSARCH_H_
diff --git a/sys/ia64/include/ucontext.h b/sys/ia64/include/ucontext.h
index 5619d59068c9..fd3f17787c06 100644
--- a/sys/ia64/include/ucontext.h
+++ b/sys/ia64/include/ucontext.h
@@ -25,7 +25,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/sys/ia64/include/ucontext.h,v 1.7 2003/12/07 20:47:33 marcel Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/ia64/include/unwind.h b/sys/ia64/include/unwind.h
index b1d512c349e4..6cf30357ff99 100644
--- a/sys/ia64/include/unwind.h
+++ b/sys/ia64/include/unwind.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/sys/ia64/include/unwind.h,v 1.7 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_UNWIND_H_
diff --git a/sys/ia64/include/varargs.h b/sys/ia64/include/varargs.h
index 3ed42315c8c8..96ead78d5d1f 100644
--- a/sys/ia64/include/varargs.h
+++ b/sys/ia64/include/varargs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/varargs.h,v 1.5 2003/09/28 05:34:07 marcel Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/ia64/include/vmparam.h b/sys/ia64/include/vmparam.h
index 65fbe99eee17..3fd455e2a3d4 100644
--- a/sys/ia64/include/vmparam.h
+++ b/sys/ia64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/vmparam.h,v 1.10 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
 #ifndef	_MACHINE_VMPARAM_H
 #define	_MACHINE_VMPARAM_H
diff --git a/sys/ia64/isa/isa.c b/sys/ia64/isa/isa.c
index 01b4c3d5a050..6bbcdd0d6abc 100644
--- a/sys/ia64/isa/isa.c
+++ b/sys/ia64/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/isa/isa.c,v 1.3 2004/03/17 21:45:55 jmg Exp $
  */
 
 /*
diff --git a/sys/ia64/isa/isa_dma.c b/sys/ia64/isa/isa_dma.c
index 0943d83ccd53..0baf2b67825a 100644
--- a/sys/ia64/isa/isa_dma.c
+++ b/sys/ia64/isa/isa_dma.c
@@ -31,7 +31,7 @@
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
  *	from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/isa/isa_dma.c,v 1.9 2005/05/14 10:14:56 nyan Exp $
  */
 
 /*
diff --git a/sys/ia64/pci/pci_cfgreg.c b/sys/ia64/pci/pci_cfgreg.c
index cef743b89f7a..945dc3d12007 100644
--- a/sys/ia64/pci/pci_cfgreg.c
+++ b/sys/ia64/pci/pci_cfgreg.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/pci/pci_cfgreg.c,v 1.2 2001/10/03 08:25:58 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 36f3d79061d5..0307c5fdc9da 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/isa_common.c,v 1.42 2005/03/18 05:19:50 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 65e0ad5df2e0..80a3ed998c92 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isa_common.h,v 1.13 2004/12/24 23:03:17 imp Exp $
  */
 
 /*
diff --git a/sys/isa/isa_dmareg.h b/sys/isa/isa_dmareg.h
index 33c768f5c3bf..bdcafb4ace6a 100644
--- a/sys/isa/isa_dmareg.h
+++ b/sys/isa/isa_dmareg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isa_dmareg.h,v 1.1 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifndef _ISA_ISA_DMAREG_H_
diff --git a/sys/isa/isa_if.m b/sys/isa/isa_if.m
index dc64fc568b94..dcb1726eb941 100644
--- a/sys/isa/isa_if.m
+++ b/sys/isa/isa_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/isa/isa_if.m,v 1.7 2005/01/06 22:18:23 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index 65a0d5c8950d..3b0efe30f463 100644
--- a/sys/isa/isahint.c
+++ b/sys/isa/isahint.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/isahint.c,v 1.16 2005/04/13 03:26:24 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index 534d76a59493..caefa4afb66d 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isareg.h,v 1.13 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifdef PC98
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 86641ced4050..7d312d4cb6fc 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isavar.h,v 1.29 2005/04/13 03:26:24 mdodd Exp $
  */
 
 #ifndef _ISA_ISAVAR_H_
diff --git a/sys/isa/orm.c b/sys/isa/orm.c
index f25312fbe305..ace75e499d3b 100644
--- a/sys/isa/orm.c
+++ b/sys/isa/orm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/orm.c,v 1.5 2004/07/05 17:26:04 imp Exp $");
 
 /*
  * Driver to take care of holes in ISA I/O memory occupied
diff --git a/sys/isa/pnp.c b/sys/isa/pnp.c
index 2b9db6b69741..a5472efa8c97 100644
--- a/sys/isa/pnp.c
+++ b/sys/isa/pnp.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/pnp.c,v 1.20.2.1 2005/10/05 21:53:17 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c
index c229373b9025..fd058613bf31 100644
--- a/sys/isa/pnpparse.c
+++ b/sys/isa/pnpparse.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/pnpparse.c,v 1.14 2003/06/11 00:32:45 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/pnpreg.h b/sys/isa/pnpreg.h
index abd181198d41..a2b27bda92b7 100644
--- a/sys/isa/pnpreg.h
+++ b/sys/isa/pnpreg.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/isa/pnpreg.h,v 1.6 2005/01/06 22:18:23 imp Exp $
  *      from: pnp.h,v 1.7 1998/09/13 22:15:44 eivind Exp
  */
 
diff --git a/sys/isa/pnpvar.h b/sys/isa/pnpvar.h
index 291c8130a83d..5cedec089540 100644
--- a/sys/isa/pnpvar.h
+++ b/sys/isa/pnpvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/isa/pnpvar.h,v 1.8 2004/12/24 22:08:57 imp Exp $
  */
 
 #ifndef _ISA_PNPVAR_H_
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index 35bef94e08e9..aa40fb51e450 100644
--- a/sys/isa/rtc.h
+++ b/sys/isa/rtc.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/rtc.h,v 1.13 2004/04/07 20:46:09 imp Exp $
  */
 
 #ifndef _I386_ISA_RTC_H_
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 3f750ef23501..af51553c4c5a 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/syscons_isa.c,v 1.27 2005/05/14 09:10:01 nyan Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 594e3d04c14b..eac6babe2503 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/vga_isa.c,v 1.33 2005/02/28 21:06:14 iedowse Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO
index b8d7f3efebb9..49f21fd48482 100644
--- a/sys/isofs/cd9660/TODO
+++ b/sys/isofs/cd9660/TODO
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/isofs/cd9660/TODO,v 1.7 1999/08/28 00:46:05 peter Exp $
 
  2) should understand Rock Ridge
 
diff --git a/sys/isofs/cd9660/TODO.hibler b/sys/isofs/cd9660/TODO.hibler
index e0842da82d5a..0850e4550442 100644
--- a/sys/isofs/cd9660/TODO.hibler
+++ b/sys/isofs/cd9660/TODO.hibler
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/isofs/cd9660/TODO.hibler,v 1.3 2001/02/06 11:20:34 asmodai Exp $
 
 1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS).
    Since it was modelled after the inode code, we might be able to merge
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index 147f4457b85b..e9bc19fdbb40 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_bmap.c,v 1.15 2004/11/15 09:18:27 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/cd9660_iconv.c b/sys/isofs/cd9660/cd9660_iconv.c
index 43a5a0de8960..b7560e2eefa8 100644
--- a/sys/isofs/cd9660/cd9660_iconv.c
+++ b/sys/isofs/cd9660/cd9660_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_iconv.c,v 1.1 2003/09/26 20:26:23 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index b89e6702fd08..7ab4b81a72d4 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_lookup.c,v 1.41 2005/04/13 10:59:09 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/cd9660_mount.h b/sys/isofs/cd9660/cd9660_mount.h
index 518677d19ae2..1eef9d3616b8 100644
--- a/sys/isofs/cd9660/cd9660_mount.h
+++ b/sys/isofs/cd9660/cd9660_mount.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_mount.h	8.1 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_mount.h,v 1.8 2005/01/06 22:18:23 imp Exp $
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 8d281defd693..aae03755dcb9 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_node.c,v 1.54 2005/03/14 13:22:41 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index a362dc1d5148..c28713545b61 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.h,v 1.31 2005/03/16 08:09:52 phk Exp $
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index aae739441846..95f05649f02e 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.28 2004/07/03 16:56:45 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h
index f6fa050368d2..b34ad2f92ccc 100644
--- a/sys/isofs/cd9660/cd9660_rrip.h
+++ b/sys/isofs/cd9660/cd9660_rrip.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.h,v 1.8 2004/07/03 16:56:45 phk Exp $
  */
 
 typedef struct {
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 1922627a0dad..9f389e955694 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_util.c,v 1.22 2004/04/07 20:46:09 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index cd7e375617e1..7ff3b81ce9e1 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.140.2.1 2005/08/18 11:32:06 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index e4f6336b35ee..0acc26be3aed 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.110 2005/03/17 14:43:40 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 8645f58ec021..801741169759 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/iso.h,v 1.30 2005/03/14 13:22:41 phk Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 75c004c40b62..05925aed6f92 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/iso_rrip.h,v 1.8 2004/04/07 20:46:09 imp Exp $
  */
 
 
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 421f73cf8c58..5dee028915c7 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.15 2003/03/05 19:24:21 peter Exp $
 #	@(#)Make.tags.inc	8.1 (Berkeley) 6/11/93
 
 SYS?=	${.CURDIR}/..
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index 1ea154dab8f0..65aa1acb130d 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/21/94
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/Makefile,v 1.11.12.1 2005/07/18 19:54:49 jhb Exp $
 
 # Makefile for kernel tags files, init_sysent, etc.
 
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index b6fc624da086..ce2ddbcd96c7 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/bus_if.m,v 1.29 2005/01/06 23:35:38 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/clock_if.m b/sys/kern/clock_if.m
index cb1179aed203..fbca6132708b 100644
--- a/sys/kern/clock_if.m
+++ b/sys/kern/clock_if.m
@@ -22,7 +22,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/clock_if.m,v 1.2 2005/01/06 23:35:38 imp Exp $
 
 #include <sys/bus.h>
 #include <sys/time.h>
diff --git a/sys/kern/cpufreq_if.m b/sys/kern/cpufreq_if.m
index 8b1213e2b3d8..866165f6c75a 100644
--- a/sys/kern/cpufreq_if.m
+++ b/sys/kern/cpufreq_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/cpufreq_if.m,v 1.2 2005/02/18 00:23:36 njl Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/device_if.m b/sys/kern/device_if.m
index 2931c0a5cd2f..9e9b230d54e5 100644
--- a/sys/kern/device_if.m
+++ b/sys/kern/device_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/device_if.m,v 1.12 2005/01/06 23:35:38 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/genassym.sh b/sys/kern/genassym.sh
index 70ad69ebd1d4..6da45023d4f0 100644
--- a/sys/kern/genassym.sh
+++ b/sys/kern/genassym.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/genassym.sh,v 1.4 2002/02/11 03:54:30 obrien Exp $
 
 # Grrr, this should use stdin and stdout, but is encrufted for compatibility.
 
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 572bc47bcd22..a68ee734fa6e 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_aout.c,v 1.99 2005/05/03 10:51:38 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index b469898359cb..e2037d5cc7f4 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.162.2.1 2005/09/18 03:31:35 csjp Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/imgact_elf32.c b/sys/kern/imgact_elf32.c
index b286f315e1ba..477bb83363bf 100644
--- a/sys/kern/imgact_elf32.c
+++ b/sys/kern/imgact_elf32.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf32.c,v 1.3 2003/06/11 00:56:54 obrien Exp $");
 
 #define __ELF_WORD_SIZE 32
 #include <kern/imgact_elf.c>
diff --git a/sys/kern/imgact_elf64.c b/sys/kern/imgact_elf64.c
index db2470dd915a..f5d0f2a2dfe8 100644
--- a/sys/kern/imgact_elf64.c
+++ b/sys/kern/imgact_elf64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf64.c,v 1.3 2003/06/11 00:56:54 obrien Exp $");
 
 #define __ELF_WORD_SIZE 64
 #include <kern/imgact_elf.c>
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 0b08204806b0..2539cc39fc03 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_gzip.c,v 1.54 2005/04/01 20:00:11 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index 2f8b133e1685..4adbac335fe1 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_shell.c,v 1.35 2005/06/19 02:21:03 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/vnode.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 9ac6364ca6b0..dfcf0de98db4 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/inflate.c,v 1.19 2003/06/11 00:56:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/inflate.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 7e2396d51ced..8c8a4d03ecc9 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.256.2.2 2005/10/05 10:31:03 rwatson Exp $");
 
 #include "opt_init_path.h"
 #include "opt_mac.h"
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index e67baf297dfe..1ecb2be8d3b1 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.195 2005/07/08 15:06:58 jhb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198 2005/07/08 15:01:13 jhb Exp 
  */
 
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 5811608fd616..a5ef7522101b 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.74.2.1 2005/09/25 18:54:28 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c
index 7beca5c29831..15ef8b568bed 100644
--- a/sys/kern/kern_acl.c
+++ b/sys/kern/kern_acl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.45 2004/07/26 07:24:03 cperciva Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c
index 3617afe08d90..2057568a7976 100644
--- a/sys/kern/kern_alq.c
+++ b/sys/kern/kern_alq.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.12 2005/04/16 12:12:27 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index bfcca44263dd..acb29316f12b 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.178.2.1 2005/10/07 14:00:05 glebius Exp $");
 
 #include "opt_device_polling.h"
 #include "opt_hwpmc_hooks.h"
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c
index 8ccea3aab414..8fe782f03f58 100644
--- a/sys/kern/kern_condvar.c
+++ b/sys/kern/kern_condvar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.52 2004/10/12 18:36:19 jhb Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index b400a4e3c65e..47e46d5ba14d 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.186.2.4 2005/10/06 15:17:41 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_context.c b/sys/kern/kern_context.c
index 300b1f441bbd..fa8386678acf 100644
--- a/sys/kern/kern_context.c
+++ b/sys/kern/kern_context.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_context.c,v 1.7 2003/11/09 20:31:03 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c
index 16300be09cd3..a39ce22082ab 100644
--- a/sys/kern/kern_cpu.c
+++ b/sys/kern/kern_cpu.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_cpu.c,v 1.14.2.2 2005/09/06 18:01:44 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 25caa9fc57ae..67504d22ac41 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.279.2.2 2005/10/09 08:13:56 rik Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 9bb88140e9a9..ad490697b9bb 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.39.2.2 2005/10/09 03:29:03 delphij Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 3aa4550243b9..4dbfd56459cb 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.93.2.1 2005/09/18 15:03:31 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 2b7dd3210119..c2f4df5dd1b5 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.275.2.2 2005/10/09 17:28:12 ps Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 2a113c12b500..d3b08f0dc7ac 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.263.2.2.2.1 2005/10/27 18:35:18 glebius Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 56ad939f480c..4644518ddde2 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.252 2005/07/01 16:28:30 ssouhlal Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c
index 1b4d432faf65..45e88bf088da 100644
--- a/sys/kern/kern_idle.c
+++ b/sys/kern/kern_idle.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_idle.c,v 1.43 2005/04/04 21:53:54 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index ab189cfb4aa3..a83dd5caac8a 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.124.2.1 2005/09/26 19:49:12 jhb Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index c3d1f9ad32d7..9154113b99e4 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.50 2005/06/23 22:13:28 pjd Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index 69ca17ae7396..9e2974c21317 100644
--- a/sys/kern/kern_kse.c
+++ b/sys/kern/kern_kse.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.214.2.4 2005/10/06 18:24:24 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index e5a0629c44d5..898c94aa68e9 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_kthread.c,v 1.34 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c
index b6d90986d777..67eb55571720 100644
--- a/sys/kern/kern_ktr.c
+++ b/sys/kern/kern_ktr.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktr.c,v 1.48 2005/06/10 23:21:29 jeff Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktr.h"
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 850e9b02bfe6..42d980d0fb3d 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.101 2005/06/24 12:05:24 pjd Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index ac33ef017f52..811b452cdfec 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.117 2005/05/28 23:20:05 pjd Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index e3bc36ae50b8..ea76a2eb4795 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.89.2.2 2005/10/02 10:08:29 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 483f953f8cb8..0e1ea140dfa7 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.54 2005/03/29 08:13:01 phk Exp $");
 
 #include "opt_debug_lockf.h"
 
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index 9e8d45ae3cf6..728bd8c0be86 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.117 2005/04/22 19:09:12 trhodes Exp $");
 
 #include "opt_mac.h"
 #include "opt_devfs.h"
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 0e3403bf1521..484784dc6a80 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.142.2.2 2005/07/30 06:14:57 pjd Exp $");
 
 #include "opt_vm.h"
 
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 1ea627466fa4..b8b5c84f6a23 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.9.2.1 2005/07/25 00:08:12 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 16755d477ed1..3be66b8a8939 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mib.c,v 1.74.2.2 2005/10/08 07:06:49 pjd Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index e76565ec8d45..41fbc5c9d09e 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -27,7 +27,7 @@
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_module.c,v 1.48 2005/02/18 22:14:40 ps Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c
index 58158b9e791d..a9faf9e77b8b 100644
--- a/sys/kern/kern_mtxpool.c
+++ b/sys/kern/kern_mtxpool.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mtxpool.c,v 1.11 2005/02/10 12:02:37 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index a0127e77d165..a8dc94532ae8 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.154.2.3 2005/10/09 04:30:31 delphij Exp $");
 
 #include "opt_adaptive_mutexes.h"
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index 53deb9fc7994..17c36ee2236b 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.59 2005/05/28 14:34:41 rwatson Exp $");
 
 #include "opt_ntp.h"
 
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index d6be6e7c087e..d5e03824a5eb 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_physio.c,v 1.68 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_pmc.c b/sys/kern/kern_pmc.c
index ed4de5950e48..55af9df44e33 100644
--- a/sys/kern/kern_pmc.c
+++ b/sys/kern/kern_pmc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_pmc.c,v 1.4.2.1 2005/08/15 18:46:12 jkoshy Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index 992116fdf8f1..16b209b618f6 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.19.2.2 2005/10/07 14:00:05 glebius Exp $");
 
 #include "opt_device_polling.h"
 
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index fc6ed8d943da..10bdf78f73f0 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -27,11 +27,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_proc.c,v 1.230.2.1 2005/10/05 05:30:24 truckman Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.230.2.1 2005/10/05 05:30:24 truckman Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index ebe4b18f469d..16ce2c031907 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.200 2005/04/18 13:36:56 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index b70b97f5b720..08c7b2d4b4fd 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.148 2005/06/01 17:52:51 alc Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/kern_sema.c b/sys/kern/kern_sema.c
index f09099e4b2e0..1ad0fbf22452 100644
--- a/sys/kern/kern_sema.c
+++ b/sys/kern/kern_sema.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sema.c,v 1.6 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 9ba486f9ae38..51187746efa7 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.174.2.2 2005/10/06 17:53:46 ups Exp $");
 
 #include "opt_kdb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 64fdfde1b793..91bcfec21015 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.306 2005/06/06 05:13:10 davidxu Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index f7cc67057692..1f166405b198 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.96 2005/01/06 23:35:39 imp Exp $");
 
 #include "opt_zero.h"
 
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index b5c813059b3f..cb5cf4f84b00 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -86,7 +86,7 @@ reassigned to keep this true.
 ***/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.116.2.1 2005/08/06 03:06:25 davidxu Exp $");
 
 #include "opt_sched.h"
 
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
index 8860c3fab255..1d501e2c5b33 100644
--- a/sys/kern/kern_sx.c
+++ b/sys/kern/kern_sx.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.25 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 9694763efe66..0b21472a92da 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.270 2005/05/23 23:01:52 ups Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index a437fb328cf8..7c0259534dc1 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.11 2004/07/15 08:26:05 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 6a64a1a475ab..7e64455e6b2e 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.165.2.1 2005/08/19 04:50:08 csjp Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index f9b54a06298b..692eb4e92c27 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.164 2005/03/26 20:04:28 phk Exp $");
 
 #include "opt_ntp.h"
 
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index 0e8b3e81f69f..93aa38db7169 100644
--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.34 2005/07/10 23:31:10 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index ed788dae8c20..6ac79cd7af66 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.216.2.1 2005/10/04 22:53:56 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index d0c3f9e62576..4ac8175fce5a 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.116 2005/03/31 22:51:18 jhb Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 0ef93ec5063d..bb9753e577ec 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.97.2.2 2005/09/26 19:49:12 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index c159487c899a..4736a71d0b63 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.33 2005/03/05 09:15:03 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index de471582c46a..802e02cfbd6e 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.8 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index d93ba37b67ae..93d26560ac0c 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.46 2005/01/06 23:35:39 imp Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index d2809082bf34..97a00e39c063 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.81.8.3 2005/10/06 19:00:39 delphij Exp $");
 
 #include "opt_gdb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index a338610da77f..e6b3e6f14201 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.87.2.2 2005/10/06 19:01:42 delphij Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/linker_if.m b/sys/kern/linker_if.m
index 84d56d2d6f7e..a4c2bb605e77 100644
--- a/sys/kern/linker_if.m
+++ b/sys/kern/linker_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/linker_if.m,v 1.6 2005/01/06 23:35:39 imp Exp $
 #
 
 #include <sys/linker.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index f6f64e08af44..c4c5b4e0ab3a 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.62 2005/05/30 15:09:15 rwatson Exp $
 
 set -e
 
diff --git a/sys/kern/md4c.c b/sys/kern/md4c.c
index 84a294aaf533..d5562af631ae 100644
--- a/sys/kern/md4c.c
+++ b/sys/kern/md4c.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/md4c.c,v 1.3 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index 10fb7a32419b..b0fbdb93c3e9 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -30,7 +30,7 @@
  * This file should be kept in sync with src/lib/libmd/md5c.c
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/md5c.c,v 1.25 2005/02/10 12:20:42 phk Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 7ba4285f80e8..a25fb90d12e9 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.77 2005/06/24 00:16:57 peter Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index e5fe68aafef0..31570b831b89 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.153.2.3 2005/09/27 12:00:31 davidxu Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index d40f1e40c07a..2e4450e0b32b 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.22 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 2c83499072de..91047fd1a177 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_blist.c,v 1.17 2004/06/04 04:03:25 alc Exp $");
 
 #ifdef _KERNEL
 
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index a50a6b8a91ca..a509d0073adb 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.184.2.1 2005/10/06 23:15:18 imp Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c
index bfa1e10b2e62..13af89780ff3 100644
--- a/sys/kern/subr_clock.c
+++ b/sys/kern/subr_clock.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.6 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index 8a7eff58e5a1..527d28df4a6f 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_devstat.c,v 1.51 2005/05/03 10:58:05 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 224882276336..cdddd17f1183 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_disk.c,v 1.85 2005/06/15 23:32:07 jeff Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index 885c01344e87..a65f003dac60 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_eventhandler.c,v 1.23 2005/02/23 19:32:29 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c
index eac4f59b84e5..92c530330991 100644
--- a/sys/kern/subr_hints.c
+++ b/sys/kern/subr_hints.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_hints.c,v 1.11.2.1 2005/10/06 18:29:30 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 0216df0ef6e2..b4463fdb0433 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.12.2.1 2005/10/02 10:06:15 rwatson Exp $");
 
 #include "opt_kdb.h"
 
diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c
index 1704a0f4a3c6..c8d90a2c7498 100644
--- a/sys/kern/subr_kobj.c
+++ b/sys/kern/subr_kobj.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_kobj.c,v 1.8 2003/10/16 09:16:28 dfr Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index cd9a70abf12c..0201a82426df 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_log.c,v 1.64 2005/02/27 22:01:09 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_mbpool.c b/sys/kern/subr_mbpool.c
index 400c6da25065..7f6aafb6a90a 100644
--- a/sys/kern/subr_mbpool.c
+++ b/sys/kern/subr_mbpool.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_mbpool.c,v 1.3 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c
index 4f0dab1bb6f2..8545a33b412c 100644
--- a/sys/kern/subr_mchain.c
+++ b/sys/kern/subr_mchain.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_mchain.c,v 1.17 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 1517129c81a1..2db107054ade 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_module.c,v 1.8 2003/06/11 00:56:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_msgbuf.c b/sys/kern/subr_msgbuf.c
index 14cd39dd8316..52c326496a15 100644
--- a/sys/kern/subr_msgbuf.c
+++ b/sys/kern/subr_msgbuf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_msgbuf.c,v 1.3 2005/01/06 23:35:39 imp Exp $
  */
 
 /*
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 833842b68c96..0d26761afca7 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.71.4.1 2005/10/17 00:17:22 kris Exp $");
 
 #include "opt_param.h"
 #include "opt_maxusers.h"
diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c
index bacf5ba22959..d01a8de21ca6 100644
--- a/sys/kern/subr_pcpu.c
+++ b/sys/kern/subr_pcpu.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_pcpu.c,v 1.6.2.1 2005/10/02 10:06:49 rwatson Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c
index 7d6976549916..8b5acc9e3510 100644
--- a/sys/kern/subr_power.c
+++ b/sys/kern/subr_power.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_power.c,v 1.5 2004/01/02 18:24:13 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 8184c01c9766..283b1cc11f3c 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_prf.c,v 1.116.2.3 2005/10/07 12:40:51 phk Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 0e2379d52cb3..d71445ec80a4 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.75 2005/03/02 21:33:27 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index 31ffa02461bf..4a1f70a42a68 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.43 2005/05/06 02:48:20 cperciva Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index efa9ad7e4b73..99624fe2fb7f 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_sbuf.c,v 1.29 2005/02/10 12:02:37 phk Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index 0814953424ce..457c34b6078a 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_scanf.c,v 1.17 2004/04/05 21:03:35 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index 3def26335a01..2cc2d05de949 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -62,7 +62,7 @@
 #include "opt_sleepqueue_profiling.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.18.2.1 2005/09/26 19:43:37 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 6b11b47e83a4..093921652a74 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.196 2005/06/30 03:38:10 peter Exp $");
 
 #include "opt_kdb.h"
 
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index 9622098e3447..e6c7fcf5396b 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.27 2005/05/01 00:38:11 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 4574aad5e098..20e1948d538d 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.281 2005/03/28 12:52:46 jeff Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index cd1aa0c01899..49ec6d9ed036 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -59,7 +59,7 @@
 #include "opt_turnstile_profiling.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.152.2.1 2005/10/09 03:25:37 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
index 910020d9c481..dd514aec586b 100644
--- a/sys/kern/subr_unit.c
+++ b/sys/kern/subr_unit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_unit.c,v 1.7 2005/03/14 06:51:29 phk Exp $
  *
  *
  * Unit number allocation functions.
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 81ac7a755f43..709e6d8c6d14 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.195.2.3.2.1 2005/10/25 20:17:11 jhb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_witness.h"
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 3c7199a28cd7..98196fb7864e 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.146 2005/07/07 18:17:55 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index d79a3198bd23..9fabdbfbdb00 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -89,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.184 2005/07/01 16:28:30 ssouhlal Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index f1157ca5ff26..07376fd53977 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.131.2.1 2005/09/27 12:17:38 davidxu Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 7c352beee215..ccf36658560b 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.69 2005/04/16 18:46:28 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index e0fdc5860cc9..b5649c4a6b18 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/syscalls.c,v 1.181 2005/07/08 15:06:58 jhb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198 2005/07/08 15:01:13 jhb Exp 
  */
 
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index c6d0313b0254..f2e5ca0734bc 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.198 2005/07/08 15:01:13 jhb Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index 8fec1da00a64..02ac1d87dc84 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_ipc.c,v 1.29 2005/01/06 23:35:39 imp Exp $");
 
 #include "opt_sysvipc.h"
 
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 60a943171a6e..72c811d046d4 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_msg.c,v 1.60 2005/02/12 01:22:39 csjp Exp $");
 
 #include "opt_sysvipc.h"
 #include "opt_mac.h"
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index b32ec0f09c6e..b760e1dab935 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.78 2005/06/07 05:03:27 rwatson Exp $");
 
 #include "opt_sysvipc.h"
 #include "opt_mac.h"
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 02f96e60c6ae..9b15b4734720 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.102 2005/05/12 20:04:48 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_sysvipc.h"
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 62634321a723..171073e45edb 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.250 2005/07/01 16:28:30 ssouhlal Exp $");
 
 #include "opt_compat.h"
 #include "opt_tty.h"
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index f8975b6e8aca..92d98d37cdfa 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.37 2004/06/21 22:57:15 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index 77a95937547f..60c0c957f11c 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_conf.c,v 1.24 2004/07/15 20:47:40 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index abd79ba3e4a1..cd34ec0c9a91 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_cons.c,v 1.131 2005/02/27 21:52:41 phk Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index d38660146bcb..2ac0599d73a1 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.137.2.1 2005/08/13 21:24:16 rwatson Exp $");
 
 /*
  * Pseudo-teletype Driver
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index f0dc88d616c0..b556313db46e 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_subr.c,v 1.43 2005/01/06 23:35:40 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 5a99d2534ed2..894969a46985 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_tty.c,v 1.56.2.1 2005/08/13 21:24:16 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index 4449b5bc5c68..4bd7d395e3e1 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.19 2005/06/11 11:59:47 maxim Exp $");
 
 #define ACCEPT_FILTER_MOD
 
diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c
index b4773d1e399e..6c9e93bcbb38 100644
--- a/sys/kern/uipc_cow.c
+++ b/sys/kern/uipc_cow.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_cow.c,v 1.23.4.1 2005/10/26 20:22:00 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 1b4c1ee6d884..5dc74c6c0ff4 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.44.2.1 2005/09/20 09:16:10 glebius Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 6a0e9ba34f4c..7380c71bdb96 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.148.2.1 2005/08/10 17:02:29 sam Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index 109b3a6b1720..145fa47dfcfe 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.31.2.1 2005/07/25 00:08:12 rwatson Exp $");
 
 /*#define PULLDOWN_DEBUG*/
 
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 68be29401507..23ef3abce8ea 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_proto.c,v 1.24 2004/04/05 21:03:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index de012b68f1b2..347caf90d647 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.20 2005/06/08 07:29:22 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_posix.h"
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 39baa63e621e..40f0bfb17d60 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.242.2.3 2005/10/06 18:31:38 delphij Exp $");
 
 #include "opt_inet.h"
 #include "opt_mac.h"
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 16fa1f8ad8e7..8465f2559cff 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.147.2.1 2005/09/21 15:30:54 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index d9944fe08573..502d536e54d0 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.221 2005/07/05 22:49:09 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index ac23154c8719..fac5a602eb39 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.155.2.1 2005/09/28 06:52:10 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index ac4877f96ec3..a55090caf427 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.195.2.1 2005/08/20 06:07:54 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 476f4ec5b586..dca636568cbe 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.491.2.3.2.1 2005/10/29 07:00:44 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 4dfbe93669e1..8331e5ac415e 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.103 2005/06/17 01:05:13 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 01fa49e0f14a..66abe1ef22c7 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_cluster.c,v 1.166.2.1.2.1 2005/10/28 01:03:26 ups Exp $");
 
 #include "opt_debug_cluster.h"
 
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index e33886366a11..54d659f999f5 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_default.c,v 1.127 2005/06/14 20:32:27 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index d77cd82f85f0..fa4f5755e309 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.333 2005/05/11 18:25:42 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
diff --git a/sys/kern/vfs_hash.c b/sys/kern/vfs_hash.c
index c26c4c81c798..89dc5b2e79b6 100644
--- a/sys/kern/vfs_hash.c
+++ b/sys/kern/vfs_hash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_hash.c,v 1.9.2.1 2005/09/12 15:53:58 tegge Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index b890ffe1ba85..bb8c42eeb2fa 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_init.c,v 1.81 2005/02/20 23:02:20 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 6175d22e90d2..2f3bb62ff0d0 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.80.2.3 2005/09/29 18:53:10 jhb Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index e13146f6f796..2e8f4d2213c0 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.196.2.1 2005/09/30 06:10:59 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 09f7c7b01176..14d9610a9b62 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.635.2.9.2.1 2005/10/25 20:43:25 kris Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 975339991644..0734cb3a67aa 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.392.2.2 2005/09/18 03:31:35 csjp Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 3337e10df117..03c9ae32b499 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.233 2005/06/14 01:14:40 jeff Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 19780a5cfb22..14889441fe7d 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -27,7 +27,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.src	8.12 (Berkeley) 5/14/95
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/vnode_if.src,v 1.78 2005/06/09 20:20:29 ssouhlal Exp $
 #
 
 #
diff --git a/sys/libkern/alpha/bswap16.S b/sys/libkern/alpha/bswap16.S
index 1c600171ae66..1137e462a56f 100644
--- a/sys/libkern/alpha/bswap16.S
+++ b/sys/libkern/alpha/bswap16.S
@@ -27,7 +27,7 @@
  *	from: NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd
  *	from: src/sys/libkern/alpha/htons.S,v 1.3 2002/02/18 20:35:21
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/alpha/bswap16.S,v 1.2 2005/01/07 00:24:33 imp Exp $
  */
 
 #define	NAME	__bswap16
diff --git a/sys/libkern/alpha/bswap32.S b/sys/libkern/alpha/bswap32.S
index d8ce3618e077..729a8c34fdbe 100644
--- a/sys/libkern/alpha/bswap32.S
+++ b/sys/libkern/alpha/bswap32.S
@@ -27,7 +27,7 @@
  *	from: NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd
  *	from: src/sys/libkern/alpha/htonl.S,v 1.3 2002/02/18 20:35:21
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/alpha/bswap32.S,v 1.2 2005/01/07 00:24:33 imp Exp $
  */
 
 #define	NAME	__bswap32
diff --git a/sys/libkern/alpha/byte_swap_2.S b/sys/libkern/alpha/byte_swap_2.S
index fae80389699f..138c552d375e 100644
--- a/sys/libkern/alpha/byte_swap_2.S
+++ b/sys/libkern/alpha/byte_swap_2.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/libkern/alpha/byte_swap_2.S,v 1.5 2005/01/07 00:24:33 imp Exp $ */
 /*	$NetBSD: byte_swap_2.S,v 1.2 1996/10/17 03:08:08 cgd Exp $	*/
 
 /*-
diff --git a/sys/libkern/alpha/byte_swap_4.S b/sys/libkern/alpha/byte_swap_4.S
index 3aa8a2e64584..37c18b498f62 100644
--- a/sys/libkern/alpha/byte_swap_4.S
+++ b/sys/libkern/alpha/byte_swap_4.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/libkern/alpha/byte_swap_4.S,v 1.5 2005/01/07 00:24:33 imp Exp $ */
 /*	$NetBSD: byte_swap_4.S,v 1.2 1996/10/17 03:08:09 cgd Exp $	*/
 
 /*-
diff --git a/sys/libkern/arc4random.c b/sys/libkern/arc4random.c
index 3a3227cd211f..12b5d383d2ab 100644
--- a/sys/libkern/arc4random.c
+++ b/sys/libkern/arc4random.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arc4random.c,v 1.12 2003/08/15 06:34:47 silby Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/libkern/arm/divsi3.S b/sys/libkern/arm/divsi3.S
index 00bacfac0224..0320da852fdf 100644
--- a/sys/libkern/arm/divsi3.S
+++ b/sys/libkern/arm/divsi3.S
@@ -15,7 +15,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arm/divsi3.S,v 1.4 2005/01/07 00:24:33 imp Exp $");
 
 /* 
  * stack is aligned as there's a possibility of branching to L_overflow
diff --git a/sys/libkern/arm/ffs.S b/sys/libkern/arm/ffs.S
index 933b91f900b7..7d2d3ff5aac2 100644
--- a/sys/libkern/arm/ffs.S
+++ b/sys/libkern/arm/ffs.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arm/ffs.S,v 1.4 2005/01/07 00:24:33 imp Exp $");
 
 
 /*
diff --git a/sys/libkern/arm/muldi3.c b/sys/libkern/arm/muldi3.c
index 8cdb478be9b6..c7bd3bed48b1 100644
--- a/sys/libkern/arm/muldi3.c
+++ b/sys/libkern/arm/muldi3.c
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
 #else
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arm/muldi3.c,v 1.1 2004/05/14 12:28:31 cognet Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 435a35af79d8..3969ffa121f8 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ashldi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index 1eab1d60d99f..86f5aa9a0b9e 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ashrdi3.c,v 1.9 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/bcd.c b/sys/libkern/bcd.c
index b68f63fa0e50..dc1212ee639a 100644
--- a/sys/libkern/bcd.c
+++ b/sys/libkern/bcd.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/bcd.c,v 1.7 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index 90576c6d4c62..f19f2da85564 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/bcmp.c,v 1.11 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 #include <machine/endian.h>
diff --git a/sys/libkern/bsearch.c b/sys/libkern/bsearch.c
index 298f32735dfc..b1fec4ddc1d2 100644
--- a/sys/libkern/bsearch.c
+++ b/sys/libkern/bsearch.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/bsearch.c,v 1.8 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/crc32.c b/sys/libkern/crc32.c
index 2bfc11efbe57..b51e5a2e1b20 100644
--- a/sys/libkern/crc32.c
+++ b/sys/libkern/crc32.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/crc32.c,v 1.5 2005/04/28 05:50:18 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index 27b1cf0a0429..353f36d57fbd 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/divdi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 057ee3defc14..bddfd59ca348 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ffs.c,v 1.11 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/ffsl.c b/sys/libkern/ffsl.c
index 0aa005c63f99..c53a44f43bb6 100644
--- a/sys/libkern/ffsl.c
+++ b/sys/libkern/ffsl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ffsl.c,v 1.4 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/fls.c b/sys/libkern/fls.c
index 202d9524de19..296bdad89d22 100644
--- a/sys/libkern/fls.c
+++ b/sys/libkern/fls.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/fls.c,v 1.4 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/flsl.c b/sys/libkern/flsl.c
index 73533c4b32b5..bbad6d0ed646 100644
--- a/sys/libkern/flsl.c
+++ b/sys/libkern/flsl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/flsl.c,v 1.4 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/fnmatch.c b/sys/libkern/fnmatch.c
index 02ded93407ba..76a663c73d2a 100644
--- a/sys/libkern/fnmatch.c
+++ b/sys/libkern/fnmatch.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/fnmatch.c,v 1.19 2005/01/07 00:24:32 imp Exp $");
 
 /*
  * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
diff --git a/sys/libkern/gets.c b/sys/libkern/gets.c
index 423146ed5edb..8f0e0cac1b5b 100644
--- a/sys/libkern/gets.c
+++ b/sys/libkern/gets.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/gets.c,v 1.3 2005/02/03 15:47:30 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/cons.h>
diff --git a/sys/libkern/ia64/__divdi3.S b/sys/libkern/ia64/__divdi3.S
index 9465c9c97d0b..0f098f5e5757 100644
--- a/sys/libkern/ia64/__divdi3.S
+++ b/sys/libkern/ia64/__divdi3.S
@@ -1,6 +1,6 @@
 .file "__divdi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__divdi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__divsi3.S b/sys/libkern/ia64/__divsi3.S
index f7edd97abe2e..d951e311a0e1 100644
--- a/sys/libkern/ia64/__divsi3.S
+++ b/sys/libkern/ia64/__divsi3.S
@@ -1,6 +1,6 @@
 .file "__divsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__divsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__moddi3.S b/sys/libkern/ia64/__moddi3.S
index e731adc23bac..df03a2c69353 100644
--- a/sys/libkern/ia64/__moddi3.S
+++ b/sys/libkern/ia64/__moddi3.S
@@ -1,6 +1,6 @@
 .file "__moddi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__moddi3.S,v 1.4 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__modsi3.S b/sys/libkern/ia64/__modsi3.S
index 568b20b1b3fc..69c098162278 100644
--- a/sys/libkern/ia64/__modsi3.S
+++ b/sys/libkern/ia64/__modsi3.S
@@ -1,6 +1,6 @@
 .file "__modsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__modsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__udivdi3.S b/sys/libkern/ia64/__udivdi3.S
index 91c94294b93d..c4be01103ee2 100644
--- a/sys/libkern/ia64/__udivdi3.S
+++ b/sys/libkern/ia64/__udivdi3.S
@@ -1,6 +1,6 @@
 .file "__udivdi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__udivdi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__udivsi3.S b/sys/libkern/ia64/__udivsi3.S
index 9597abdc0541..dafed4e4a750 100644
--- a/sys/libkern/ia64/__udivsi3.S
+++ b/sys/libkern/ia64/__udivsi3.S
@@ -1,6 +1,6 @@
 .file "__udivsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__udivsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__umoddi3.S b/sys/libkern/ia64/__umoddi3.S
index 98708e43b7eb..8873278ccca3 100644
--- a/sys/libkern/ia64/__umoddi3.S
+++ b/sys/libkern/ia64/__umoddi3.S
@@ -1,6 +1,6 @@
 .file "__umoddi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__umoddi3.S,v 1.4 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__umodsi3.S b/sys/libkern/ia64/__umodsi3.S
index 7df61a65a351..eccf21ffd50c 100644
--- a/sys/libkern/ia64/__umodsi3.S
+++ b/sys/libkern/ia64/__umodsi3.S
@@ -1,6 +1,6 @@
 .file "__umodsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__umodsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/bswap16.S b/sys/libkern/ia64/bswap16.S
index d3adc2e92141..81b1f667886b 100644
--- a/sys/libkern/ia64/bswap16.S
+++ b/sys/libkern/ia64/bswap16.S
@@ -27,7 +27,7 @@
  *	from: NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd
  *	from: src/sys/libkern/ia64/htons.S,v 1.2 2002/02/18 20:35:21
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ia64/bswap16.S,v 1.2 2005/01/07 00:24:33 imp Exp $
  */
 
 #define	NAME	__bswap16
diff --git a/sys/libkern/ia64/bswap32.S b/sys/libkern/ia64/bswap32.S
index c1c76d188494..84791faf367c 100644
--- a/sys/libkern/ia64/bswap32.S
+++ b/sys/libkern/ia64/bswap32.S
@@ -27,7 +27,7 @@
  *	from: NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd
  *	from: src/sys/libkern/ia64/htonl.S,v 1.2 2002/02/18 20:35:21
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ia64/bswap32.S,v 1.2 2005/01/07 00:24:33 imp Exp $
  */
 
 #define	NAME	__bswap32
diff --git a/sys/libkern/ia64/byte_swap_2.S b/sys/libkern/ia64/byte_swap_2.S
index 74ad5f79248e..753a79238d44 100644
--- a/sys/libkern/ia64/byte_swap_2.S
+++ b/sys/libkern/ia64/byte_swap_2.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/libkern/ia64/byte_swap_2.S,v 1.5 2005/01/07 00:24:33 imp Exp $ */
 /*	$NetBSD: byte_swap_2.S,v 1.2 1996/10/17 03:08:08 cgd Exp $	*/
 
 /*-
diff --git a/sys/libkern/ia64/byte_swap_4.S b/sys/libkern/ia64/byte_swap_4.S
index 9aba08d325db..6be6cce69e5f 100644
--- a/sys/libkern/ia64/byte_swap_4.S
+++ b/sys/libkern/ia64/byte_swap_4.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/libkern/ia64/byte_swap_4.S,v 1.5 2005/01/07 00:24:33 imp Exp $ */
 /*	$NetBSD: byte_swap_4.S,v 1.2 1996/10/17 03:08:09 cgd Exp $	*/
 
 /*-
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 4751d4b72615..a847f301b08d 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/iconv.c,v 1.9.2.1 2005/09/08 15:46:38 imura Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/iconv_converter_if.m b/sys/libkern/iconv_converter_if.m
index c366884b115c..affcfd22d9fd 100644
--- a/sys/libkern/iconv_converter_if.m
+++ b/sys/libkern/iconv_converter_if.m
@@ -29,7 +29,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/libkern/iconv_converter_if.m,v 1.3 2005/01/07 00:24:32 imp Exp $
 #
 
 #include <sys/iconv.h>
diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c
index 8ab4d6c2b3be..d0492d73e1e2 100644
--- a/sys/libkern/iconv_xlat.c
+++ b/sys/libkern/iconv_xlat.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/iconv_xlat.c,v 1.5 2003/09/26 20:26:24 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/libkern/iconv_xlat16.c b/sys/libkern/iconv_xlat16.c
index 78e764a86b90..0dd6543eb7ee 100644
--- a/sys/libkern/iconv_xlat16.c
+++ b/sys/libkern/iconv_xlat16.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/iconv_xlat16.c,v 1.3 2005/05/24 15:38:08 imura Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/libkern/index.c b/sys/libkern/index.c
index d9f470945550..ac0ad95a7920 100644
--- a/sys/libkern/index.c
+++ b/sys/libkern/index.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/index.c,v 1.9 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/inet_ntoa.c b/sys/libkern/inet_ntoa.c
index 767b2d9df175..e99727325301 100644
--- a/sys/libkern/inet_ntoa.c
+++ b/sys/libkern/inet_ntoa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/inet_ntoa.c,v 1.6 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index 470139419653..7199335d1146 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/lshrdi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index d967fe8bb254..9dc0b863d025 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/mcount.c,v 1.23 2004/08/27 19:42:35 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/gmon.h>
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index 050d47e255be..34f11bf31de0 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/moddi3.c,v 1.9 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index c014f028d6c0..7858703873f8 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/qdivrem.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c
index bb0baee73c9f..746cea85905c 100644
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/qsort.c,v 1.15 2004/07/15 23:58:23 glebius Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/qsort_r.c b/sys/libkern/qsort_r.c
index 00f9f056048d..b5f6aa2008f7 100644
--- a/sys/libkern/qsort_r.c
+++ b/sys/libkern/qsort_r.c
@@ -2,7 +2,7 @@
  * This file is in the public domain.  Originally written by Garrett
  * A. Wollman.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/qsort_r.c,v 1.2 2005/01/07 00:24:32 imp Exp $
  */
 #define I_AM_QSORT_R
 #include "libkern/qsort.c"
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index 5100bef033a5..9dd1d0ef75f8 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/quad.h,v 1.18 2004/05/05 15:12:55 bde Exp $
  */
 
 #ifndef _LIBKERN_QUAD_H_
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 360ff81cf35d..79ba5cf70e40 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/random.c,v 1.13 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index b1669f82c2b9..a768608daa8e 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/rindex.c,v 1.11 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 28a5b7ec1f14..d6d401e189b2 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/scanc.c,v 1.11 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
index 9f4124bde260..bd1589babaf7 100644
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/skpc.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strcasecmp.c b/sys/libkern/strcasecmp.c
index a0586549ff56..c2064e79a259 100644
--- a/sys/libkern/strcasecmp.c
+++ b/sys/libkern/strcasecmp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcasecmp.c,v 1.2.2.1 2005/08/16 08:10:59 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/ctype.h>
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 13738f97e26c..1bfd9b3d632b 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcat.c,v 1.11 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 7313e6011c04..042a589952cf 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcmp.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index 4b902c281b23..72dd51fd328a 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcpy.c,v 1.12 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strdup.c b/sys/libkern/strdup.c
index 5922f569b20f..d506932f117d 100644
--- a/sys/libkern/strdup.c
+++ b/sys/libkern/strdup.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strdup.c,v 1.5 2003/06/11 05:23:04 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/libkern/strlcat.c b/sys/libkern/strlcat.c
index 74d3bcc87d54..3acddfe0b07f 100644
--- a/sys/libkern/strlcat.c
+++ b/sys/libkern/strlcat.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strlcat.c,v 1.10 2005/02/03 15:51:39 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strlcpy.c b/sys/libkern/strlcpy.c
index 45d760c9f3cf..04fa19d0e583 100644
--- a/sys/libkern/strlcpy.c
+++ b/sys/libkern/strlcpy.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strlcpy.c,v 1.8 2005/02/03 15:51:39 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 4a2e6454ba5b..f015e1f5bfbe 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strlen.c,v 1.9 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c
index 5758d249980b..7553c6091c8c 100644
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strncmp.c,v 1.11 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 7daaaea3dc1d..c63ad8f923b0 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strncpy.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strsep.c b/sys/libkern/strsep.c
index 46122697e8bb..0d583d13148f 100644
--- a/sys/libkern/strsep.c
+++ b/sys/libkern/strsep.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strsep.c,v 1.7 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strspn.c b/sys/libkern/strspn.c
index 18327b7bd4b7..9284415b4555 100644
--- a/sys/libkern/strspn.c
+++ b/sys/libkern/strspn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strspn.c,v 1.2 2005/04/02 18:52:44 das Exp $");
 
 #include <sys/libkern.h>
 #include <sys/limits.h>
diff --git a/sys/libkern/strtol.c b/sys/libkern/strtol.c
index 3d734ab18dc8..e5606f4799e0 100644
--- a/sys/libkern/strtol.c
+++ b/sys/libkern/strtol.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtol.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strtoq.c b/sys/libkern/strtoq.c
index ea4e7edbc02e..939924479948 100644
--- a/sys/libkern/strtoq.c
+++ b/sys/libkern/strtoq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtoq.c,v 1.6 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strtoul.c b/sys/libkern/strtoul.c
index 5c97ca912579..0fc92a70ecbc 100644
--- a/sys/libkern/strtoul.c
+++ b/sys/libkern/strtoul.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtoul.c,v 1.6 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strtouq.c b/sys/libkern/strtouq.c
index 4ed72a18f29e..6b04b0a8d973 100644
--- a/sys/libkern/strtouq.c
+++ b/sys/libkern/strtouq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtouq.c,v 1.6 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strvalid.c b/sys/libkern/strvalid.c
index 3761b074348c..2fad4b071e7e 100644
--- a/sys/libkern/strvalid.c
+++ b/sys/libkern/strvalid.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strvalid.c,v 1.5 2005/01/29 13:34:22 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index 376d9c4e6cbd..c215bfe3765d 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ucmpdi2.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index 71c9272364d8..27090cfb29bd 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/udivdi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index e3776413722c..0460beea15e8 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/umoddi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile
index fd0d010ed994..6d49e0b7eee9 100644
--- a/sys/modules/3dfx/Makefile
+++ b/sys/modules/3dfx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/3dfx/Makefile,v 1.11 2001/03/27 19:04:09 cokane Exp $
 
 MAINTAINER=	cokane@FreeBSD.org
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index e91b75fc3445..0b0cee2c8523 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/Makefile,v 1.450.2.5 2005/10/07 15:56:30 nyan Exp $
 
 # oldcard -- specialized use for debugging only.
 # owi -- totally unsupported for debugging only.
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc
index 9dc38af9623f..ce95b7e8ebfa 100644
--- a/sys/modules/Makefile.inc
+++ b/sys/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/Makefile.inc,v 1.4 2002/11/06 13:46:58 nyan Exp $
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile
index 6964defc8203..34eb3263b5ea 100644
--- a/sys/modules/aac/Makefile
+++ b/sys/modules/aac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aac/Makefile,v 1.8 2004/08/30 03:35:17 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/aac
 
diff --git a/sys/modules/aac/Makefile.inc b/sys/modules/aac/Makefile.inc
index 265f86d1ed55..f8121d40d4fa 100644
--- a/sys/modules/aac/Makefile.inc
+++ b/sys/modules/aac/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aac/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/aac/aac_linux/Makefile b/sys/modules/aac/aac_linux/Makefile
index 4247a2280878..752b8cade4d7 100644
--- a/sys/modules/aac/aac_linux/Makefile
+++ b/sys/modules/aac/aac_linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aac/aac_linux/Makefile,v 1.1 2002/09/25 05:00:25 scottl Exp $
 
 .PATH: ${.CURDIR}/../../../dev/aac
 
diff --git a/sys/modules/accf_data/Makefile b/sys/modules/accf_data/Makefile
index 6c5216c07a65..31b0c4f55a15 100644
--- a/sys/modules/accf_data/Makefile
+++ b/sys/modules/accf_data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/accf_data/Makefile,v 1.2 2001/01/06 13:59:38 obrien Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/accf_http/Makefile b/sys/modules/accf_http/Makefile
index b942d3e7639e..72d2b5da83e7 100644
--- a/sys/modules/accf_http/Makefile
+++ b/sys/modules/accf_http/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/accf_http/Makefile,v 1.2 2001/01/06 13:59:38 obrien Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile
index fbe2bdd3c4d6..0830ce3c7514 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/Makefile,v 1.48 2005/03/18 08:48:10 philip Exp $
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
 .error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms"
diff --git a/sys/modules/acpi/Makefile.inc b/sys/modules/acpi/Makefile.inc
index 265f86d1ed55..a3cda978c916 100644
--- a/sys/modules/acpi/Makefile.inc
+++ b/sys/modules/acpi/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/Makefile.inc,v 1.1 2004/01/13 13:08:27 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index d4b84e72b59d..ace19c05f6a5 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.11 2005/05/09 07:26:16 marks Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/acpica \
        ${.CURDIR}/../../../pci \
diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile
index 17ba482ae494..427dbe170046 100644
--- a/sys/modules/acpi/acpi_asus/Makefile
+++ b/sys/modules/acpi/acpi_asus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_asus/Makefile,v 1.7 2004/12/13 03:23:08 scottl Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_fujitsu/Makefile b/sys/modules/acpi/acpi_fujitsu/Makefile
index 03bf3c7ea674..2be081c8eb10 100644
--- a/sys/modules/acpi/acpi_fujitsu/Makefile
+++ b/sys/modules/acpi/acpi_fujitsu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_fujitsu/Makefile,v 1.1 2005/03/18 08:48:10 philip Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile
index 75c22e7a2ea0..343eb3e89450 100644
--- a/sys/modules/acpi/acpi_ibm/Makefile
+++ b/sys/modules/acpi/acpi_ibm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_ibm/Makefile,v 1.3 2004/12/13 04:59:35 imp Exp $
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 KMOD=		acpi_ibm
diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile
index 20f33b05a3cb..ae88442ce1f8 100644
--- a/sys/modules/acpi/acpi_panasonic/Makefile
+++ b/sys/modules/acpi/acpi_panasonic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_panasonic/Makefile,v 1.3 2004/11/15 05:54:14 imp Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_sony/Makefile b/sys/modules/acpi/acpi_sony/Makefile
index 3974094ea136..8d4202c26789 100644
--- a/sys/modules/acpi/acpi_sony/Makefile
+++ b/sys/modules/acpi/acpi_sony/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_sony/Makefile,v 1.1 2004/11/15 05:54:14 imp Exp $
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile
index 9ab04fe3f6a8..f9cbe91fde37 100644
--- a/sys/modules/acpi/acpi_toshiba/Makefile
+++ b/sys/modules/acpi/acpi_toshiba/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_toshiba/Makefile,v 1.4 2004/11/15 05:54:14 imp Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile
index 5ee3ab44bfed..496e4b69b0e4 100644
--- a/sys/modules/acpi/acpi_video/Makefile
+++ b/sys/modules/acpi/acpi_video/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sys/modules/acpi/acpi_video/Makefile,v 1.4 2004/12/21 08:47:19 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpica
 
diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile
index 878fbb0ca8ca..a6059782ce2c 100644
--- a/sys/modules/agp/Makefile
+++ b/sys/modules/agp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/agp/Makefile,v 1.14 2005/01/26 21:18:58 imp Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile
index 44b4f93540bd..a7d6c98578d2 100644
--- a/sys/modules/aha/Makefile
+++ b/sys/modules/aha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aha/Makefile,v 1.8 2001/02/04 16:45:39 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/aha
 
diff --git a/sys/modules/ahb/Makefile b/sys/modules/ahb/Makefile
index d759bbbe39b9..4f2af0e4933a 100644
--- a/sys/modules/ahb/Makefile
+++ b/sys/modules/ahb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ahb/Makefile,v 1.1 2004/06/29 20:50:24 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ahb
 
diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile
index 860d9a8a9499..66702941b85c 100644
--- a/sys/modules/aic/Makefile
+++ b/sys/modules/aic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic/Makefile,v 1.6 2004/05/26 00:53:00 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/aic
 
diff --git a/sys/modules/aic7xxx/Makefile b/sys/modules/aic7xxx/Makefile
index 47550f0de2c4..f59b32b58bc8 100644
--- a/sys/modules/aic7xxx/Makefile
+++ b/sys/modules/aic7xxx/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/Makefile,v 1.1 2002/08/01 01:36:38 scottl Exp $
 
 SUBDIR= aicasm ahc ahd
 
diff --git a/sys/modules/aic7xxx/Makefile.inc b/sys/modules/aic7xxx/Makefile.inc
index 265f86d1ed55..80ad4daaa915 100644
--- a/sys/modules/aic7xxx/Makefile.inc
+++ b/sys/modules/aic7xxx/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile
index 66780d8ccaad..a8dca272fa96 100644
--- a/sys/modules/aic7xxx/ahc/Makefile
+++ b/sys/modules/aic7xxx/ahc/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/Makefile,v 1.6 2004/10/24 07:54:44 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahc
diff --git a/sys/modules/aic7xxx/ahc/Makefile.inc b/sys/modules/aic7xxx/ahc/Makefile.inc
index 265f86d1ed55..0556c73c0df4 100644
--- a/sys/modules/aic7xxx/ahc/Makefile.inc
+++ b/sys/modules/aic7xxx/ahc/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile b/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
index 5e5d9c208857..bbe2d1d0cb22 100644
--- a/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
+++ b/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile,v 1.3 2004/08/17 00:14:31 gibbs Exp $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=		ahc_eisa
diff --git a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
index 965e74db9c32..23f263229b6a 100644
--- a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
+++ b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_isa/Makefile,v 1.1 2004/08/17 02:32:30 gibbs Exp $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=		ahc_isa
diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
index 9a595806500d..2e1178fb6e1d 100644
--- a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
+++ b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_pci/Makefile,v 1.1 2002/08/01 01:36:38 scottl Exp $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=	ahc_pci
diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile
index 25f312fcd842..08cb0e2a9c39 100644
--- a/sys/modules/aic7xxx/ahd/Makefile
+++ b/sys/modules/aic7xxx/ahd/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahd/Makefile,v 1.6 2005/01/26 16:23:34 imp Exp $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahd
diff --git a/sys/modules/aic7xxx/aicasm/Makefile b/sys/modules/aic7xxx/aicasm/Makefile
index b1b2cf7a293f..874974b19072 100644
--- a/sys/modules/aic7xxx/aicasm/Makefile
+++ b/sys/modules/aic7xxx/aicasm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/aicasm/Makefile,v 1.8 2005/01/03 07:27:17 njl Exp $
 
 MAKESRCPATH=	${.CURDIR}/../../../dev/aic7xxx/aicasm
 
diff --git a/sys/modules/aio/Makefile b/sys/modules/aio/Makefile
index 4136135d7350..e7055cdefff8 100644
--- a/sys/modules/aio/Makefile
+++ b/sys/modules/aio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aio/Makefile,v 1.1 2001/12/29 07:13:47 alfred Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/amd/Makefile b/sys/modules/amd/Makefile
index fbaae5c7b7f6..9ec22ac15042 100644
--- a/sys/modules/amd/Makefile
+++ b/sys/modules/amd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/amd/Makefile,v 1.1 2002/12/13 22:59:18 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/amd
 
diff --git a/sys/modules/amr/Makefile b/sys/modules/amr/Makefile
index 53045c8bb2ce..379869845bc5 100644
--- a/sys/modules/amr/Makefile
+++ b/sys/modules/amr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/amr/Makefile,v 1.9 2002/10/18 21:29:14 emoore Exp $
 
 .PATH: ${.CURDIR}/../../dev/amr
 
diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile
index c2c66d5fa700..52ee338bbe55 100644
--- a/sys/modules/an/Makefile
+++ b/sys/modules/an/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/an/Makefile,v 1.7 2004/05/26 00:53:01 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/an
 
diff --git a/sys/modules/aout/Makefile b/sys/modules/aout/Makefile
index 203d9cfca3dd..356f6f4886b3 100644
--- a/sys/modules/aout/Makefile
+++ b/sys/modules/aout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aout/Makefile,v 1.3 2002/09/11 18:03:03 peter Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/apm/Makefile b/sys/modules/apm/Makefile
index 96703b15fab6..374a44e83c20 100644
--- a/sys/modules/apm/Makefile
+++ b/sys/modules/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/apm/Makefile,v 1.9 2005/04/20 12:28:20 nyan Exp $
 
 .PATH: ${.CURDIR}/../../i386/bios
 .if ${MACHINE} == "pc98"
diff --git a/sys/modules/ar/Makefile b/sys/modules/ar/Makefile
index fae9452ef414..4a88ddbf81d4 100644
--- a/sys/modules/ar/Makefile
+++ b/sys/modules/ar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ar/Makefile,v 1.4 2004/06/25 19:22:05 julian Exp $
 
 .PATH:  ${.CURDIR}/../../dev/ar
 KMOD    = if_ar
diff --git a/sys/modules/arcmsr/Makefile b/sys/modules/arcmsr/Makefile
index 0a186f883b6d..b4090fbee9ac 100644
--- a/sys/modules/arcmsr/Makefile
+++ b/sys/modules/arcmsr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/arcmsr/Makefile,v 1.1 2005/03/31 18:19:55 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/arcmsr
 
diff --git a/sys/modules/arcnet/Makefile b/sys/modules/arcnet/Makefile
index ab1d961bdfe0..a73ea3ca6221 100644
--- a/sys/modules/arcnet/Makefile
+++ b/sys/modules/arcnet/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/arcnet/Makefile,v 1.3 2003/01/24 01:32:20 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/arl/Makefile b/sys/modules/arl/Makefile
index 37c6529f74a0..94f1324f0d9c 100644
--- a/sys/modules/arl/Makefile
+++ b/sys/modules/arl/Makefile
@@ -1,5 +1,5 @@
 # $RISS: if_arl/modules/if_arl/Makefile,v 1.3 2003/01/13 08:05:29 frol Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/arl/Makefile,v 1.3 2005/02/09 11:50:43 ru Exp $
 
 .PATH:	${.CURDIR}/../../dev/arl
 
diff --git a/sys/modules/asr/Makefile b/sys/modules/asr/Makefile
index 6b76cf714ecb..aaa301431873 100644
--- a/sys/modules/asr/Makefile
+++ b/sys/modules/asr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/asr/Makefile,v 1.5 2005/03/23 17:13:08 cognet Exp $
 
 .PATH: ${.CURDIR}/../../dev/asr
 
diff --git a/sys/modules/ata/Makefile b/sys/modules/ata/Makefile
index c67ade9d2c0d..280dafa3b502 100644
--- a/sys/modules/ata/Makefile
+++ b/sys/modules/ata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/Makefile,v 1.2 2005/04/05 02:05:01 scottl Exp $
 
 SUBDIR = ata
 SUBDIR += atacard
diff --git a/sys/modules/ata/Makefile.inc b/sys/modules/ata/Makefile.inc
index 265f86d1ed55..69a55e68cb13 100644
--- a/sys/modules/ata/Makefile.inc
+++ b/sys/modules/ata/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/Makefile.inc,v 1.1 2005/03/30 12:03:38 sos Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/ata/ata/Makefile b/sys/modules/ata/ata/Makefile
index 262984e35e27..dd2f954a7f68 100644
--- a/sys/modules/ata/ata/Makefile
+++ b/sys/modules/ata/ata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/ata/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atacam/Makefile b/sys/modules/ata/atacam/Makefile
index dcaf847a3561..258f2f83852b 100644
--- a/sys/modules/ata/atacam/Makefile
+++ b/sys/modules/ata/atacam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atacam/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atacard/Makefile b/sys/modules/ata/atacard/Makefile
index 1bb8b5bcddb2..cd0270d07296 100644
--- a/sys/modules/ata/atacard/Makefile
+++ b/sys/modules/ata/atacard/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atacard/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atacbus/Makefile b/sys/modules/ata/atacbus/Makefile
index 2b11a89137ee..477cb6cdc465 100644
--- a/sys/modules/ata/atacbus/Makefile
+++ b/sys/modules/ata/atacbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atacbus/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atadisk/Makefile b/sys/modules/ata/atadisk/Makefile
index c64cd3f79a07..9bf2822943a4 100644
--- a/sys/modules/ata/atadisk/Makefile
+++ b/sys/modules/ata/atadisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atadisk/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/ataisa/Makefile b/sys/modules/ata/ataisa/Makefile
index b43fd2e34888..8f70f11203f2 100644
--- a/sys/modules/ata/ataisa/Makefile
+++ b/sys/modules/ata/ataisa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/ataisa/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile
index 00d188bb9a8d..07de058f30a1 100644
--- a/sys/modules/ata/atapci/Makefile
+++ b/sys/modules/ata/atapci/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapci/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapicam/Makefile b/sys/modules/ata/atapicam/Makefile
index 6dbaffe1e716..d0ae8e939e55 100644
--- a/sys/modules/ata/atapicam/Makefile
+++ b/sys/modules/ata/atapicam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapicam/Makefile,v 1.1 2005/04/05 02:04:30 scottl Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapicd/Makefile b/sys/modules/ata/atapicd/Makefile
index bcc23199d653..9cc7b3cd32ca 100644
--- a/sys/modules/ata/atapicd/Makefile
+++ b/sys/modules/ata/atapicd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapicd/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapifd/Makefile b/sys/modules/ata/atapifd/Makefile
index f5637480a26d..e0a6c95fc4b1 100644
--- a/sys/modules/ata/atapifd/Makefile
+++ b/sys/modules/ata/atapifd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapifd/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapist/Makefile b/sys/modules/ata/atapist/Makefile
index 86c19b5f7b89..90c7cfe09bc4 100644
--- a/sys/modules/ata/atapist/Makefile
+++ b/sys/modules/ata/atapist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapist/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/ataraid/Makefile b/sys/modules/ata/ataraid/Makefile
index 8f41bd7425b1..5770e9aaccb0 100644
--- a/sys/modules/ata/ataraid/Makefile
+++ b/sys/modules/ata/ataraid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/ataraid/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile
index 15e760cd9811..4f86cbfaf365 100644
--- a/sys/modules/ath/Makefile
+++ b/sys/modules/ath/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath/Makefile,v 1.1 2003/06/23 17:02:43 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath
diff --git a/sys/modules/ath_hal/Makefile b/sys/modules/ath_hal/Makefile
index 1507d139b94a..b87e24a8d4fc 100644
--- a/sys/modules/ath_hal/Makefile
+++ b/sys/modules/ath_hal/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_hal/Makefile,v 1.4 2005/01/18 03:28:08 sam Exp $
 #
 
 #
diff --git a/sys/modules/ath_rate_amrr/Makefile b/sys/modules/ath_rate_amrr/Makefile
index 22f16d2d2213..c9ab129f3038 100644
--- a/sys/modules/ath_rate_amrr/Makefile
+++ b/sys/modules/ath_rate_amrr/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_rate_amrr/Makefile,v 1.1 2004/12/08 17:38:37 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr
diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile
index e404e4b48725..7719bd21d7b7 100644
--- a/sys/modules/ath_rate_onoe/Makefile
+++ b/sys/modules/ath_rate_onoe/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_rate_onoe/Makefile,v 1.1 2004/12/08 17:38:37 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe
diff --git a/sys/modules/ath_rate_sample/Makefile b/sys/modules/ath_rate_sample/Makefile
index 1ce6ea37120c..709551ed4823 100644
--- a/sys/modules/ath_rate_sample/Makefile
+++ b/sys/modules/ath_rate_sample/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_rate_sample/Makefile,v 1.1 2005/03/11 01:39:57 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample
diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile
index c7bb645391e0..b917f3bfac89 100644
--- a/sys/modules/aue/Makefile
+++ b/sys/modules/aue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aue/Makefile,v 1.7 2004/06/27 12:33:16 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/auxio/Makefile b/sys/modules/auxio/Makefile
index ead878cce503..531d1eb68f3f 100644
--- a/sys/modules/auxio/Makefile
+++ b/sys/modules/auxio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/auxio/Makefile,v 1.2 2005/02/25 06:59:56 yongari Exp $
 
 .PATH: ${.CURDIR}/../../dev/auxio
 
diff --git a/sys/modules/awi/Makefile b/sys/modules/awi/Makefile
index 554ffe5c01ab..5247af6fe1c8 100644
--- a/sys/modules/awi/Makefile
+++ b/sys/modules/awi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/awi/Makefile,v 1.3 2004/05/26 00:53:01 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/awi
 
diff --git a/sys/modules/axe/Makefile b/sys/modules/axe/Makefile
index fa00d095fbac..2e125c143094 100644
--- a/sys/modules/axe/Makefile
+++ b/sys/modules/axe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/axe/Makefile,v 1.2 2004/06/27 12:33:16 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/bfe/Makefile b/sys/modules/bfe/Makefile
index 6fbe93ab854a..dca07b83fe3b 100644
--- a/sys/modules/bfe/Makefile
+++ b/sys/modules/bfe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bfe/Makefile,v 1.1 2003/09/09 18:17:22 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../dev/bfe
 
diff --git a/sys/modules/bge/Makefile b/sys/modules/bge/Makefile
index 53d8e54a2657..6c5e4db93e3e 100644
--- a/sys/modules/bge/Makefile
+++ b/sys/modules/bge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bge/Makefile,v 1.3 2005/06/24 21:43:47 dwhite Exp $
 
 .PATH: ${.CURDIR}/../../dev/bge
 
diff --git a/sys/modules/bios/Makefile b/sys/modules/bios/Makefile
index d150806c045d..d76e4b722585 100644
--- a/sys/modules/bios/Makefile
+++ b/sys/modules/bios/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/Makefile,v 1.1 2003/03/29 15:20:44 mdodd Exp $
 #
 
 SUBDIR=	smapi smbios vpd
diff --git a/sys/modules/bios/smapi/Makefile b/sys/modules/bios/smapi/Makefile
index a845c0adc970..c32bc6f36b42 100644
--- a/sys/modules/bios/smapi/Makefile
+++ b/sys/modules/bios/smapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/smapi/Makefile,v 1.2 2005/01/26 16:24:55 imp Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
diff --git a/sys/modules/bios/smbios/Makefile b/sys/modules/bios/smbios/Makefile
index 40df8e80db47..412bc01601ef 100644
--- a/sys/modules/bios/smbios/Makefile
+++ b/sys/modules/bios/smbios/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/smbios/Makefile,v 1.1 2003/03/29 15:20:44 mdodd Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
diff --git a/sys/modules/bios/vpd/Makefile b/sys/modules/bios/vpd/Makefile
index d1dd8f1d9215..29905cea3e75 100644
--- a/sys/modules/bios/vpd/Makefile
+++ b/sys/modules/bios/vpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/vpd/Makefile,v 1.1 2003/03/29 15:20:44 mdodd Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
diff --git a/sys/modules/bktr/Makefile b/sys/modules/bktr/Makefile
index 1a9e0376921f..97178d2b12d5 100644
--- a/sys/modules/bktr/Makefile
+++ b/sys/modules/bktr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/Makefile,v 1.13 2000/09/10 15:40:15 roger Exp $
 
 SUBDIR =
 SUBDIR += bktr
diff --git a/sys/modules/bktr/Makefile.inc b/sys/modules/bktr/Makefile.inc
index 265f86d1ed55..c91b77b49aec 100644
--- a/sys/modules/bktr/Makefile.inc
+++ b/sys/modules/bktr/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/bktr/bktr/Makefile b/sys/modules/bktr/bktr/Makefile
index bd0286420c63..f6c4b3a7395c 100644
--- a/sys/modules/bktr/bktr/Makefile
+++ b/sys/modules/bktr/bktr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/bktr/Makefile,v 1.7 2004/12/29 08:43:14 imp Exp $
 
 # Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
 
diff --git a/sys/modules/bktr/bktr_mem/Makefile b/sys/modules/bktr/bktr_mem/Makefile
index 5e9f6b5f7a22..dab26e559ea9 100644
--- a/sys/modules/bktr/bktr_mem/Makefile
+++ b/sys/modules/bktr/bktr_mem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/bktr_mem/Makefile,v 1.3 2002/01/11 01:15:58 msmith Exp $
 
 MAINTAINER=	roger@freebsd.org
 
diff --git a/sys/modules/bridge/Makefile b/sys/modules/bridge/Makefile
index d2c1e32391da..2392e618eef1 100644
--- a/sys/modules/bridge/Makefile
+++ b/sys/modules/bridge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bridge/Makefile,v 1.5 2004/08/27 19:57:33 andre Exp $
 
 .PATH:	${.CURDIR}/../../net
 KMOD=	bridge
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index d175dbf8141b..5c6b1914eedd 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cam/Makefile,v 1.13 2005/06/04 10:58:37 schweikh Exp $
 
 S=	${.CURDIR}/../..
 
diff --git a/sys/modules/canbepm/Makefile b/sys/modules/canbepm/Makefile
index 0eb911243eee..630e601a4e64 100644
--- a/sys/modules/canbepm/Makefile
+++ b/sys/modules/canbepm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/canbepm/Makefile,v 1.1 2003/02/03 14:46:26 nyan Exp $
 
 .PATH:	${.CURDIR}/../../pc98/pc98
 KMOD	= canbepm
diff --git a/sys/modules/canbus/Makefile b/sys/modules/canbus/Makefile
index 19487e01ef3d..4e576f77ec73 100644
--- a/sys/modules/canbus/Makefile
+++ b/sys/modules/canbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/canbus/Makefile,v 1.1 2003/02/03 14:46:26 nyan Exp $
 
 .PATH:	${.CURDIR}/../../pc98/pc98
 KMOD	= canbus
diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile
index 67019ee0dd4e..9ceb2796dc2e 100644
--- a/sys/modules/cardbus/Makefile
+++ b/sys/modules/cardbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cardbus/Makefile,v 1.10 2002/01/11 20:14:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/cardbus
 
diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile
index a071485ccd73..32d241e18c30 100644
--- a/sys/modules/cbb/Makefile
+++ b/sys/modules/cbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cbb/Makefile,v 1.10 2004/08/16 15:24:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/pccbb
 
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 6dffbc9cabe9..a53d8f791da9 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cd9660/Makefile,v 1.15 2003/09/26 20:26:24 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../isofs/cd9660
 
diff --git a/sys/modules/cd9660_iconv/Makefile b/sys/modules/cd9660_iconv/Makefile
index 49104d383cf2..04f9eeb3b6ca 100644
--- a/sys/modules/cd9660_iconv/Makefile
+++ b/sys/modules/cd9660_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cd9660_iconv/Makefile,v 1.1 2003/09/26 20:26:24 fjoe Exp $
 
 .PATH:	${.CURDIR}/../../isofs/cd9660
 KMOD=	cd9660_iconv
diff --git a/sys/modules/cdce/Makefile b/sys/modules/cdce/Makefile
index c82754d2bfce..02717a177690 100644
--- a/sys/modules/cdce/Makefile
+++ b/sys/modules/cdce/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cdce/Makefile,v 1.1 2005/03/22 14:52:40 sobomax Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ciss/Makefile b/sys/modules/ciss/Makefile
index 2ea619c5786c..696124a8e1c4 100644
--- a/sys/modules/ciss/Makefile
+++ b/sys/modules/ciss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ciss/Makefile,v 1.2 2002/10/27 12:09:51 mux Exp $
 
 KMOD		=  ciss
 .PATH:		${.CURDIR}/../../dev/${KMOD}
diff --git a/sys/modules/cm/Makefile b/sys/modules/cm/Makefile
index 3f2067b46985..beb64e50171a 100644
--- a/sys/modules/cm/Makefile
+++ b/sys/modules/cm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cm/Makefile,v 1.1 2002/01/08 20:03:13 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../dev/cm
 
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index 919213a0b5ea..a805c8e9510a 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coda/Makefile,v 1.16 2004/09/01 06:51:43 ru Exp $
 
 .PATH: ${.CURDIR}/../../coda
 
diff --git a/sys/modules/coda5/Makefile b/sys/modules/coda5/Makefile
index f974cc09b31b..2a3abaa22fb7 100644
--- a/sys/modules/coda5/Makefile
+++ b/sys/modules/coda5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coda5/Makefile,v 1.4 2004/09/01 06:51:43 ru Exp $
 
 .PATH: ${.CURDIR}/../../coda
 
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index 95956e5c9784..ecae7161d995 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coff/Makefile,v 1.15 2002/01/11 15:48:38 ru Exp $
 
 .PATH: ${.CURDIR}/../../i386/ibcs2
 
diff --git a/sys/modules/cp/Makefile b/sys/modules/cp/Makefile
index fb8d951da4ad..2beae515b7a6 100644
--- a/sys/modules/cp/Makefile
+++ b/sys/modules/cp/Makefile
@@ -1,5 +1,5 @@
 # $Cronyx: sys.modules.cp.Makefile,v 1.1.2.3 2004/04/28 16:17:57 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cp/Makefile,v 1.3 2004/12/21 08:47:19 ru Exp $
 
 .PATH:  ${.CURDIR}/../../dev/cp
 KMOD	= if_cp
diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile
index 8f675b29fa85..2ee6f8125121 100644
--- a/sys/modules/cpufreq/Makefile
+++ b/sys/modules/cpufreq/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cpufreq/Makefile,v 1.8 2005/04/19 16:38:24 njl Exp $
 
 .PATH:	${.CURDIR}/../../dev/cpufreq		\
 	${.CURDIR}/../../${MACHINE_ARCH}/cpufreq
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 01fdd4b96344..74b354eb1b66 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/crypto/Makefile,v 1.3 2005/03/11 17:24:46 ume Exp $
 
 .PATH:	${.CURDIR}/../../opencrypto
 .PATH:	${.CURDIR}/../../crypto
diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile
index b2692a690218..57e93a4ed341 100644
--- a/sys/modules/cryptodev/Makefile
+++ b/sys/modules/cryptodev/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cryptodev/Makefile,v 1.1 2002/10/04 20:35:02 sam Exp $
 
 .PATH:	${.CURDIR}/../../opencrypto
 KMOD	= cryptodev
diff --git a/sys/modules/cs/Makefile b/sys/modules/cs/Makefile
index 39da53044b3f..18e3ed8ab619 100644
--- a/sys/modules/cs/Makefile
+++ b/sys/modules/cs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cs/Makefile,v 1.3 2004/09/04 03:32:15 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/cs
 
diff --git a/sys/modules/ctau/Makefile b/sys/modules/ctau/Makefile
index 75ad7f0a96f9..81f4783ae47d 100644
--- a/sys/modules/ctau/Makefile
+++ b/sys/modules/ctau/Makefile
@@ -1,5 +1,5 @@
 # Cronyx Id: sys.modules.ct.Makefile,v 1.1.2.2 2003/12/08 15:39:01 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ctau/Makefile,v 1.3 2004/09/01 07:12:24 ru Exp $
 .PATH:  ${.CURDIR}/../../dev/ctau
 KMOD=   if_ct
 SRCS=   if_ct.c ctddk.c ctau.c opt_netgraph.h opt_ng_cronyx.h bpf.h sppp.h \
diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile
index 939e714aacfd..aba0fe89eeaf 100644
--- a/sys/modules/cue/Makefile
+++ b/sys/modules/cue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cue/Makefile,v 1.6 2004/06/27 12:33:16 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/cx/Makefile b/sys/modules/cx/Makefile
index ce9932c1e0c1..81a2201fb0fb 100644
--- a/sys/modules/cx/Makefile
+++ b/sys/modules/cx/Makefile
@@ -1,5 +1,5 @@
 # Cronyx Id: sys.modules.cx.Makefile,v 1.1.2.2 2003/01/21 15:15:49 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cx/Makefile,v 1.4 2004/09/01 07:12:24 ru Exp $
 
 .PATH:  ${.CURDIR}/../../dev/cx
 KMOD=   if_cx
diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile
index ac56533935fb..385d2fdeb080 100644
--- a/sys/modules/dc/Makefile
+++ b/sys/modules/dc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dc/Makefile,v 1.6 2001/01/06 13:59:44 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/dcons/Makefile b/sys/modules/dcons/Makefile
index 555dd688709f..732018a21c9e 100644
--- a/sys/modules/dcons/Makefile
+++ b/sys/modules/dcons/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dcons/Makefile,v 1.3 2004/10/13 05:41:09 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 
diff --git a/sys/modules/dcons_crom/Makefile b/sys/modules/dcons_crom/Makefile
index 258beaddf14b..517583aa14f0 100644
--- a/sys/modules/dcons_crom/Makefile
+++ b/sys/modules/dcons_crom/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/10/24 15:43:24 simokawa Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dcons_crom/Makefile,v 1.2 2004/10/13 05:41:09 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 
diff --git a/sys/modules/de/Makefile b/sys/modules/de/Makefile
index f625252152d0..2abce9ae076e 100644
--- a/sys/modules/de/Makefile
+++ b/sys/modules/de/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/de/Makefile,v 1.3 2004/07/09 02:38:25 bms Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/digi/Makefile b/sys/modules/digi/Makefile
index 9d9aea61da70..c881da1445db 100755
--- a/sys/modules/digi/Makefile
+++ b/sys/modules/digi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/Makefile,v 1.1 2001/05/02 01:08:06 brian Exp $
 
 SUBDIR=	digi
 SUBDIR+=digi_CX
diff --git a/sys/modules/digi/Makefile.inc b/sys/modules/digi/Makefile.inc
index 265f86d1ed55..b11eaf0d7213 100755
--- a/sys/modules/digi/Makefile.inc
+++ b/sys/modules/digi/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/Makefile.inc,v 1.1 2001/05/02 01:08:06 brian Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/digi/digi/Makefile b/sys/modules/digi/digi/Makefile
index 5737af536f05..4a62c5cffa67 100644
--- a/sys/modules/digi/digi/Makefile
+++ b/sys/modules/digi/digi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi/Makefile,v 1.3 2002/02/15 15:45:34 bde Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi
diff --git a/sys/modules/digi/digi_CX/Makefile b/sys/modules/digi/digi_CX/Makefile
index 2d833dec8fff..7d7135340c3d 100644
--- a/sys/modules/digi/digi_CX/Makefile
+++ b/sys/modules/digi/digi_CX/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_CX/Makefile,v 1.1 2001/05/02 01:08:07 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_CX
diff --git a/sys/modules/digi/digi_CX_PCI/Makefile b/sys/modules/digi/digi_CX_PCI/Makefile
index 65afb17f2d6c..3279f3ec48c3 100644
--- a/sys/modules/digi/digi_CX_PCI/Makefile
+++ b/sys/modules/digi/digi_CX_PCI/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_CX_PCI/Makefile,v 1.1 2001/05/02 01:08:07 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_CX_PCI
diff --git a/sys/modules/digi/digi_EPCX/Makefile b/sys/modules/digi/digi_EPCX/Makefile
index e9d95b01d147..7692ee6ec934 100644
--- a/sys/modules/digi/digi_EPCX/Makefile
+++ b/sys/modules/digi/digi_EPCX/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_EPCX/Makefile,v 1.1 2001/05/02 01:08:07 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_EPCX
diff --git a/sys/modules/digi/digi_EPCX_PCI/Makefile b/sys/modules/digi/digi_EPCX_PCI/Makefile
index d1119cc0bb54..2fbc877f6c27 100644
--- a/sys/modules/digi/digi_EPCX_PCI/Makefile
+++ b/sys/modules/digi/digi_EPCX_PCI/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_EPCX_PCI/Makefile,v 1.1 2001/05/02 01:08:08 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_EPCX_PCI
diff --git a/sys/modules/digi/digi_Xe/Makefile b/sys/modules/digi/digi_Xe/Makefile
index 4c8f9e53c62c..a8234b2b2e6d 100644
--- a/sys/modules/digi/digi_Xe/Makefile
+++ b/sys/modules/digi/digi_Xe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_Xe/Makefile,v 1.1 2001/05/02 01:08:08 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xe
diff --git a/sys/modules/digi/digi_Xem/Makefile b/sys/modules/digi/digi_Xem/Makefile
index 0a49ddd07f75..1b5294ea06f5 100644
--- a/sys/modules/digi/digi_Xem/Makefile
+++ b/sys/modules/digi/digi_Xem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_Xem/Makefile,v 1.1 2001/05/02 01:08:08 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xem
diff --git a/sys/modules/digi/digi_Xr/Makefile b/sys/modules/digi/digi_Xr/Makefile
index 786ce79a1c60..2bf16d71aa67 100644
--- a/sys/modules/digi/digi_Xr/Makefile
+++ b/sys/modules/digi/digi_Xr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_Xr/Makefile,v 1.1 2001/05/02 01:08:09 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xr
diff --git a/sys/modules/dpt/Makefile b/sys/modules/dpt/Makefile
index 3f681b0c0dfb..0be23a1065a8 100644
--- a/sys/modules/dpt/Makefile
+++ b/sys/modules/dpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dpt/Makefile,v 1.1 2003/03/29 15:47:13 mdodd Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/dpt
diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile
index 6a8bd8e7f429..691b9b71c968 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/Makefile,v 1.4 2005/04/16 03:44:46 anholt Exp $
 
 SUBDIR = \
 	drm \
diff --git a/sys/modules/drm/Makefile.inc b/sys/modules/drm/Makefile.inc
index 265f86d1ed55..922d96595e67 100644
--- a/sys/modules/drm/Makefile.inc
+++ b/sys/modules/drm/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/drm/drm/Makefile b/sys/modules/drm/drm/Makefile
index faa30097553d..dfa4b3a3f842 100644
--- a/sys/modules/drm/drm/Makefile
+++ b/sys/modules/drm/drm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/drm/Makefile,v 1.1 2005/04/16 03:44:47 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= drm
diff --git a/sys/modules/drm/mach64/Makefile b/sys/modules/drm/mach64/Makefile
index 4d5069c1e5eb..3b31e0727452 100644
--- a/sys/modules/drm/mach64/Makefile
+++ b/sys/modules/drm/mach64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/mach64/Makefile,v 1.1 2005/04/16 03:44:47 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= mach64
diff --git a/sys/modules/drm/mga/Makefile b/sys/modules/drm/mga/Makefile
index d88d12c78d03..0b15554ddfd6 100644
--- a/sys/modules/drm/mga/Makefile
+++ b/sys/modules/drm/mga/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/mga/Makefile,v 1.5 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= mga
diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile
index e80a0d803f8b..cb20f2431baa 100644
--- a/sys/modules/drm/r128/Makefile
+++ b/sys/modules/drm/r128/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/r128/Makefile,v 1.5 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= r128
diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile
index ba59b7273f17..c2158bdcc2b8 100644
--- a/sys/modules/drm/radeon/Makefile
+++ b/sys/modules/drm/radeon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/radeon/Makefile,v 1.5.8.1 2005/08/04 17:31:01 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= radeon
diff --git a/sys/modules/drm/sis/Makefile b/sys/modules/drm/sis/Makefile
index 885ce2863bb4..fcfc28c81bb1 100644
--- a/sys/modules/drm/sis/Makefile
+++ b/sys/modules/drm/sis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/sis/Makefile,v 1.2 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD= 	sis
diff --git a/sys/modules/drm/tdfx/Makefile b/sys/modules/drm/tdfx/Makefile
index 2e015a7cead7..0c071cd76731 100644
--- a/sys/modules/drm/tdfx/Makefile
+++ b/sys/modules/drm/tdfx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/tdfx/Makefile,v 1.3 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= tdfx
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index 18f6eedfefd8..dccbdce0bf99 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dummynet/Makefile,v 1.3 2002/01/11 15:48:38 ru Exp $
 
 .PATH:  ${.CURDIR}/../../netinet
 KMOD=   dummynet
diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile
index 723df349904a..8f52104910f9 100644
--- a/sys/modules/ed/Makefile
+++ b/sys/modules/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ed/Makefile,v 1.9.2.1 2005/10/08 18:00:41 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ed
 
diff --git a/sys/modules/el/Makefile b/sys/modules/el/Makefile
index 78394059226f..520d480e2ec1 100644
--- a/sys/modules/el/Makefile
+++ b/sys/modules/el/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/el/Makefile,v 1.2 2001/01/06 13:59:45 obrien Exp $
 
 .PATH: ${.CURDIR}/../../i386/isa
 
diff --git a/sys/modules/elink/Makefile b/sys/modules/elink/Makefile
index a7776578931b..518e70bd3b8e 100644
--- a/sys/modules/elink/Makefile
+++ b/sys/modules/elink/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/elink/Makefile,v 1.1 2003/03/29 13:42:20 mdodd Exp $
 #
 
 .PATH:	${.CURDIR}/../../i386/isa
diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile
index 9518d6828975..9059a0bd0711 100644
--- a/sys/modules/em/Makefile
+++ b/sys/modules/em/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/modules/em/Makefile,v 1.4 2004/06/09 08:27:05 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/em
 
diff --git a/sys/modules/en/Makefile b/sys/modules/en/Makefile
index 42909facad40..0dcdcdad54cc 100644
--- a/sys/modules/en/Makefile
+++ b/sys/modules/en/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/en/Makefile,v 1.3 2003/08/06 16:01:32 harti Exp $
 
 .PATH: ${.CURDIR}/../../dev/en
 
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index 39bb42f09d4e..0c4db69d79b4 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ep/Makefile,v 1.8 2005/03/17 18:40:37 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ep
 
diff --git a/sys/modules/esp/Makefile b/sys/modules/esp/Makefile
index 2685b09ed298..3d7723f1feb1 100644
--- a/sys/modules/esp/Makefile
+++ b/sys/modules/esp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/esp/Makefile,v 1.5 2005/05/19 14:51:10 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/esp ${.CURDIR}/../../sparc64/sbus
 
diff --git a/sys/modules/ex/Makefile b/sys/modules/ex/Makefile
index 5c394aa5e11f..abe0b4f10f2f 100644
--- a/sys/modules/ex/Makefile
+++ b/sys/modules/ex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ex/Makefile,v 1.2 2004/05/26 00:53:02 imp Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/ex
diff --git a/sys/modules/exca/Makefile b/sys/modules/exca/Makefile
index b7a8d522b283..9bec941b0c07 100644
--- a/sys/modules/exca/Makefile
+++ b/sys/modules/exca/Makefile
@@ -1,4 +1,4 @@
- # $FreeBSD$
+ # $FreeBSD: src/sys/modules/exca/Makefile,v 1.2 2004/05/26 00:53:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/exca
 
diff --git a/sys/modules/ext2fs/Makefile b/sys/modules/ext2fs/Makefile
index 1ce8ab87aa28..8ea80f461d8c 100644
--- a/sys/modules/ext2fs/Makefile
+++ b/sys/modules/ext2fs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ext2fs/Makefile,v 1.6 2005/06/15 02:36:11 rodrigc Exp $
 
 .PATH:	${.CURDIR}/../../gnu/fs/ext2fs
 KMOD=	ext2fs
diff --git a/sys/modules/fatm/Makefile b/sys/modules/fatm/Makefile
index f6d39672a4f2..d7f07976fa75 100644
--- a/sys/modules/fatm/Makefile
+++ b/sys/modules/fatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fatm/Makefile,v 1.2 2004/02/13 10:11:00 ru Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index b632dcd15896..8aef98bd186c 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fdc/Makefile,v 1.14 2005/05/10 12:02:15 nyan Exp $
 
 KMOD=	fdc
 WARNS?=	2
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index eead3ec0862b..0c454763b11b 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fdescfs/Makefile,v 1.12 2002/01/11 15:48:39 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/fdescfs
 
diff --git a/sys/modules/fe/Makefile b/sys/modules/fe/Makefile
index 77af85bfd63b..32aedc41ddb6 100644
--- a/sys/modules/fe/Makefile
+++ b/sys/modules/fe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fe/Makefile,v 1.3 2004/05/26 00:53:04 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/fe
 
diff --git a/sys/modules/firewire/Makefile b/sys/modules/firewire/Makefile
index 379ad58ba0ea..13592482db91 100644
--- a/sys/modules/firewire/Makefile
+++ b/sys/modules/firewire/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/Makefile,v 1.5 2004/07/12 13:13:17 dfr Exp $
 
 SUBDIR=	firewire \
 	fwe \
diff --git a/sys/modules/firewire/Makefile.inc b/sys/modules/firewire/Makefile.inc
index 265f86d1ed55..cf896c728078 100644
--- a/sys/modules/firewire/Makefile.inc
+++ b/sys/modules/firewire/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/Makefile.inc,v 1.3 2004/02/13 10:11:00 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/firewire/firewire/Makefile b/sys/modules/firewire/firewire/Makefile
index 8e4e06f0fc91..68bcddbd44cd 100644
--- a/sys/modules/firewire/firewire/Makefile
+++ b/sys/modules/firewire/firewire/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/firewire/Makefile,v 1.7 2003/04/17 03:38:02 simokawa Exp $
 
 # Makefile for the IEEE1394 OHCI chipset
 
diff --git a/sys/modules/firewire/fwe/Makefile b/sys/modules/firewire/fwe/Makefile
index 6b26606b04e0..ed37b792b6e0 100644
--- a/sys/modules/firewire/fwe/Makefile
+++ b/sys/modules/firewire/fwe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/fwe/Makefile,v 1.3 2003/04/17 03:38:03 simokawa Exp $
 
 # Makefile for the fwe(4) module (Ethernet over IEEE1394)
 
diff --git a/sys/modules/firewire/fwip/Makefile b/sys/modules/firewire/fwip/Makefile
index 002bd9a85491..51d75a7ef133 100644
--- a/sys/modules/firewire/fwip/Makefile
+++ b/sys/modules/firewire/fwip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/fwip/Makefile,v 1.1 2004/07/12 13:12:56 dfr Exp $
 
 # Makefile for the fwip(4) module (IP over IEEE1394)
 
diff --git a/sys/modules/firewire/sbp/Makefile b/sys/modules/firewire/sbp/Makefile
index 7acf1a39fb32..336c522349c1 100644
--- a/sys/modules/firewire/sbp/Makefile
+++ b/sys/modules/firewire/sbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/sbp/Makefile,v 1.3 2003/10/02 04:06:56 simokawa Exp $
 
 # Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394)
 
diff --git a/sys/modules/firewire/sbp_targ/Makefile b/sys/modules/firewire/sbp_targ/Makefile
index 04eaa9466fb2..058c3db708b8 100644
--- a/sys/modules/firewire/sbp_targ/Makefile
+++ b/sys/modules/firewire/sbp_targ/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/sbp_targ/Makefile,v 1.2 2004/02/13 10:11:00 ru Exp $
 
 # Makefile for the SBP-II Target mode
 
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index 0904e1a1b789..9a67b7c71b6c 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fxp/Makefile,v 1.17 2001/09/05 23:47:01 brooks Exp $
 
 .PATH: ${.CURDIR}/../../dev/fxp
 
diff --git a/sys/modules/gem/Makefile b/sys/modules/gem/Makefile
index 4352bd636f86..b6830fe7d796 100644
--- a/sys/modules/gem/Makefile
+++ b/sys/modules/gem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/gem/Makefile,v 1.1 2003/01/08 20:40:29 tmm Exp $
 
 .PATH: ${.CURDIR}/../../dev/gem
 
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index cf99e377f7c8..b4dbdbb67530 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/Makefile,v 1.13.2.2 2005/08/05 20:02:45 pjd Exp $
 
 SUBDIR=	geom_apple \
 	geom_bde \
diff --git a/sys/modules/geom/Makefile.inc b/sys/modules/geom/Makefile.inc
index 265f86d1ed55..b985b59dd6e9 100644
--- a/sys/modules/geom/Makefile.inc
+++ b/sys/modules/geom/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/Makefile.inc,v 1.1 2003/06/15 04:27:22 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/geom/geom_apple/Makefile b/sys/modules/geom/geom_apple/Makefile
index 4ec59a629289..e97c3b3d90b8 100644
--- a/sys/modules/geom/geom_apple/Makefile
+++ b/sys/modules/geom/geom_apple/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_apple/Makefile,v 1.1 2003/05/31 18:36:40 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile
index 2da5bf411ce7..c1b90eece316 100644
--- a/sys/modules/geom/geom_bde/Makefile
+++ b/sys/modules/geom/geom_bde/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_bde/Makefile,v 1.1 2003/05/31 18:36:40 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom/bde
 
diff --git a/sys/modules/geom/geom_bsd/Makefile b/sys/modules/geom/geom_bsd/Makefile
index 884ac6e98bad..e5e84abb9db9 100644
--- a/sys/modules/geom/geom_bsd/Makefile
+++ b/sys/modules/geom/geom_bsd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_bsd/Makefile,v 1.1 2003/05/31 18:36:40 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_ccd/Makefile b/sys/modules/geom/geom_ccd/Makefile
index 18d6eeb04718..dde3fdca0728 100644
--- a/sys/modules/geom/geom_ccd/Makefile
+++ b/sys/modules/geom/geom_ccd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_ccd/Makefile,v 1.1 2003/06/09 21:49:54 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_concat/Makefile b/sys/modules/geom/geom_concat/Makefile
index 3de201a79b48..15ad24932164 100644
--- a/sys/modules/geom/geom_concat/Makefile
+++ b/sys/modules/geom/geom_concat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_concat/Makefile,v 1.1 2004/02/19 15:43:58 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/concat
 
diff --git a/sys/modules/geom/geom_eli/Makefile b/sys/modules/geom/geom_eli/Makefile
index 20db77d5b703..5c75762037df 100644
--- a/sys/modules/geom/geom_eli/Makefile
+++ b/sys/modules/geom/geom_eli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_eli/Makefile,v 1.1.2.1 2005/08/05 19:58:14 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/eli
 
diff --git a/sys/modules/geom/geom_fox/Makefile b/sys/modules/geom/geom_fox/Makefile
index adf8c2e8e8bf..3f1b6f51fe6c 100644
--- a/sys/modules/geom/geom_fox/Makefile
+++ b/sys/modules/geom/geom_fox/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_fox/Makefile,v 1.1 2003/06/18 09:29:27 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_gate/Makefile b/sys/modules/geom/geom_gate/Makefile
index 783a58ac2d82..56b3a0e30f3c 100644
--- a/sys/modules/geom/geom_gate/Makefile
+++ b/sys/modules/geom/geom_gate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_gate/Makefile,v 1.1 2004/04/30 16:09:28 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/gate
 
diff --git a/sys/modules/geom/geom_gpt/Makefile b/sys/modules/geom/geom_gpt/Makefile
index ca074bda369c..2b6febd07eda 100644
--- a/sys/modules/geom/geom_gpt/Makefile
+++ b/sys/modules/geom/geom_gpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_gpt/Makefile,v 1.1 2003/05/31 18:36:41 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile
index 435dc1170c02..22a4a0e444d1 100644
--- a/sys/modules/geom/geom_label/Makefile
+++ b/sys/modules/geom/geom_label/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_label/Makefile,v 1.1.8.1 2005/08/16 08:20:48 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/label
 
diff --git a/sys/modules/geom/geom_mbr/Makefile b/sys/modules/geom/geom_mbr/Makefile
index 1820f3bc3bdd..b50bfe4c5a5e 100644
--- a/sys/modules/geom/geom_mbr/Makefile
+++ b/sys/modules/geom/geom_mbr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_mbr/Makefile,v 1.2 2003/07/05 08:11:43 jmg Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_mirror/Makefile b/sys/modules/geom/geom_mirror/Makefile
index 3e653ce540c4..5c3def41be22 100644
--- a/sys/modules/geom/geom_mirror/Makefile
+++ b/sys/modules/geom/geom_mirror/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_mirror/Makefile,v 1.1 2004/07/30 23:13:44 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/mirror
 
diff --git a/sys/modules/geom/geom_nop/Makefile b/sys/modules/geom/geom_nop/Makefile
index 139e12422ea2..71c983e4c866 100644
--- a/sys/modules/geom/geom_nop/Makefile
+++ b/sys/modules/geom/geom_nop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_nop/Makefile,v 1.1 2004/05/20 10:27:20 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/nop
 
diff --git a/sys/modules/geom/geom_pc98/Makefile b/sys/modules/geom/geom_pc98/Makefile
index 2c5952d3e4f0..0ad176ccecb2 100644
--- a/sys/modules/geom/geom_pc98/Makefile
+++ b/sys/modules/geom/geom_pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_pc98/Makefile,v 1.1 2003/05/31 18:36:41 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_raid3/Makefile b/sys/modules/geom/geom_raid3/Makefile
index b202237a611f..29df04423437 100644
--- a/sys/modules/geom/geom_raid3/Makefile
+++ b/sys/modules/geom/geom_raid3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_raid3/Makefile,v 1.1 2004/08/16 06:23:14 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/raid3
 
diff --git a/sys/modules/geom/geom_shsec/Makefile b/sys/modules/geom/geom_shsec/Makefile
index f229203ad87a..c7f57212fa01 100644
--- a/sys/modules/geom/geom_shsec/Makefile
+++ b/sys/modules/geom/geom_shsec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_shsec/Makefile,v 1.1 2005/01/11 18:06:44 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/shsec
 
diff --git a/sys/modules/geom/geom_stripe/Makefile b/sys/modules/geom/geom_stripe/Makefile
index 278d3accfdc6..4968df58a61e 100644
--- a/sys/modules/geom/geom_stripe/Makefile
+++ b/sys/modules/geom/geom_stripe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_stripe/Makefile,v 1.1 2004/05/20 10:27:20 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/stripe
 
diff --git a/sys/modules/geom/geom_sunlabel/Makefile b/sys/modules/geom/geom_sunlabel/Makefile
index 840395aaf1de..4ff6266c420e 100644
--- a/sys/modules/geom/geom_sunlabel/Makefile
+++ b/sys/modules/geom/geom_sunlabel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_sunlabel/Makefile,v 1.1 2003/05/31 18:36:41 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile
index 8e468451773b..ede20e1dc04f 100644
--- a/sys/modules/geom/geom_uzip/Makefile
+++ b/sys/modules/geom/geom_uzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_uzip/Makefile,v 1.2 2004/09/08 17:27:31 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../../geom/uzip ${.CURDIR}/../../../net
 
diff --git a/sys/modules/geom/geom_vinum/Makefile b/sys/modules/geom/geom_vinum/Makefile
index 35a1c9b1d41b..3aab94c631b9 100644
--- a/sys/modules/geom/geom_vinum/Makefile
+++ b/sys/modules/geom/geom_vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_vinum/Makefile,v 1.1.8.1 2005/10/09 04:34:29 delphij Exp $
 
 .PATH: ${.CURDIR}/../../../geom/vinum
 
diff --git a/sys/modules/geom/geom_vol_ffs/Makefile b/sys/modules/geom/geom_vol_ffs/Makefile
index de9b75806dfe..aee68421fade 100644
--- a/sys/modules/geom/geom_vol_ffs/Makefile
+++ b/sys/modules/geom/geom_vol_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_vol_ffs/Makefile,v 1.1 2003/06/03 20:32:13 gordon Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_zero/Makefile b/sys/modules/geom/geom_zero/Makefile
index 43dae09d3333..e184fd628932 100644
--- a/sys/modules/geom/geom_zero/Makefile
+++ b/sys/modules/geom/geom_zero/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_zero/Makefile,v 1.1.2.1 2005/07/30 06:22:24 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/zero
 
diff --git a/sys/modules/harp/Makefile b/sys/modules/harp/Makefile
index e6d75ed1d555..e64b32de59a5 100644
--- a/sys/modules/harp/Makefile
+++ b/sys/modules/harp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/harp/Makefile,v 1.2 2004/02/13 10:11:00 ru Exp $
 #
 # Author: Harti Brandt <brandt@fokus.gmd.de>
 #
diff --git a/sys/modules/hatm/Makefile b/sys/modules/hatm/Makefile
index f455f810a6c2..00e6103fa8fb 100644
--- a/sys/modules/hatm/Makefile
+++ b/sys/modules/hatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hatm/Makefile,v 1.2 2004/02/13 10:11:00 ru Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/hfa/Makefile b/sys/modules/hfa/Makefile
index 964083090442..359324518232 100644
--- a/sys/modules/hfa/Makefile
+++ b/sys/modules/hfa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/Makefile,v 1.1 2002/04/17 00:24:57 mdodd Exp $
 
 SUBDIR=	hfa pci
 
diff --git a/sys/modules/hfa/Makefile.inc b/sys/modules/hfa/Makefile.inc
index 265f86d1ed55..deafde7d2385 100644
--- a/sys/modules/hfa/Makefile.inc
+++ b/sys/modules/hfa/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/hfa/eisa/Makefile b/sys/modules/hfa/eisa/Makefile
index bc4f30de70cd..28707a17063b 100644
--- a/sys/modules/hfa/eisa/Makefile
+++ b/sys/modules/hfa/eisa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/eisa/Makefile,v 1.1 2002/04/17 00:25:08 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
 
diff --git a/sys/modules/hfa/hfa/Makefile b/sys/modules/hfa/hfa/Makefile
index 3c8694ca0684..27088531c114 100644
--- a/sys/modules/hfa/hfa/Makefile
+++ b/sys/modules/hfa/hfa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/hfa/Makefile,v 1.1 2002/04/17 00:25:44 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
 
diff --git a/sys/modules/hfa/pci/Makefile b/sys/modules/hfa/pci/Makefile
index 3e62752b31cd..00faf2ee0a13 100644
--- a/sys/modules/hfa/pci/Makefile
+++ b/sys/modules/hfa/pci/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/pci/Makefile,v 1.1 2002/04/17 00:26:01 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
   
diff --git a/sys/modules/hfa/sbus/Makefile b/sys/modules/hfa/sbus/Makefile
index 3862c296624a..3c3f918687b8 100644
--- a/sys/modules/hfa/sbus/Makefile
+++ b/sys/modules/hfa/sbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/sbus/Makefile,v 1.1 2002/04/17 00:26:09 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
 
diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile
index 33e6a77c3f59..1e63bfcb4bc1 100644
--- a/sys/modules/hifn/Makefile
+++ b/sys/modules/hifn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hifn/Makefile,v 1.3 2003/03/11 23:20:43 sam Exp $
 
 .PATH:	${.CURDIR}/../../dev/hifn
 KMOD	= hifn
diff --git a/sys/modules/hme/Makefile b/sys/modules/hme/Makefile
index 8f403710ce13..85e0d9f93684 100644
--- a/sys/modules/hme/Makefile
+++ b/sys/modules/hme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hme/Makefile,v 1.3 2004/08/14 22:40:16 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/hme
 
diff --git a/sys/modules/hpfs/Makefile b/sys/modules/hpfs/Makefile
index 750fda00dae0..ba7bce3bb0ba 100644
--- a/sys/modules/hpfs/Makefile
+++ b/sys/modules/hpfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hpfs/Makefile,v 1.8 2005/03/28 09:41:25 jeff Exp $
 
 .PATH: ${.CURDIR}/../../fs/hpfs
 
diff --git a/sys/modules/hptmv/Makefile b/sys/modules/hptmv/Makefile
index 05ceac7bb1f6..f4151a86220b 100644
--- a/sys/modules/hptmv/Makefile
+++ b/sys/modules/hptmv/Makefile
@@ -2,7 +2,7 @@
 # Makefile for RR182x FreeBSD driver
 # Copyright (c)  2004-2005 HighPoint Technologies, Inc. All rights reserved
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.3.2.1 2005/10/06 18:47:58 delphij Exp $
 
 HPTMV= ${.CURDIR}/../../dev/hptmv
 .PATH: ${HPTMV}
diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile
index 9d7dfde6d5bd..3a09c818c835 100644
--- a/sys/modules/hwpmc/Makefile
+++ b/sys/modules/hwpmc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hwpmc/Makefile,v 1.3 2005/06/09 19:45:08 jkoshy Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/hwpmc
diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile
index 7ba1f436f495..c234a5490000 100644
--- a/sys/modules/i2c/Makefile
+++ b/sys/modules/i2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/Makefile,v 1.1 2002/03/23 15:48:36 nsouch Exp $
 
 SUBDIR =
 SUBDIR += controllers if_ic smbus iicbus iicbb iicsmb iic smb
diff --git a/sys/modules/i2c/Makefile.inc b/sys/modules/i2c/Makefile.inc
index 265f86d1ed55..03593a43aa7d 100644
--- a/sys/modules/i2c/Makefile.inc
+++ b/sys/modules/i2c/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/i2c/controllers/Makefile b/sys/modules/i2c/controllers/Makefile
index 8317536f544e..0b8a755b041a 100644
--- a/sys/modules/i2c/controllers/Makefile
+++ b/sys/modules/i2c/controllers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/Makefile,v 1.4 2005/06/05 12:00:03 takawata Exp $
 
 .if ${MACHINE} == "pc98"
 SUBDIR = lpbb
diff --git a/sys/modules/i2c/controllers/Makefile.inc b/sys/modules/i2c/controllers/Makefile.inc
index 265f86d1ed55..607c6327d011 100644
--- a/sys/modules/i2c/controllers/Makefile.inc
+++ b/sys/modules/i2c/controllers/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/Makefile.inc,v 1.1 2002/11/06 13:41:40 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile
index 5429b9cee4db..6184792059fd 100644
--- a/sys/modules/i2c/controllers/alpm/Makefile
+++ b/sys/modules/i2c/controllers/alpm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/alpm/Makefile,v 1.1 2002/03/23 15:48:39 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= alpm
diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile
index 5f6d7ed295ba..5c3930ef2967 100644
--- a/sys/modules/i2c/controllers/amdpm/Makefile
+++ b/sys/modules/i2c/controllers/amdpm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/amdpm/Makefile,v 1.1 2002/03/23 15:48:41 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= amdpm
diff --git a/sys/modules/i2c/controllers/ichsmb/Makefile b/sys/modules/i2c/controllers/ichsmb/Makefile
index 7cb9957384f5..dbdbf769825f 100644
--- a/sys/modules/i2c/controllers/ichsmb/Makefile
+++ b/sys/modules/i2c/controllers/ichsmb/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/modules/i2c/controllers/ichsmb/Makefile,v 1.1 2005/06/05 11:55:29 takawata Exp $
 
 .PATH:		${.CURDIR}/../../../../dev/ichsmb
 KMOD		= ichsmb
diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile
index 7cef578707b9..4c108735c307 100644
--- a/sys/modules/i2c/controllers/intpm/Makefile
+++ b/sys/modules/i2c/controllers/intpm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/intpm/Makefile,v 1.1 2002/03/23 15:48:42 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= intpm
diff --git a/sys/modules/i2c/controllers/lpbb/Makefile b/sys/modules/i2c/controllers/lpbb/Makefile
index 77e84d2caf22..ce4f50d40a06 100644
--- a/sys/modules/i2c/controllers/lpbb/Makefile
+++ b/sys/modules/i2c/controllers/lpbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/lpbb/Makefile,v 1.2 2003/06/14 20:43:33 jmg Exp $
 
 .PATH:		${.CURDIR}/../../../../dev/ppbus
 KMOD		= lpbb
diff --git a/sys/modules/i2c/controllers/pcf/Makefile b/sys/modules/i2c/controllers/pcf/Makefile
index 42d3adef8c69..a75b1a676115 100644
--- a/sys/modules/i2c/controllers/pcf/Makefile
+++ b/sys/modules/i2c/controllers/pcf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/pcf/Makefile,v 1.2 2004/03/15 11:27:39 imp Exp $
 
 .PATH:		${.CURDIR}/../../../../i386/isa
 KMOD		= pcf
diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile
index 4c3e3a6981ff..76e2d95f738b 100644
--- a/sys/modules/i2c/controllers/viapm/Makefile
+++ b/sys/modules/i2c/controllers/viapm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/viapm/Makefile,v 1.1 2002/03/23 15:48:46 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= viapm
diff --git a/sys/modules/i2c/if_ic/Makefile b/sys/modules/i2c/if_ic/Makefile
index 67dd7344585b..b9da2d9b140d 100644
--- a/sys/modules/i2c/if_ic/Makefile
+++ b/sys/modules/i2c/if_ic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/if_ic/Makefile,v 1.1 2002/03/23 15:48:48 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= if_ic
diff --git a/sys/modules/i2c/iic/Makefile b/sys/modules/i2c/iic/Makefile
index 0ac8678c6d00..89ad521d003e 100644
--- a/sys/modules/i2c/iic/Makefile
+++ b/sys/modules/i2c/iic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iic/Makefile,v 1.1 2002/03/23 15:48:51 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iic
diff --git a/sys/modules/i2c/iicbb/Makefile b/sys/modules/i2c/iicbb/Makefile
index ea991e082e06..d40cf2466d75 100644
--- a/sys/modules/i2c/iicbb/Makefile
+++ b/sys/modules/i2c/iicbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iicbb/Makefile,v 1.1 2002/03/23 15:48:53 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicbb
diff --git a/sys/modules/i2c/iicbus/Makefile b/sys/modules/i2c/iicbus/Makefile
index c3fc8e3f5225..63d3b89e2674 100644
--- a/sys/modules/i2c/iicbus/Makefile
+++ b/sys/modules/i2c/iicbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iicbus/Makefile,v 1.1 2002/03/23 15:48:55 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicbus
diff --git a/sys/modules/i2c/iicsmb/Makefile b/sys/modules/i2c/iicsmb/Makefile
index d0c676482e5c..fe470383b59d 100644
--- a/sys/modules/i2c/iicsmb/Makefile
+++ b/sys/modules/i2c/iicsmb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iicsmb/Makefile,v 1.1 2002/03/23 15:48:56 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicsmb
diff --git a/sys/modules/i2c/smb/Makefile b/sys/modules/i2c/smb/Makefile
index f6f960c02126..b90de9ff1068 100644
--- a/sys/modules/i2c/smb/Makefile
+++ b/sys/modules/i2c/smb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/smb/Makefile,v 1.1 2002/03/23 15:48:58 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/smbus
 KMOD		= smb
diff --git a/sys/modules/i2c/smbus/Makefile b/sys/modules/i2c/smbus/Makefile
index 24462d038512..9a5683f12bae 100644
--- a/sys/modules/i2c/smbus/Makefile
+++ b/sys/modules/i2c/smbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/smbus/Makefile,v 1.1 2002/03/23 15:48:59 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/smbus
 KMOD		= smbus
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index f258fa901933..87255d8bb3a7 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ibcs2/Makefile,v 1.34 2002/08/12 07:20:15 alfred Exp $
 
 .PATH: ${.CURDIR}/../../i386/ibcs2
 
diff --git a/sys/modules/ichwd/Makefile b/sys/modules/ichwd/Makefile
index 880ec82a28ef..b3f73f248a46 100644
--- a/sys/modules/ichwd/Makefile
+++ b/sys/modules/ichwd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ichwd/Makefile,v 1.1 2004/05/11 18:21:38 des Exp $
 
 .PATH: ${.CURDIR}/../../dev/ichwd
 
diff --git a/sys/modules/ida/Makefile b/sys/modules/ida/Makefile
index e97ac69db123..e51ebdfd8204 100644
--- a/sys/modules/ida/Makefile
+++ b/sys/modules/ida/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ida/Makefile,v 1.2 2004/01/11 07:01:30 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../dev/ida
 
diff --git a/sys/modules/idt/Makefile b/sys/modules/idt/Makefile
index 8f1a08ee225b..45748d9c021b 100644
--- a/sys/modules/idt/Makefile
+++ b/sys/modules/idt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/idt/Makefile,v 1.1 2002/09/30 05:12:39 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../dev/idt
   
diff --git a/sys/modules/ie/Makefile b/sys/modules/ie/Makefile
index d6c611de3480..c4dccf230641 100644
--- a/sys/modules/ie/Makefile
+++ b/sys/modules/ie/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ie/Makefile,v 1.2 2005/01/26 16:26:06 imp Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/ie
diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile
index 1727d750211a..71f9745c6765 100644
--- a/sys/modules/if_bridge/Makefile
+++ b/sys/modules/if_bridge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_bridge/Makefile,v 1.2 2005/06/05 05:28:41 ru Exp $
 
 .PATH:	${.CURDIR}/../../net
 KMOD=	if_bridge
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index f88df14eb649..d58e04186dac 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_disc/Makefile,v 1.17 2002/01/11 15:48:40 ru Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile
index 03e1e5087cf4..9d6ebb5811ed 100644
--- a/sys/modules/if_ef/Makefile
+++ b/sys/modules/if_ef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_ef/Makefile,v 1.11 2004/01/19 14:00:26 ru Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_faith/Makefile b/sys/modules/if_faith/Makefile
index 959d5e287fc0..12405c907ccc 100644
--- a/sys/modules/if_faith/Makefile
+++ b/sys/modules/if_faith/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_faith/Makefile,v 1.2 2002/01/11 15:48:46 ru Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index df04cba7ba0c..1d33b0b65371 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_gif/Makefile,v 1.6 2004/12/21 10:49:27 ru Exp $
 
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile
index cbc2ed0ee34c..03e771ad29c2 100644
--- a/sys/modules/if_ndis/Makefile
+++ b/sys/modules/if_ndis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_ndis/Makefile,v 1.5 2005/04/24 20:21:22 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../dev/if_ndis
 
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 95f81f9de80e..db42c0564f2e 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.33 2004/12/29 08:45:48 imp Exp $
 
 .PATH:  ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index e57301317f08..8a18964360c3 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_sl/Makefile,v 1.19 2002/01/11 15:48:48 ru Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile
index 2ea7363437a0..0f2ee211397d 100644
--- a/sys/modules/if_stf/Makefile
+++ b/sys/modules/if_stf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_stf/Makefile,v 1.3 2002/10/20 22:57:22 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_tap/Makefile b/sys/modules/if_tap/Makefile
index dcd6df39b51b..17042a14ee45 100644
--- a/sys/modules/if_tap/Makefile
+++ b/sys/modules/if_tap/Makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_tap/Makefile,v 1.4 2004/09/01 07:12:24 ru Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index e94f835dd5ac..f7312aebdf2b 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_tun/Makefile,v 1.28 2004/12/29 08:45:48 imp Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile
index 797ece457eda..f41fc568736d 100644
--- a/sys/modules/if_vlan/Makefile
+++ b/sys/modules/if_vlan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_vlan/Makefile,v 1.2 2002/01/11 15:48:48 ru Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/iir/Makefile b/sys/modules/iir/Makefile
index 591fef8c0e88..568a16bbca63 100644
--- a/sys/modules/iir/Makefile
+++ b/sys/modules/iir/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iir/Makefile,v 1.1 2002/01/20 08:51:08 msmith Exp $
 
 KMOD		=  iir
 .PATH:		${.CURDIR}/../../dev/${KMOD}
diff --git a/sys/modules/io/Makefile b/sys/modules/io/Makefile
index d90a8e473b10..0c603c02c4c1 100644
--- a/sys/modules/io/Makefile
+++ b/sys/modules/io/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/io/Makefile,v 1.2 2004/12/29 08:44:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/io
 .PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH}
diff --git a/sys/modules/ip6fw/Makefile b/sys/modules/ip6fw/Makefile
index 42ca025507cc..4b205c6d944f 100644
--- a/sys/modules/ip6fw/Makefile
+++ b/sys/modules/ip6fw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ip6fw/Makefile,v 1.3 2002/01/11 15:48:48 ru Exp $
 
 .PATH: ${.CURDIR}/../../netinet6
 
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index be135def4026..bb3cb333f1da 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ip_mroute_mod/Makefile,v 1.12 2004/08/14 15:32:19 dwmalone Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile
index 203b4bf6871d..7c8c32e02f91 100644
--- a/sys/modules/ipdivert/Makefile
+++ b/sys/modules/ipdivert/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipdivert/Makefile,v 1.1 2004/10/19 21:14:57 andre Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index 9cb029068b6f..8180296ff113 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.18 2005/06/03 15:31:10 ru Exp $ 
 
 .PATH: ${.CURDIR}/../../contrib/ipfilter/netinet
 
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index cd5a6f791e49..7b5ed579c050 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.21 2004/10/25 20:02:33 andre Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile
index 4ec20a3d05ba..c8ab489401ba 100644
--- a/sys/modules/ips/Makefile
+++ b/sys/modules/ips/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ips/Makefile,v 1.1 2003/05/11 06:36:49 scottl Exp $
 
 .PATH:		${.CURDIR}/../../dev/ips
 KMOD		= ips
diff --git a/sys/modules/ipw/Makefile b/sys/modules/ipw/Makefile
index 8ef81358b2be..4c7143c43b66 100644
--- a/sys/modules/ipw/Makefile
+++ b/sys/modules/ipw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipw/Makefile,v 1.1 2005/04/18 18:47:38 damien Exp $
 
 .PATH: ${.CURDIR}/../../dev/ipw
 
diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile
index b3ddc3910390..218a8f997831 100644
--- a/sys/modules/isp/Makefile
+++ b/sys/modules/isp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/isp/Makefile,v 1.2 2004/08/12 17:41:31 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/isp
 
diff --git a/sys/modules/ispfw/Makefile b/sys/modules/ispfw/Makefile
index 07b9f8b27b86..3537a52523b9 100644
--- a/sys/modules/ispfw/Makefile
+++ b/sys/modules/ispfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/Makefile,v 1.2 2001/01/06 13:59:52 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/ispfw
 
diff --git a/sys/modules/iwi/Makefile b/sys/modules/iwi/Makefile
index a5a960550add..93dfee7eed6e 100644
--- a/sys/modules/iwi/Makefile
+++ b/sys/modules/iwi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iwi/Makefile,v 1.1 2005/04/18 18:47:38 damien Exp $
 
 .PATH: ${.CURDIR}/../../dev/iwi
 
diff --git a/sys/modules/ixgb/Makefile b/sys/modules/ixgb/Makefile
index 4396c2d3e7f8..46c127a0d0d9 100644
--- a/sys/modules/ixgb/Makefile
+++ b/sys/modules/ixgb/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/modules/ixgb/Makefile,v 1.2 2004/06/09 08:27:05 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/ixgb
 
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 71ba7f14692d..44a555735661 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/joy/Makefile,v 1.23 2004/05/26 00:53:04 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/joy
 
diff --git a/sys/modules/kbdmux/Makefile b/sys/modules/kbdmux/Makefile
index 78569edbc0e5..191823094ee3 100644
--- a/sys/modules/kbdmux/Makefile
+++ b/sys/modules/kbdmux/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2005/06/23 00:30:50 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/kbdmux/Makefile,v 1.1.2.1 2005/07/21 16:41:18 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../dev/kbdmux
 
diff --git a/sys/modules/kue/Makefile b/sys/modules/kue/Makefile
index 8569f16f5b41..f3bb8af74f18 100644
--- a/sys/modules/kue/Makefile
+++ b/sys/modules/kue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/kue/Makefile,v 1.6 2004/06/27 12:33:16 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/lge/Makefile b/sys/modules/lge/Makefile
index 0728e6e94bb4..3a2b8cc18ecf 100644
--- a/sys/modules/lge/Makefile
+++ b/sys/modules/lge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/lge/Makefile,v 1.1 2001/05/31 21:44:21 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../dev/lge
 
diff --git a/sys/modules/libalias/Makefile b/sys/modules/libalias/Makefile
index 6a2255e5de48..6accb4ba1bfb 100644
--- a/sys/modules/libalias/Makefile
+++ b/sys/modules/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/Makefile,v 1.2 2005/06/20 08:33:29 glebius Exp $
 
 .PATH: ${.CURDIR}/../../netinet/libalias
 
diff --git a/sys/modules/libiconv/Makefile b/sys/modules/libiconv/Makefile
index 66460642104e..874429015096 100644
--- a/sys/modules/libiconv/Makefile
+++ b/sys/modules/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libiconv/Makefile,v 1.4 2003/09/26 20:26:24 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../libkern ${.CURDIR}/../../sys
 
diff --git a/sys/modules/libmbpool/Makefile b/sys/modules/libmbpool/Makefile
index efd15ec759c7..e78f00920a59 100644
--- a/sys/modules/libmbpool/Makefile
+++ b/sys/modules/libmbpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libmbpool/Makefile,v 1.1 2003/07/15 08:59:38 harti Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/libmchain/Makefile b/sys/modules/libmchain/Makefile
index fd151ec6ab72..4ba8a3bebd02 100644
--- a/sys/modules/libmchain/Makefile
+++ b/sys/modules/libmchain/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libmchain/Makefile,v 1.3 2002/12/14 00:01:51 tjr Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile
index 98f9fcb55c36..24c2773f9a55 100644
--- a/sys/modules/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linprocfs/Makefile,v 1.13 2004/09/04 06:37:57 ru Exp $
 
 .PATH: ${.CURDIR}/../../compat/linprocfs
 
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index e446790c0a27..700c2c0672ef 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linux/Makefile,v 1.63 2005/06/04 16:57:04 imp Exp $
 
 .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux
 
diff --git a/sys/modules/lnc/Makefile b/sys/modules/lnc/Makefile
index 46225c349ebd..c4f1849431e2 100644
--- a/sys/modules/lnc/Makefile
+++ b/sys/modules/lnc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/lnc/Makefile,v 1.7 2004/02/13 10:11:00 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/lnc
 
diff --git a/sys/modules/lpt/Makefile b/sys/modules/lpt/Makefile
index b57960d572f4..37ce2843092d 100644
--- a/sys/modules/lpt/Makefile
+++ b/sys/modules/lpt/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/lpt/Makefile,v 1.2 2002/01/11 15:48:50 ru Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	lpt
diff --git a/sys/modules/mac_biba/Makefile b/sys/modules/mac_biba/Makefile
index 76ae8e8265ce..0c1214ab4bce 100644
--- a/sys/modules/mac_biba/Makefile
+++ b/sys/modules/mac_biba/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_biba/Makefile,v 1.2 2002/10/22 17:10:14 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_biba
 
diff --git a/sys/modules/mac_bsdextended/Makefile b/sys/modules/mac_bsdextended/Makefile
index 93388fe03eb1..8156c689a131 100644
--- a/sys/modules/mac_bsdextended/Makefile
+++ b/sys/modules/mac_bsdextended/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_bsdextended/Makefile,v 1.1 2002/08/01 17:41:26 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_bsdextended
 
diff --git a/sys/modules/mac_ifoff/Makefile b/sys/modules/mac_ifoff/Makefile
index fc1a60037fc4..0669b6aff32e 100644
--- a/sys/modules/mac_ifoff/Makefile
+++ b/sys/modules/mac_ifoff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_ifoff/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_ifoff
 
diff --git a/sys/modules/mac_lomac/Makefile b/sys/modules/mac_lomac/Makefile
index 6216a578483c..f5e413dd018e 100644
--- a/sys/modules/mac_lomac/Makefile
+++ b/sys/modules/mac_lomac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_lomac/Makefile,v 1.1 2002/11/26 17:35:44 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_lomac
 
diff --git a/sys/modules/mac_mls/Makefile b/sys/modules/mac_mls/Makefile
index d4aa5cec7e30..b4b2b694df6b 100644
--- a/sys/modules/mac_mls/Makefile
+++ b/sys/modules/mac_mls/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_mls/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_mls
 
diff --git a/sys/modules/mac_none/Makefile b/sys/modules/mac_none/Makefile
index b180f718794f..fb98d46799e7 100644
--- a/sys/modules/mac_none/Makefile
+++ b/sys/modules/mac_none/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_none/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_none
 
diff --git a/sys/modules/mac_partition/Makefile b/sys/modules/mac_partition/Makefile
index b04d181777e5..b39fa3215031 100644
--- a/sys/modules/mac_partition/Makefile
+++ b/sys/modules/mac_partition/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_partition/Makefile,v 1.1 2002/10/24 02:04:03 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_partition
 
diff --git a/sys/modules/mac_portacl/Makefile b/sys/modules/mac_portacl/Makefile
index f9bbe2355ef3..1840c931f5a7 100644
--- a/sys/modules/mac_portacl/Makefile
+++ b/sys/modules/mac_portacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_portacl/Makefile,v 1.2 2004/12/30 13:49:01 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_portacl
 
diff --git a/sys/modules/mac_seeotheruids/Makefile b/sys/modules/mac_seeotheruids/Makefile
index d27aefb947b9..c821df4c4619 100644
--- a/sys/modules/mac_seeotheruids/Makefile
+++ b/sys/modules/mac_seeotheruids/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_seeotheruids/Makefile,v 1.1 2002/08/01 17:41:27 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_seeotheruids
 
diff --git a/sys/modules/mac_stub/Makefile b/sys/modules/mac_stub/Makefile
index 3b98cb00e62d..64ff542ffddb 100644
--- a/sys/modules/mac_stub/Makefile
+++ b/sys/modules/mac_stub/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_stub/Makefile,v 1.4 2003/11/11 21:23:54 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_stub
 
diff --git a/sys/modules/mac_test/Makefile b/sys/modules/mac_test/Makefile
index 94b5aa87198f..96486494cd32 100644
--- a/sys/modules/mac_test/Makefile
+++ b/sys/modules/mac_test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_test/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_test
 
diff --git a/sys/modules/mcd/Makefile b/sys/modules/mcd/Makefile
index 1602c0304c7f..24019ba586f6 100644
--- a/sys/modules/mcd/Makefile
+++ b/sys/modules/mcd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mcd/Makefile,v 1.2 2003/03/29 16:13:11 mdodd Exp $
 
 .PATH: ${.CURDIR}/../../dev/mcd
 
diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile
index 3f0654fbbe63..917ab06afb88 100644
--- a/sys/modules/md/Makefile
+++ b/sys/modules/md/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/md/Makefile,v 1.13 2004/08/09 06:45:20 jmg Exp $
 
 .PATH: ${.CURDIR}/../../dev/md
 
diff --git a/sys/modules/mem/Makefile b/sys/modules/mem/Makefile
index b80ec3179dbd..7703c911dfe6 100644
--- a/sys/modules/mem/Makefile
+++ b/sys/modules/mem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mem/Makefile,v 1.4 2004/12/29 08:44:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/mem
 .PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH}
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 61fec9858353..d2143da6e7cb 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mii/Makefile,v 1.26 2003/09/11 03:53:45 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../dev/mii
 
diff --git a/sys/modules/mlx/Makefile b/sys/modules/mlx/Makefile
index ba0951ac4e67..5135ae0c4725 100644
--- a/sys/modules/mlx/Makefile
+++ b/sys/modules/mlx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mlx/Makefile,v 1.7 2001/01/06 13:59:55 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/mlx
 
diff --git a/sys/modules/mly/Makefile b/sys/modules/mly/Makefile
index e8773def4b9a..0999eed61572 100644
--- a/sys/modules/mly/Makefile
+++ b/sys/modules/mly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mly/Makefile,v 1.3 2001/07/14 00:12:23 msmith Exp $
 
 .PATH: ${.CURDIR}/../../dev/mly
 
diff --git a/sys/modules/mpt/Makefile b/sys/modules/mpt/Makefile
index 82f5e54f3209..04a7f5b5b678 100644
--- a/sys/modules/mpt/Makefile
+++ b/sys/modules/mpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mpt/Makefile,v 1.2 2005/07/10 15:07:57 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/mpt
 
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index cca7fa69d6f0..eb9831aa465a 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/msdosfs/Makefile,v 1.22 2004/09/04 06:37:57 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/msdosfs
 
diff --git a/sys/modules/msdosfs_iconv/Makefile b/sys/modules/msdosfs_iconv/Makefile
index 8d2e41da121e..f4ff99f3dbb0 100644
--- a/sys/modules/msdosfs_iconv/Makefile
+++ b/sys/modules/msdosfs_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/msdosfs_iconv/Makefile,v 1.1 2003/09/26 20:26:25 fjoe Exp $
 
 .PATH:	${.CURDIR}/../../fs/msdosfs
 KMOD=	msdosfs_iconv
diff --git a/sys/modules/mse/Makefile b/sys/modules/mse/Makefile
index 4cc68c1f9c6d..dbb39e3542e1 100644
--- a/sys/modules/mse/Makefile
+++ b/sys/modules/mse/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mse/Makefile,v 1.1 2004/12/12 20:05:49 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/mse
 
diff --git a/sys/modules/my/Makefile b/sys/modules/my/Makefile
index 4b454a88722c..4d75a561d22b 100644
--- a/sys/modules/my/Makefile
+++ b/sys/modules/my/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/my/Makefile,v 1.2 2002/04/16 20:40:06 julian Exp $
 
 .PATH: ${.CURDIR}/../../dev/my
 
diff --git a/sys/modules/ncp/Makefile b/sys/modules/ncp/Makefile
index fb9d9937c83c..ee494c727b08 100644
--- a/sys/modules/ncp/Makefile
+++ b/sys/modules/ncp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ncp/Makefile,v 1.10 2004/01/19 14:00:26 ru Exp $
 
 .PATH: ${.CURDIR}/../../netncp
 
diff --git a/sys/modules/ncv/Makefile b/sys/modules/ncv/Makefile
index b1a273aae520..3139139f33db 100644
--- a/sys/modules/ncv/Makefile
+++ b/sys/modules/ncv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ncv/Makefile,v 1.2 2004/05/26 00:53:05 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ncv
 
diff --git a/sys/modules/ndis/Makefile b/sys/modules/ndis/Makefile
index 688cf97e5db9..74e64dee1386 100644
--- a/sys/modules/ndis/Makefile
+++ b/sys/modules/ndis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ndis/Makefile,v 1.10 2005/04/11 02:02:35 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../compat/ndis
 
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index b2b6af4ec4a6..518d3723c162 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -1,5 +1,5 @@
 # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.45 2005/06/10 08:05:12 glebius Exp $
 
 SUBDIR=	async \
 	atm \
diff --git a/sys/modules/netgraph/Makefile.inc b/sys/modules/netgraph/Makefile.inc
index 3d2fd195b5ce..471949a71dd2 100644
--- a/sys/modules/netgraph/Makefile.inc
+++ b/sys/modules/netgraph/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/Makefile.inc,v 1.4 2005/05/16 08:25:55 glebius Exp $
 # $Whistle: Makefile.inc,v 1.4 1999/01/19 23:46:16 archie Exp $
 
 .PATH:		${.CURDIR}/../../../netgraph
diff --git a/sys/modules/netgraph/UI/Makefile b/sys/modules/netgraph/UI/Makefile
index 413308c13812..52bbf2937a58 100644
--- a/sys/modules/netgraph/UI/Makefile
+++ b/sys/modules/netgraph/UI/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/UI/Makefile,v 1.9 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_UI
diff --git a/sys/modules/netgraph/async/Makefile b/sys/modules/netgraph/async/Makefile
index 921eabcf2727..e07a852c73a1 100644
--- a/sys/modules/netgraph/async/Makefile
+++ b/sys/modules/netgraph/async/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/async/Makefile,v 1.9 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_async
diff --git a/sys/modules/netgraph/atm/Makefile b/sys/modules/netgraph/atm/Makefile
index 02de9774ffa7..2d105736532f 100644
--- a/sys/modules/netgraph/atm/Makefile
+++ b/sys/modules/netgraph/atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/Makefile,v 1.5 2004/08/12 14:58:46 harti Exp $
 
 SUBDIR=			\
 	atm 		\
diff --git a/sys/modules/netgraph/atm/Makefile.inc b/sys/modules/netgraph/atm/Makefile.inc
index 265f86d1ed55..4bdab8528627 100644
--- a/sys/modules/netgraph/atm/Makefile.inc
+++ b/sys/modules/netgraph/atm/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/Makefile.inc,v 1.1 2003/06/25 13:20:18 harti Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/netgraph/atm/atm/Makefile b/sys/modules/netgraph/atm/atm/Makefile
index ebd94e13f40e..ea2d9bc05008 100644
--- a/sys/modules/netgraph/atm/atm/Makefile
+++ b/sys/modules/netgraph/atm/atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/atm/Makefile,v 1.1 2003/06/25 13:20:19 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/atmbase/Makefile b/sys/modules/netgraph/atm/atmbase/Makefile
index 1ad4bb6b6079..046c70e45b9c 100644
--- a/sys/modules/netgraph/atm/atmbase/Makefile
+++ b/sys/modules/netgraph/atm/atmbase/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/atmbase/Makefile,v 1.2 2003/11/03 09:18:52 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/atmpif/Makefile b/sys/modules/netgraph/atm/atmpif/Makefile
index 324fbdfc922e..05b66709e3e4 100644
--- a/sys/modules/netgraph/atm/atmpif/Makefile
+++ b/sys/modules/netgraph/atm/atmpif/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/atmpif/Makefile,v 1.1 2003/08/11 08:40:02 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/ccatm/Makefile b/sys/modules/netgraph/atm/ccatm/Makefile
index 562653611a2d..113fab3f354d 100644
--- a/sys/modules/netgraph/atm/ccatm/Makefile
+++ b/sys/modules/netgraph/atm/ccatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/ccatm/Makefile,v 1.1 2004/08/12 14:58:46 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/sscfu/Makefile b/sys/modules/netgraph/atm/sscfu/Makefile
index 278159f26797..9d9244eeba48 100644
--- a/sys/modules/netgraph/atm/sscfu/Makefile
+++ b/sys/modules/netgraph/atm/sscfu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/sscfu/Makefile,v 1.1 2003/10/24 07:42:08 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/sscop/Makefile b/sys/modules/netgraph/atm/sscop/Makefile
index b9334dd98ab3..53ef9f95c2af 100644
--- a/sys/modules/netgraph/atm/sscop/Makefile
+++ b/sys/modules/netgraph/atm/sscop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/sscop/Makefile,v 1.1 2003/10/24 07:42:08 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/sys/modules/netgraph/atm/uni/Makefile b/sys/modules/netgraph/atm/uni/Makefile
index 57c20b0265e3..fad8415a6ac2 100644
--- a/sys/modules/netgraph/atm/uni/Makefile
+++ b/sys/modules/netgraph/atm/uni/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/uni/Makefile,v 1.1 2003/11/07 09:15:14 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atmllc/Makefile b/sys/modules/netgraph/atmllc/Makefile
index fd47b5c02958..d98eb1fcba07 100644
--- a/sys/modules/netgraph/atmllc/Makefile
+++ b/sys/modules/netgraph/atmllc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atmllc/Makefile,v 1.1 2004/03/08 10:54:35 benno Exp $
 
 KMOD=	ng_atmllc
 SRCS= 	ng_atmllc.c
diff --git a/sys/modules/netgraph/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/Makefile
index 8fdd89643c97..954c66928900 100644
--- a/sys/modules/netgraph/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/04/27 00:22:11 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/Makefile,v 1.2 2003/05/10 21:44:37 julian Exp $
 
 SUBDIR=	\
 	bluetooth \
diff --git a/sys/modules/netgraph/bluetooth/Makefile.inc b/sys/modules/netgraph/bluetooth/Makefile.inc
index 265f86d1ed55..41ddd2457895 100644
--- a/sys/modules/netgraph/bluetooth/Makefile.inc
+++ b/sys/modules/netgraph/bluetooth/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/Makefile.inc,v 1.1 2002/12/01 16:07:53 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/netgraph/bluetooth/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
index a3c951f6dfa3..b1022e9d726a 100644
--- a/sys/modules/netgraph/bluetooth/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:39:57 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/bluetooth/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/common
 
diff --git a/sys/modules/netgraph/bluetooth/bt3c/Makefile b/sys/modules/netgraph/bluetooth/bt3c/Makefile
index 753400eddda5..d3e2da2a294b 100644
--- a/sys/modules/netgraph/bluetooth/bt3c/Makefile
+++ b/sys/modules/netgraph/bluetooth/bt3c/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2002/11/24 20:50:56 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/bt3c/Makefile,v 1.6 2004/05/26 00:53:05 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
 
diff --git a/sys/modules/netgraph/bluetooth/h4/Makefile b/sys/modules/netgraph/bluetooth/h4/Makefile
index 849d899f490c..baf749098fcf 100644
--- a/sys/modules/netgraph/bluetooth/h4/Makefile
+++ b/sys/modules/netgraph/bluetooth/h4/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:40:04 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/h4/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4
 
diff --git a/sys/modules/netgraph/bluetooth/hci/Makefile b/sys/modules/netgraph/bluetooth/hci/Makefile
index 729ea7b5b234..3a31ff481687 100644
--- a/sys/modules/netgraph/bluetooth/hci/Makefile
+++ b/sys/modules/netgraph/bluetooth/hci/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:40:05 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/hci/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/hci
 
diff --git a/sys/modules/netgraph/bluetooth/l2cap/Makefile b/sys/modules/netgraph/bluetooth/l2cap/Makefile
index 5b66e0988f72..a436f77724f4 100644
--- a/sys/modules/netgraph/bluetooth/l2cap/Makefile
+++ b/sys/modules/netgraph/bluetooth/l2cap/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:40:11 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/l2cap/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/l2cap
 
diff --git a/sys/modules/netgraph/bluetooth/socket/Makefile b/sys/modules/netgraph/bluetooth/socket/Makefile
index 5342c2aaba88..caf06e7bd8de 100644
--- a/sys/modules/netgraph/bluetooth/socket/Makefile
+++ b/sys/modules/netgraph/bluetooth/socket/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/01/12 23:37:31 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/socket/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/socket
 
diff --git a/sys/modules/netgraph/bluetooth/ubt/Makefile b/sys/modules/netgraph/bluetooth/ubt/Makefile
index c68961c80c33..66326011a833 100644
--- a/sys/modules/netgraph/bluetooth/ubt/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubt/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubt/Makefile,v 1.7 2004/12/29 08:44:19 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
diff --git a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
index 908d2c361159..515827e3ec2b 100644
--- a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile,v 1.5 2004/12/29 08:44:19 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
diff --git a/sys/modules/netgraph/bpf/Makefile b/sys/modules/netgraph/bpf/Makefile
index 0bde4f25e198..84f03b01f63a 100644
--- a/sys/modules/netgraph/bpf/Makefile
+++ b/sys/modules/netgraph/bpf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bpf/Makefile,v 1.10 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
 
 .PATH: ${.CURDIR}/../../../net
diff --git a/sys/modules/netgraph/bridge/Makefile b/sys/modules/netgraph/bridge/Makefile
index 318142900c91..4badb78f6c17 100644
--- a/sys/modules/netgraph/bridge/Makefile
+++ b/sys/modules/netgraph/bridge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bridge/Makefile,v 1.3 2002/01/11 15:48:51 ru Exp $
 
 KMOD=	ng_bridge
 SRCS= 	ng_bridge.c
diff --git a/sys/modules/netgraph/cisco/Makefile b/sys/modules/netgraph/cisco/Makefile
index 2e3000dd3bf5..dd23f2cf7e41 100644
--- a/sys/modules/netgraph/cisco/Makefile
+++ b/sys/modules/netgraph/cisco/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/cisco/Makefile,v 1.11 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_cisco
diff --git a/sys/modules/netgraph/device/Makefile b/sys/modules/netgraph/device/Makefile
index 92eaa9807ae3..f2de14c7f406 100644
--- a/sys/modules/netgraph/device/Makefile
+++ b/sys/modules/netgraph/device/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/device/Makefile,v 1.2 2004/10/18 20:13:57 glebius Exp $
 KMOD=   ng_device
 SRCS=   ng_device.c
 
diff --git a/sys/modules/netgraph/echo/Makefile b/sys/modules/netgraph/echo/Makefile
index d7cce8d461ef..a6bda8d93f3e 100644
--- a/sys/modules/netgraph/echo/Makefile
+++ b/sys/modules/netgraph/echo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/echo/Makefile,v 1.9 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_echo
diff --git a/sys/modules/netgraph/eiface/Makefile b/sys/modules/netgraph/eiface/Makefile
index 6e8b800c8ec4..fff0ffd3d0e2 100644
--- a/sys/modules/netgraph/eiface/Makefile
+++ b/sys/modules/netgraph/eiface/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/eiface/Makefile,v 1.2 2002/01/11 15:48:52 ru Exp $
 
 KMOD=	ng_eiface
 SRCS= 	ng_eiface.c
diff --git a/sys/modules/netgraph/etf/Makefile b/sys/modules/netgraph/etf/Makefile
index d807bc91c848..c654584de7f1 100644
--- a/sys/modules/netgraph/etf/Makefile
+++ b/sys/modules/netgraph/etf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/etf/Makefile,v 1.3 2003/11/10 12:54:54 ru Exp $
 # Ethertype filter
 
 KMOD=	ng_etf
diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile
index 7a3950edae75..da6cd0706c80 100644
--- a/sys/modules/netgraph/ether/Makefile
+++ b/sys/modules/netgraph/ether/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ether/Makefile,v 1.4 2005/02/12 12:35:56 ru Exp $
 
 KMOD=	ng_ether
 SRCS= 	ng_ether.c
diff --git a/sys/modules/netgraph/fec/Makefile b/sys/modules/netgraph/fec/Makefile
index 1d437f58d869..5310f5c96e4b 100644
--- a/sys/modules/netgraph/fec/Makefile
+++ b/sys/modules/netgraph/fec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/fec/Makefile,v 1.4 2004/01/13 11:30:37 ru Exp $
 
 KMOD=		ng_fec
 SRCS= 		ng_fec.c opt_inet.h opt_inet6.h
diff --git a/sys/modules/netgraph/frame_relay/Makefile b/sys/modules/netgraph/frame_relay/Makefile
index 81a2a96aeeb9..f48efb56725b 100644
--- a/sys/modules/netgraph/frame_relay/Makefile
+++ b/sys/modules/netgraph/frame_relay/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/frame_relay/Makefile,v 1.9 2002/01/11 15:48:52 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_frame_relay
diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile
index 4c18c27e50c2..870777a56598 100644
--- a/sys/modules/netgraph/gif/Makefile
+++ b/sys/modules/netgraph/gif/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/gif/Makefile,v 1.2 2001/09/27 03:14:16 brooks Exp $
 
 KMOD=	ng_gif
 SRCS= 	ng_gif.c opt_inet.h opt_inet6.h
diff --git a/sys/modules/netgraph/gif_demux/Makefile b/sys/modules/netgraph/gif_demux/Makefile
index 56de5adf8ed0..1be3ec0a5179 100644
--- a/sys/modules/netgraph/gif_demux/Makefile
+++ b/sys/modules/netgraph/gif_demux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/gif_demux/Makefile,v 1.2 2001/09/27 03:14:16 brooks Exp $
 
 KMOD=	ng_gif_demux
 SRCS= 	ng_gif_demux.c
diff --git a/sys/modules/netgraph/hole/Makefile b/sys/modules/netgraph/hole/Makefile
index c7502bfccf85..4c62e1a6127f 100644
--- a/sys/modules/netgraph/hole/Makefile
+++ b/sys/modules/netgraph/hole/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/hole/Makefile,v 1.9 2002/01/11 15:48:52 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_hole
diff --git a/sys/modules/netgraph/hub/Makefile b/sys/modules/netgraph/hub/Makefile
index 9ebb54de8f2c..bfbeafa62f11 100644
--- a/sys/modules/netgraph/hub/Makefile
+++ b/sys/modules/netgraph/hub/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/hub/Makefile,v 1.1 2004/04/17 12:42:17 ru Exp $
 
 KMOD=	ng_hub
 SRCS=	ng_hub.c
diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile
index 98940efbf564..7e9a6f7f0813 100644
--- a/sys/modules/netgraph/iface/Makefile
+++ b/sys/modules/netgraph/iface/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/iface/Makefile,v 1.15 2003/03/08 21:54:32 jlemon Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_iface
diff --git a/sys/modules/netgraph/ip_input/Makefile b/sys/modules/netgraph/ip_input/Makefile
index 7a40c45c2dc8..5af1eb966d7f 100644
--- a/sys/modules/netgraph/ip_input/Makefile
+++ b/sys/modules/netgraph/ip_input/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ip_input/Makefile,v 1.2 2002/01/11 15:48:53 ru Exp $
 
 KMOD=	ng_ip_input
 SRCS= 	ng_ip_input.c
diff --git a/sys/modules/netgraph/ipfw/Makefile b/sys/modules/netgraph/ipfw/Makefile
index b40abcfbf57c..9568873a69a3 100644
--- a/sys/modules/netgraph/ipfw/Makefile
+++ b/sys/modules/netgraph/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ipfw/Makefile,v 1.1 2005/02/05 12:09:38 glebius Exp $
 
 KMOD=	ng_ipfw
 SRCS= 	ng_ipfw.c
diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile
index f8fd73f87568..e9ec420df72e 100644
--- a/sys/modules/netgraph/ksocket/Makefile
+++ b/sys/modules/netgraph/ksocket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ksocket/Makefile,v 1.9 2002/01/11 15:48:53 ru Exp $
 
 KMOD=	ng_ksocket
 SRCS= 	ng_ksocket.c
diff --git a/sys/modules/netgraph/l2tp/Makefile b/sys/modules/netgraph/l2tp/Makefile
index 799437c4e70a..dbac0b26f33f 100644
--- a/sys/modules/netgraph/l2tp/Makefile
+++ b/sys/modules/netgraph/l2tp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/l2tp/Makefile,v 1.1 2002/08/20 22:03:57 archie Exp $
 
 KMOD=	ng_l2tp
 SRCS= 	ng_l2tp.c
diff --git a/sys/modules/netgraph/lmi/Makefile b/sys/modules/netgraph/lmi/Makefile
index e1b08876d1b1..775b7142daa7 100644
--- a/sys/modules/netgraph/lmi/Makefile
+++ b/sys/modules/netgraph/lmi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/lmi/Makefile,v 1.9 2002/01/11 15:48:53 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_lmi
diff --git a/sys/modules/netgraph/mppc/Makefile b/sys/modules/netgraph/mppc/Makefile
index 7e337f4f4c44..e48320164b7d 100644
--- a/sys/modules/netgraph/mppc/Makefile
+++ b/sys/modules/netgraph/mppc/Makefile
@@ -1,5 +1,5 @@
 # $Whistle: Makefile,v 1.1 1999/12/08 20:20:39 archie Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/mppc/Makefile,v 1.12 2003/02/05 19:11:11 ambrisko Exp $
 
 KMOD=	ng_mppc
 SRCS= 	ng_mppc.c opt_netgraph.h
diff --git a/sys/modules/netgraph/nat/Makefile b/sys/modules/netgraph/nat/Makefile
index f51bbe0b139f..9cf90b12f780 100644
--- a/sys/modules/netgraph/nat/Makefile
+++ b/sys/modules/netgraph/nat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/nat/Makefile,v 1.1 2005/05/05 23:41:21 glebius Exp $
 
 KMOD=	ng_nat
 SRCS= 	ng_nat.c
diff --git a/sys/modules/netgraph/netflow/Makefile b/sys/modules/netgraph/netflow/Makefile
index b1b9ba517f77..9bd1d22a781f 100644
--- a/sys/modules/netgraph/netflow/Makefile
+++ b/sys/modules/netgraph/netflow/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/netflow/Makefile,v 1.1 2004/09/16 20:35:27 glebius Exp $
 #
 # Author: Gleb Smirnoff <glebius@freebsd.org>
 #
diff --git a/sys/modules/netgraph/netgraph/Makefile b/sys/modules/netgraph/netgraph/Makefile
index a34d6164c908..2614beaf7d8d 100644
--- a/sys/modules/netgraph/netgraph/Makefile
+++ b/sys/modules/netgraph/netgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/netgraph/Makefile,v 1.8 2002/01/11 15:48:53 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	netgraph
diff --git a/sys/modules/netgraph/one2many/Makefile b/sys/modules/netgraph/one2many/Makefile
index 74a0a6c6273e..ffe7fcce9387 100644
--- a/sys/modules/netgraph/one2many/Makefile
+++ b/sys/modules/netgraph/one2many/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/one2many/Makefile,v 1.3 2002/01/11 15:48:54 ru Exp $
 
 KMOD=	ng_one2many
 SRCS= 	ng_one2many.c
diff --git a/sys/modules/netgraph/ppp/Makefile b/sys/modules/netgraph/ppp/Makefile
index 6ce720ab9587..a2869cc1474f 100644
--- a/sys/modules/netgraph/ppp/Makefile
+++ b/sys/modules/netgraph/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ppp/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 02:52:12 archie Exp $
 
 KMOD=	ng_ppp
diff --git a/sys/modules/netgraph/pppoe/Makefile b/sys/modules/netgraph/pppoe/Makefile
index 642dbdde2106..9b35abccb132 100644
--- a/sys/modules/netgraph/pppoe/Makefile
+++ b/sys/modules/netgraph/pppoe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/pppoe/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_pppoe
diff --git a/sys/modules/netgraph/pptpgre/Makefile b/sys/modules/netgraph/pptpgre/Makefile
index 34cbbf6e2867..c7016618d0de 100644
--- a/sys/modules/netgraph/pptpgre/Makefile
+++ b/sys/modules/netgraph/pptpgre/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/pptpgre/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/11/29 23:14:33 archie Exp $
 
 KMOD=	ng_pptpgre
diff --git a/sys/modules/netgraph/rfc1490/Makefile b/sys/modules/netgraph/rfc1490/Makefile
index 6ba065345129..77d8ff1d7721 100644
--- a/sys/modules/netgraph/rfc1490/Makefile
+++ b/sys/modules/netgraph/rfc1490/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/rfc1490/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_rfc1490
diff --git a/sys/modules/netgraph/sample/Makefile b/sys/modules/netgraph/sample/Makefile
index 701752662ed5..bc0e17c01d43 100644
--- a/sys/modules/netgraph/sample/Makefile
+++ b/sys/modules/netgraph/sample/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sample/Makefile,v 1.2 2002/01/11 15:48:54 ru Exp $
 
 KMOD=	ng_sample
 SRCS= 	ng_sample.c
diff --git a/sys/modules/netgraph/socket/Makefile b/sys/modules/netgraph/socket/Makefile
index a44ba0ff6330..b5e3a6ad476b 100644
--- a/sys/modules/netgraph/socket/Makefile
+++ b/sys/modules/netgraph/socket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/socket/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_socket
diff --git a/sys/modules/netgraph/source/Makefile b/sys/modules/netgraph/source/Makefile
index c70a6bb748f6..1723ba66f731 100644
--- a/sys/modules/netgraph/source/Makefile
+++ b/sys/modules/netgraph/source/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/source/Makefile,v 1.1 2002/10/31 23:03:09 julian Exp $
 
 KMOD=		ng_source
 SRCS= 		ng_source.c
diff --git a/sys/modules/netgraph/split/Makefile b/sys/modules/netgraph/split/Makefile
index 2eb4fa399b4a..778b76414bd6 100644
--- a/sys/modules/netgraph/split/Makefile
+++ b/sys/modules/netgraph/split/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/split/Makefile,v 1.2 2002/01/11 15:48:54 ru Exp $
 #
 
 KMOD=	ng_split
diff --git a/sys/modules/netgraph/sppp/Makefile b/sys/modules/netgraph/sppp/Makefile
index 203e83e437ae..0b08fb0821d9 100644
--- a/sys/modules/netgraph/sppp/Makefile
+++ b/sys/modules/netgraph/sppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sppp/Makefile,v 1.1 2004/03/24 17:24:01 rik Exp $
 # Cronyx Id: ng_sppp.Makefile,v 1.1.2.1 2002/12/25 08:37:25 rik Exp $
 
 KMOD=	ng_sppp
diff --git a/sys/modules/netgraph/sync_ar/Makefile b/sys/modules/netgraph/sync_ar/Makefile
index bc51040f0d15..1f9a8afefce3 100644
--- a/sys/modules/netgraph/sync_ar/Makefile
+++ b/sys/modules/netgraph/sync_ar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sync_ar/Makefile,v 1.2 2001/04/16 13:20:39 jhay Exp $
  
 .PATH:  ${.CURDIR}/../../../dev/ar
 KMOD    = ng_sync_ar
diff --git a/sys/modules/netgraph/sync_sr/Makefile b/sys/modules/netgraph/sync_sr/Makefile
index 16a291ca4654..e09974fff305 100644
--- a/sys/modules/netgraph/sync_sr/Makefile
+++ b/sys/modules/netgraph/sync_sr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sync_sr/Makefile,v 1.1 2001/01/30 10:20:42 jhay Exp $
  
 .PATH:  ${.CURDIR}/../../../dev/sr
 KMOD    = ng_sync_sr
diff --git a/sys/modules/netgraph/tcpmss/Makefile b/sys/modules/netgraph/tcpmss/Makefile
index 0379c88cec7d..6134548fb254 100644
--- a/sys/modules/netgraph/tcpmss/Makefile
+++ b/sys/modules/netgraph/tcpmss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tcpmss/Makefile,v 1.1 2005/06/10 08:05:13 glebius Exp $
 
 KMOD=	ng_tcpmss
 SRCS= 	ng_tcpmss.c
diff --git a/sys/modules/netgraph/tee/Makefile b/sys/modules/netgraph/tee/Makefile
index 7d5115831a49..c64fb10ebcef 100644
--- a/sys/modules/netgraph/tee/Makefile
+++ b/sys/modules/netgraph/tee/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tee/Makefile,v 1.9 2002/01/11 15:48:55 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_tee
diff --git a/sys/modules/netgraph/tty/Makefile b/sys/modules/netgraph/tty/Makefile
index 3f19a7cd4e41..dac2a0cc90cf 100644
--- a/sys/modules/netgraph/tty/Makefile
+++ b/sys/modules/netgraph/tty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tty/Makefile,v 1.12 2002/01/11 15:48:55 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_tty
diff --git a/sys/modules/netgraph/vjc/Makefile b/sys/modules/netgraph/vjc/Makefile
index 4921ac953bb2..1277ae9653ef 100644
--- a/sys/modules/netgraph/vjc/Makefile
+++ b/sys/modules/netgraph/vjc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/vjc/Makefile,v 1.10 2002/01/11 15:48:55 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $
 
 .PATH: ${.CURDIR}/../../../net
diff --git a/sys/modules/netgraph/vlan/Makefile b/sys/modules/netgraph/vlan/Makefile
index e6cdf0dbbc16..4ea9df0aab01 100644
--- a/sys/modules/netgraph/vlan/Makefile
+++ b/sys/modules/netgraph/vlan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/vlan/Makefile,v 1.1 2004/03/01 17:22:16 ru Exp $
 
 KMOD=	ng_vlan
 SRCS=	ng_vlan.c
diff --git a/sys/modules/nfs4client/Makefile b/sys/modules/nfs4client/Makefile
index 5d6a695f8842..a051256be55e 100644
--- a/sys/modules/nfs4client/Makefile
+++ b/sys/modules/nfs4client/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfs4client/Makefile,v 1.4 2004/09/04 06:37:57 ru Exp $
 
 .PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs4client \
 	${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 1d7565e719ea..a191a4aba6bd 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfsclient/Makefile,v 1.30 2004/09/04 06:37:58 ru Exp $
 
 .PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs4client \
 	${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index fb9d0f2dae09..79b15a8c6f48 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfsserver/Makefile,v 1.25 2002/11/04 15:13:35 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsserver
diff --git a/sys/modules/nge/Makefile b/sys/modules/nge/Makefile
index 15dc9555e0df..98eed27144d0 100644
--- a/sys/modules/nge/Makefile
+++ b/sys/modules/nge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nge/Makefile,v 1.3 2001/09/05 23:47:01 brooks Exp $
 
 .PATH: ${.CURDIR}/../../dev/nge
 
diff --git a/sys/modules/nmdm/Makefile b/sys/modules/nmdm/Makefile
index 4982c382a45f..61e37fad64a2 100644
--- a/sys/modules/nmdm/Makefile
+++ b/sys/modules/nmdm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nmdm/Makefile,v 1.2 2003/03/05 08:16:29 das Exp $
 
 .PATH: ${.CURDIR}/../../dev/nmdm
 
diff --git a/sys/modules/nsp/Makefile b/sys/modules/nsp/Makefile
index 3cdc7051079f..b7d5ce511133 100644
--- a/sys/modules/nsp/Makefile
+++ b/sys/modules/nsp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nsp/Makefile,v 1.2 2004/05/26 00:53:05 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/nsp
 
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 367af98792d2..87daf45dcef5 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ntfs/Makefile,v 1.11 2003/09/26 20:26:25 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../fs/ntfs
 
diff --git a/sys/modules/ntfs_iconv/Makefile b/sys/modules/ntfs_iconv/Makefile
index 33e6d42a155e..0e799051940f 100644
--- a/sys/modules/ntfs_iconv/Makefile
+++ b/sys/modules/ntfs_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ntfs_iconv/Makefile,v 1.1 2003/09/26 20:26:25 fjoe Exp $
 
 .PATH:	${.CURDIR}/../../fs/ntfs
 KMOD=	ntfs_iconv
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index 22cbf003afbd..75740c372f67 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nullfs/Makefile,v 1.16 2002/01/11 15:48:55 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/nullfs
 
diff --git a/sys/modules/nve/Makefile b/sys/modules/nve/Makefile
index 33d5c2d9f804..8289d3c53f48 100644
--- a/sys/modules/nve/Makefile
+++ b/sys/modules/nve/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nve/Makefile,v 1.2 2005/03/12 08:02:06 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/nve
 
diff --git a/sys/modules/nwfs/Makefile b/sys/modules/nwfs/Makefile
index 255aabc51a4b..32fa51b4bfa7 100644
--- a/sys/modules/nwfs/Makefile
+++ b/sys/modules/nwfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nwfs/Makefile,v 1.13 2004/01/19 14:00:26 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/nwfs
 
diff --git a/sys/modules/oldcard/Makefile b/sys/modules/oldcard/Makefile
index cbe92d776702..e0795bd7a27c 100644
--- a/sys/modules/oldcard/Makefile
+++ b/sys/modules/oldcard/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/oldcard/Makefile,v 1.11 2004/05/26 00:53:06 imp Exp $
 
 .PATH: ${.CURDIR}/../../pccard ${.CURDIR}/../../pci
 
diff --git a/sys/modules/oltr/Makefile b/sys/modules/oltr/Makefile
index 75c5cda04258..ede160a83525 100644
--- a/sys/modules/oltr/Makefile
+++ b/sys/modules/oltr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/oltr/Makefile,v 1.5 2005/02/03 23:01:01 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../contrib/dev/oltr
 KMOD=	if_oltr
diff --git a/sys/modules/osf1/Makefile b/sys/modules/osf1/Makefile
index d8a8896c3015..44936fd5e210 100644
--- a/sys/modules/osf1/Makefile
+++ b/sys/modules/osf1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/osf1/Makefile,v 1.13 2005/06/03 12:37:56 gallatin Exp $
 
 .PATH: ${.CURDIR}/../../alpha/osf1
 
diff --git a/sys/modules/owi/Makefile b/sys/modules/owi/Makefile
index e3aef24de2c3..7c04d8b58688 100644
--- a/sys/modules/owi/Makefile
+++ b/sys/modules/owi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/owi/Makefile,v 1.3 2004/09/04 06:37:58 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/owi
 
diff --git a/sys/modules/padlock/Makefile b/sys/modules/padlock/Makefile
index 41d9a53924b0..ef4ce9c3c489 100644
--- a/sys/modules/padlock/Makefile
+++ b/sys/modules/padlock/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/padlock/Makefile,v 1.1.2.1 2005/08/30 14:56:02 pjd Exp $
 
 .PATH: ${.CURDIR}/../../crypto/via
 
diff --git a/sys/modules/patm/Makefile b/sys/modules/patm/Makefile
index daa483b6529d..c77538511a80 100644
--- a/sys/modules/patm/Makefile
+++ b/sys/modules/patm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/patm/Makefile,v 1.2 2004/02/13 10:11:00 ru Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile
index 95bcf3fc344c..6606f370907e 100644
--- a/sys/modules/pccard/Makefile
+++ b/sys/modules/pccard/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pccard/Makefile,v 1.11.8.1 2005/09/27 18:42:19 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/pccard
 
diff --git a/sys/modules/pcfclock/Makefile b/sys/modules/pcfclock/Makefile
index 107a0674ba21..fb9e181d9e27 100644
--- a/sys/modules/pcfclock/Makefile
+++ b/sys/modules/pcfclock/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pcfclock/Makefile,v 1.4 2001/01/06 14:00:10 obrien Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 
diff --git a/sys/modules/pcn/Makefile b/sys/modules/pcn/Makefile
index 637692eb6ee9..3053594cddea 100644
--- a/sys/modules/pcn/Makefile
+++ b/sys/modules/pcn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pcn/Makefile,v 1.2 2001/01/06 14:00:10 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/pecoff/Makefile b/sys/modules/pecoff/Makefile
index 0f02f73bd94c..81c78eb51428 100644
--- a/sys/modules/pecoff/Makefile
+++ b/sys/modules/pecoff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pecoff/Makefile,v 1.7 2005/06/03 15:35:36 imp Exp $
 
 .PATH: ${.CURDIR}/../../compat/pecoff
 
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index d52119b25904..fab65822f01d 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pf/Makefile,v 1.7 2005/06/05 05:30:37 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/pf/net
 .PATH: ${.CURDIR}/../../contrib/pf/netinet
diff --git a/sys/modules/plip/Makefile b/sys/modules/plip/Makefile
index 9aa5bd41c378..cf6c3ec9be6e 100644
--- a/sys/modules/plip/Makefile
+++ b/sys/modules/plip/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/plip/Makefile,v 1.2 2002/01/11 15:48:56 ru Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	plip
diff --git a/sys/modules/pmc/Makefile b/sys/modules/pmc/Makefile
index 60dd3503dfcd..5a29a6d49c16 100644
--- a/sys/modules/pmc/Makefile
+++ b/sys/modules/pmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pmc/Makefile,v 1.3 2005/05/10 12:02:15 nyan Exp $
 
 .PATH: ${.CURDIR}/../../pc98/cbus
 
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index ef6955b5d141..e016a3fd12f0 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/portalfs/Makefile,v 1.12 2002/01/11 15:48:56 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/portalfs
 
diff --git a/sys/modules/ppbus/Makefile b/sys/modules/ppbus/Makefile
index 1347e6482bcb..8026df45238d 100644
--- a/sys/modules/ppbus/Makefile
+++ b/sys/modules/ppbus/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ppbus/Makefile,v 1.5 2003/11/19 05:08:26 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppbus
diff --git a/sys/modules/ppi/Makefile b/sys/modules/ppi/Makefile
index 568fddfd4282..2c1186ea1c8f 100644
--- a/sys/modules/ppi/Makefile
+++ b/sys/modules/ppi/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ppi/Makefile,v 1.3 2003/11/19 05:08:26 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppi
diff --git a/sys/modules/pps/Makefile b/sys/modules/pps/Makefile
index 7e70bb2973ad..6500015790f1 100644
--- a/sys/modules/pps/Makefile
+++ b/sys/modules/pps/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pps/Makefile,v 1.3 2003/11/19 05:08:26 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	pps
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 48a3e021f993..753c53ff9e26 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/procfs/Makefile,v 1.28.14.1 2005/08/20 08:05:01 yar Exp $
 
 .PATH: ${.CURDIR}/../../fs/procfs
 
diff --git a/sys/modules/pseudofs/Makefile b/sys/modules/pseudofs/Makefile
index b04bffb0beaf..026e84a2b977 100644
--- a/sys/modules/pseudofs/Makefile
+++ b/sys/modules/pseudofs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pseudofs/Makefile,v 1.4 2005/03/14 16:04:27 des Exp $
 
 .PATH: ${.CURDIR}/../../fs/pseudofs
 
diff --git a/sys/modules/pst/Makefile b/sys/modules/pst/Makefile
index 46e552ddaf74..6e2083d31d61 100644
--- a/sys/modules/pst/Makefile
+++ b/sys/modules/pst/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pst/Makefile,v 1.1 2003/08/30 08:01:05 sos Exp $
 
 .PATH: ${.CURDIR}/../../dev/pst
 
diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile
index b011db5117c9..e2fd52990c02 100644
--- a/sys/modules/puc/Makefile
+++ b/sys/modules/puc/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/puc/Makefile,v 1.1 2005/04/22 07:43:27 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/puc
 KMOD=	puc
diff --git a/sys/modules/ral/Makefile b/sys/modules/ral/Makefile
index 002d1e87e616..775f40e86eca 100644
--- a/sys/modules/ral/Makefile
+++ b/sys/modules/ral/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ral/Makefile,v 1.1 2005/04/18 18:47:38 damien Exp $
 
 .PATH: ${.CURDIR}/../../dev/ral
 
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index 37c4d829bc3b..c379265fed2b 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/random/Makefile,v 1.15 2004/04/11 15:40:18 marcel Exp $
 
 .PATH: ${.CURDIR}/../../dev/random
 .PATH: ${.CURDIR}/../../crypto/rijndael
diff --git a/sys/modules/ray/Makefile b/sys/modules/ray/Makefile
index 84eb9d958568..c39a3cca681b 100644
--- a/sys/modules/ray/Makefile
+++ b/sys/modules/ray/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ray/Makefile,v 1.4 2004/05/26 00:53:07 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ray
 
diff --git a/sys/modules/rc/Makefile b/sys/modules/rc/Makefile
index 9cc8f0306552..d98b00caa3f9 100644
--- a/sys/modules/rc/Makefile
+++ b/sys/modules/rc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rc/Makefile,v 1.2 2003/03/05 08:16:29 das Exp $
 
 .PATH: ${.CURDIR}/../../dev/rc
 
diff --git a/sys/modules/rc4/Makefile b/sys/modules/rc4/Makefile
index 95f609eac016..61ee38d247bd 100644
--- a/sys/modules/rc4/Makefile
+++ b/sys/modules/rc4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rc4/Makefile,v 1.1 2003/01/15 19:55:17 sam Exp $
 
 .PATH: ${.CURDIR}/../../crypto/rc4
 
diff --git a/sys/modules/re/Makefile b/sys/modules/re/Makefile
index c28eb842c589..b0950bea7024 100644
--- a/sys/modules/re/Makefile
+++ b/sys/modules/re/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/re/Makefile,v 1.2 2003/09/08 03:24:29 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../dev/re
 
diff --git a/sys/modules/reiserfs/Makefile b/sys/modules/reiserfs/Makefile
index 64d044039134..60f216ed00ab 100644
--- a/sys/modules/reiserfs/Makefile
+++ b/sys/modules/reiserfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/reiserfs/Makefile,v 1.2 2005/06/18 17:10:50 dumbbell Exp $
 
 .PATH: ${.CURDIR}/../../gnu/fs/reiserfs
 KMOD=	reiserfs
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index 23a06a1daa61..ee8edd275832 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rl/Makefile,v 1.10 2001/01/06 14:00:13 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/rndtest/Makefile b/sys/modules/rndtest/Makefile
index f818704a861e..5be96d6ae365 100644
--- a/sys/modules/rndtest/Makefile
+++ b/sys/modules/rndtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rndtest/Makefile,v 1.1 2003/03/11 19:26:16 sam Exp $
 
 .PATH:	${.CURDIR}/../../dev/rndtest
 KMOD	= rndtest
diff --git a/sys/modules/rp/Makefile b/sys/modules/rp/Makefile
index cff6e12dad00..bbbb8f7dece5 100644
--- a/sys/modules/rp/Makefile
+++ b/sys/modules/rp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rp/Makefile,v 1.3 2002/02/15 15:45:34 bde Exp $
 
 .PATH: ${.CURDIR}/../../dev/rp
 
diff --git a/sys/modules/rue/Makefile b/sys/modules/rue/Makefile
index 7e6175248335..28ec0fefc1e3 100644
--- a/sys/modules/rue/Makefile
+++ b/sys/modules/rue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rue/Makefile,v 1.2 2004/06/27 12:33:16 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/s3/Makefile b/sys/modules/s3/Makefile
index c0babcbc3717..e545f59c67d3 100644
--- a/sys/modules/s3/Makefile
+++ b/sys/modules/s3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/s3/Makefile,v 1.5 2001/02/04 12:35:22 peter Exp $
 
 .PATH: ${.CURDIR}/../../dev/fb
 
diff --git a/sys/modules/safe/Makefile b/sys/modules/safe/Makefile
index b47a594011d9..31e1d6ecf153 100644
--- a/sys/modules/safe/Makefile
+++ b/sys/modules/safe/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/safe/Makefile,v 1.1 2003/07/21 21:47:47 sam Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/safe
diff --git a/sys/modules/sbni/Makefile b/sys/modules/sbni/Makefile
index 9dfab90f59ab..d627d14cb679 100644
--- a/sys/modules/sbni/Makefile
+++ b/sys/modules/sbni/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.1 2001/11/21 22:29:35 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../dev/sbni
 
diff --git a/sys/modules/sbsh/Makefile b/sys/modules/sbsh/Makefile
index 74569567c470..6a31e25c5a96 100644
--- a/sys/modules/sbsh/Makefile
+++ b/sys/modules/sbsh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sbsh/Makefile,v 1.1 2003/04/13 06:27:13 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../dev/sbsh
 
diff --git a/sys/modules/scd/Makefile b/sys/modules/scd/Makefile
index 4cf41456fa4e..b15ba760e3b6 100644
--- a/sys/modules/scd/Makefile
+++ b/sys/modules/scd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/scd/Makefile,v 1.1 2002/11/05 09:37:32 mdodd Exp $
 
 .PATH: ${.CURDIR}/../../dev/scd
 
diff --git a/sys/modules/scsi_low/Makefile b/sys/modules/scsi_low/Makefile
index d8e3cc36a7ce..ca06184bf349 100644
--- a/sys/modules/scsi_low/Makefile
+++ b/sys/modules/scsi_low/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/scsi_low/Makefile,v 1.2 2002/01/11 01:16:00 msmith Exp $
 
 .PATH: ${.CURDIR}/../../cam/scsi
 KMOD=	scsi_low
diff --git a/sys/modules/sem/Makefile b/sys/modules/sem/Makefile
index 8b88444a995d..17cc6732053b 100644
--- a/sys/modules/sem/Makefile
+++ b/sys/modules/sem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sem/Makefile,v 1.2 2005/05/04 10:39:14 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index 1725f098267d..6bce16363faf 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sf/Makefile,v 1.13 2001/01/06 14:00:14 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/sio/Makefile b/sys/modules/sio/Makefile
index 8ec6b4efe2ee..80ab63dbf078 100644
--- a/sys/modules/sio/Makefile
+++ b/sys/modules/sio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sio/Makefile,v 1.8 2005/05/10 12:02:16 nyan Exp $
 
 .if ${MACHINE} == "pc98"
 .PATH: ${.CURDIR}/../../pc98/cbus
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index 8fa9ec46ed7e..bac388cfad39 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sis/Makefile,v 1.10 2001/01/06 14:00:14 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index 28ad56bcd136..68cd0a609ee8 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sk/Makefile,v 1.12 2001/01/06 14:00:14 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
index c9a0d19eb500..cd02b6d8952e 100644
--- a/sys/modules/smbfs/Makefile
+++ b/sys/modules/smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.9 2004/10/24 15:32:51 ru Exp $
 
 .PATH:	${.CURDIR}/../../crypto/des \
 	${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \
diff --git a/sys/modules/sn/Makefile b/sys/modules/sn/Makefile
index b248c757643c..633942a7dbd4 100644
--- a/sys/modules/sn/Makefile
+++ b/sys/modules/sn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sn/Makefile,v 1.4 2004/05/26 00:53:08 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/sn
 
diff --git a/sys/modules/snc/Makefile b/sys/modules/snc/Makefile
index 4b158fb9992a..1e5c3336d200 100644
--- a/sys/modules/snc/Makefile
+++ b/sys/modules/snc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/snc/Makefile,v 1.2 2001/01/06 14:00:15 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/snc
 
diff --git a/sys/modules/snp/Makefile b/sys/modules/snp/Makefile
index 9cafd330e7b6..8d2f7b8b7001 100644
--- a/sys/modules/snp/Makefile
+++ b/sys/modules/snp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/snp/Makefile,v 1.4.2.1 2005/09/23 23:23:54 cognet Exp $
 
 .PATH: ${.CURDIR}/../../dev/snp
 
diff --git a/sys/modules/sound/Makefile b/sys/modules/sound/Makefile
index d6867331eb67..bf5bd35ed30c 100644
--- a/sys/modules/sound/Makefile
+++ b/sys/modules/sound/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/Makefile,v 1.2 2004/07/16 03:58:46 tanimura Exp $
 
 SUBDIR =
 SUBDIR += sound
diff --git a/sys/modules/sound/Makefile.inc b/sys/modules/sound/Makefile.inc
index 265f86d1ed55..beabedaf50e1 100644
--- a/sys/modules/sound/Makefile.inc
+++ b/sys/modules/sound/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/Makefile.inc,v 1.1 2000/07/04 23:32:01 cg Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index c863d7cce20d..05493564e721 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.16 2004/10/25 10:29:56 yongari Exp $
 
 .if ${MACHINE_ARCH} == "sparc64"
 SUBDIR  = audiocs
diff --git a/sys/modules/sound/driver/Makefile.inc b/sys/modules/sound/driver/Makefile.inc
index 63bf7601dc36..6be4dd51ec0c 100644
--- a/sys/modules/sound/driver/Makefile.inc
+++ b/sys/modules/sound/driver/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/Makefile.inc,v 1.3 2001/04/08 21:50:41 obrien Exp $
 
 SRCS+=	ac97_if.h channel_if.h feeder_if.h mixer_if.h
 
diff --git a/sys/modules/sound/driver/ad1816/Makefile b/sys/modules/sound/driver/ad1816/Makefile
index 9c7fa9ec5d85..05f59675bfb0 100644
--- a/sys/modules/sound/driver/ad1816/Makefile
+++ b/sys/modules/sound/driver/ad1816/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ad1816/Makefile,v 1.2 2001/01/06 14:00:15 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/als4000/Makefile b/sys/modules/sound/driver/als4000/Makefile
index 59dc73ac05bd..fcb9096d446a 100644
--- a/sys/modules/sound/driver/als4000/Makefile
+++ b/sys/modules/sound/driver/als4000/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/als4000/Makefile,v 1.2 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/au88x0/Makefile b/sys/modules/sound/driver/au88x0/Makefile
index b00a90f47309..02420c041f5b 100644
--- a/sys/modules/sound/driver/au88x0/Makefile
+++ b/sys/modules/sound/driver/au88x0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/au88x0/Makefile,v 1.1 2003/06/01 11:58:46 des Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/audiocs/Makefile b/sys/modules/sound/driver/audiocs/Makefile
index ff67554f9e1f..a462899d3789 100644
--- a/sys/modules/sound/driver/audiocs/Makefile
+++ b/sys/modules/sound/driver/audiocs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/audiocs/Makefile,v 1.1 2004/10/25 10:29:57 yongari Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/sbus
 
diff --git a/sys/modules/sound/driver/cmi/Makefile b/sys/modules/sound/driver/cmi/Makefile
index 85f9ba160b98..20efaee687af 100644
--- a/sys/modules/sound/driver/cmi/Makefile
+++ b/sys/modules/sound/driver/cmi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/cmi/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/cs4281/Makefile b/sys/modules/sound/driver/cs4281/Makefile
index ed3ddbc1574b..72de13d994ef 100644
--- a/sys/modules/sound/driver/cs4281/Makefile
+++ b/sys/modules/sound/driver/cs4281/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/cs4281/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/csa/Makefile b/sys/modules/sound/driver/csa/Makefile
index 521005e143e2..0e0a703b17fc 100644
--- a/sys/modules/sound/driver/csa/Makefile
+++ b/sys/modules/sound/driver/csa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/csa/Makefile,v 1.4 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/driver/Makefile b/sys/modules/sound/driver/driver/Makefile
index 56a8461e3e6f..585cc45e804b 100644
--- a/sys/modules/sound/driver/driver/Makefile
+++ b/sys/modules/sound/driver/driver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/driver/Makefile,v 1.4 2003/02/07 15:05:37 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound
 
diff --git a/sys/modules/sound/driver/ds1/Makefile b/sys/modules/sound/driver/ds1/Makefile
index c8f90ec781d6..294ee7500533 100644
--- a/sys/modules/sound/driver/ds1/Makefile
+++ b/sys/modules/sound/driver/ds1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ds1/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/emu10k1/Makefile b/sys/modules/sound/driver/emu10k1/Makefile
index 3d9984c5840a..3ce87ce870b2 100644
--- a/sys/modules/sound/driver/emu10k1/Makefile
+++ b/sys/modules/sound/driver/emu10k1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/emu10k1/Makefile,v 1.4 2004/01/11 10:30:56 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci \
        ${.CURDIR}/../../../../gnu/dev/sound/pci
diff --git a/sys/modules/sound/driver/es137x/Makefile b/sys/modules/sound/driver/es137x/Makefile
index d2a2d58cc343..d555b5f933e8 100644
--- a/sys/modules/sound/driver/es137x/Makefile
+++ b/sys/modules/sound/driver/es137x/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/es137x/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/ess/Makefile b/sys/modules/sound/driver/ess/Makefile
index 4c8da8165809..e8a5534c85e4 100644
--- a/sys/modules/sound/driver/ess/Makefile
+++ b/sys/modules/sound/driver/ess/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ess/Makefile,v 1.3 2002/01/23 03:32:36 cg Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/fm801/Makefile b/sys/modules/sound/driver/fm801/Makefile
index a8ed6bd95ee4..b0e1ebdf43fd 100644
--- a/sys/modules/sound/driver/fm801/Makefile
+++ b/sys/modules/sound/driver/fm801/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/fm801/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/ich/Makefile b/sys/modules/sound/driver/ich/Makefile
index e0f2ce7e3626..4547436006cd 100755
--- a/sys/modules/sound/driver/ich/Makefile
+++ b/sys/modules/sound/driver/ich/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ich/Makefile,v 1.2 2003/02/07 13:56:32 nyan Exp $
 
 .PATH:		${.CURDIR}/../../../../dev/sound/pci
 KMOD		= snd_ich
diff --git a/sys/modules/sound/driver/maestro/Makefile b/sys/modules/sound/driver/maestro/Makefile
index 817097d7aab6..ddef51f0d820 100644
--- a/sys/modules/sound/driver/maestro/Makefile
+++ b/sys/modules/sound/driver/maestro/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/maestro/Makefile,v 1.4 2005/01/26 16:29:07 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/maestro3/Makefile b/sys/modules/sound/driver/maestro3/Makefile
index d4378b8b790a..7fd526b32745 100644
--- a/sys/modules/sound/driver/maestro3/Makefile
+++ b/sys/modules/sound/driver/maestro3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/maestro3/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/mss/Makefile b/sys/modules/sound/driver/mss/Makefile
index 44880788998b..f02f3883ceee 100644
--- a/sys/modules/sound/driver/mss/Makefile
+++ b/sys/modules/sound/driver/mss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/mss/Makefile,v 1.5 2002/11/06 13:46:59 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/neomagic/Makefile b/sys/modules/sound/driver/neomagic/Makefile
index 9eabb5ccaf99..d4bbb3041b32 100644
--- a/sys/modules/sound/driver/neomagic/Makefile
+++ b/sys/modules/sound/driver/neomagic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/neomagic/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/sb16/Makefile b/sys/modules/sound/driver/sb16/Makefile
index bf009f7035b8..b6fe341d5c7e 100644
--- a/sys/modules/sound/driver/sb16/Makefile
+++ b/sys/modules/sound/driver/sb16/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/sb16/Makefile,v 1.2 2001/01/06 14:00:20 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/sb8/Makefile b/sys/modules/sound/driver/sb8/Makefile
index f2b0da834c7a..24e92cefd737 100644
--- a/sys/modules/sound/driver/sb8/Makefile
+++ b/sys/modules/sound/driver/sb8/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/sb8/Makefile,v 1.2 2001/01/06 14:00:20 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/sbc/Makefile b/sys/modules/sound/driver/sbc/Makefile
index 8e2343df2663..ae8c1a14db3e 100644
--- a/sys/modules/sound/driver/sbc/Makefile
+++ b/sys/modules/sound/driver/sbc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/sbc/Makefile,v 1.4 2002/11/06 13:46:59 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/solo/Makefile b/sys/modules/sound/driver/solo/Makefile
index 01059faf3536..2ac2f6a482b7 100644
--- a/sys/modules/sound/driver/solo/Makefile
+++ b/sys/modules/sound/driver/solo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/solo/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/t4dwave/Makefile b/sys/modules/sound/driver/t4dwave/Makefile
index 7cd91402f49e..179a6f662a28 100644
--- a/sys/modules/sound/driver/t4dwave/Makefile
+++ b/sys/modules/sound/driver/t4dwave/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/t4dwave/Makefile,v 1.3 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/uaudio/Makefile b/sys/modules/sound/driver/uaudio/Makefile
index ff92551bb61e..42803908c514 100644
--- a/sys/modules/sound/driver/uaudio/Makefile
+++ b/sys/modules/sound/driver/uaudio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/uaudio/Makefile,v 1.3 2004/12/29 08:50:35 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/usb
 
diff --git a/sys/modules/sound/driver/via8233/Makefile b/sys/modules/sound/driver/via8233/Makefile
index fa3fd960185c..e0f01cd441be 100644
--- a/sys/modules/sound/driver/via8233/Makefile
+++ b/sys/modules/sound/driver/via8233/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/via8233/Makefile,v 1.2 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/via82c686/Makefile b/sys/modules/sound/driver/via82c686/Makefile
index d53576ce9fce..d2527313bb5d 100644
--- a/sys/modules/sound/driver/via82c686/Makefile
+++ b/sys/modules/sound/driver/via82c686/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/via82c686/Makefile,v 1.3 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/vibes/Makefile b/sys/modules/sound/driver/vibes/Makefile
index 663d8a00969c..456b99280cb8 100644
--- a/sys/modules/sound/driver/vibes/Makefile
+++ b/sys/modules/sound/driver/vibes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/vibes/Makefile,v 1.4 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile
index 8649d9653e27..3974279ff37d 100644
--- a/sys/modules/sound/sound/Makefile
+++ b/sys/modules/sound/sound/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.16 2005/07/10 10:43:59 marius Exp $
 
 .PATH: ${.CURDIR}/../../../dev/sound/pcm
 .PATH: ${.CURDIR}/../../../dev/sound/isa
diff --git a/sys/modules/speaker/Makefile b/sys/modules/speaker/Makefile
index 69267d522b3e..342a6560bb27 100644
--- a/sys/modules/speaker/Makefile
+++ b/sys/modules/speaker/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/speaker/Makefile,v 1.2 2003/03/29 10:01:03 mdodd Exp $
 
 .PATH: ${.CURDIR}/../../i386/isa
 
diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile
index 1c634bf4bf98..a159afb22756 100644
--- a/sys/modules/splash/Makefile
+++ b/sys/modules/splash/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/Makefile,v 1.3 1999/08/28 00:47:37 peter Exp $
 
 SUBDIR=	bmp pcx
 
diff --git a/sys/modules/splash/Makefile.inc b/sys/modules/splash/Makefile.inc
index 265f86d1ed55..21cbb45f0da0 100644
--- a/sys/modules/splash/Makefile.inc
+++ b/sys/modules/splash/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/Makefile.inc,v 1.2 1999/08/28 00:47:37 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile
index a169fdfec21a..376bf83572e4 100644
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/bmp/Makefile,v 1.9 2004/08/06 20:37:08 des Exp $
 
 .PATH:	${.CURDIR}/../../../dev/fb
 
diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile
index 188dafcd0f02..ddbad01ac81e 100644
--- a/sys/modules/splash/pcx/Makefile
+++ b/sys/modules/splash/pcx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/pcx/Makefile,v 1.7 2004/08/06 20:37:08 des Exp $
 
 .PATH:	${.CURDIR}/../../../dev/fb
 
diff --git a/sys/modules/sppp/Makefile b/sys/modules/sppp/Makefile
index 030f843e5f42..3875e8591905 100644
--- a/sys/modules/sppp/Makefile
+++ b/sys/modules/sppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sppp/Makefile,v 1.6 2004/12/28 00:07:56 rik Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/sr/Makefile b/sys/modules/sr/Makefile
index b49d21edbdbe..76b85b8c884e 100644
--- a/sys/modules/sr/Makefile
+++ b/sys/modules/sr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sr/Makefile,v 1.3 2004/06/25 19:22:04 julian Exp $
  
 .PATH:  ${.CURDIR}/../../dev/sr
 KMOD    = if_sr
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index 6ad69a8f2705..8b89f0c18078 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ste/Makefile,v 1.11 2001/01/06 14:00:23 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/stg/Makefile b/sys/modules/stg/Makefile
index 83362d3e9a35..978068299eb2 100644
--- a/sys/modules/stg/Makefile
+++ b/sys/modules/stg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/stg/Makefile,v 1.3 2004/05/26 00:53:08 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/stg
 
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index ab343005eb9d..305be8e4434b 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/streams/Makefile,v 1.11 2003/11/19 05:08:27 imp Exp $ 
 MAINTAINER=	newton@atdot.dotat.org
 
 .PATH: ${.CURDIR}/../../dev/streams
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 25345e750c60..c90b18ec25df 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/svr4/Makefile,v 1.27 2002/08/12 01:36:20 rwatson Exp $
 
 MAINTAINER=	newton@FreeBSD.org
 
diff --git a/sys/modules/svr4/README b/sys/modules/svr4/README
index a14e2b735401..9ddd10824a5c 100644
--- a/sys/modules/svr4/README
+++ b/sys/modules/svr4/README
@@ -35,4 +35,4 @@ things)).  Patches will be appreciated (use send-pr).
    - Mark Newton
      newton@atdot.dotat.org
 
-$FreeBSD$
+$FreeBSD: src/sys/modules/svr4/README,v 1.5 2001/05/01 11:26:14 schweikh Exp $
diff --git a/sys/modules/svr4/TO-DO b/sys/modules/svr4/TO-DO
index 078b80d8943a..e4d2c41c78fe 100644
--- a/sys/modules/svr4/TO-DO
+++ b/sys/modules/svr4/TO-DO
@@ -12,4 +12,4 @@ TO-DO list
   * Make SysV emulator use SysV shared memory support (duh)
 
 
-$FreeBSD$
+$FreeBSD: src/sys/modules/svr4/TO-DO,v 1.2 1999/08/28 00:47:42 peter Exp $
diff --git a/sys/modules/sym/Makefile b/sys/modules/sym/Makefile
index 198c98245aa5..c254b7ece73b 100644
--- a/sys/modules/sym/Makefile
+++ b/sys/modules/sym/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sym/Makefile,v 1.3 2001/01/06 14:00:24 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/sym
 
diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile
index 71e84d040613..a003b31f13d6 100644
--- a/sys/modules/syscons/Makefile
+++ b/sys/modules/syscons/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/Makefile,v 1.15 2005/07/10 11:47:04 marius Exp $
 
 SUBDIR=	${_apm} \
 	blank \
diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc
index 265f86d1ed55..960e646f9c0c 100644
--- a/sys/modules/syscons/Makefile.inc
+++ b/sys/modules/syscons/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/Makefile.inc,v 1.2 1999/08/28 00:47:44 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile
index d2e31d8c15ba..1ea0c1131760 100644
--- a/sys/modules/syscons/apm/Makefile
+++ b/sys/modules/syscons/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/apm/Makefile,v 1.8 2002/11/06 13:46:59 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/apm
 
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index 673b6bd2ff55..a6ef563f8f10 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/blank/Makefile,v 1.14 2002/01/11 15:48:58 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/blank
 
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index b027972c8d83..9da1f9a21441 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/daemon/Makefile,v 1.13 2002/11/06 13:46:59 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/daemon
 
diff --git a/sys/modules/syscons/dragon/Makefile b/sys/modules/syscons/dragon/Makefile
index 95ebecd53982..04d1ce854b88 100644
--- a/sys/modules/syscons/dragon/Makefile
+++ b/sys/modules/syscons/dragon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/dragon/Makefile,v 1.3 2002/11/11 10:11:58 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/dragon
 
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index 76919617dae8..f4ed1722b5d1 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/fade/Makefile,v 1.14 2002/01/11 15:48:59 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/fade
 
diff --git a/sys/modules/syscons/fire/Makefile b/sys/modules/syscons/fire/Makefile
index 219017e7f897..cb43420c0be5 100644
--- a/sys/modules/syscons/fire/Makefile
+++ b/sys/modules/syscons/fire/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/fire/Makefile,v 1.9 2002/11/11 10:11:59 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/fire
 
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index 255171ebb445..d0d2a1e81284 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/green/Makefile,v 1.14 2002/01/11 15:48:59 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/green
 
diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile
index b4439f2ddb99..9114f6724253 100644
--- a/sys/modules/syscons/logo/Makefile
+++ b/sys/modules/syscons/logo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/logo/Makefile,v 1.8 2002/01/11 15:48:59 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/logo
 
diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile
index 5c0d1265a198..5c688f90351e 100644
--- a/sys/modules/syscons/rain/Makefile
+++ b/sys/modules/syscons/rain/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/rain/Makefile,v 1.8 2002/11/11 10:07:18 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/rain
 
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 9edf83006817..5d98ec2f0480 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/snake/Makefile,v 1.16 2002/11/06 13:47:00 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/snake
 
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index ca3075fe1e84..67a2b8768753 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/star/Makefile,v 1.16 2002/11/06 13:47:00 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/star
 
diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile
index 3ff59d3c4ea3..43f8ff80110a 100644
--- a/sys/modules/syscons/warp/Makefile
+++ b/sys/modules/syscons/warp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/warp/Makefile,v 1.9 2002/11/11 10:11:59 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/warp
 
diff --git a/sys/modules/sysvipc/Makefile b/sys/modules/sysvipc/Makefile
index 6c65857836d2..6acc4466fd74 100644
--- a/sys/modules/sysvipc/Makefile
+++ b/sys/modules/sysvipc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/Makefile,v 1.1 2000/12/01 17:49:16 alfred Exp $
 
 SUBDIR= sysvmsg sysvsem sysvshm
 
diff --git a/sys/modules/sysvipc/Makefile.inc b/sys/modules/sysvipc/Makefile.inc
index 265f86d1ed55..4fe9ceee9fe3 100644
--- a/sys/modules/sysvipc/Makefile.inc
+++ b/sys/modules/sysvipc/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/Makefile.inc,v 1.1 2002/11/06 13:41:40 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile
index 3e48b3128cfb..353ea112adba 100644
--- a/sys/modules/sysvipc/sysvmsg/Makefile
+++ b/sys/modules/sysvipc/sysvmsg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/sysvmsg/Makefile,v 1.4 2005/02/09 08:35:23 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile
index 22d97eed945d..ca0b1e061cd4 100644
--- a/sys/modules/sysvipc/sysvsem/Makefile
+++ b/sys/modules/sysvipc/sysvsem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/sysvsem/Makefile,v 1.4 2005/02/09 08:35:24 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile
index 760a6a236e19..cfa6752c4866 100644
--- a/sys/modules/sysvipc/sysvshm/Makefile
+++ b/sys/modules/sysvipc/sysvshm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/sysvshm/Makefile,v 1.5 2005/02/09 08:35:24 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index fdafb8a8d82a..955326935653 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ti/Makefile,v 1.15 2004/12/29 21:50:44 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index bbd30a13e605..05befe48e86e 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/tl/Makefile,v 1.15 2001/01/06 14:00:31 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/trm/Makefile b/sys/modules/trm/Makefile
index f984794b3070..c7874d9df08e 100644
--- a/sys/modules/trm/Makefile
+++ b/sys/modules/trm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/trm/Makefile,v 1.1 2002/10/13 18:44:26 cognet Exp $
 
 .PATH: ${.CURDIR}/../../dev/trm
 
diff --git a/sys/modules/twa/Makefile b/sys/modules/twa/Makefile
index 5529cd759ee3..73181eebcd36 100644
--- a/sys/modules/twa/Makefile
+++ b/sys/modules/twa/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/sys/modules/twa/Makefile,v 1.4 2005/04/12 22:07:11 vkashyap Exp $
 #
 
 #
diff --git a/sys/modules/twe/Makefile b/sys/modules/twe/Makefile
index 052c541fab51..caa152df8fa4 100644
--- a/sys/modules/twe/Makefile
+++ b/sys/modules/twe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/twe/Makefile,v 1.6 2001/01/06 14:00:31 obrien Exp $
 
 #
 # The 3ware controller offers a choice of options related to handling of
diff --git a/sys/modules/tx/Makefile b/sys/modules/tx/Makefile
index 8d4ded923798..0b866bdf88f4 100644
--- a/sys/modules/tx/Makefile
+++ b/sys/modules/tx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/tx/Makefile,v 1.9 2003/01/19 02:59:33 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/tx
 
diff --git a/sys/modules/txp/Makefile b/sys/modules/txp/Makefile
index 7e1f500e85c5..6ad64411b3aa 100644
--- a/sys/modules/txp/Makefile
+++ b/sys/modules/txp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/txp/Makefile,v 1.3 2001/09/05 23:47:02 brooks Exp $
 
 .PATH: ${.CURDIR}/../../dev/txp
 
diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile
index 6a8f285590c7..25b4f1d1b442 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uart/Makefile,v 1.13 2004/11/20 23:38:48 marcel Exp $
 
 .PATH: ${.CURDIR}/../../dev/uart
 
diff --git a/sys/modules/ubsa/Makefile b/sys/modules/ubsa/Makefile
index 1d7eb766fef2..a28d94efcfb0 100644
--- a/sys/modules/ubsa/Makefile
+++ b/sys/modules/ubsa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubsa/Makefile,v 1.4 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ubsec/Makefile b/sys/modules/ubsec/Makefile
index 4c9f58cf14b1..98734494074e 100644
--- a/sys/modules/ubsec/Makefile
+++ b/sys/modules/ubsec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubsec/Makefile,v 1.3 2003/03/11 23:20:43 sam Exp $
 
 .PATH:	${.CURDIR}/../../dev/ubsec
 KMOD	= ubsec
diff --git a/sys/modules/ubser/Makefile b/sys/modules/ubser/Makefile
index 41a0bc3f01d2..099bf5b9ddd7 100644
--- a/sys/modules/ubser/Makefile
+++ b/sys/modules/ubser/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubser/Makefile,v 1.3 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ucom/Makefile b/sys/modules/ucom/Makefile
index bbd5c21dbf21..118add5f4383 100644
--- a/sys/modules/ucom/Makefile
+++ b/sys/modules/ucom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ucom/Makefile,v 1.4 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ucycom/Makefile b/sys/modules/ucycom/Makefile
index d5849a93f520..b6de48c961f2 100644
--- a/sys/modules/ucycom/Makefile
+++ b/sys/modules/ucycom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ucycom/Makefile,v 1.2 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/udav/Makefile b/sys/modules/udav/Makefile
index 02a9d721f9b9..0126a4e8d750 100644
--- a/sys/modules/udav/Makefile
+++ b/sys/modules/udav/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udav/Makefile,v 1.2 2004/06/27 12:33:17 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile
index aeeac7cb4b98..0a343e2948a4 100644
--- a/sys/modules/udbp/Makefile
+++ b/sys/modules/udbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udbp/Makefile,v 1.9 2005/06/04 10:58:37 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/udf/Makefile b/sys/modules/udf/Makefile
index 220cba1e08ce..3beb472672c5 100644
--- a/sys/modules/udf/Makefile
+++ b/sys/modules/udf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udf/Makefile,v 1.5 2004/01/13 11:28:50 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/udf
 
diff --git a/sys/modules/udf_iconv/Makefile b/sys/modules/udf_iconv/Makefile
index 008f722bcba1..4de2bcc4d9ba 100644
--- a/sys/modules/udf_iconv/Makefile
+++ b/sys/modules/udf_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udf_iconv/Makefile,v 1.1 2003/11/07 09:38:05 scottl Exp $
 
 .PATH:	${.CURDIR}/../../fs/udf
 KMOD=	udf_iconv
diff --git a/sys/modules/ufm/Makefile b/sys/modules/ufm/Makefile
index 28bbc90e3a09..b1ae1727bf9d 100644
--- a/sys/modules/ufm/Makefile
+++ b/sys/modules/ufm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ufm/Makefile,v 1.3 2004/06/27 12:33:17 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/usb
 KMOD=	ufm
diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile
index b216b80c5892..f2de47d20d49 100644
--- a/sys/modules/ufs/Makefile
+++ b/sys/modules/ufs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ufs/Makefile,v 1.3 2005/03/14 10:23:34 phk Exp $
 
 .PATH:	${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs
 
diff --git a/sys/modules/uftdi/Makefile b/sys/modules/uftdi/Makefile
index 65cb10782f5a..a2d10aaf8c68 100644
--- a/sys/modules/uftdi/Makefile
+++ b/sys/modules/uftdi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uftdi/Makefile,v 1.4 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index d024a3a396d3..03b868a04118 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ugen/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index 31c5a17ec2b8..d83964aceeba 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uhid/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index 3c55896e6088..d2517de49d87 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ukbd/Makefile,v 1.18 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index c7d51c30f9fa..121284e7b783 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ulpt/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index 761d588dba22..2726d56e712b 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umapfs/Makefile,v 1.14 2002/01/11 15:49:00 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/umapfs
 
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index 4af29fe90976..cc2ccd67c7ad 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umass/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/umct/Makefile b/sys/modules/umct/Makefile
index ccd775f4ba6f..7153187a38fb 100644
--- a/sys/modules/umct/Makefile
+++ b/sys/modules/umct/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umct/Makefile,v 1.4 2004/12/29 08:49:50 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 458a2c3cfafb..badc4bd55778 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umodem/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index fee38430c2ec..ff81fc08f5a8 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ums/Makefile,v 1.14 2005/06/04 10:58:39 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index 64d38c5f2a82..4e155c333fd8 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/unionfs/Makefile,v 1.12 2002/01/11 15:49:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/unionfs
 
diff --git a/sys/modules/uplcom/Makefile b/sys/modules/uplcom/Makefile
index 36115ccca436..d1fbaec57b5f 100644
--- a/sys/modules/uplcom/Makefile
+++ b/sys/modules/uplcom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uplcom/Makefile,v 1.5 2004/12/29 08:49:50 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ural/Makefile b/sys/modules/ural/Makefile
index e347e05217c8..ba2246c68bf8 100644
--- a/sys/modules/ural/Makefile
+++ b/sys/modules/ural/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ural/Makefile,v 1.1 2005/04/18 18:47:38 damien Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile
index 0221c5d1a103..2d5478c872b7 100644
--- a/sys/modules/urio/Makefile
+++ b/sys/modules/urio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/urio/Makefile,v 1.7 2004/12/29 08:49:51 imp Exp $ 
 
 MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
 
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index d08279d89376..faa61e7d93cd 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/usb/Makefile,v 1.18 2005/06/04 10:58:39 schweikh Exp $
 
 S=	${.CURDIR}/../..
 
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index fa3485659339..a34690cb78e5 100644
--- a/sys/modules/uscanner/Makefile
+++ b/sys/modules/uscanner/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uscanner/Makefile,v 1.7 2005/06/04 10:58:39 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/utopia/Makefile b/sys/modules/utopia/Makefile
index c1a444516c14..b31d18e0e76a 100644
--- a/sys/modules/utopia/Makefile
+++ b/sys/modules/utopia/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/utopia/Makefile,v 1.2 2005/02/25 09:49:29 harti Exp $
 
 .PATH: ${.CURDIR}/../../dev/utopia
 
diff --git a/sys/modules/uvisor/Makefile b/sys/modules/uvisor/Makefile
index feb74df9acb4..5807ef5f964a 100644
--- a/sys/modules/uvisor/Makefile
+++ b/sys/modules/uvisor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uvisor/Makefile,v 1.4 2004/12/29 08:49:51 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/uvscom/Makefile b/sys/modules/uvscom/Makefile
index ceb1959df1f2..dd527b309cea 100644
--- a/sys/modules/uvscom/Makefile
+++ b/sys/modules/uvscom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uvscom/Makefile,v 1.5 2004/12/29 08:49:51 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index eb49f933c9ba..796d574e16dd 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vesa/Makefile,v 1.14 2002/01/11 15:49:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
 
diff --git a/sys/modules/vge/Makefile b/sys/modules/vge/Makefile
index 8569f6831d60..85c7563fe3df 100644
--- a/sys/modules/vge/Makefile
+++ b/sys/modules/vge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vge/Makefile,v 1.1 2004/09/10 20:57:45 wpaul Exp $
 
 .PATH: ${.CURDIR}/../../dev/vge
 
diff --git a/sys/modules/vkbd/Makefile b/sys/modules/vkbd/Makefile
index b16ce414b4de..5bcd1b9c5984 100644
--- a/sys/modules/vkbd/Makefile
+++ b/sys/modules/vkbd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2004/08/13 18:30:24 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vkbd/Makefile,v 1.2 2004/12/29 08:44:30 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/vkbd
 
diff --git a/sys/modules/vpo/Makefile b/sys/modules/vpo/Makefile
index cad169a856fb..bf871953d166 100644
--- a/sys/modules/vpo/Makefile
+++ b/sys/modules/vpo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vpo/Makefile,v 1.6 2002/01/11 15:49:02 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/ppbus
 
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index fd58ab0cb26f..af23bac6b943 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vr/Makefile,v 1.12 2001/01/06 14:00:40 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/vx/Makefile b/sys/modules/vx/Makefile
index 37d036f654a6..05907ef112f9 100644
--- a/sys/modules/vx/Makefile
+++ b/sys/modules/vx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vx/Makefile,v 1.3 2004/06/09 21:52:12 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/vx
 
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index e53d9861cb6a..ef78c31b266a 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wb/Makefile,v 1.12 2001/01/06 14:00:41 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/wi/Makefile b/sys/modules/wi/Makefile
index ee577e8bd4ac..0e98b6d70580 100644
--- a/sys/modules/wi/Makefile
+++ b/sys/modules/wi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wi/Makefile,v 1.17 2004/05/26 00:53:09 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/wi
 
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index f37ba4420e01..16ec2f5b6a03 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan/Makefile,v 1.4 2004/12/08 17:38:37 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile
index aa71de2eebf8..0f3e3a873958 100644
--- a/sys/modules/wlan_acl/Makefile
+++ b/sys/modules/wlan_acl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_acl/Makefile,v 1.1 2004/12/08 17:38:37 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile
index 06bafcec6eed..48ca21b542e5 100644
--- a/sys/modules/wlan_ccmp/Makefile
+++ b/sys/modules/wlan_ccmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_ccmp/Makefile,v 1.3 2004/12/16 01:10:48 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 .PATH: ${.CURDIR}/../../crypto/rijndael
diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile
index 1449b78479e0..5a41495730fe 100644
--- a/sys/modules/wlan_tkip/Makefile
+++ b/sys/modules/wlan_tkip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_tkip/Makefile,v 1.1 2004/12/08 17:38:38 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile
index 88ad322bb5e7..c0aa7a610589 100644
--- a/sys/modules/wlan_wep/Makefile
+++ b/sys/modules/wlan_wep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_wep/Makefile,v 1.1 2004/12/08 17:38:38 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile
index fba6f8aabb46..3609c17d0f81 100644
--- a/sys/modules/wlan_xauth/Makefile
+++ b/sys/modules/wlan_xauth/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_xauth/Makefile,v 1.1 2004/12/08 17:38:38 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/xe/Makefile b/sys/modules/xe/Makefile
index f900854352b4..505bc82c6ef3 100644
--- a/sys/modules/xe/Makefile
+++ b/sys/modules/xe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/xe/Makefile,v 1.2 2004/05/26 00:53:09 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/xe
 
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index 3c2c1627b36d..4dc0ef6bace9 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/xl/Makefile,v 1.13 2001/01/06 14:00:42 obrien Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile
index 0a475b55fce3..f96100648e8d 100644
--- a/sys/modules/zlib/Makefile
+++ b/sys/modules/zlib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/zlib/Makefile,v 1.1 2004/06/20 17:42:35 markm Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index ad334fe24b27..482d3c0ea994 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -33,7 +33,7 @@
  *
  *      @(#)bpf.c	8.4 (Berkeley) 1/9/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf.c,v 1.153.2.6 2005/10/01 18:43:16 csjp Exp $
  */
 
 #include "opt_bpf.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 189b30f560a0..0cffe5adcaa1 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -34,7 +34,7 @@
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *	@(#)bpf.h	1.34 (LBL)     6/16/96
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf.h,v 1.39.2.1 2005/09/29 23:48:04 csjp Exp $
  */
 
 #ifndef _NET_BPF_H_
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index 94a2ff49f9e8..f92ee09dc25c 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_compat.h,v 1.12 2004/04/07 20:46:11 imp Exp $
  */
 
 #ifndef _NET_BPF_COMPAT_H_
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 2754f4da0404..ad246ea94864 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -33,7 +33,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_filter.c,v 1.23 2005/01/07 01:45:34 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 39a134095101..ba6003704143 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -33,7 +33,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpfdesc.h,v 1.29.2.2 2005/09/29 23:48:04 csjp Exp $
  */
 
 #ifndef _NET_BPFDESC_H_
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index b95fa57541bf..f072485f6210 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bridge.c,v 1.93.2.1 2005/08/25 05:01:19 rwatson Exp $
  */
 
 /*
diff --git a/sys/net/bridge.h b/sys/net/bridge.h
index 76594f50e7ec..d312cf369ded 100644
--- a/sys/net/bridge.h
+++ b/sys/net/bridge.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bridge.h,v 1.15 2005/06/10 16:49:18 brooks Exp $
  */
 
 extern int do_bridge;
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 125ab3f02f56..83262a829357 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.3.2.3.2.1 2005/10/23 02:37:28 thompsa Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index 3071fc3032ca..052b903ea8ea 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -37,7 +37,7 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bsd_comp.c,v 1.23 2005/07/05 23:39:49 rwatson Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index 45986a42d880..c313fc607c82 100644
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -1,7 +1,7 @@
 /*
  * Fundamental constants relating to ethernet.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ethernet.h,v 1.24 2004/10/05 19:28:52 sam Exp $
  *
  */
 
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index a488f29a0c4a..9262f3d92a30 100644
--- a/sys/net/fddi.h
+++ b/sys/net/fddi.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/fddi.h,v 1.14 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/net/firewire.h b/sys/net/firewire.h
index d47b8225e9dc..1bfce82dd689 100644
--- a/sys/net/firewire.h
+++ b/sys/net/firewire.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/net/firewire.h,v 1.3 2005/06/10 16:49:18 brooks Exp $
  */
 
 #ifndef _NET_FIREWIRE_H_
diff --git a/sys/net/if.c b/sys/net/if.c
index 11922780ee4e..310041a01dc8 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if.c,v 1.234.2.12 2005/09/29 20:57:06 rwatson Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/net/if.h b/sys/net/if.h
index 460f37410a1a..752bb05990d3 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if.h,v 1.96.2.3 2005/10/07 14:00:05 glebius Exp $
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h
index 7274829ac9a2..39d96efb3065 100644
--- a/sys/net/if_arc.h
+++ b/sys/net/if_arc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_arc.h,v 1.8 2005/06/10 16:49:18 brooks Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1993
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index 94f6681b6309..e70e0ccde87c 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/if_arcsubr.c,v 1.25.2.2 2005/08/25 05:01:19 rwatson Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995 Ignatios Souvatzis
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 9aa63c626641..2cfdf7ef82fb 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_arp.h,v 1.22 2005/06/10 16:49:18 brooks Exp $
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_atm.h b/sys/net/if_atm.h
index 99cc27757148..857121ae1099 100644
--- a/sys/net/if_atm.h
+++ b/sys/net/if_atm.h
@@ -1,5 +1,5 @@
 /*      $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $       */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_atm.h,v 1.23.2.1 2005/08/25 05:01:19 rwatson Exp $ */
 
 /*-
  *
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index a0e84ea7981c..f68187b28827 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.37.2.3 2005/08/25 05:01:19 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index ab1f8441193c..8acb2307babb 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.11.2.12.2.3 2005/10/27 19:43:07 thompsa Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h
index 7c6b9c2fbd1c..7600ca49bdd6 100644
--- a/sys/net/if_bridgevar.h
+++ b/sys/net/if_bridgevar.h
@@ -67,7 +67,7 @@
  *
  * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_bridgevar.h,v 1.4.6.1 2005/10/23 02:37:28 thompsa Exp $
  */
 
 /*
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index 7dd3d5998646..f48114e2918d 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_clone.c,v 1.6 2005/02/24 13:14:41 maxim Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h
index d84b47ef42aa..97d562980ebb 100644
--- a/sys/net/if_clone.h
+++ b/sys/net/if_clone.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_clone.h,v 1.2 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef	_NET_IF_CLONE_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index d94eeeb64289..7b855b5e784d 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_disc.c,v 1.48 2005/06/26 18:11:10 dwmalone Exp $
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 8d88623db856..4d2b4f7435d6 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_dl.h,v 1.14 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 448240e39568..cc959113c301 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ef.c,v 1.34.2.1 2005/08/25 05:01:19 rwatson Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index bb12efa91f28..473db7535595 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.193.2.4.2.2 2005/10/23 02:37:28 thompsa Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index d71a3fa1922e..8043a3ab61b1 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_faith.c,v 1.36.2.1 2005/08/25 05:01:19 rwatson Exp $
  */
 /*
  * derived from
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index ed33313c1f0e..47165252cc67 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.98.2.2 2005/08/25 05:01:20 rwatson Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index a3afd3984b89..539daab5cb5d 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_fwsubr.c,v 1.12.2.2.2.1 2005/10/28 22:52:31 avatar Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index ba9a9ebfe764..eff202adacd3 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_gif.c,v 1.52.2.1 2005/08/25 05:01:20 rwatson Exp $	*/
 /*	$KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $	*/
 
 /*-
diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h
index 831c7f7d306a..53ea0ca09e9c 100644
--- a/sys/net/if_gif.h
+++ b/sys/net/if_gif.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_gif.h,v 1.17 2005/06/10 16:49:18 brooks Exp $	*/
 /*	$KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index aa575262f4bc..b94067bf9b38 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_gre.c,v 1.49 2003/12/11 00:22:29 itojun Exp $ */
-/*	 $FreeBSD$ */
+/*	 $FreeBSD: src/sys/net/if_gre.c,v 1.32.2.2 2005/08/25 05:01:20 rwatson Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 6c8e8537c6d3..3ed9b64f63ac 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $ */
-/*	 $FreeBSD$ */
+/*	 $FreeBSD: src/sys/net/if_gre.h,v 1.13 2005/06/10 16:49:18 brooks Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 5e8382faea64..2f6209aa7d54 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.67.2.3 2005/08/25 05:01:20 rwatson Exp $
  *
  */
 
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 8d96686c0aac..e6618b180fe6 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_llc.h,v 1.12 2005/06/05 03:13:12 thompsa Exp $
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 94f1c3e47b7d..2f4fcc4494af 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_loop.c,v 1.106.2.1 2005/08/25 05:01:20 rwatson Exp $
  */
 
 /*
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index dcb947516365..e10cbccf4fbb 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_media.c,v 1.21 2005/01/07 01:45:34 imp Exp $ */
 
 /*-
  * Copyright (c) 1997
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 4f7389b3db9b..832646c453fa 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_media.h,v 1.30 2005/02/22 13:04:03 glebius Exp $ */
 
 /*-
  * Copyright (c) 1997
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 0c11454ce69b..a2d4496a56b4 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_mib.c,v 1.15 2005/05/06 02:48:20 cperciva Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_mib.h b/sys/net/if_mib.h
index 445bd5b388ac..6b7c80bcaaad 100644
--- a/sys/net/if_mib.h
+++ b/sys/net/if_mib.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_mib.h,v 1.7 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _NET_IF_MIB_H
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 877d94dbb52e..d37428c83652 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -71,7 +71,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_ppp.c,v 1.105.2.2 2005/08/25 05:01:20 rwatson Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index d23255be63f0..b97c3411ff4c 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ppp.h,v 1.15 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _IF_PPP_H_
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index 12c308f175aa..c18cac2d3a3d 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -40,7 +40,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_pppvar.h,v 1.23.2.1 2005/08/19 14:52:21 glebius Exp $
  */
 
 /*
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index a03ba1c6bc35..cfd5367ec77b 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_sl.c,v 1.129 2005/06/10 16:49:18 brooks Exp $
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index e6b6d2c0d3c2..761cf5c8b5f4 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -28,7 +28,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_slvar.h,v 1.23 2005/06/10 16:49:18 brooks Exp $
  */
 
 #ifndef _NET_IF_SLVAR_H_
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 97f94b390de6..91a5562308fc 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -17,7 +17,7 @@
  *
  * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_sppp.h,v 1.28 2005/06/10 16:49:18 brooks Exp $
  */
 
 #ifndef _NET_IF_SPPP_H_
diff --git a/sys/net/if_spppfr.c b/sys/net/if_spppfr.c
index ae4f95916e38..184ca0f12331 100644
--- a/sys/net/if_spppfr.c
+++ b/sys/net/if_spppfr.c
@@ -20,7 +20,7 @@
  * works or modified versions.
  *
  * $Cronyx Id: if_spppfr.c,v 1.1.2.10 2004/06/29 09:02:30 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_spppfr.c,v 1.3 2005/06/10 16:49:18 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index f72af2e3a671..b782be9bc05c 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -18,7 +18,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.119.2.1 2005/08/25 05:01:20 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 3ba334323325..8fc1ac4c8ae7 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_stf.c,v 1.50 2005/06/26 18:11:10 dwmalone Exp $	*/
 /*	$KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $	*/
 
 /*-
diff --git a/sys/net/if_stf.h b/sys/net/if_stf.h
index cbaf67033c54..6ee95f3096c3 100644
--- a/sys/net/if_stf.h
+++ b/sys/net/if_stf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_stf.h,v 1.5 2005/01/07 01:45:34 imp Exp $	*/
 /*	$KAME: if_stf.h,v 1.5 2001/10/12 10:09:17 keiichi Exp $	*/
 
 /*-
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index 4e1b7278de7f..1e7b57f2f09e 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -31,7 +31,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tap.c,v 1.55.2.2 2005/08/25 05:01:20 rwatson Exp $
  * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $
  */
 
diff --git a/sys/net/if_tap.h b/sys/net/if_tap.h
index daaddf73d648..001019051568 100644
--- a/sys/net/if_tap.h
+++ b/sys/net/if_tap.h
@@ -31,7 +31,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tap.h,v 1.2 2005/01/07 01:45:34 imp Exp $
  * $Id: if_tap.h,v 0.7 2000/07/12 04:12:51 max Exp $
  */
 
diff --git a/sys/net/if_tapvar.h b/sys/net/if_tapvar.h
index 21bac5054d00..32cda7a2600f 100644
--- a/sys/net/if_tapvar.h
+++ b/sys/net/if_tapvar.h
@@ -34,7 +34,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tapvar.h,v 1.10 2005/06/10 16:49:18 brooks Exp $
  * $Id: if_tapvar.h,v 0.6 2000/07/11 02:16:08 max Exp $
  */
 
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index eafcdb569965..a465afc4c13f 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -13,7 +13,7 @@
  * UCL. This driver is based much more on read/write/poll mode of
  * operation though.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tun.c,v 1.152.2.2 2005/08/25 05:01:20 rwatson Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 382881cb256d..f0b12aaf1a41 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -13,7 +13,7 @@
  * UCL. This driver is based much more on read/write/select mode of
  * operation though.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tun.h,v 1.18 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _NET_IF_TUN_H_
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 2d25b69739a0..d202865d93d6 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.3 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_types.h,v 1.21 2005/06/10 16:49:19 brooks Exp $
  * $NetBSD: if_types.h,v 1.16 2000/04/19 06:30:53 itojun Exp $
  */
 
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 783ddd85eb23..219d0dc069db 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_var.h,v 1.98.2.5 2005/10/07 14:00:05 glebius Exp $
  */
 
 #ifndef	_NET_IF_VAR_H_
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index ee007c0d9a07..5f3d112692d4 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_vlan.c,v 1.79.2.4.2.1 2005/10/26 19:57:04 pjd Exp $
  */
 
 /*
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 11cbf7b20fcf..a1861df41c96 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.21 2005/02/18 22:31:19 ru Exp $
  */
 
 #ifndef _NET_IF_VLAN_VAR_H_
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index 88d6d340c0fa..f22ab2b2614b 100644
--- a/sys/net/iso88025.h
+++ b/sys/net/iso88025.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/iso88025.h,v 1.15 2005/04/13 08:14:14 mdodd Exp $
  *
  * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
  * the Mach token ring driver.
diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h
index 874eeb764fd3..dfcefa79e49a 100644
--- a/sys/net/net_osdep.h
+++ b/sys/net/net_osdep.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/net_osdep.h,v 1.15 2005/01/11 07:08:15 ume Exp $	*/
 /*	$KAME: net_osdep.h,v 1.80 2003/08/09 17:06:39 suz Exp $	*/
 
 /*-
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index cfa14ef587dc..0435fbf7dedc 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/netisr.c,v 1.15.2.2 2005/10/07 14:00:05 glebius Exp $
  */
 
 #include "opt_device_polling.h"
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 9ba3e8d4a653..d2f2bc79d4ee 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/netisr.h,v 1.33 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_NETISR_H_
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index 35ac338095b6..0c5f7ec44c34 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/pfil.c,v 1.13 2005/05/23 17:07:16 mlaier Exp $ */
 /*	$NetBSD: pfil.c,v 1.20 2001/11/12 23:49:46 lukem Exp $	*/
 
 /*-
diff --git a/sys/net/pfil.h b/sys/net/pfil.h
index da14f5b4801c..692b616708eb 100644
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/pfil.h,v 1.13 2005/01/07 01:45:35 imp Exp $ */
 /*	$NetBSD: pfil.h,v 1.22 2003/06/23 12:57:08 martin Exp $	*/
 
 /*-
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index d959acb1fac9..ca25cbdcd60c 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/pfkeyv2.h,v 1.14 2005/01/07 01:45:35 imp Exp $	*/
 /*	$KAME: pfkeyv2.h,v 1.37 2003/09/06 05:15:43 itojun Exp $	*/
 
 /*-
diff --git a/sys/net/ppp_comp.h b/sys/net/ppp_comp.h
index 00591efc2321..d8cc2021ee60 100644
--- a/sys/net/ppp_comp.h
+++ b/sys/net/ppp_comp.h
@@ -26,7 +26,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_comp.h,v 1.12 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_PPP_COMP_H
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index 6a49363c1cf7..720981d6847d 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/net/ppp_deflate.c,v 1.21 2005/01/07 01:45:35 imp Exp $	*/
 
 /*-
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h
index 386a1763b1e3..57e503f5afe3 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -25,7 +25,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_defs.h,v 1.8 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _PPP_DEFS_H_
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 88a73188462d..c20ffa895e55 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -71,7 +71,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/ppp_tty.c,v 1.66.2.2 2005/08/25 05:01:20 rwatson Exp $ */
 
 #include "opt_ppp.h"		/* XXX for ppp_defs.h */
 
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 3e8ef9727ed7..97e2428a802e 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.5 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/radix.c,v 1.37 2005/01/07 01:45:35 imp Exp $
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index ca530955e59a..772f7c134fad 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/radix.h,v 1.26 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 31566d1cb96f..74fb04cbf461 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_cb.c,v 1.32 2005/01/24 22:56:09 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 4e6b77a23ba0..1d9fad59c417 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_cb.h,v 1.19 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index f06a9033d4da..fce092fde1b5 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.37 2005/01/07 01:45:35 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index d003490d3a09..941c901c3aab 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.3.1.1 (Berkeley) 2/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/route.c,v 1.109.2.2 2005/09/26 14:59:12 glebius Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/route.h b/sys/net/route.h
index 755973e2f66e..8ec0fbe5fb26 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/route.h,v 1.63 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 2f4a182c6bf2..f60980c010bf 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/rtsock.c,v 1.123.2.4 2005/09/20 01:59:54 csjp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index d58cd3d0d544..832961bc284c 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slcompress.c,v 1.19 2004/04/07 20:46:12 imp Exp $
  */
 
 /*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 794d8b83818b..85f285a17a5c 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -31,7 +31,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slcompress.h,v 1.19 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net/slip.h b/sys/net/slip.h
index 7b4164e8bef6..e361ae4f0833 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slip.h,v 1.10 2004/04/07 20:46:12 imp Exp $
  */
 
 #ifndef _NET_SLIP_H_
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 73e95727b9ea..4482fa5d0e6b 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -10,7 +10,7 @@
  * - added inflateIncomp and deflateOutputPending
  * - allow strm->next_out to be NULL, meaning discard the output
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/zlib.c,v 1.19 2005/01/07 01:45:35 imp Exp $
  */
 
 /* 
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index 9529e43b8be7..dd929896e39a 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/net/zlib.h,v 1.10 2005/01/07 01:45:35 imp Exp $	*/
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h
index 24da6ffc8790..1e4506d386f1 100644
--- a/sys/net80211/_ieee80211.h
+++ b/sys/net80211/_ieee80211.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/_ieee80211.h,v 1.2.2.1 2005/09/03 22:40:02 sam Exp $
  */
 #ifndef _NET80211__IEEE80211_H_
 #define _NET80211__IEEE80211_H_
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 74ee6276d919..0c7dbdb80900 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.19.2.2 2005/09/03 22:40:02 sam Exp $");
 
 /*
  * IEEE 802.11 generic handler
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index 61b5bd6d9cab..cf2857efdbef 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211.h,v 1.9.2.1 2005/07/29 23:31:02 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_H_
 #define _NET80211_IEEE80211_H_
diff --git a/sys/net80211/ieee80211_acl.c b/sys/net80211/ieee80211_acl.c
index 2dadff99c730..6d405921090a 100644
--- a/sys/net80211/ieee80211_acl.c
+++ b/sys/net80211/ieee80211_acl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_acl.c,v 1.3.2.1 2005/09/03 22:40:02 sam Exp $");
 
 /*
  * IEEE 802.11 MAC ACL support.
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index e9ce1351ebe3..ce868abe505a 100644
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.10.2.2 2005/09/03 22:40:02 sam Exp $");
 
 /*
  * IEEE 802.11 generic crypto support.
diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
index f006a7aa0501..532a0ef052ba 100644
--- a/sys/net80211/ieee80211_crypto.h
+++ b/sys/net80211/ieee80211_crypto.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_crypto.h,v 1.9.2.1 2005/09/03 22:40:02 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_CRYPTO_H_
 #define _NET80211_IEEE80211_CRYPTO_H_
diff --git a/sys/net80211/ieee80211_crypto_ccmp.c b/sys/net80211/ieee80211_crypto_ccmp.c
index d0ccc9313474..c07217ec90c3 100644
--- a/sys/net80211/ieee80211_crypto_ccmp.c
+++ b/sys/net80211/ieee80211_crypto_ccmp.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_ccmp.c,v 1.7 2005/07/11 03:06:23 sam Exp $");
 
 /*
  * IEEE 802.11i AES-CCMP crypto support.
diff --git a/sys/net80211/ieee80211_crypto_none.c b/sys/net80211/ieee80211_crypto_none.c
index ce43134edf1c..15f9baff2f31 100644
--- a/sys/net80211/ieee80211_crypto_none.c
+++ b/sys/net80211/ieee80211_crypto_none.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_none.c,v 1.5 2005/06/10 16:11:24 sam Exp $");
 
 /*
  * IEEE 802.11 NULL crypto support.
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
index 6775ee7f4281..7df2d73ae81d 100644
--- a/sys/net80211/ieee80211_crypto_tkip.c
+++ b/sys/net80211/ieee80211_crypto_tkip.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_tkip.c,v 1.9.2.1 2005/09/03 22:40:02 sam Exp $");
 
 /*
  * IEEE 802.11i TKIP crypto support.
diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index 451324193e62..3587e8e802c5 100644
--- a/sys/net80211/ieee80211_crypto_wep.c
+++ b/sys/net80211/ieee80211_crypto_wep.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_wep.c,v 1.7 2005/06/10 16:11:24 sam Exp $");
 
 /*
  * IEEE 802.11 WEP crypto support.
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c
index dd372505499d..cd2cc4fdd989 100644
--- a/sys/net80211/ieee80211_freebsd.c
+++ b/sys/net80211/ieee80211_freebsd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.7.2.1 2005/09/03 22:40:02 sam Exp $");
 
 /*
  * IEEE 802.11 support (FreeBSD-specific code)
diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h
index 70a40c19af29..25eaf4a303f0 100644
--- a/sys/net80211/ieee80211_freebsd.h
+++ b/sys/net80211/ieee80211_freebsd.h
@@ -24,7 +24,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/sys/net80211/ieee80211_freebsd.h,v 1.5.2.1 2005/09/03 22:40:02 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_FREEBSD_H_
 #define _NET80211_IEEE80211_FREEBSD_H_
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 74b147e21660..be2ed5f62d1f 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.62.2.2 2005/09/03 22:40:02 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 00f8a761a796..e1788f3d5763 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.25.2.3 2005/09/03 22:40:02 sam Exp $");
 
 /*
  * IEEE 802.11 ioctl support (FreeBSD-specific)
diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h
index 8c3b2abbb2f4..553933661388 100644
--- a/sys/net80211/ieee80211_ioctl.h
+++ b/sys/net80211/ieee80211_ioctl.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_ioctl.h,v 1.10.2.2 2005/09/03 22:40:02 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_IOCTL_H_
 #define _NET80211_IEEE80211_IOCTL_H_
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index d4f59ef709cc..9c48d1721cbe 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.48.2.2 2005/09/03 22:40:02 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index e2bfc2c87398..e44136340abf 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_node.h,v 1.17.2.2 2005/09/03 22:40:02 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_NODE_H_
 #define _NET80211_IEEE80211_NODE_H_
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index b6c15867e7ca..73a69e40901d 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.26.2.2 2005/09/03 22:40:02 sam Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 5537b336fa49..5cdbe935a92c 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.17.2.2 2005/09/03 22:40:02 sam Exp $");
 
 /*
  * IEEE 802.11 protocol support.
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index 694eff5b6b2d..7426a6d4f65a 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.11.2.2 2005/09/03 22:40:02 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_PROTO_H_
 #define _NET80211_IEEE80211_PROTO_H_
diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h
index 9cac685fda97..99833ef6aad0 100644
--- a/sys/net80211/ieee80211_radiotap.h
+++ b/sys/net80211/ieee80211_radiotap.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.10 2005/01/04 00:34:58 dyoung Exp $ */
 
 /*-
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index c552d36a8aa1..20b5b0e3e8c5 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.22.2.2 2005/09/03 22:40:02 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
diff --git a/sys/net80211/ieee80211_xauth.c b/sys/net80211/ieee80211_xauth.c
index 11328dd08ba3..20c81d6fb46b 100644
--- a/sys/net80211/ieee80211_xauth.c
+++ b/sys/net80211/ieee80211_xauth.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_xauth.c,v 1.2 2004/12/31 22:42:38 sam Exp $");
 
 /*
  * External authenticator placeholder module.
diff --git a/sys/netatalk/COPYRIGHT b/sys/netatalk/COPYRIGHT
index 21b86e72f2f8..3ceaadb5f7a8 100644
--- a/sys/netatalk/COPYRIGHT
+++ b/sys/netatalk/COPYRIGHT
@@ -22,5 +22,5 @@
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/COPYRIGHT,v 1.2 2005/01/07 02:35:34 imp Exp $
  */
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index 68064911f57d..a4909f69bff9 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -48,7 +48,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/aarp.c,v 1.37 2005/06/10 16:49:20 brooks Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/netatalk/aarp.h b/sys/netatalk/aarp.h
index 5b989844eb9f..b556623e6934 100644
--- a/sys/netatalk/aarp.h
+++ b/sys/netatalk/aarp.h
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/aarp.h,v 1.4 2005/01/07 02:35:34 imp Exp $
  */
 
 #ifndef _NETATALK_AARP_H_
diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 866b2f8f221e..0756899f7680 100644
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at.h,v 1.7 2005/01/07 02:35:34 imp Exp $
  */
 
 #ifndef __AT_HEADER__
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index 4dc0a716a80f..344451d2d3e9 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_control.c,v 1.44 2005/02/22 14:20:29 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h
index 58ceb8d6e814..cc1ef753446e 100644
--- a/sys/netatalk/at_extern.h
+++ b/sys/netatalk/at_extern.h
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_extern.h,v 1.16 2005/02/22 14:20:29 rwatson Exp $
  */
 struct mbuf;
 struct sockaddr_at;
diff --git a/sys/netatalk/at_proto.c b/sys/netatalk/at_proto.c
index 1060ca34e537..3d09560b1f49 100644
--- a/sys/netatalk/at_proto.c
+++ b/sys/netatalk/at_proto.c
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_proto.c,v 1.10 2005/01/07 02:35:34 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/at_rmx.c b/sys/netatalk/at_rmx.c
index 39c2a2d87fb6..2c2f8ca32b34 100644
--- a/sys/netatalk/at_rmx.c
+++ b/sys/netatalk/at_rmx.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * at_rmx.c,v 1.13 1995/05/30 08:09:31 rgrimes Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_rmx.c,v 1.9 2005/01/07 02:35:34 imp Exp $
  */
 
 /* This code generates debugging traces to the radix code */
diff --git a/sys/netatalk/at_var.h b/sys/netatalk/at_var.h
index fa4e69d81efa..a3081be54be8 100644
--- a/sys/netatalk/at_var.h
+++ b/sys/netatalk/at_var.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_var.h,v 1.14 2005/02/22 14:20:29 rwatson Exp $
  */
 
 #ifndef _NETATALK_AT_VAR_H_
diff --git a/sys/netatalk/ddp.h b/sys/netatalk/ddp.h
index 702c3f460dd3..f622069f53d0 100644
--- a/sys/netatalk/ddp.h
+++ b/sys/netatalk/ddp.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp.h,v 1.2 2005/01/07 02:35:34 imp Exp $
  */
 #ifndef _NETATALK_DDP_H_
 #define _NETATALK_DDP_H_ 1
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index 9ffa10f1d105..2b98f5ab4415 100644
--- a/sys/netatalk/ddp_input.c
+++ b/sys/netatalk/ddp_input.c
@@ -47,7 +47,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.29 2005/01/07 02:35:34 imp Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c
index 357d707f30b0..20ee38ede43f 100644
--- a/sys/netatalk/ddp_output.c
+++ b/sys/netatalk/ddp_output.c
@@ -21,7 +21,7 @@
  *	netatalk@itd.umich.edu
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.27.2.1 2005/10/09 04:22:03 delphij Exp $ */
 
 #include "opt_mac.h"
 
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 23ccd8c1de2c..74bec3bbc1d7 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -23,7 +23,7 @@
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.47 2005/01/07 02:35:34 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/ddp_pcb.h b/sys/netatalk/ddp_pcb.h
index 5ed28726fbf3..9b8c98cdbb44 100644
--- a/sys/netatalk/ddp_pcb.h
+++ b/sys/netatalk/ddp_pcb.h
@@ -24,7 +24,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_pcb.h,v 1.3 2005/01/07 02:35:34 imp Exp $
  */
 
 #ifndef _NETATALK_DDP_PCB_H_
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index e3bde16aa0c4..30b6144e2218 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -24,7 +24,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.45 2005/02/18 10:53:00 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/ddp_var.h b/sys/netatalk/ddp_var.h
index 6f6c10a3e413..2705145c57c4 100644
--- a/sys/netatalk/ddp_var.h
+++ b/sys/netatalk/ddp_var.h
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.8 2005/01/07 02:35:34 imp Exp $
  */
 
 #ifndef _NETATALK_DDP_VAR_H_
diff --git a/sys/netatalk/endian.h b/sys/netatalk/endian.h
index 41df5bce2ec7..d7e77be52fbc 100644
--- a/sys/netatalk/endian.h
+++ b/sys/netatalk/endian.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/endian.h,v 1.4 2005/01/07 02:35:34 imp Exp $
  */
 
 #ifndef _ATALK_ENDIAN_H_
diff --git a/sys/netatalk/phase2.h b/sys/netatalk/phase2.h
index e6a4bec13291..2a7644ab3f6d 100644
--- a/sys/netatalk/phase2.h
+++ b/sys/netatalk/phase2.h
@@ -22,7 +22,7 @@
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/phase2.h,v 1.3 2005/01/07 02:35:34 imp Exp $
  */
 
 #include <net/if_llc.h>
diff --git a/sys/netatm/atm.h b/sys/netatm/atm.h
index 7ec9bdddf556..954192283157 100644
--- a/sys/netatm/atm.h
+++ b/sys/netatm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm.h,v 1.6 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index 6d625e0bf388..e19683e7ab4d 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_aal5.c,v 1.21 2005/01/07 01:45:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 60bf48234da5..b2f93b2ad460 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.33 2005/02/21 21:58:16 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index c9e6dc5d1d31..f4090226ce0c 100644
--- a/sys/netatm/atm_cm.h
+++ b/sys/netatm/atm_cm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_cm.h,v 1.8 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index 1d10f0fd7593..aa7a870b253c 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_device.c,v 1.26 2005/01/07 01:45:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index cc9cfb0a9133..8d53f9b8a8f1 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_if.c,v 1.30.2.1 2005/08/25 05:01:21 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index c9ea43aeb68b..3014423458bf 100644
--- a/sys/netatm/atm_if.h
+++ b/sys/netatm/atm_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_if.h,v 1.20 2005/06/10 16:49:20 brooks Exp $
  *
  */
 
diff --git a/sys/netatm/atm_ioctl.h b/sys/netatm/atm_ioctl.h
index e30cf7824ba5..aa20d3ebc161 100644
--- a/sys/netatm/atm_ioctl.h
+++ b/sys/netatm/atm_ioctl.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_ioctl.h,v 1.10 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index 07a263d21c1e..e0eed21d00c0 100644
--- a/sys/netatm/atm_pcb.h
+++ b/sys/netatm/atm_pcb.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_pcb.h,v 1.4 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 96e3c2191be1..e82b1f197fbb 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_proto.c,v 1.13 2005/02/17 14:21:22 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netatm/atm_sap.h b/sys/netatm/atm_sap.h
index a05b32ab75d8..941d594e9c01 100644
--- a/sys/netatm/atm_sap.h
+++ b/sys/netatm/atm_sap.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sap.h,v 1.3 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index 8018929261e1..7b8f9800c8cb 100644
--- a/sys/netatm/atm_sigmgr.h
+++ b/sys/netatm/atm_sigmgr.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sigmgr.h,v 1.5 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index d2a90e6c6a13..7b1ffa490d1a 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_signal.c,v 1.13 2005/01/07 01:45:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 7da8f3e6c582..82f758208e12 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.24 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index b277c4436383..face2ea0e80f 100644
--- a/sys/netatm/atm_stack.h
+++ b/sys/netatm/atm_stack.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_stack.h,v 1.6 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 505e899ee21d..dbce0b956722 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_subr.c,v 1.43 2005/01/07 01:45:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index 7368ef589e4b..90667727fb53 100644
--- a/sys/netatm/atm_sys.h
+++ b/sys/netatm/atm_sys.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sys.h,v 1.8 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 8baec6a4e369..8a084d0ced22 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_usrreq.c,v 1.24 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index 3332c927b134..f4b69bdfa971 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.26 2005/02/21 21:58:16 rwatson Exp $
  *
  */
 
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index e70e6462d3e6..78ae3ef364e2 100644
--- a/sys/netatm/atm_vc.h
+++ b/sys/netatm/atm_vc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_vc.h,v 1.5 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm.h b/sys/netatm/ipatm/ipatm.h
index 303d3cd4f9c8..c1399d4c21b9 100644
--- a/sys/netatm/ipatm/ipatm.h
+++ b/sys/netatm/ipatm/ipatm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index c266afac8ede..74f811e564d6 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_event.c,v 1.10 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 3227b6a4f027..215b975f203e 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_if.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index 1bdadd26d017..4997fe9b6467 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_input.c,v 1.15 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 2e931cd015be..b63d18169aaf 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.22 2005/06/10 16:49:20 brooks Exp $");
 
 #ifndef ATM_IP_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 45559f09d6f1..15b996fa35a4 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_output.c,v 1.14 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/ipatm/ipatm_serv.h b/sys/netatm/ipatm/ipatm_serv.h
index 5eb6dc12bb67..6f1c8de69d6a 100644
--- a/sys/netatm/ipatm/ipatm_serv.h
+++ b/sys/netatm/ipatm/ipatm_serv.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_serv.h,v 1.4 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index 19c02b3829e7..edc010614595 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_usrreq.c,v 1.16 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index 12326775ab95..902096b2f141 100644
--- a/sys/netatm/ipatm/ipatm_var.h
+++ b/sys/netatm/ipatm/ipatm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index f06348e9b09e..a3328386b575 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_vcm.c,v 1.19 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index 1487ac575097..a2711485ed95 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/port.h,v 1.16 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/queue.h b/sys/netatm/queue.h
index 82db2465a25e..ad9624b5c187 100644
--- a/sys/netatm/queue.h
+++ b/sys/netatm/queue.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/queue.h,v 1.3 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index 440de2072b1a..6262a8a70a65 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/sigpvc/sigpvc_if.c,v 1.18 2005/01/07 01:45:38 imp Exp $");
 
 #ifndef ATM_SIGPVC_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 67164c8fba04..2fef490f234a 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/sigpvc/sigpvc_subr.c,v 1.14 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/sigpvc/sigpvc_var.h b/sys/netatm/sigpvc/sigpvc_var.h
index 79b6818f0c83..f663f5506001 100644
--- a/sys/netatm/sigpvc/sigpvc_var.h
+++ b/sys/netatm/sigpvc/sigpvc_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_var.h,v 1.5 2005/01/07 01:45:38 imp Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index eefdb3ef4766..62c60b0474e0 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_arp.c,v 1.21 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 84a9a6a43918..26807641eebb 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_cls.c,v 1.20 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_cls.h b/sys/netatm/spans/spans_cls.h
index 5539af696152..1429f3af2cd4 100644
--- a/sys/netatm/spans/spans_cls.h
+++ b/sys/netatm/spans/spans_cls.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_cls.h,v 1.4 2005/01/07 01:45:38 imp Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index b07c503004da..0818bff6b495 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_if.c,v 1.16 2005/01/07 01:45:38 imp Exp $");
 
 #ifndef ATM_SPANS_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 61864d5e3a87..1609dd6941fa 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -80,7 +80,7 @@
 /*static char *sccsid = "from: @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";*/
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_kxdr.c,v 1.15 2005/01/07 01:45:38 imp Exp $");
 
 /*
  * xdr.c, Generic XDR routines implementation.
diff --git a/sys/netatm/spans/spans_kxdr.h b/sys/netatm/spans/spans_kxdr.h
index b9adfddda6c6..3756f8f5c94e 100644
--- a/sys/netatm/spans/spans_kxdr.h
+++ b/sys/netatm/spans/spans_kxdr.h
@@ -30,7 +30,7 @@
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatm/spans/spans_kxdr.h,v 1.3 2005/01/07 01:45:38 imp Exp $
  */
 
 #ifndef _SPANS_KXDR_H
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 85da01f468a5..7a1da56073aa 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_msg.c,v 1.16 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 6f69562c31fa..d04cacfc4ef5 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_print.c,v 1.11 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 8e57e6eaa8fe..6aa1aab4b811 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_proto.c,v 1.14 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index 4b7889e2faa9..da48a14aa42d 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_subr.c,v 1.13 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index 1f74255db953..05577e48910e 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_util.c,v 1.11 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index 7b1e2c21bdc6..19b1ddce7901 100644
--- a/sys/netatm/spans/spans_var.h
+++ b/sys/netatm/spans/spans_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_var.h,v 1.9 2005/01/07 01:45:38 imp Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_xdr.x b/sys/netatm/spans/spans_xdr.x
index ad9bfcc8c97b..39e158367633 100644
--- a/sys/netatm/spans/spans_xdr.x
+++ b/sys/netatm/spans/spans_xdr.x
@@ -23,7 +23,7 @@
 % * Copies of this Software may be made, however, the above copyright
 % * notice must be reproduced on all copies.
 % *
-% *	@(#) $FreeBSD$
+% *	@(#) $FreeBSD: src/sys/netatm/spans/spans_xdr.x,v 1.5 2005/01/07 01:45:38 imp Exp $
 % *
 % */
 %
@@ -61,7 +61,7 @@
 % */
 %
 %#ifndef lint
-%static const char RCSid[] = "@(#) $FreeBSD$";
+%static const char RCSid[] = "@(#) $FreeBSD: src/sys/netatm/spans/spans_xdr.x,v 1.5 2005/01/07 01:45:38 imp Exp $";
 %#endif
 %
 #endif
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index 8a07532b55b6..c40e9bf136c7 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/q2110_sigaa.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 279178b164b1..f0ff22423d35 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/q2110_sigcpcs.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index 00ab4e92f29e..b1930a5bdec3 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/q2110_subr.c,v 1.9 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 2a105a594341..d7e98ce26044 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/qsaal1_sigaa.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index c0ec4c925a35..930d824f4199 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/qsaal1_sigcpcs.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index 273ce82f6b9a..72b7d7eef551 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/qsaal1_subr.c,v 1.9 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index 8cabd161fee9..678c13107247 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscf_uni.c,v 1.22 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni.h b/sys/netatm/uni/sscf_uni.h
index bdb2b26e594c..d6d49ef5315f 100644
--- a/sys/netatm/uni/sscf_uni.h
+++ b/sys/netatm/uni/sscf_uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 1286cea8d2e0..df75c38a849d 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscf_uni_lower.c,v 1.13 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index 473366a81235..33796958ffa6 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscf_uni_upper.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h
index 117e3adbd348..77a4869c3ad0 100644
--- a/sys/netatm/uni/sscf_uni_var.h
+++ b/sys/netatm/uni/sscf_uni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_var.h,v 1.8 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 2deb9b9a9503..3608c2ffd1a8 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop.c,v 1.18 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop.h b/sys/netatm/uni/sscop.h
index 54e5a880d422..85748a09954d 100644
--- a/sys/netatm/uni/sscop.h
+++ b/sys/netatm/uni/sscop.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 35bf7f41f659..024579808cfb 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_lower.c,v 1.15 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_misc.h b/sys/netatm/uni/sscop_misc.h
index fa7c14aef215..ab68eadd2e21 100644
--- a/sys/netatm/uni/sscop_misc.h
+++ b/sys/netatm/uni/sscop_misc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_misc.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index 1e95fe9b7e82..36cbf7f76823 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_pdu.c,v 1.14 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/sscop_pdu.h b/sys/netatm/uni/sscop_pdu.h
index e039a8a8d619..5c7f07960bfd 100644
--- a/sys/netatm/uni/sscop_pdu.h
+++ b/sys/netatm/uni/sscop_pdu.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_pdu.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 586cf052f97e..ccfe0cf53807 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_sigaa.c,v 1.10 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 62110177b9f1..a17637dbb114 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_sigcpcs.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 51a28d870d22..6d1636e1ff4d 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_subr.c,v 1.16 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index 1fba36873ac3..07e877e62d65 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_timer.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index 3e7d0b0af74f..2417ff967f87 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_upper.c,v 1.14 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h
index a71c876be20c..9eb47a76dbe5 100644
--- a/sys/netatm/uni/sscop_var.h
+++ b/sys/netatm/uni/sscop_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni.h b/sys/netatm/uni/uni.h
index 44b0ed630ae9..b59d20921ed1 100644
--- a/sys/netatm/uni/uni.h
+++ b/sys/netatm/uni/uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uni.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index feb1d7d97d2f..7b58eeeac5e0 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uni_load.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #ifndef ATM_UNI_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index c23a905a6e35..efcb250ee760 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp.c,v 1.23 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 074b8c78fb2e..0dc61cf696b3 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_cache.c,v 1.15 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index 125d20ab1670..e8de3d6b0273 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_input.c,v 1.16 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index ea0916907c36..3b9da9729f7a 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_output.c,v 1.10 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index a5c384dfe4f8..dfe06e0ac264 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_timer.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index 08cc8efeac71..5238dc94e3b8 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_vcm.c,v 1.15 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 57c072db4dc7..03566bbbd9bc 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniip.c,v 1.16 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h
index 1fcdead515c0..d5d9a10afede 100644
--- a/sys/netatm/uni/uniip_var.h
+++ b/sys/netatm/uni/uniip_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniip_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig.h b/sys/netatm/uni/unisig.h
index 88b496b570d6..fd79efe0287d 100644
--- a/sys/netatm/uni/unisig.h
+++ b/sys/netatm/uni/unisig.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index e89f55116838..ed4c391611ee 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_decode.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_decode.h b/sys/netatm/uni/unisig_decode.h
index 9e80d4314d18..7fa871233f27 100644
--- a/sys/netatm/uni/unisig_decode.h
+++ b/sys/netatm/uni/unisig_decode.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_decode.h,v 1.4 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 4ecfc9c80243..6560682309f9 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_encode.c,v 1.14 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index 7347becf7579..979bb4647067 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_if.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index aa5a85affe78..5379ed712332 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_mbuf.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_mbuf.h b/sys/netatm/uni/unisig_mbuf.h
index c5bc8bfba132..7885ad3aec28 100644
--- a/sys/netatm/uni/unisig_mbuf.h
+++ b/sys/netatm/uni/unisig_mbuf.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_mbuf.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 806102bfe9e3..9a4819ff77b3 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_msg.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_msg.h b/sys/netatm/uni/unisig_msg.h
index 123bdb414aa9..7fdc336ffd10 100644
--- a/sys/netatm/uni/unisig_msg.h
+++ b/sys/netatm/uni/unisig_msg.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_msg.h,v 1.4 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 72d1733109f6..4b581953108f 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_print.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_print.h b/sys/netatm/uni/unisig_print.h
index 2812d03fdc07..b25605978400 100644
--- a/sys/netatm/uni/unisig_print.h
+++ b/sys/netatm/uni/unisig_print.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_print.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 08fe235e33c3..e0c2571d6fa3 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_proto.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index 2d58354956b9..488143464afd 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_sigmgr_state.c,v 1.14 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 821283b1c89f..029ee35731d9 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_subr.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index 6bb23ccd765f..693f15c85f4f 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_util.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h
index ae6c2fefd7f5..d18721ad6f40 100644
--- a/sys/netatm/uni/unisig_var.h
+++ b/sys/netatm/uni/unisig_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 1c63b074d7cc..3252bc5e168f 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_vc_state.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/NOTES b/sys/netgraph/NOTES
index 0ddc02f5a663..2050cc41511f 100644
--- a/sys/netgraph/NOTES
+++ b/sys/netgraph/NOTES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/NOTES,v 1.2 2001/01/06 00:46:46 julian Exp $
 Development ideas..
 
 Archie's suggestions... :-)
diff --git a/sys/netgraph/atm/atmpif/ng_atmpif.c b/sys/netgraph/atm/atmpif/ng_atmpif.c
index 23e39b92fac5..f48c1df9c247 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif.c
+++ b/sys/netgraph/atm/atmpif/ng_atmpif.c
@@ -33,7 +33,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/atmpif/ng_atmpif.c,v 1.3 2005/01/07 01:45:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/atmpif/ng_atmpif_harp.c b/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
index aa3136503b1b..6440098fd4df 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
+++ b/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
@@ -33,7 +33,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/atmpif/ng_atmpif_harp.c,v 1.4 2005/06/10 16:49:21 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/atmpif/ng_atmpif_var.h b/sys/netgraph/atm/atmpif/ng_atmpif_var.h
index 515eb4e3a4d0..ceb97c08d39d 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif_var.h
+++ b/sys/netgraph/atm/atmpif/ng_atmpif_var.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/atmpif/ng_atmpif_var.h,v 1.2 2005/01/07 01:45:41 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c
index f2e2b870aac6..be0871a6c0f7 100644
--- a/sys/netgraph/atm/ccatm/ng_ccatm.c
+++ b/sys/netgraph/atm/ccatm/ng_ccatm.c
@@ -30,13 +30,13 @@
  * 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/sys/netgraph/atm/ccatm/ng_ccatm.c,v 1.2 2005/01/07 01:45:41 imp Exp $
  *
  * ATM call control and API
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ccatm/ng_ccatm.c,v 1.2 2005/01/07 01:45:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h b/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
index 305f2f967704..0749a94998e9 100644
--- a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
+++ b/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
@@ -28,7 +28,7 @@
  *
  * Customisation of call control source to the NG environment.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ccatm/ng_ccatm_cust.h,v 1.2 2005/01/07 01:45:41 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index 65364cc0a6e6..fa012b474066 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.14 2005/06/10 16:49:21 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/ng_atm.h b/sys/netgraph/atm/ng_atm.h
index 6b42d721c4cd..4b40657ada51 100644
--- a/sys/netgraph/atm/ng_atm.h
+++ b/sys/netgraph/atm/ng_atm.h
@@ -30,7 +30,7 @@
 /*
  * Netgraph module to connect NATM interfaces to netgraph.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_atm.h,v 1.5 2005/01/07 01:45:40 imp Exp $
  */
 #ifndef _NETGRAPH_ATM_NG_ATM_H_
 #define _NETGRAPH_ATM_NG_ATM_H_
diff --git a/sys/netgraph/atm/ng_atmpif.h b/sys/netgraph/atm/ng_atmpif.h
index bc41ad5de927..70fb2114be5e 100644
--- a/sys/netgraph/atm/ng_atmpif.h
+++ b/sys/netgraph/atm/ng_atmpif.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_atmpif.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  */
 
 #ifndef _NETGRAPH_ATM_NG_ATMPIF_H_
diff --git a/sys/netgraph/atm/ng_ccatm.h b/sys/netgraph/atm/ng_ccatm.h
index 9e1eb66887f6..b0ab97a59f40 100644
--- a/sys/netgraph/atm/ng_ccatm.h
+++ b/sys/netgraph/atm/ng_ccatm.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_ccatm.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/atm/ng_sscfu.h b/sys/netgraph/atm/ng_sscfu.h
index a59c98ddc742..5a8950a70d26 100644
--- a/sys/netgraph/atm/ng_sscfu.h
+++ b/sys/netgraph/atm/ng_sscfu.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_sscfu.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  *
  * Netgraph module for ITU-T Q.2120 UNI SSCF.
  */
diff --git a/sys/netgraph/atm/ng_sscop.h b/sys/netgraph/atm/ng_sscop.h
index 2f1e38ce30ee..b4b2b3e6addc 100644
--- a/sys/netgraph/atm/ng_sscop.h
+++ b/sys/netgraph/atm/ng_sscop.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_sscop.h,v 1.3 2005/01/07 01:45:40 imp Exp $
  *
  * Netgraph module for Q.2110 SSCOP
  */
diff --git a/sys/netgraph/atm/ng_uni.h b/sys/netgraph/atm/ng_uni.h
index b2f6af0ec365..b2dc2c5c332e 100644
--- a/sys/netgraph/atm/ng_uni.h
+++ b/sys/netgraph/atm/ng_uni.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_uni.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  *
  * Netgraph module for UNI 4.0
  */
diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c
index ecb23e63d6a4..47fa5bf71f63 100644
--- a/sys/netgraph/atm/ngatmbase.c
+++ b/sys/netgraph/atm/ngatmbase.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ngatmbase.c,v 1.3 2005/01/07 01:45:40 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/module.h>
diff --git a/sys/netgraph/atm/ngatmbase.h b/sys/netgraph/atm/ngatmbase.h
index 910dd03c0847..126cb0b0ec36 100644
--- a/sys/netgraph/atm/ngatmbase.h
+++ b/sys/netgraph/atm/ngatmbase.h
@@ -27,7 +27,7 @@
  * 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/sys/netgraph/atm/ngatmbase.h,v 1.3 2005/01/07 01:45:40 imp Exp $
  *
  * In-kernel UNI stack message functions.
  */
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c
index 47413b59d81c..1cf1f5d51b41 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu.c
+++ b/sys/netgraph/atm/sscfu/ng_sscfu.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/sscfu/ng_sscfu.c,v 1.4 2005/01/07 01:45:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
index b700c1b37d5c..4605ad53f36a 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
+++ b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
@@ -28,7 +28,7 @@
  *
  * Customisation of the SSCFU code to ng_sscfu.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/sscfu/ng_sscfu_cust.h,v 1.2 2005/01/07 01:45:41 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c
index cb9752173194..802e23ff5ceb 100644
--- a/sys/netgraph/atm/sscop/ng_sscop.c
+++ b/sys/netgraph/atm/sscop/ng_sscop.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/sscop/ng_sscop.c,v 1.3 2005/01/07 01:45:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/sscop/ng_sscop_cust.h b/sys/netgraph/atm/sscop/ng_sscop_cust.h
index a1d839aa4156..d8f073b41d30 100644
--- a/sys/netgraph/atm/sscop/ng_sscop_cust.h
+++ b/sys/netgraph/atm/sscop/ng_sscop_cust.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/sscop/ng_sscop_cust.h,v 1.5 2005/01/07 01:45:41 imp Exp $
  *
  * Customisation of the SSCOP code to ng_sscop.
  */
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
index 915b53b07373..2f87489f9c85 100644
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ b/sys/netgraph/atm/uni/ng_uni.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/uni/ng_uni.c,v 1.4 2005/01/07 01:45:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/uni/ng_uni_cust.h b/sys/netgraph/atm/uni/ng_uni_cust.h
index c2f23256312e..9f3d9a1be2a0 100644
--- a/sys/netgraph/atm/uni/ng_uni_cust.h
+++ b/sys/netgraph/atm/uni/ng_uni_cust.h
@@ -28,7 +28,7 @@
  *
  * Customisation of signalling source to the NG environment.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/uni/ng_uni_cust.h,v 1.5 2005/01/07 01:45:41 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c
index 108e96bc1a70..e54a65d33f80 100644
--- a/sys/netgraph/bluetooth/common/ng_bluetooth.c
+++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bluetooth.c,v 1.3 2003/04/26 22:37:31 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/common/ng_bluetooth.c,v 1.6 2005/04/08 05:13:53 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 841a1b323942..b8f4a5f15011 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bt3c_pccard.c,v 1.5 2003/04/01 18:15:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c,v 1.12 2005/06/24 14:36:54 imp Exp $
  *
  * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
  *
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
index 76d959af44b2..18008f0efd2d 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bt3c_var.h,v 1.1 2002/11/24 19:46:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h,v 1.3 2005/01/07 01:45:42 imp Exp $
  *
  * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
  *
diff --git a/sys/netgraph/bluetooth/drivers/h4/TODO b/sys/netgraph/bluetooth/drivers/h4/TODO
index d1066590b468..66802bcaa593 100644
--- a/sys/netgraph/bluetooth/drivers/h4/TODO
+++ b/sys/netgraph/bluetooth/drivers/h4/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:46:55 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/TODO,v 1.2 2003/05/10 21:44:39 julian Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index b84244fe7e9b..25034472cb06 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4.c,v 1.7 2004/08/23 18:08:15 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c,v 1.13 2005/01/11 11:55:56 glebius Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
index 0feda482e6d0..341b4db3c9c6 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4_prse.h,v 1.1 2002/11/24 19:46:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h,v 1.4 2005/01/07 01:45:42 imp Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
index d0cba3d1173f..7e2f0da83f09 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4_var.h,v 1.1 2002/11/24 19:46:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h,v 1.5 2005/01/11 11:55:56 glebius Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/drivers/ubt/TODO b/sys/netgraph/bluetooth/drivers/ubt/TODO
index 90f9d1db5094..608c3b0a099f 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/TODO
+++ b/sys/netgraph/bluetooth/drivers/ubt/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:46:56 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/TODO,v 1.2 2003/05/10 21:44:39 julian Exp $
 
 1) SMP/Locking
 
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 089ae72e8cd1..5432d78b0daf 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.23.2.1 2005/07/25 16:22:38 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
index b136a8ed00a9..a18101c138e6 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.5 2005/01/07 01:45:42 imp Exp $
  */
 
 #ifndef _NG_UBT_VAR_H_
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 26f47cd7032f..270da4055207 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.10 2005/01/07 01:45:42 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/TODO b/sys/netgraph/bluetooth/hci/TODO
index 6f66d7b84d0f..0cc8f74184c3 100644
--- a/sys/netgraph/bluetooth/hci/TODO
+++ b/sys/netgraph/bluetooth/hci/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.2 2003/04/26 22:36:29 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/hci/TODO,v 1.2 2003/05/10 21:44:40 julian Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
index 8d630a272b84..aa31c007fad7 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_cmds.c,v 1.4 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_cmds.c,v 1.7 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
index 9addd14f8ae2..f802aaca2aae 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_cmds.h,v 1.1 2002/11/24 19:46:58 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_cmds.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_CMDS_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
index a4cc9ba45470..6cab3eaf73b4 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_evnt.c,v 1.6 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_evnt.c,v 1.8 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
index d89cfd51bab8..e6949f6ea19a 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_evnt.h,v 1.1 2002/11/24 19:46:58 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_evnt.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_EVNT_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c
index 7ea23c8dfeaf..c7eb336a1cc6 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_main.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_main.c,v 1.2 2003/03/18 00:09:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_main.c,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index d7a185c71874..c4b6caf70b68 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_misc.c,v 1.5 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_misc.c,v 1.10 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.h b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
index 59e8a3bd7220..7861b915fe43 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_misc.h,v 1.3 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_misc.h,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_MISC_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_prse.h b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
index fb4e8fa13a03..5856f171e483 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_prse.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_prse.h,v 1.2 2003/03/18 00:09:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_prse.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index 311bd4f782f6..1da18d4f6a41 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_ulpi.c,v 1.7 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c,v 1.8 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
index ced697e45e66..e3bfb4481b03 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_ulpi.h,v 1.2 2003/04/26 22:35:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_ULPI_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_var.h b/sys/netgraph/bluetooth/hci/ng_hci_var.h
index bce4a25258db..8df13a8cd816 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_var.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_var.h,v 1.3 2003/04/26 22:35:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_var.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_VAR_H_
diff --git a/sys/netgraph/bluetooth/include/ng_bluetooth.h b/sys/netgraph/bluetooth/include/ng_bluetooth.h
index c0da3b9fd32f..d195aa6f3b3b 100644
--- a/sys/netgraph/bluetooth/include/ng_bluetooth.h
+++ b/sys/netgraph/bluetooth/include/ng_bluetooth.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bluetooth.h,v 1.4 2003/04/26 22:32:34 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_bluetooth.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_BLUETOOTH_H_
diff --git a/sys/netgraph/bluetooth/include/ng_bt3c.h b/sys/netgraph/bluetooth/include/ng_bt3c.h
index 49e0ed17d170..0cf5d5d9b010 100644
--- a/sys/netgraph/bluetooth/include/ng_bt3c.h
+++ b/sys/netgraph/bluetooth/include/ng_bt3c.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bt3c.h,v 1.1 2002/11/24 19:47:05 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_bt3c.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  *
  * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
  *
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket.h b/sys/netgraph/bluetooth/include/ng_btsocket.h
index 01822e3f0da3..8d08cebe76f1 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket.h,v 1.8 2003/04/26 22:32:10 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket.h,v 1.7 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
index 95b5b3f91688..bbd5e74382d9 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_hci_raw.h,v 1.3 2003/03/25 23:53:32 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_HCI_RAW_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
index ff04ce2aaf1a..70538f5364fb 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap.h,v 1.4 2003/03/25 23:53:33 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_L2CAP_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
index 4dd1b8282588..75fff084c8c0 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_rfcomm.h,v 1.10 2003/03/29 22:27:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h,v 1.4 2005/01/11 01:39:53 emax Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_
diff --git a/sys/netgraph/bluetooth/include/ng_h4.h b/sys/netgraph/bluetooth/include/ng_h4.h
index 753c297419e9..a8a8fdcdb859 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4.h,v 1.1 2002/11/24 19:47:05 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_h4.h,v 1.5 2005/01/07 01:45:43 imp Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index b2d6da6084fe..809678ca4d76 100644
--- a/sys/netgraph/bluetooth/include/ng_hci.h
+++ b/sys/netgraph/bluetooth/include/ng_hci.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci.h,v 1.2 2003/03/18 00:09:37 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_l2cap.h b/sys/netgraph/bluetooth/include/ng_l2cap.h
index f57b5cbe3d20..bbd0d1c10745 100644
--- a/sys/netgraph/bluetooth/include/ng_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_l2cap.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap.h,v 1.2 2003/04/27 00:52:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_l2cap.h,v 1.3.2.1 2005/09/03 03:34:23 emax Exp $
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_ubt.h b/sys/netgraph/bluetooth/include/ng_ubt.h
index 94b209729bfd..0233f0858747 100644
--- a/sys/netgraph/bluetooth/include/ng_ubt.h
+++ b/sys/netgraph/bluetooth/include/ng_ubt.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.h,v 1.6 2003/04/13 21:34:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_ubt.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NG_UBT_H_
diff --git a/sys/netgraph/bluetooth/l2cap/TODO b/sys/netgraph/bluetooth/l2cap/TODO
index 7c7bb27c59aa..0d7aa2971639 100644
--- a/sys/netgraph/bluetooth/l2cap/TODO
+++ b/sys/netgraph/bluetooth/l2cap/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:47:06 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/l2cap/TODO,v 1.2 2003/05/10 21:44:41 julian Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
index 2e0efe392ef8..9cd176593fd8 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_cmds.c,v 1.2 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c,v 1.5.2.1 2005/09/03 03:34:23 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
index 1831b84d0a6e..5c4f126d0946 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_cmds.h,v 1.4 2003/04/01 18:15:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_CMDS_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
index 9d5268e89cf4..2a79976fbc24 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_evnt.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c,v 1.8 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
index 227b9c6a99a9..d4cd0c93e993 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_evnt.h,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_EVNT_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
index b2df2a7e013e..94af8282b6b3 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_llpi.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c,v 1.8.2.1 2005/07/29 16:42:42 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
index 919a0aa44438..a630bd419319 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_llpi.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_LLPI_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
index 7d5b300ee374..47905a8c3e48 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_main.c,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index 635298a4e3d3..d080e37e86fd 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_misc.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c,v 1.10.2.1 2005/09/03 03:34:23 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
index ad97107e04c2..d5b96d7b6f7c 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_misc.h,v 1.3 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h,v 1.5.2.1 2005/09/03 03:34:23 emax Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_MISC_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
index e2ec854e592b..bc2dba3666bb 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_prse.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
index 8a8e31d4225d..ce2d93c6ef89 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_ulpi.c,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
index 8a7679a1de44..4e9380c65072 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_ulpi.h,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_ULPI_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
index 218849219e8a..2a93b9adc5df 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_var.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_VAR_H_
diff --git a/sys/netgraph/bluetooth/socket/TODO b/sys/netgraph/bluetooth/socket/TODO
index c1aa3b2d476d..b40b7dcee86a 100644
--- a/sys/netgraph/bluetooth/socket/TODO
+++ b/sys/netgraph/bluetooth/socket/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:47:07 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/socket/TODO,v 1.2 2003/05/10 21:44:41 julian Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c
index 9b8fdd6c52ba..18d1c49f5412 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket.c,v 1.4 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket.c,v 1.11 2005/04/06 20:54:05 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index 6afa9187ca18..45dbbb34404a 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.17.2.1 2005/08/29 17:00:54 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 1a25fb38db52..5f45730fceca 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.16 2005/02/21 21:58:16 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index bd6ce171a255..86f51847db08 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.14.2.2 2005/08/29 17:00:54 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 672c6fae2dbe..aa7b4a8de087 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.17 2005/04/06 18:55:58 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c
index 1eba26a3de9c..1cdb59f081e9 100644
--- a/sys/netgraph/netflow/netflow.c
+++ b/sys/netgraph/netflow/netflow.c
@@ -28,7 +28,7 @@
  */
 
 static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+    "@(#) $FreeBSD: src/sys/netgraph/netflow/netflow.c,v 1.15 2005/05/16 17:10:08 glebius Exp $";
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netgraph/netflow/netflow.h b/sys/netgraph/netflow/netflow.h
index 578aa788cb6e..b8618d53cc49 100644
--- a/sys/netgraph/netflow/netflow.h
+++ b/sys/netgraph/netflow/netflow.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	 $SourceForge: netflow.h,v 1.8 2004/09/16 17:05:11 glebius Exp $
- *	 $FreeBSD$
+ *	 $FreeBSD: src/sys/netgraph/netflow/netflow.h,v 1.3 2005/05/11 11:26:24 glebius Exp $
  */
 
 /* netflow timeouts in seconds */
diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c
index 134fafaf2a1a..00d7f9fe9879 100644
--- a/sys/netgraph/netflow/ng_netflow.c
+++ b/sys/netgraph/netflow/ng_netflow.c
@@ -28,7 +28,7 @@
  */
 
 static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+    "@(#) $FreeBSD: src/sys/netgraph/netflow/ng_netflow.c,v 1.9.2.1 2005/08/10 15:00:57 glebius Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/netflow/ng_netflow.h b/sys/netgraph/netflow/ng_netflow.h
index 79037ee208fa..ca4cf8847f03 100644
--- a/sys/netgraph/netflow/ng_netflow.h
+++ b/sys/netgraph/netflow/ng_netflow.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	 $SourceForge: ng_netflow.h,v 1.26 2004/09/04 15:44:55 glebius Exp $
- *	 $FreeBSD$
+ *	 $FreeBSD: src/sys/netgraph/netflow/ng_netflow.h,v 1.7 2005/05/12 13:52:49 glebius Exp $
  */
 
 #ifndef	_NG_NETFLOW_H_
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index 345e121c80eb..592e5b63ea4d 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.55.2.2 2005/08/15 20:04:28 julian Exp $
  * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index 4755eb34292d..ee0c169f6f81 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.c,v 1.20 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_UI.c,v 1.14 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_UI.h b/sys/netgraph/ng_UI.h
index 216570aaf1dc..f9250501672e 100644
--- a/sys/netgraph/ng_UI.h
+++ b/sys/netgraph/ng_UI.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_UI.h,v 1.6 1999/01/20 00:54:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 6cb534508f9f..2a27fecd4ab2 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.c,v 1.22 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_async.c,v 1.17 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_async.h b/sys/netgraph/ng_async.h
index 4eb9fb5315d9..b0ea22da1dc5 100644
--- a/sys/netgraph/ng_async.h
+++ b/sys/netgraph/ng_async.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.h,v 1.11 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_async.h,v 1.5 1999/01/25 01:17:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c
index 64bf8c3f5c25..9aa0d0cfd86e 100644
--- a/sys/netgraph/ng_atmllc.c
+++ b/sys/netgraph/ng_atmllc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_atmllc.c,v 1.3 2005/01/07 01:45:39 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_atmllc.h b/sys/netgraph/ng_atmllc.h
index e2b35bdb8e3c..f9d009a3e791 100644
--- a/sys/netgraph/ng_atmllc.h
+++ b/sys/netgraph/ng_atmllc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_atmllc.h,v 1.2 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef	_NETGRAPH_ATMLLC_H_
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index cbe94e31f705..1301d4579e38 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -38,7 +38,7 @@
  * Authors: Julian Elischer <julian@freebsd.org>
  *          Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.102.2.5 2005/09/12 14:46:19 glebius Exp $
  * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_bpf.c b/sys/netgraph/ng_bpf.c
index ff3e76f2db70..9d224880dd0a 100644
--- a/sys/netgraph/ng_bpf.c
+++ b/sys/netgraph/ng_bpf.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.c,v 1.19 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_bpf.c,v 1.3 1999/12/03 20:30:23 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_bpf.h b/sys/netgraph/ng_bpf.h
index 8d1eb8b63d4b..540b4af870d2 100644
--- a/sys/netgraph/ng_bpf.h
+++ b/sys/netgraph/ng_bpf.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.h,v 1.11 2005/02/12 18:10:26 ru Exp $
  * $Whistle: ng_bpf.h,v 1.3 1999/12/03 20:30:23 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index bc36172415a4..befd97eca0ce 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.31 2005/02/09 15:14:44 ru Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_bridge.h b/sys/netgraph/ng_bridge.h
index e60a75311dca..0c465f1a8265 100644
--- a/sys/netgraph/ng_bridge.h
+++ b/sys/netgraph/ng_bridge.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bridge.h,v 1.3 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_BRIDGE_H_
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index e6b7539ecd15..b682610f0582 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.28 2005/04/13 14:03:28 glebius Exp $
  * $Whistle: ng_cisco.c,v 1.25 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_cisco.h b/sys/netgraph/ng_cisco.h
index e6ed9a212460..ac916ad83d4f 100644
--- a/sys/netgraph/ng_cisco.h
+++ b/sys/netgraph/ng_cisco.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.h,v 1.8 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_cisco.h,v 1.6 1999/01/25 01:21:48 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index 9439a574f209..72476aba2dff 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -27,7 +27,7 @@
  * This node presents a /dev/ngd%d device that interfaces to an other
  * netgraph node.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.21 2005/05/04 18:55:02 emax Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_device.h b/sys/netgraph/ng_device.h
index b718fc07f2ad..f7b2ccdf92ac 100644
--- a/sys/netgraph/ng_device.h
+++ b/sys/netgraph/ng_device.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_device.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_echo.c b/sys/netgraph/ng_echo.c
index e9daf5eda958..ee42955c61c4 100644
--- a/sys/netgraph/ng_echo.c
+++ b/sys/netgraph/ng_echo.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elisher <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.c,v 1.13 2005/04/15 10:14:00 glebius Exp $
  * $Whistle: ng_echo.c,v 1.13 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_echo.h b/sys/netgraph/ng_echo.h
index adb4e7cf67a8..483245be3171 100644
--- a/sys/netgraph/ng_echo.h
+++ b/sys/netgraph/ng_echo.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_echo.h,v 1.3 1999/01/20 00:22:12 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 6a21cbac50aa..6abc2a5bb51f 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.32.2.1 2005/08/25 05:01:21 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_eiface.h b/sys/netgraph/ng_eiface.h
index db07a55028ef..e670d9826c06 100644
--- a/sys/netgraph/ng_eiface.h
+++ b/sys/netgraph/ng_eiface.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_eiface.h,v 1.9 2005/02/03 11:52:42 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_EIFACE_H_
diff --git a/sys/netgraph/ng_etf.c b/sys/netgraph/ng_etf.c
index 11a0d96611b6..5a01d67ecbd2 100644
--- a/sys/netgraph/ng_etf.c
+++ b/sys/netgraph/ng_etf.c
@@ -30,7 +30,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_etf.c,v 1.9 2005/03/14 20:49:48 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_etf.h b/sys/netgraph/ng_etf.h
index 9cc87c2fa284..3ae8441ff6f6 100644
--- a/sys/netgraph/ng_etf.h
+++ b/sys/netgraph/ng_etf.h
@@ -30,7 +30,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_etf.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_ETF_H_
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index 45f90da59bb0..28f8ebd50b1c 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -39,7 +39,7 @@
  * Authors: Archie Cobbs <archie@freebsd.org>
  *	    Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.49.2.1.2.1 2005/10/23 02:37:28 thompsa Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_ether.h b/sys/netgraph/ng_ether.h
index f2f051952b7f..d60a949af1c2 100644
--- a/sys/netgraph/ng_ether.h
+++ b/sys/netgraph/ng_ether.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ether.h,v 1.14 2005/02/14 12:01:09 glebius Exp $
  * $Whistle: ng_ether.h,v 1.1 1999/02/02 03:17:22 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index d68b9959ad74..76ac347edc11 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.18.2.2 2005/08/29 16:23:21 emax Exp $
  */
 /*-
  * Copyright (c) 1996-1999 Whistle Communications, Inc.
diff --git a/sys/netgraph/ng_fec.h b/sys/netgraph/ng_fec.h
index 8ef441b6c231..0144023c94f2 100644
--- a/sys/netgraph/ng_fec.h
+++ b/sys/netgraph/ng_fec.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_fec.h,v 1.3 2005/01/07 01:45:39 imp Exp $
  */
 /*-
  * Copyright (c) 1996-1999 Whistle Communications, Inc.
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index b2bcfc5e4187..5759ba305436 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.24 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_frame_relay.c,v 1.20 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_frame_relay.h b/sys/netgraph/ng_frame_relay.h
index 87b283a08fb4..f0b0843091d2 100644
--- a/sys/netgraph/ng_frame_relay.h
+++ b/sys/netgraph/ng_frame_relay.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_frame_relay.h,v 1.7 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 5d948bd4c580..3cd6bbc0c2ac 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -62,7 +62,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif.c,v 1.19 2005/06/10 16:49:21 brooks Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_gif.h b/sys/netgraph/ng_gif.h
index 3b5634209b72..d284f26540a0 100644
--- a/sys/netgraph/ng_gif.h
+++ b/sys/netgraph/ng_gif.h
@@ -62,7 +62,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_GIF_H_
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index 1c5c43a57135..133590ebd33e 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -62,7 +62,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif_demux.c,v 1.10 2005/01/07 01:45:39 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_gif_demux.h b/sys/netgraph/ng_gif_demux.h
index 072ffa001c6a..f4293cd4e1fe 100644
--- a/sys/netgraph/ng_gif_demux.h
+++ b/sys/netgraph/ng_gif_demux.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif_demux.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_GIF_DEMUX_H_
diff --git a/sys/netgraph/ng_hole.c b/sys/netgraph/ng_hole.c
index 75832f45e478..9cbcfbf5f3c8 100644
--- a/sys/netgraph/ng_hole.c
+++ b/sys/netgraph/ng_hole.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elisher <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.c,v 1.14 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_hole.c,v 1.10 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_hole.h b/sys/netgraph/ng_hole.h
index 0c3f72d615fb..72097572aea4 100644
--- a/sys/netgraph/ng_hole.h
+++ b/sys/netgraph/ng_hole.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.h,v 1.6 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_hole.h,v 1.3 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_hub.c b/sys/netgraph/ng_hub.c
index ba298e56b13b..3f6bfaead3b7 100644
--- a/sys/netgraph/ng_hub.c
+++ b/sys/netgraph/ng_hub.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hub.c,v 1.3 2004/06/26 22:24:16 julian Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_hub.h b/sys/netgraph/ng_hub.h
index a735d7b64dff..4d5f308a13ea 100644
--- a/sys/netgraph/ng_hub.h
+++ b/sys/netgraph/ng_hub.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hub.h,v 1.1 2004/04/17 12:42:16 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_HUB_H_
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index 34526851d505..70c7aed90246 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.43.2.1 2005/08/25 05:01:21 rwatson Exp $
  * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_iface.h b/sys/netgraph/ng_iface.h
index 54dfa8c78690..ca5bc7d0f1e3 100644
--- a/sys/netgraph/ng_iface.h
+++ b/sys/netgraph/ng_iface.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.9 2005/02/13 16:36:41 archie Exp $
  * $Whistle: ng_iface.h,v 1.5 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_ip_input.c b/sys/netgraph/ng_ip_input.c
index 416bc12e9ede..af002dfa79f7 100644
--- a/sys/netgraph/ng_ip_input.c
+++ b/sys/netgraph/ng_ip_input.c
@@ -64,7 +64,7 @@
  * Author:		Brooks Davis <brooks@FreeBSD.org>
  * Derived from:	ng_hole.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ip_input.c,v 1.4 2005/01/07 01:45:39 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_ip_input.h b/sys/netgraph/ng_ip_input.h
index 96b72e5ae513..2c167b9d9b75 100644
--- a/sys/netgraph/ng_ip_input.h
+++ b/sys/netgraph/ng_ip_input.h
@@ -64,7 +64,7 @@
  * Author:		Brooks Davis <brooks@FreeBSD.org>
  * Derived from:	ng_hole.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ip_input.h,v 1.3 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_IP_INPUT_H_
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c
index f2e4a7f4dbba..fa68b1f8783a 100644
--- a/sys/netgraph/ng_ipfw.c
+++ b/sys/netgraph/ng_ipfw.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.8 2005/05/29 12:20:41 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_ipfw.h b/sys/netgraph/ng_ipfw.h
index e2ff69821402..d81e97580281 100644
--- a/sys/netgraph/ng_ipfw.h
+++ b/sys/netgraph/ng_ipfw.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ipfw.h,v 1.1 2005/02/05 12:06:33 glebius Exp $
  */
 
 #define NG_IPFW_NODE_TYPE    "ipfw"
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index e2f466cdf3b6..d8e25c1f9524 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.55.2.2 2005/09/09 06:13:25 glebius Exp $
  * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_ksocket.h b/sys/netgraph/ng_ksocket.h
index 953486f09864..8931dca3694b 100644
--- a/sys/netgraph/ng_ksocket.h
+++ b/sys/netgraph/ng_ksocket.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.h,v 1.12 2005/02/12 14:54:19 glebius Exp $
  * $Whistle: ng_ksocket.h,v 1.1 1999/11/16 20:04:40 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c
index 4f920b972ca2..c8b5daa0b71e 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -36,7 +36,7 @@
  * 
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.14 2005/01/11 11:51:17 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_l2tp.h b/sys/netgraph/ng_l2tp.h
index 106162b0c865..b5f731cd8757 100644
--- a/sys/netgraph/ng_l2tp.h
+++ b/sys/netgraph/ng_l2tp.h
@@ -36,7 +36,7 @@
  * 
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_l2tp.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_L2TP_H_
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index f78184a1e82a..877bbccd0d99 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.24 2005/06/09 10:27:27 ru Exp $
  * $Whistle: ng_lmi.c,v 1.38 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_lmi.h b/sys/netgraph/ng_lmi.h
index f1a1e81a90bb..3d187e64e3bc 100644
--- a/sys/netgraph/ng_lmi.h
+++ b/sys/netgraph/ng_lmi.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_lmi.h,v 1.9 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h
index c132b03bac4b..c54796766d2a 100644
--- a/sys/netgraph/ng_message.h
+++ b/sys/netgraph/ng_message.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.27 2005/04/20 12:18:22 glebius Exp $
  * $Whistle: ng_message.h,v 1.12 1999/01/25 01:17:44 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index a6a7a971f6e3..2de00564534a 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.23 2005/06/03 09:06:00 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_mppc.h b/sys/netgraph/ng_mppc.h
index b826806c277e..81c5461849be 100644
--- a/sys/netgraph/ng_mppc.h
+++ b/sys/netgraph/ng_mppc.h
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_mppc.h,v 1.3 2000/02/12 01:17:22 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_mppc.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_MPPC_H_
diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c
index bb3f8280cebb..6cf4618c6171 100644
--- a/sys/netgraph/ng_nat.c
+++ b/sys/netgraph/ng_nat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.4 2005/06/27 07:39:13 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_nat.h b/sys/netgraph/ng_nat.h
index 5afcec55a269..773ec240180c 100644
--- a/sys/netgraph/ng_nat.h
+++ b/sys/netgraph/ng_nat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_nat.h,v 1.1 2005/05/05 23:41:21 glebius Exp $
  */
 
 #define NG_NAT_NODE_TYPE    "nat"
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c
index ca742b3dc959..56e6cffa1edc 100644
--- a/sys/netgraph/ng_one2many.c
+++ b/sys/netgraph/ng_one2many.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_one2many.c,v 1.21 2005/03/11 10:29:38 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_one2many.h b/sys/netgraph/ng_one2many.h
index 343f7ee8e729..c233a53c7250 100644
--- a/sys/netgraph/ng_one2many.h
+++ b/sys/netgraph/ng_one2many.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_one2many.h,v 1.8 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_ONE2MANY_H_
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index 0687937ae233..698849f912a7 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.25.2.1 2005/09/13 12:41:05 glebius Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/netgraph/ng_parse.h b/sys/netgraph/ng_parse.h
index b5efaf6100d1..9dc7416abd2c 100644
--- a/sys/netgraph/ng_parse.h
+++ b/sys/netgraph/ng_parse.h
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_parse.h,v 1.2 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_parse.h,v 1.12 2005/01/16 19:12:27 rik Exp $
  */
 
 #ifndef _NETGRAPH_NG_PARSE_H_
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 7016a73c09e7..3d6f931f1138 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.57 2005/05/16 19:12:57 glebius Exp $
  * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_ppp.h b/sys/netgraph/ng_ppp.h
index eb43cfb98353..fede4e8d2ae3 100644
--- a/sys/netgraph/ng_ppp.h
+++ b/sys/netgraph/ng_ppp.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.h,v 1.12 2005/02/10 02:43:26 archie Exp $
  * $Whistle: ng_ppp.h,v 1.8 1999/01/25 02:40:02 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index 39d3e97a40e5..d434764162aa 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.74.2.1 2005/09/20 13:46:15 glebius Exp $
  * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $
  */
 #if 0
diff --git a/sys/netgraph/ng_pppoe.h b/sys/netgraph/ng_pppoe.h
index be9a48f76ee4..05e03772f8e7 100644
--- a/sys/netgraph/ng_pppoe.h
+++ b/sys/netgraph/ng_pppoe.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.h,v 1.21 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_pppoe.h,v 1.7 1999/10/16 10:16:43 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index 4c3925644dcd..7016a9086678 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.37.2.1 2005/09/20 13:40:55 glebius Exp $
  * $Whistle: ng_pptpgre.c,v 1.7 1999/12/08 00:10:06 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_pptpgre.h b/sys/netgraph/ng_pptpgre.h
index 275f9e2efd7d..27186957b17f 100644
--- a/sys/netgraph/ng_pptpgre.h
+++ b/sys/netgraph/ng_pptpgre.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.h,v 1.9 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_pptpgre.h,v 1.3 1999/12/08 00:11:36 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 52a89a3adfeb..20c46bed43c2 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.c,v 1.24 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_rfc1490.c,v 1.22 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_rfc1490.h b/sys/netgraph/ng_rfc1490.h
index 0ef3f118ce34..478e1dc0d144 100644
--- a/sys/netgraph/ng_rfc1490.h
+++ b/sys/netgraph/ng_rfc1490.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.h,v 1.7 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_rfc1490.h,v 1.7 1999/01/20 00:54:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c
index 63b3f0be118f..d78f7bcce935 100644
--- a/sys/netgraph/ng_sample.c
+++ b/sys/netgraph/ng_sample.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.c,v 1.30 2005/02/06 19:24:59 glebius Exp $
  * $Whistle: ng_sample.c,v 1.13 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h
index 816bc3b2415f..c7c13bd8b22a 100644
--- a/sys/netgraph/ng_sample.h
+++ b/sys/netgraph/ng_sample.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.h,v 1.7 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_sample.h,v 1.3 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 2326aa315153..db5e6eb79f71 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.67.2.2 2005/09/20 13:42:20 glebius Exp $
  * $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_socket.h b/sys/netgraph/ng_socket.h
index 204f11d9951e..656852f5c7c5 100644
--- a/sys/netgraph/ng_socket.h
+++ b/sys/netgraph/ng_socket.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.h,v 1.6 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_socket.h,v 1.5 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_socketvar.h b/sys/netgraph/ng_socketvar.h
index 3cf81035541a..67d38f7c32a8 100644
--- a/sys/netgraph/ng_socketvar.h
+++ b/sys/netgraph/ng_socketvar.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socketvar.h,v 1.10 2005/07/05 17:35:20 glebius Exp $
  * $Whistle: ng_socketvar.h,v 1.1 1999/01/20 21:35:39 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_source.c b/sys/netgraph/ng_source.c
index 16c10bb58e54..e491ca3cf4bc 100644
--- a/sys/netgraph/ng_source.c
+++ b/sys/netgraph/ng_source.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.25 2005/04/05 17:22:04 glebius Exp $");
 
 /*
  * This node is used for high speed packet geneneration.  It queues
diff --git a/sys/netgraph/ng_source.h b/sys/netgraph/ng_source.h
index 0d84f06d7253..0a2c8f11c6ed 100644
--- a/sys/netgraph/ng_source.h
+++ b/sys/netgraph/ng_source.h
@@ -36,7 +36,7 @@
  *
  * Author: Dave Chapeskie <dchapeskie@sandvine.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_source.h,v 1.6 2005/04/05 17:22:05 glebius Exp $
  */
 
 #ifndef _NETGRAPH_NG_SOURCE_H_
diff --git a/sys/netgraph/ng_split.c b/sys/netgraph/ng_split.c
index b7168f4224f2..350e71d68870 100644
--- a/sys/netgraph/ng_split.c
+++ b/sys/netgraph/ng_split.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_split.c,v 1.6.2.1 2005/09/13 12:44:19 glebius Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_split.h b/sys/netgraph/ng_split.h
index 0be54a8b4885..b9c0d231eb9f 100644
--- a/sys/netgraph/ng_split.h
+++ b/sys/netgraph/ng_split.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_split.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index dc96acfd195f..af7d33b21965 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -17,7 +17,7 @@
  * Cronyx Id: ng_sppp.c,v 1.1.2.10 2004/03/01 15:17:21 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/ng_sppp.c,v 1.8.2.1 2005/08/25 05:01:21 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/ng_sppp.h b/sys/netgraph/ng_sppp.h
index be1631e48f36..8c9ad429b5a2 100644
--- a/sys/netgraph/ng_sppp.h
+++ b/sys/netgraph/ng_sppp.h
@@ -14,7 +14,7 @@
  * as long as this message is kept with the software, all derivative
  * works or modified versions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sppp.h,v 1.3 2005/02/03 13:03:31 ru Exp $
  * Cronyx Id: ng_sppp.h,v 1.1.2.6 2004/03/01 15:17:21 rik Exp $
  */
 
diff --git a/sys/netgraph/ng_tcpmss.c b/sys/netgraph/ng_tcpmss.c
index 760dad30436f..c3b68c114f22 100644
--- a/sys/netgraph/ng_tcpmss.c
+++ b/sys/netgraph/ng_tcpmss.c
@@ -29,7 +29,7 @@
  * This software includes fragments of the following programs:
  *	tcpmssd		Ruslan Ermilov <ru@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tcpmss.c,v 1.2 2005/06/10 12:44:21 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_tcpmss.h b/sys/netgraph/ng_tcpmss.h
index 4450ac6f0629..bec96ef3bd7a 100644
--- a/sys/netgraph/ng_tcpmss.h
+++ b/sys/netgraph/ng_tcpmss.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tcpmss.h,v 1.1 2005/06/10 08:02:34 glebius Exp $
  */
 
 #ifndef _NETGRAPH_TCPMSS_H_
diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c
index 63eca3ca58f8..1ca46f606a50 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -38,7 +38,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.33 2005/06/07 12:22:13 glebius Exp $
  * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_tee.h b/sys/netgraph/ng_tee.h
index 830155e3aa83..da3e22096e6c 100644
--- a/sys/netgraph/ng_tee.h
+++ b/sys/netgraph/ng_tee.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.h,v 1.8 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_tee.h,v 1.2 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 380bcdf6b552..5a2d23c73b71 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.34.2.1 2005/10/09 00:19:28 tanimura Exp $
  * $Whistle: ng_tty.c,v 1.21 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_tty.h b/sys/netgraph/ng_tty.h
index c6b0094d520d..e4e79f8ed291 100644
--- a/sys/netgraph/ng_tty.h
+++ b/sys/netgraph/ng_tty.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_tty.h,v 1.7 1999/01/20 00:22:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index 1321233abca4..a6423dfa5f93 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.25 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_vjc.h b/sys/netgraph/ng_vjc.h
index 284d8d5f5d32..26da5a0c200a 100644
--- a/sys/netgraph/ng_vjc.h
+++ b/sys/netgraph/ng_vjc.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.h,v 1.9 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_vjc.h,v 1.6 1999/01/25 02:40:22 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_vlan.c b/sys/netgraph/ng_vlan.c
index 437f2323e9bb..e371103639f0 100644
--- a/sys/netgraph/ng_vlan.c
+++ b/sys/netgraph/ng_vlan.c
@@ -25,7 +25,7 @@
  *
  * Author: Ruslan Ermilov <ru@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vlan.c,v 1.3 2005/04/20 14:19:20 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_vlan.h b/sys/netgraph/ng_vlan.h
index 579e3baf26ae..db522daa1f9e 100644
--- a/sys/netgraph/ng_vlan.h
+++ b/sys/netgraph/ng_vlan.h
@@ -25,7 +25,7 @@
  *
  * Author: Ruslan Ermilov <ru@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vlan.h,v 1.1 2004/03/01 17:22:15 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_VLAN_H_
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c
index 4694e8e68960..559ef999ada6 100644
--- a/sys/netinet/accf_data.c
+++ b/sys/netinet/accf_data.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/netinet/accf_data.c,v 1.10 2004/05/30 20:23:30 phk Exp $
  */
 
 #define ACCEPT_FILTER_MOD
diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c
index dc146d0b5202..51fe37c798f2 100644
--- a/sys/netinet/accf_http.c
+++ b/sys/netinet/accf_http.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/netinet/accf_http.c,v 1.16 2005/01/07 01:45:44 imp Exp $
  */
 
 #define ACCEPT_FILTER_MOD
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 4dee079bc94b..47651d6da988 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.16.2.2 2005/10/09 05:34:33 ume Exp $	*/
 /*	$KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index f7bfa8b3335e..f129359480fe 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/icmp_var.h,v 1.25 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index d19dea8fd476..5e7476584575 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/if_atm.c,v 1.19.2.2 2005/08/31 13:58:28 glebius Exp $");
 
 /*
  * IP <=> ATM address resolution.
diff --git a/sys/netinet/if_atm.h b/sys/netinet/if_atm.h
index bd8b51437ecc..c87850418724 100644
--- a/sys/netinet/if_atm.h
+++ b/sys/netinet/if_atm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/netinet/if_atm.h,v 1.7 2005/01/07 01:45:44 imp Exp $ */
 /*      $NetBSD: if_atm.h,v 1.2 1996/07/03 17:17:17 chuck Exp $       */
 
 /*-
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index d15336f736ca..42c44cac8c03 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/if_ether.c,v 1.137.2.4 2005/10/07 01:51:29 thompsa Exp $
  */
 
 /*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 14df15fcc17c..9bc6b7ba7ec7 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/if_ether.h,v 1.32 2005/02/22 13:04:03 glebius Exp $
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 8612a23b01ef..519df85b907d 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp.c,v 1.48.2.1 2005/08/24 17:30:44 rwatson Exp $
  */
 
 /*
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 05a70fc4c145..b3a5067bc695 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp.h,v 1.13 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index aa083a804cb4..11103141dad2 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp_var.h,v 1.21 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 84052a3913e6..b7bd7886493a 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in.c,v 1.85.2.3.2.1 2005/10/16 17:12:18 rwatson Exp $
  */
 
 #include "opt_carp.h"
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index e06f200f3ba9..74378821bb36 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in.h,v 1.90.2.3 2005/10/02 15:45:47 andre Exp $
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index cd1affefa8f0..5d118652a1eb 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_cksum.c,v 1.8 2005/01/07 01:45:44 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 8b43f736567f..0dc9c148a402 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/in_gif.c,v 1.31 2005/06/20 08:39:30 bz Exp $	*/
 /*	$KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/in_gif.h b/sys/netinet/in_gif.h
index e1f4ae48d6ed..0124dbbbe8af 100644
--- a/sys/netinet/in_gif.h
+++ b/sys/netinet/in_gif.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/in_gif.h,v 1.12 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: in_gif.h,v 1.5 2000/04/14 08:36:02 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 55e9f9d6eea8..e3ba7223c537 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.165.2.1 2005/08/20 13:34:59 rwatson Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index fc4dfe40169e..56e0f0184190 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.80.2.2 2005/10/02 15:45:47 andre Exp $
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index fd014792f901..c306a7f52f06 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_proto.c,v 1.77.2.1 2005/07/23 17:02:10 mlaier Exp $
  */
 
 #include "opt_ipx.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index b98aa9120f11..443b1fcfbee2 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_rmx.c,v 1.53 2005/01/07 01:45:44 imp Exp $
  */
 
 /*
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 8ae8885be109..a5c0a6adda13 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_systm.h,v 1.12 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 5792a0bd007a..573de9977b41 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_var.h,v 1.53.2.2 2005/08/24 17:30:44 rwatson Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 1ad3a93e1c38..4ca14fdce127 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip.h,v 1.29 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 883b65ae8664..36141c57c4c2 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip6.h,v 1.13.2.2 2005/10/09 05:50:43 ume Exp $	*/
 /*	$KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 292020f60517..ad1cb6cf215d 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* 	$FreeBSD$ */
+/* 	$FreeBSD: src/sys/netinet/ip_carp.c,v 1.27.2.2 2005/09/12 13:37:56 glebius Exp $ */
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index a050a88e3991..0f8e0b857e1c 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_carp.h,v 1.1 2005/02/22 13:04:03 glebius Exp $	*/
 /*	$OpenBSD: ip_carp.h,v 1.8 2004/07/29 22:12:15 mcbride Exp $	*/
 
 /*
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 65e7376537d4..f13e1aa7ccd7 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.113 2005/05/13 11:44:37 glebius Exp $
  */
 
 #if !defined(KLD_MODULE)
diff --git a/sys/netinet/ip_divert.h b/sys/netinet/ip_divert.h
index 1bb09447b23d..3c387b6f6b5a 100644
--- a/sys/netinet/ip_divert.h
+++ b/sys/netinet/ip_divert.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_divert.h,v 1.4 2004/10/19 21:14:57 andre Exp $
  */
 
 #ifndef _NETINET_IP_DIVERT_H_
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 3c2aa70d6c54..10d652d97959 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.93 2005/06/10 01:25:22 thompsa Exp $
  */
 
 #define	DUMMYNET_DEBUG
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 72a88631e409..934641c9d02f 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_dummynet.h,v 1.36 2005/06/10 01:25:22 thompsa Exp $
  */
 
 #ifndef _IP_DUMMYNET_H
diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index 39884ba2b89b..4dc5f1b06c0f 100644
--- a/sys/netinet/ip_ecn.c
+++ b/sys/netinet/ip_ecn.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_ecn.c,v 1.7 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: ip_ecn.c,v 1.12 2002/01/07 11:34:47 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h
index 0886cc8277fe..7869f75763c1 100644
--- a/sys/netinet/ip_ecn.h
+++ b/sys/netinet/ip_ecn.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_ecn.h,v 1.7 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: ip_ecn.h,v 1.8 2002/01/07 11:34:47 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index efe0ccee6523..2cb22f190567 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_encap.c,v 1.20 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h
index 3b1a5aeeb738..706fdf857fa9 100644
--- a/sys/netinet/ip_encap.h
+++ b/sys/netinet/ip_encap.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_encap.h,v 1.4 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
index 8a84078ef82a..cd2d60f95d9e 100644
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.28.2.2 2005/08/29 17:52:53 andre Exp $
  */
 
 /*
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index 88c13bde31b7..96a723196126 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.100.2.1 2005/08/20 08:36:57 bz Exp $
  */
 
 #ifndef _IPFW2_H
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index 57472d53c99b..a71cda057ef3 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.106.2.3 2005/09/17 13:43:36 bz Exp $
  */
 
 #define        DEB(x)
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c
index ab1ff5596d1c..3b572e9750e5 100644
--- a/sys/netinet/ip_fw_pfil.c
+++ b/sys/netinet/ip_fw_pfil.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.19 2005/04/18 18:35:05 brooks Exp $
  */
 
 #if !defined(KLD_MODULE)
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index 04dc3d932ad9..41b4c9d2e3db 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */
-/*	 $FreeBSD$ */
+/*	 $FreeBSD: src/sys/netinet/ip_gre.c,v 1.19.2.1 2005/08/10 19:12:32 bz Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index f997f6609a04..69ec98f79436 100644
--- a/sys/netinet/ip_gre.h
+++ b/sys/netinet/ip_gre.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ip_gre.h,v 1.5 2002/06/09 16:33:40 itojun Exp $ */
-/*	 $FreeBSD$ */
+/*	 $FreeBSD: src/sys/netinet/ip_gre.h,v 1.3 2005/01/07 01:45:44 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 6d1670f6ea8c..159e786e7888 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.101 2005/05/04 13:23:54 andre Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index e212083cc5d8..a878198ed60f 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.26 2005/05/04 13:09:19 andre Exp $
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index 31262d9273fb..255bc1577f8f 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -34,7 +34,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/sys/netinet/ip_id.c,v 1.7 2005/01/07 01:45:44 imp Exp $
  */
 
 /*
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 107ef1f20077..1cb7b13f25ac 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_input.c,v 1.301.2.3 2005/10/09 04:24:45 delphij Exp $
  */
 
 #include "opt_bootp.h"
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 9e756c29bd97..b95c948f9895 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -52,7 +52,7 @@
  * and PIM-SMv2 and PIM-DM support, advanced API support,
  * bandwidth metering and signaling
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.111 2005/06/23 18:42:58 imp Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 78119aad9187..149a484ef789 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_mroute.h,v 1.24 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index f983425e94ea..37e11d632907 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_output.c,v 1.242.2.5 2005/10/09 04:24:45 delphij Exp $
  */
 
 #include "opt_ipfw.h"
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index e64570b0aeff..f061f3bc29cf 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_var.h,v 1.95 2005/07/02 23:13:31 thompsa Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/ipprotosw.h b/sys/netinet/ipprotosw.h
index 5f67eda7c252..4c1337bc5ae2 100644
--- a/sys/netinet/ipprotosw.h
+++ b/sys/netinet/ipprotosw.h
@@ -56,7 +56,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipprotosw.h,v 1.6 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IPPROTOSW_H_
diff --git a/sys/netinet/libalias/HISTORY b/sys/netinet/libalias/HISTORY
index c5bca59cac1f..258fe6ff7a6f 100644
--- a/sys/netinet/libalias/HISTORY
+++ b/sys/netinet/libalias/HISTORY
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netinet/libalias/HISTORY,v 1.9 2000/07/26 23:15:46 archie Exp $
 
 Version 1.0: August 11, 1996 (cjm)
 
diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c
index aa2bed937dab..16bfd4b5b545 100644
--- a/sys/netinet/libalias/alias.c
+++ b/sys/netinet/libalias/alias.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.53 2005/06/27 22:21:42 phk Exp $");
 
 /*
     Alias.c provides supervisory control for the functions of the
diff --git a/sys/netinet/libalias/alias.h b/sys/netinet/libalias/alias.h
index 2c509435a58e..0bf51b8b8197 100644
--- a/sys/netinet/libalias/alias.h
+++ b/sys/netinet/libalias/alias.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/libalias/alias.h,v 1.32 2005/05/05 21:53:17 glebius Exp $
  */
 
 /*-
diff --git a/sys/netinet/libalias/alias_cuseeme.c b/sys/netinet/libalias/alias_cuseeme.c
index 171a6f966a71..8a479e187594 100644
--- a/sys/netinet/libalias/alias_cuseeme.c
+++ b/sys/netinet/libalias/alias_cuseeme.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_cuseeme.c,v 1.12 2005/05/05 21:55:17 glebius Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c
index f8f0c13c0278..f4c4d3483a18 100644
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_db.c,v 1.67 2005/05/06 11:07:49 glebius Exp $");
 
 /*
     Alias_db.c encapsulates all data structures used for storing
diff --git a/sys/netinet/libalias/alias_ftp.c b/sys/netinet/libalias/alias_ftp.c
index d91e1cde018f..9b1583ed5605 100644
--- a/sys/netinet/libalias/alias_ftp.c
+++ b/sys/netinet/libalias/alias_ftp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_ftp.c,v 1.27 2005/06/27 07:36:02 glebius Exp $");
 
 /*
     Alias_ftp.c performs special processing for FTP sessions under
diff --git a/sys/netinet/libalias/alias_irc.c b/sys/netinet/libalias/alias_irc.c
index defdb561384e..2cdd202c6631 100644
--- a/sys/netinet/libalias/alias_irc.c
+++ b/sys/netinet/libalias/alias_irc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_irc.c,v 1.21 2005/06/27 07:36:02 glebius Exp $");
 
 /* Alias_irc.c intercepts packages contain IRC CTCP commands, and
 	changes DCC commands to export a port on the aliasing host instead
diff --git a/sys/netinet/libalias/alias_local.h b/sys/netinet/libalias/alias_local.h
index 4dc2e0a95742..1bc249629f27 100644
--- a/sys/netinet/libalias/alias_local.h
+++ b/sys/netinet/libalias/alias_local.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/libalias/alias_local.h,v 1.32 2005/06/27 07:36:02 glebius Exp $
  */
 
 /*
diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c
index 303cf3f9cb05..ec70701d3ab5 100644
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_nbt.c,v 1.19 2005/05/06 11:07:49 glebius Exp $");
 
 /*
     alias_nbt.c performs special processing for NetBios over TCP/IP
diff --git a/sys/netinet/libalias/alias_old.c b/sys/netinet/libalias/alias_old.c
index e885fdc6f934..e250df6758f1 100644
--- a/sys/netinet/libalias/alias_old.c
+++ b/sys/netinet/libalias/alias_old.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_old.c,v 1.7 2005/05/05 19:27:32 glebius Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/netinet/libalias/alias_pptp.c b/sys/netinet/libalias/alias_pptp.c
index 0ce69a4718ce..432156906da9 100644
--- a/sys/netinet/libalias/alias_pptp.c
+++ b/sys/netinet/libalias/alias_pptp.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_pptp.c,v 1.14 2005/05/05 21:55:17 glebius Exp $");
 
 /*
    Alias_pptp.c performs special processing for PPTP sessions under TCP.
diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c
index f683ba095240..9c76b7daa6bd 100644
--- a/sys/netinet/libalias/alias_proxy.c
+++ b/sys/netinet/libalias/alias_proxy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_proxy.c,v 1.26 2005/06/27 07:36:02 glebius Exp $");
 
 /* file: alias_proxy.c
 
diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c
index f109f74c4d65..fee11e94331b 100644
--- a/sys/netinet/libalias/alias_skinny.c
+++ b/sys/netinet/libalias/alias_skinny.c
@@ -27,7 +27,7 @@
  *
  * Author: Joe Marcus Clarke <marcus@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/libalias/alias_skinny.c,v 1.12 2005/06/27 07:36:02 glebius Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c
index c314a65f770d..3a2a48a0bb13 100644
--- a/sys/netinet/libalias/alias_smedia.c
+++ b/sys/netinet/libalias/alias_smedia.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_smedia.c,v 1.15 2005/06/27 07:36:02 glebius Exp $");
 
 /*
    Alias_smedia.c is meant to contain the aliasing code for streaming media
diff --git a/sys/netinet/libalias/alias_util.c b/sys/netinet/libalias/alias_util.c
index dc70bc12667e..c47efab79cf2 100644
--- a/sys/netinet/libalias/alias_util.c
+++ b/sys/netinet/libalias/alias_util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_util.c,v 1.18 2005/06/27 07:36:02 glebius Exp $");
 
 
 /*
diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3
index d429d7d0bfbb..b01d6a8a90bd 100644
--- a/sys/netinet/libalias/libalias.3
+++ b/sys/netinet/libalias/libalias.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.53 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd January 17, 2004
 .Dt LIBALIAS 3
diff --git a/sys/netinet/pim.h b/sys/netinet/pim.h
index 7878f7972fb6..cd3b96a912d8 100644
--- a/sys/netinet/pim.h
+++ b/sys/netinet/pim.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/pim.h,v 1.3 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_PIM_H_
diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h
index e32a4acb4022..b5a6b89e0cd2 100644
--- a/sys/netinet/pim_var.h
+++ b/sys/netinet/pim_var.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/pim_var.h,v 1.2 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_PIM_VAR_H_
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index bc250a40f0ad..f7070d09bf13 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.150.2.2 2005/10/02 15:45:47 andre Exp $
  */
 
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 12b6d57eab81..9c1bf11376f4 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp.h,v 1.31.2.1 2005/10/09 03:22:51 delphij Exp $
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index 6cfc0d749bdb..cb7c3dfe571a 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_debug.c,v 1.26 2005/01/07 01:45:45 imp Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 03872e2c972a..896863c4d286 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_debug.h,v 1.15 2005/01/07 01:45:45 imp Exp $
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index e026cf345d2a..65dd748175aa 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_fsm.h,v 1.18 2005/01/07 01:45:45 imp Exp $
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index 7535d31fe9f5..eab7671ee247 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.10 2005/01/07 01:45:45 imp Exp $
  */
 
 /*
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 82a60dbb9bbb..3b44d57e1497 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.281.2.2 2005/10/01 15:56:43 andre Exp $
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 6bfaa413def6..1ccc69777dc7 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.112 2005/05/21 00:38:29 ps Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index 163e0a4d0ddd..ea89c0065041 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_sack.c	8.12 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_sack.c,v 1.26.2.1 2005/10/09 03:17:41 delphij Exp $
  */
 
 /*-
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 7f4620123b84..d0f9890f5b6e 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_seq.h,v 1.25 2005/04/10 05:24:59 ps Exp $
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index f1bc7238f971..b9f16b699cf3 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.228.2.4 2005/10/09 08:19:16 maxim Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index a14a85570e76..5c9b265126fc 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.74.2.3 2005/09/26 12:03:37 andre Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 9726f6772398..f3faa520bdc9 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_timer.c,v 1.74.2.1 2005/08/20 13:34:13 rwatson Exp $
  */
 
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index c62060fe85cf..303015eded2a 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_timer.h,v 1.27 2005/01/07 01:45:45 imp Exp $
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 132d1ee4056b..d96c3eb1dcb2 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.124.2.1 2005/10/09 03:17:41 delphij Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index b1515ddf6d29..c870eb00ef83 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.126 2005/06/27 22:27:42 ps Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index 3a89d5d5bd30..f5732bcf879f 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcpip.h,v 1.12 2005/01/07 01:45:45 imp Exp $
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index f03522e56b6e..be2e31a337d3 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp.h,v 1.9 2005/01/07 01:45:45 imp Exp $
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 1f53137b8ba8..ee06bd9b6a08 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.175.2.2 2005/10/02 15:45:47 andre Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 2e02ce175cb1..1d4260772d0a 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp_var.h,v 1.29 2005/01/07 01:45:45 imp Exp $
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netinet6/README b/sys/netinet6/README
index 70cec5e1c625..9bcf59c1455c 100644
--- a/sys/netinet6/README
+++ b/sys/netinet6/README
@@ -1,5 +1,5 @@
 a note to committers about KAME tree
-$FreeBSD$
+$FreeBSD: src/sys/netinet6/README,v 1.2 2000/07/05 19:05:19 itojun Exp $
 KAME project
 
 
diff --git a/sys/netinet6/ah.h b/sys/netinet6/ah.h
index 6335208593f1..d3ad0d9517f5 100644
--- a/sys/netinet6/ah.h
+++ b/sys/netinet6/ah.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ah.h,v 1.12 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ah.h,v 1.20 2003/08/05 12:21:15 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ah6.h b/sys/netinet6/ah6.h
index 0aa98d8cee9e..d46cce9d052d 100644
--- a/sys/netinet6/ah6.h
+++ b/sys/netinet6/ah6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ah6.h,v 1.6 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ah_aesxcbcmac.c b/sys/netinet6/ah_aesxcbcmac.c
index 75c89bc47acc..f6acaf9801ec 100644
--- a/sys/netinet6/ah_aesxcbcmac.c
+++ b/sys/netinet6/ah_aesxcbcmac.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.c,v 1.2.2.1 2005/07/27 08:41:44 cperciva Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet6/ah_aesxcbcmac.h b/sys/netinet6/ah_aesxcbcmac.h
index 8874f24515a0..321fcf47d8b6 100644
--- a/sys/netinet6/ah_aesxcbcmac.h
+++ b/sys/netinet6/ah_aesxcbcmac.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.h,v 1.2 2005/01/07 02:30:34 imp Exp $
  */
 
 extern int ah_aes_xcbc_mac_init __P((struct ah_algorithm_state *,
diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c
index cbc70ac00c65..037882aefe59 100644
--- a/sys/netinet6/ah_core.c
+++ b/sys/netinet6/ah_core.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ah_core.c,v 1.25 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ah_core.c,v 1.59 2003/07/25 10:17:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c
index c2f2fc4c6618..987ce01668b4 100644
--- a/sys/netinet6/ah_input.c
+++ b/sys/netinet6/ah_input.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ah_input.c,v 1.20 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ah_input.c,v 1.67 2002/01/07 11:39:56 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index bb7806e261b2..9f24db5d9a05 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ah_output.c,v 1.15 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ah_output.c,v 1.38 2003/09/06 05:15:43 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index dc83c171680e..56d5219e14e6 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/dest6.c,v 1.10 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $	*/
 
 /*-
diff --git a/sys/netinet6/esp.h b/sys/netinet6/esp.h
index bfeb69f720e4..09b9387075f3 100644
--- a/sys/netinet6/esp.h
+++ b/sys/netinet6/esp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp.h,v 1.8 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: esp.h,v 1.19 2001/09/04 08:43:19 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/esp6.h b/sys/netinet6/esp6.h
index c995f644ca31..6e219415e2ca 100644
--- a/sys/netinet6/esp6.h
+++ b/sys/netinet6/esp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp6.h,v 1.5 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/esp_aesctr.c b/sys/netinet6/esp_aesctr.c
index c0b2adb5fa3a..a9e258c27e0d 100644
--- a/sys/netinet6/esp_aesctr.c
+++ b/sys/netinet6/esp_aesctr.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/esp_aesctr.c,v 1.2 2005/01/07 02:30:34 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet6/esp_aesctr.h b/sys/netinet6/esp_aesctr.h
index f638d6280c56..d4c711e5c359 100644
--- a/sys/netinet6/esp_aesctr.h
+++ b/sys/netinet6/esp_aesctr.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/esp_aesctr.h,v 1.2 2005/01/07 02:30:34 imp Exp $
  */
 
 extern int esp_aesctr_mature __P((struct secasvar *));
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index 43ea585136cf..0652605202df 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp_core.c,v 1.23 2005/03/11 12:37:06 ume Exp $	*/
 /*	$KAME: esp_core.c,v 1.50 2000/11/02 12:27:38 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index ba56e8998bd8..ae6971932fe1 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp_input.c,v 1.26 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index 660e785ac5a9..a4abbc4400b4 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp_output.c,v 1.13 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/esp_rijndael.c b/sys/netinet6/esp_rijndael.c
index e302e6a65c0c..eb58ca42fb1d 100644
--- a/sys/netinet6/esp_rijndael.c
+++ b/sys/netinet6/esp_rijndael.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp_rijndael.c,v 1.5 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: esp_rijndael.c,v 1.14 2003/08/28 08:23:20 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/esp_rijndael.h b/sys/netinet6/esp_rijndael.h
index 680a44a304d8..d5e66dee0145 100644
--- a/sys/netinet6/esp_rijndael.h
+++ b/sys/netinet6/esp_rijndael.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/esp_rijndael.h,v 1.4 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: esp_rijndael.h,v 1.2 2003/01/20 00:55:27 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index eac5ee261c8a..a1baefcab9ac 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/frag6.c,v 1.25 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 3f3cbd67bdce..a7500637a524 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/icmp6.c,v 1.62 2005/05/15 02:28:29 gnn Exp $	*/
 /*	$KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/icmp6.h b/sys/netinet6/icmp6.h
index a6414efccb7e..300b8aca2e33 100644
--- a/sys/netinet6/icmp6.h
+++ b/sys/netinet6/icmp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/icmp6.h,v 1.6 2000/07/04 16:35:09 itojun Exp $	*/
 /*	$KAME: icmp6.h,v 1.17 2000/06/11 17:23:40 jinmei Exp $	*/
 
 #error "netinet6/icmp6.h is obsolete.  use netinet/icmp6.h"
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index b7fb7344e478..e8d040a1086f 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6.c,v 1.51.2.1.2.1 2005/11/01 22:42:05 suz Exp $	*/
 /*	$KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index deba10fab232..efb6b27b6aba 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6.h,v 1.36.2.2 2005/10/09 05:21:18 ume Exp $	*/
 /*	$KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index 50e14bf15e72..cad4db597e1a 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.10 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 632ff8f11f5c..5dbd765dd11d 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.22 2005/06/20 20:17:00 ume Exp $	*/
 /*	$KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_gif.h b/sys/netinet6/in6_gif.h
index 2834162c6c80..ddaee1d63f35 100644
--- a/sys/netinet6/in6_gif.h
+++ b/sys/netinet6/in6_gif.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_gif.h,v 1.7 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: in6_gif.h,v 1.5 2000/04/14 08:36:03 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index deb62555b5b2..a204e58ca6aa 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.26.2.1 2005/09/13 18:02:39 thompsa Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_ifattach.h b/sys/netinet6/in6_ifattach.h
index e7fbc893b688..8e2492516c02 100644
--- a/sys/netinet6/in6_ifattach.h
+++ b/sys/netinet6/in6_ifattach.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_ifattach.h,v 1.5 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 9aab2a013e0a..14193b919f1a 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.62 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $	*/
   
 /*-
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
index 45b46f1b596f..62ba4a25e549 100644
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_pcb.h,v 1.16 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: in6_pcb.h,v 1.13 2001/02/06 09:16:53 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 1dc69342c439..29e201764b93 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_proto.c,v 1.32.2.1 2005/08/18 09:01:48 suz Exp $	*/
 /*	$KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 77bd5c42db54..f24a71721ea7 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.14 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: in6_rmx.c,v 1.11 2001/07/26 06:53:16 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index b20db94ee67a..1c578136f2a6 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_src.c,v 1.30.2.1 2005/08/20 12:20:48 ume Exp $	*/
 /*	$KAME: in6_src.c,v 1.132 2003/08/26 04:42:27 keiichi Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index 8f48b971e022..86619af1ddbf 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_var.h,v 1.21.2.1 2005/08/24 15:18:38 rwatson Exp $	*/
 /*	$KAME: in6_var.h,v 1.56 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6.h b/sys/netinet6/ip6.h
index 9eec13fb25ec..528ff7ce31e6 100644
--- a/sys/netinet6/ip6.h
+++ b/sys/netinet6/ip6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6.h,v 1.5 2000/07/04 16:35:09 itojun Exp $	*/
 /*	$KAME: ip6.h,v 1.7 2000/03/25 07:23:36 sumikawa Exp $	*/
 
 #error "netinet6/ip6.h is obsolete.  use netinet/ip6.h"
diff --git a/sys/netinet6/ip6_ecn.h b/sys/netinet6/ip6_ecn.h
index 8dcdbd1c581c..20b03dbb3599 100644
--- a/sys/netinet6/ip6_ecn.h
+++ b/sys/netinet6/ip6_ecn.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_ecn.h,v 1.6 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index b68502129ca9..c277e784581e 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.28.2.1 2005/08/18 09:01:48 suz Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c
index 6927b60741d8..f7b08fb70b5f 100644
--- a/sys/netinet6/ip6_fw.c
+++ b/sys/netinet6/ip6_fw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.35.2.1 2005/08/19 17:38:52 ume Exp $	*/
 /*	$KAME: ip6_fw.c,v 1.21 2001/01/24 01:25:32 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_fw.h b/sys/netinet6/ip6_fw.h
index 2b5aa9f98287..16bea32daca3 100644
--- a/sys/netinet6/ip6_fw.h
+++ b/sys/netinet6/ip6_fw.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_fw.h,v 1.15 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ip6_fw.h,v 1.9 2001/08/01 04:29:57 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 19957a488171..4ab6a3d82959 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,6 +1,6 @@
 /*	$KAME: ip6_id.c,v 1.13 2003/09/16 09:11:19 itojun Exp $	*/
 /*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/netinet6/ip6_id.c,v 1.7 2005/01/07 02:30:34 imp Exp $ */
 
 /*-
  * Copyright (C) 2003 WIDE Project.
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index d23a4470be18..4021e62e4b59 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_input.c,v 1.81.2.1 2005/10/09 05:21:18 ume Exp $	*/
 /*	$KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index af75bdd1eb44..d62d088a2000 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.29.2.1.2.1 2005/10/27 14:04:02 suz Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index 26ac0089fbf9..f93d1612aa16 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.6.2.1 2005/10/09 05:21:18 ume Exp $	*/
 /*	$KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 18b2e6b27534..e1b558a9ffe3 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_output.c,v 1.90.2.4 2005/10/09 06:51:11 ume Exp $	*/
 /*	$KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 69c35ca90b40..a7bef0673b9a 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_var.h,v 1.30.2.2 2005/10/09 06:51:11 ume Exp $	*/
 /*	$KAME: ip6_var.h,v 1.62 2001/05/03 14:51:48 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h
index a6bb6833e8a8..7a765fb4466c 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6protosw.h,v 1.13 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ip6protosw.h,v 1.25 2001/09/26 06:13:03 keiichi Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipcomp.h b/sys/netinet6/ipcomp.h
index 943cd36c1525..539862214630 100644
--- a/sys/netinet6/ipcomp.h
+++ b/sys/netinet6/ipcomp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipcomp.h,v 1.5 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ipcomp.h,v 1.11 2001/09/04 08:43:19 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipcomp6.h b/sys/netinet6/ipcomp6.h
index 444b8c48df7f..f53c4a239cc1 100644
--- a/sys/netinet6/ipcomp6.h
+++ b/sys/netinet6/ipcomp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipcomp6.h,v 1.3 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c
index bcb5cff784f7..8b577fa78d60 100644
--- a/sys/netinet6/ipcomp_core.c
+++ b/sys/netinet6/ipcomp_core.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipcomp_core.c,v 1.9 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ipcomp_core.c,v 1.25 2001/07/26 06:53:17 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipcomp_input.c b/sys/netinet6/ipcomp_input.c
index 1831648a50de..3db832102158 100644
--- a/sys/netinet6/ipcomp_input.c
+++ b/sys/netinet6/ipcomp_input.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipcomp_input.c,v 1.8 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ipcomp_input.c,v 1.25 2001/03/01 09:12:09 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c
index f9286b28ec01..f57110cf17f1 100644
--- a/sys/netinet6/ipcomp_output.c
+++ b/sys/netinet6/ipcomp_output.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipcomp_output.c,v 1.8 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ipcomp_output.c,v 1.25 2002/06/09 14:44:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index 63e02d035b6f..3ba23805484c 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipsec.c,v 1.42 2005/03/09 14:39:48 ume Exp $	*/
 /*	$KAME: ipsec.c,v 1.207 2004/01/13 03:30:42 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index 7b677aefb98f..2472b7da3f3b 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipsec.h,v 1.18 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: ipsec.h,v 1.69 2003/09/10 23:49:11 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ipsec6.h b/sys/netinet6/ipsec6.h
index 6a1547f1c3a6..caae321be39f 100644
--- a/sys/netinet6/ipsec6.h
+++ b/sys/netinet6/ipsec6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ipsec6.h,v 1.10 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 035ae8295c70..bc5a1f67bde9 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/mld6.c,v 1.19.2.2 2005/10/09 06:51:11 ume Exp $	*/
 /*	$KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/mld6_var.h b/sys/netinet6/mld6_var.h
index af98e97074e3..d5f8ecf343b9 100644
--- a/sys/netinet6/mld6_var.h
+++ b/sys/netinet6/mld6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/mld6_var.h,v 1.6 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index e880a4dd9421..1e60e5ba5101 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6.c,v 1.48.2.3.2.1 2005/10/28 14:38:56 suz Exp $	*/
 /*	$KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 33d241602e9b..ce29827c953b 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6.h,v 1.19 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 56593e2601d7..afaf1e051938 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.29.2.2 2005/09/13 18:02:39 thompsa Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index e0bc00801767..236851cad7f8 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.26 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.111 2001/04/27 01:37:15 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/pim6.h b/sys/netinet6/pim6.h
index 25e2b2320f34..2d280f5a04f8 100644
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/pim6.h,v 1.3 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index 57bf1f98d3b0..a73d6f6035e8 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/pim6_var.h,v 1.4 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 2c8e0087b7d3..7d39c8564e51 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.50.2.2.2.1 2005/10/21 11:10:46 suz Exp $
  */
 
 /*-
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index 62aac14519f7..f40b1c6e22fc 100644
--- a/sys/netinet6/raw_ip6.h
+++ b/sys/netinet6/raw_ip6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/raw_ip6.h,v 1.2 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index aa2544035029..20888d03d78b 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/route6.c,v 1.11 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: route6.c,v 1.24 2001/03/14 03:07:05 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index 7b6c473a3ff4..18de7744db1b 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/scope6.c,v 1.12 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: scope6.c,v 1.10 2000/07/24 13:29:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/scope6_var.h b/sys/netinet6/scope6_var.h
index 0baaa21193c1..046b56c09287 100644
--- a/sys/netinet6/scope6_var.h
+++ b/sys/netinet6/scope6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/scope6_var.h,v 1.4 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/tcp6_var.h b/sys/netinet6/tcp6_var.h
index 68d8bfda5e86..bf826c768c94 100644
--- a/sys/netinet6/tcp6_var.h
+++ b/sys/netinet6/tcp6_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/tcp6_var.h,v 1.7 2005/01/07 02:30:35 imp Exp $
  */
 
 /*-
@@ -58,7 +58,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/tcp6_var.h,v 1.7 2005/01/07 02:30:35 imp Exp $
  */
 
 #ifndef _NETINET_TCP6_VAR_H_
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 8c4e93d3a593..3f0c8981c6b1 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/udp6_output.c,v 1.19.2.1 2005/10/09 06:51:11 ume Exp $	*/
 /*	$KAME: udp6_output.c,v 1.31 2001/05/21 16:39:15 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index 9c6517d8cb42..b9b028e1e1a8 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.54 2005/06/01 11:38:19 rwatson Exp $	*/
 /*	$KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/udp6_var.h b/sys/netinet6/udp6_var.h
index fbe5166cd2a6..c4fb2f76ea94 100644
--- a/sys/netinet6/udp6_var.h
+++ b/sys/netinet6/udp6_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/udp6_var.h,v 1.7 2005/01/07 02:30:35 imp Exp $
  */
 
 /*-
diff --git a/sys/netipsec/ah.h b/sys/netipsec/ah.h
index 1ffeacdc3977..4f52153f8a0c 100644
--- a/sys/netipsec/ah.h
+++ b/sys/netipsec/ah.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ah.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ah_var.h b/sys/netipsec/ah_var.h
index 5a8c06e14155..9e023783deb4 100644
--- a/sys/netipsec/ah_var.h
+++ b/sys/netipsec/ah_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ah_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_ah.h,v 1.29 2002/06/09 16:26:10 itojun Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/esp.h b/sys/netipsec/esp.h
index eb3739701181..b3adabe86934 100644
--- a/sys/netipsec/esp.h
+++ b/sys/netipsec/esp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/esp.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/esp_var.h b/sys/netipsec/esp_var.h
index 278b996a708f..d25ce0fd66ea 100644
--- a/sys/netipsec/esp_var.h
+++ b/sys/netipsec/esp_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/esp_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_esp.h,v 1.37 2002/06/09 16:26:10 itojun Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/ipcomp.h b/sys/netipsec/ipcomp.h
index 47e9305ef6be..c74e3ef19127 100644
--- a/sys/netipsec/ipcomp.h
+++ b/sys/netipsec/ipcomp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipcomp.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipcomp_var.h b/sys/netipsec/ipcomp_var.h
index 6a506bb5bf04..25d98c958dc2 100644
--- a/sys/netipsec/ipcomp_var.h
+++ b/sys/netipsec/ipcomp_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipcomp_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipip_var.h b/sys/netipsec/ipip_var.h
index 7fbc64315f93..0a9761e5fa1a 100644
--- a/sys/netipsec/ipip_var.h
+++ b/sys/netipsec/ipip_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipip_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_ipip.h,v 1.5 2002/06/09 16:26:10 itojun Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 4038c005d545..df5f5705759f 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec.c,v 1.12 2005/06/02 23:56:10 hmp Exp $	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h
index e08b94acc691..17060f081096 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec.h,v 1.8 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec6.h b/sys/netipsec/ipsec6.h
index 84c3c8aa8fc5..64755e52fafd 100644
--- a/sys/netipsec/ipsec6.h
+++ b/sys/netipsec/ipsec6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec6.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 030af2e1a288..3c526ebe7e95 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec_input.c,v 1.9 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c
index f44ff7aba54b..91b53abbee08 100644
--- a/sys/netipsec/ipsec_mbuf.c
+++ b/sys/netipsec/ipsec_mbuf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipsec/ipsec_mbuf.c,v 1.10 2003/12/15 21:49:41 bms Exp $
  */
 
 /*
diff --git a/sys/netipsec/ipsec_osdep.h b/sys/netipsec/ipsec_osdep.h
index b4f0dff57b3b..5e2f0b81c4e5 100644
--- a/sys/netipsec/ipsec_osdep.h
+++ b/sys/netipsec/ipsec_osdep.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec_osdep.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$NetBSD: ipsec_osdep.h,v 1.1 2003/08/13 20:06:51 jonathan Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index c90524b5c2cc..3762948a6277 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipsec/ipsec_output.c,v 1.10 2004/01/20 22:45:10 sam Exp $
  */
 
 /*
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 72cd9d9b5176..d196ba3a8071 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key.c,v 1.20 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key.h b/sys/netipsec/key.h
index 7c63272ab4af..9113b2b2ff73 100644
--- a/sys/netipsec/key.h
+++ b/sys/netipsec/key.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key.h,v 1.4 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_debug.c b/sys/netipsec/key_debug.c
index 73270a43ab77..6a8b9f022326 100644
--- a/sys/netipsec/key_debug.c
+++ b/sys/netipsec/key_debug.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key_debug.c,v 1.3 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_debug.h b/sys/netipsec/key_debug.h
index be53f7a1f712..a8ca140d4086 100644
--- a/sys/netipsec/key_debug.h
+++ b/sys/netipsec/key_debug.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key_debug.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_var.h b/sys/netipsec/key_var.h
index e7d700503187..d0fd5d97b8d7 100644
--- a/sys/netipsec/key_var.h
+++ b/sys/netipsec/key_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keydb.h b/sys/netipsec/keydb.h
index 6136c17ea000..b8cbe411982c 100644
--- a/sys/netipsec/keydb.h
+++ b/sys/netipsec/keydb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keydb.h,v 1.5 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index 59fea032e4dd..48a9c04d4c79 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keysock.c,v 1.10 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keysock.h b/sys/netipsec/keysock.h
index d8d27d201076..dfbe8a018ac2 100644
--- a/sys/netipsec/keysock.h
+++ b/sys/netipsec/keysock.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keysock.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netipsec/xform.h b/sys/netipsec/xform.h
index 65a08edb2537..20f372a0650a 100644
--- a/sys/netipsec/xform.h
+++ b/sys/netipsec/xform.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_ipsp.h,v 1.119 2002/03/14 01:27:11 millert Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c
index 9b830d0e641c..dd0a2453072c 100644
--- a/sys/netipsec/xform_ah.c
+++ b/sys/netipsec/xform_ah.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_ah.c,v 1.7 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index 7fe303e04929..43cfbdf63691 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_esp.c,v 1.10 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c
index 90e74894de02..b2b7126b0446 100644
--- a/sys/netipsec/xform_ipcomp.c
+++ b/sys/netipsec/xform_ipcomp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.8 2005/01/07 01:45:46 imp Exp $	*/
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
 /*-
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index b0997c4c030e..a396daa2d43f 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.11 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_tcp.c b/sys/netipsec/xform_tcp.c
index c70d70a452fa..904be7225664 100644
--- a/sys/netipsec/xform_tcp.c
+++ b/sys/netipsec/xform_tcp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/netipsec/xform_tcp.c,v 1.4 2005/01/07 01:45:46 imp Exp $ */
 
 /*-
  * Copyright (c) 2003 Bruce M. Simpson <bms@spc.org>
diff --git a/sys/netipx/README b/sys/netipx/README
index 2e23ffdf3db6..a0030bf1f41a 100644
--- a/sys/netipx/README
+++ b/sys/netipx/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netipx/README,v 1.6 2005/04/10 18:05:46 rwatson Exp $
 
 This protocol implements IPX/SPX over Ethernet_II frame type 0x8137.
 Please note: the SPX implementation may require further work and testing
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index fd06a076f84d..ef7303a7de6e 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx.c,v 1.30 2005/01/09 05:34:37 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index 3331747dc986..a80bdc07d704 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx.h,v 1.21 2005/05/27 12:25:42 rwatson Exp $
  */
 
 #ifndef _NETIPX_IPX_H_
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index 81e9c654d5a5..43f4bb3216ca 100644
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_cksum.c,v 1.13 2005/01/07 01:45:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index 88d979bf49a9..9308a5094edb 100644
--- a/sys/netipx/ipx_if.h
+++ b/sys/netipx/ipx_if.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_if.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_if.h,v 1.15 2005/01/07 01:45:47 imp Exp $
  */
 
 #ifndef _NETIPX_IPX_IF_H_
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 7852e2b1e726..7497aba8731d 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.51 2005/04/10 18:05:02 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index e100e5189e7f..5785d36c5f1b 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_ip.c,v 1.40 2005/06/10 16:49:22 brooks Exp $");
 
 /*
  * Software interface driver for encapsulating IPX in IP.
diff --git a/sys/netipx/ipx_ip.h b/sys/netipx/ipx_ip.h
index 150b1ff3b5b4..60b4a1da61a7 100644
--- a/sys/netipx/ipx_ip.h
+++ b/sys/netipx/ipx_ip.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipxip.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_ip.h,v 1.17 2005/06/10 16:49:22 brooks Exp $
  */
 
 #ifndef _NETIPX_IPXIP_H_
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index b8fa39a1296b..836cef3760bf 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_outputfl.c,v 1.22 2005/01/07 01:45:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 12f65778a2c1..7b6ed9d6b92a 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.43 2005/01/09 05:10:43 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h
index f65e13383c5e..4d6343fd54cb 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -34,7 +34,7 @@
  *
  *	@(#)ipx_pcb.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_pcb.h,v 1.23 2005/01/09 05:00:41 rwatson Exp $
  */
 
 #ifndef _NETIPX_IPX_PCB_H_
diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index 8f16aae2998d..8ffa99936799 100644
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_proto.c,v 1.19 2005/01/07 01:45:47 imp Exp $");
 
 #include "opt_ipx.h"
 
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index 21e7612bc2f4..aee74a919329 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.52 2005/01/09 05:15:59 rwatson Exp $");
 
 #include "opt_ipx.h"
 
diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h
index c78536b5f28a..0e300f1d7b61 100644
--- a/sys/netipx/ipx_var.h
+++ b/sys/netipx/ipx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_var.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_var.h,v 1.22 2005/01/07 01:45:47 imp Exp $
  */
 
 #ifndef _NETIPX_IPX_VAR_H_
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 12fe93ed1a36..18135de7f278 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx.h,v 1.19 2005/01/07 01:45:47 imp Exp $
  */
 
 #ifndef _NETIPX_SPX_H_
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index 4e4aff81181b..53007a918221 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/spx_debug.c,v 1.16 2005/01/07 01:45:47 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_tcpdebug.h"
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index 9e5bf677e423..7bf31fa1db91 100644
--- a/sys/netipx/spx_debug.h
+++ b/sys/netipx/spx_debug.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_debug.h,v 1.15 2005/01/07 01:45:47 imp Exp $
  */
 
 #ifndef _NETIPX_SPX_DEBUG_H_
diff --git a/sys/netipx/spx_timer.h b/sys/netipx/spx_timer.h
index fd06efb796ae..af068c84f332 100644
--- a/sys/netipx/spx_timer.h
+++ b/sys/netipx/spx_timer.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_timer.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_timer.h,v 1.11 2005/01/07 01:45:47 imp Exp $
  */
 
 #ifndef _NETIPX_SPX_TIMER_H_
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 25042e62f453..50850d1535be 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.62 2005/02/21 21:58:17 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/netipx/spx_var.h b/sys/netipx/spx_var.h
index 1cf1229f42cc..73856d96436b 100644
--- a/sys/netipx/spx_var.h
+++ b/sys/netipx/spx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_var.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_var.h,v 1.10 2005/01/07 01:45:47 imp Exp $
  */
 
 #ifndef _NETIPX_SPX_VAR_H_
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index 2278dac726bb..d1ccec9788c2 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netkey/key.c,v 1.71.2.1 2005/09/03 16:13:05 ume Exp $");
 
 /*
  * This code is referd to RFC 2367
diff --git a/sys/netkey/key.h b/sys/netkey/key.h
index e4cfe4bbd118..3f14f58b96f6 100644
--- a/sys/netkey/key.h
+++ b/sys/netkey/key.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/key.h,v 1.12 2005/01/07 01:45:48 imp Exp $	*/
 /*	$KAME: key.h,v 1.32 2003/09/07 05:25:20 itojun Exp $	*/
 
 /*-
diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c
index 73b3b3d0b1cf..22b5076ba9fa 100644
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netkey/key_debug.c,v 1.25 2005/01/07 01:45:48 imp Exp $");
 
 #ifdef _KERNEL
 #include "opt_inet.h"
diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h
index 435d9232f7f9..d66b3199e50d 100644
--- a/sys/netkey/key_debug.h
+++ b/sys/netkey/key_debug.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/key_debug.h,v 1.12 2005/01/07 01:45:48 imp Exp $	*/
 /*	$KAME: key_debug.h,v 1.11 2002/11/05 03:48:34 itojun Exp $	*/
 
 /*-
diff --git a/sys/netkey/key_var.h b/sys/netkey/key_var.h
index 91b5d3bb1f7e..96cb99ae7a6c 100644
--- a/sys/netkey/key_var.h
+++ b/sys/netkey/key_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/key_var.h,v 1.8 2005/01/07 01:45:48 imp Exp $	*/
 /*	$KAME: key_var.h,v 1.12 2001/11/06 03:48:29 itojun Exp $	*/
 
 /*-
diff --git a/sys/netkey/keydb.c b/sys/netkey/keydb.c
index 711ed7b89dd3..bfd59ed2a014 100644
--- a/sys/netkey/keydb.c
+++ b/sys/netkey/keydb.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netkey/keydb.c,v 1.6 2005/01/07 01:45:48 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h
index b32536206feb..dc5eb697fd76 100644
--- a/sys/netkey/keydb.h
+++ b/sys/netkey/keydb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/keydb.h,v 1.12 2005/01/07 01:45:48 imp Exp $	*/
 /*	$KAME: keydb.h,v 1.24 2003/09/07 15:12:10 itojun Exp $	*/
 
 /*-
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index a3ffd15c08e5..3d50871d95cc 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netkey/keysock.c,v 1.30 2005/01/07 01:45:48 imp Exp $");
 
 #include "opt_ipsec.h"
 
diff --git a/sys/netkey/keysock.h b/sys/netkey/keysock.h
index ff2db8160101..a0b08465351d 100644
--- a/sys/netkey/keysock.h
+++ b/sys/netkey/keysock.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netkey/keysock.h,v 1.8 2005/01/07 01:45:48 imp Exp $	*/
 /*	$KAME: keysock.h,v 1.9 2002/03/21 14:00:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index ae0ecd4637f8..e33f4334d5e7 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.37.2.3 2005/08/25 05:01:23 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 0a2ebb8efe35..92275fb5d281 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: natm.h,v 1.1 1996/07/04 03:20:12 chuck Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/netnatm/natm.h,v 1.10.2.2 2005/08/15 09:52:22 rwatson Exp $ */
 
 /*-
  *
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index fd22719fa4b6..a0804707a37c 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm_pcb.c,v 1.15.2.1 2005/08/15 09:51:15 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c
index 2627bedfb924..b3089a8cfbe9 100644
--- a/sys/netnatm/natm_proto.c
+++ b/sys/netnatm/natm_proto.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm_proto.c,v 1.15.2.2 2005/08/15 09:52:22 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp.h b/sys/netncp/ncp.h
index 5b10d9a07b5b..26f9918d13e1 100644
--- a/sys/netncp/ncp.h
+++ b/sys/netncp/ncp.h
@@ -5,7 +5,7 @@
  *  Copyright (C) 1995 by Volker Lendecke
  *  New version derived from original ncp.h, 1998 Boris Popov
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp.h,v 1.7 2005/01/07 01:45:48 imp Exp $
  */
 
 #ifndef _NETNCP_NCP_H_
diff --git a/sys/netncp/ncp_cfg.h b/sys/netncp/ncp_cfg.h
index 82a30d748d5d..748af5abd664 100644
--- a/sys/netncp/ncp_cfg.h
+++ b/sys/netncp/ncp_cfg.h
@@ -1,7 +1,7 @@
 /* 
  * static configuration for libncp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_cfg.h,v 1.1 1999/10/12 11:56:38 bp Exp $
  */
 
 #define NCP_NLS_KOI2CP866
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 2052b17790ea..8407cc5f2f46 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_conn.c,v 1.26 2005/01/07 01:45:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 6a2d603148ef..535de9e9a6f5 100644
--- a/sys/netncp/ncp_conn.h
+++ b/sys/netncp/ncp_conn.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_conn.h,v 1.12 2005/01/07 01:45:48 imp Exp $
  */
 #ifndef _NETNCP_NCP_CONN_H_
 #define _NETNCP_NCP_CONN_H_
diff --git a/sys/netncp/ncp_crypt.c b/sys/netncp/ncp_crypt.c
index 9899ef6984bb..fcda29fac8d3 100644
--- a/sys/netncp/ncp_crypt.c
+++ b/sys/netncp/ncp_crypt.c
@@ -17,7 +17,7 @@
    $********************************************************* */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_crypt.c,v 1.5 2003/06/11 05:30:35 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_file.h b/sys/netncp/ncp_file.h
index cebf4b9db10a..f902ba3ae74f 100644
--- a/sys/netncp/ncp_file.h
+++ b/sys/netncp/ncp_file.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_file.h,v 1.4 2005/01/07 01:45:48 imp Exp $
  */
 
 #ifndef _NETNCP_NCP_FILE_H_
diff --git a/sys/netncp/ncp_lib.h b/sys/netncp/ncp_lib.h
index f3ce680ab438..ffe1262fe9ef 100644
--- a/sys/netncp/ncp_lib.h
+++ b/sys/netncp/ncp_lib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_lib.h,v 1.7 2005/01/07 01:45:48 imp Exp $
  */
 
 #ifndef _NETNCP_NCP_LIB_H_
diff --git a/sys/netncp/ncp_login.c b/sys/netncp/ncp_login.c
index a61eb76dd496..4bdf4d464608 100644
--- a/sys/netncp/ncp_login.c
+++ b/sys/netncp/ncp_login.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_login.c,v 1.6 2005/01/07 01:45:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_mod.c b/sys/netncp/ncp_mod.c
index b4f919df7684..2be141663f1e 100644
--- a/sys/netncp/ncp_mod.c
+++ b/sys/netncp/ncp_mod.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_mod.c,v 1.15 2005/01/07 01:45:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_ncp.c b/sys/netncp/ncp_ncp.c
index 92b7e59e95e7..e1f495105d6f 100644
--- a/sys/netncp/ncp_ncp.c
+++ b/sys/netncp/ncp_ncp.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.20 2005/01/07 01:45:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_ncp.h b/sys/netncp/ncp_ncp.h
index ab1c74229e8c..98837e07b225 100644
--- a/sys/netncp/ncp_ncp.h
+++ b/sys/netncp/ncp_ncp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_ncp.h,v 1.8 2005/01/07 01:45:48 imp Exp $
  */
 #ifndef _NETNCP_NCP_NCP_H_
 #define _NETNCP_NCP_NCP_H_
diff --git a/sys/netncp/ncp_nls.c b/sys/netncp/ncp_nls.c
index bb746fc1474f..645f0aeee1aa 100644
--- a/sys/netncp/ncp_nls.c
+++ b/sys/netncp/ncp_nls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_nls.c,v 1.8 2005/02/23 22:44:38 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_nls.h b/sys/netncp/ncp_nls.h
index 0a391528536b..511070253785 100644
--- a/sys/netncp/ncp_nls.h
+++ b/sys/netncp/ncp_nls.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_nls.h,v 1.7 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_NLS_H_
 #define _NETNCP_NCP_NLS_H_
diff --git a/sys/netncp/ncp_rcfile.h b/sys/netncp/ncp_rcfile.h
index 034402d33e07..daa09fd85d35 100644
--- a/sys/netncp/ncp_rcfile.h
+++ b/sys/netncp/ncp_rcfile.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_rcfile.h,v 1.5 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_RCFILE_H_
 #define _NETNCP_NCP_RCFILE_H_
diff --git a/sys/netncp/ncp_rq.c b/sys/netncp/ncp_rq.c
index 6915bfaf451e..d7f16a6ef3dd 100644
--- a/sys/netncp/ncp_rq.c
+++ b/sys/netncp/ncp_rq.c
@@ -33,7 +33,7 @@
  */ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_rq.c,v 1.14 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_rq.h b/sys/netncp/ncp_rq.h
index d0ad9ad57ab7..509bf50b09d1 100644
--- a/sys/netncp/ncp_rq.h
+++ b/sys/netncp/ncp_rq.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_rq.h,v 1.9 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_RQ_H_
 #define _NETNCP_NCP_RQ_H_
diff --git a/sys/netncp/ncp_sock.c b/sys/netncp/ncp_sock.c
index 8edf4bc44ae1..9c65e4c5cf1b 100644
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_sock.c,v 1.15 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_sock.h b/sys/netncp/ncp_sock.h
index 7833760285f4..aeeb97498437 100644
--- a/sys/netncp/ncp_sock.h
+++ b/sys/netncp/ncp_sock.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_sock.h,v 1.6 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_SOCK_H_
 #define _NETNCP_NCP_SOCK_H_
diff --git a/sys/netncp/ncp_subr.c b/sys/netncp/ncp_subr.c
index fd7969a9f69f..1bd8c8ffe178 100644
--- a/sys/netncp/ncp_subr.c
+++ b/sys/netncp/ncp_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_subr.c,v 1.14 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_subr.h b/sys/netncp/ncp_subr.h
index 83f1da2761a5..1c228d199d6c 100644
--- a/sys/netncp/ncp_subr.h
+++ b/sys/netncp/ncp_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_subr.h,v 1.9 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_SUBR_H_
 #define _NETNCP_NCP_SUBR_H_
diff --git a/sys/netncp/ncp_user.h b/sys/netncp/ncp_user.h
index dc6d3cddedd9..59485ab61d62 100644
--- a/sys/netncp/ncp_user.h
+++ b/sys/netncp/ncp_user.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_user.h,v 1.3 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_USER_H_
 #define _NETNCP_NCP_USER_H_
diff --git a/sys/netncp/ncpio.h b/sys/netncp/ncpio.h
index 53c90eac96c6..b9a4240ccdaf 100644
--- a/sys/netncp/ncpio.h
+++ b/sys/netncp/ncpio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncpio.h,v 1.1 2003/02/28 04:31:29 tjr Exp $
  */
 
 #ifndef _NETNCP_NCPIO_H_
diff --git a/sys/netncp/nwerror.h b/sys/netncp/nwerror.h
index 8dc7a93022b0..93fb510167c7 100644
--- a/sys/netncp/nwerror.h
+++ b/sys/netncp/nwerror.h
@@ -1,7 +1,7 @@
 /*
  * NetWare requestor error codes, they taken from NDK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/nwerror.h,v 1.2 1999/12/12 05:50:07 bp Exp $
  */
 #ifndef _NETNCP_NWERROR_H_
 #define _NETNCP_NWERROR_H_
diff --git a/sys/netsmb/netbios.h b/sys/netsmb/netbios.h
index 8353fcde22a6..8805e47c7b60 100644
--- a/sys/netsmb/netbios.h
+++ b/sys/netsmb/netbios.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/netbios.h,v 1.5 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETSMB_NETBIOS_H_
 #define	_NETSMB_NETBIOS_H_
diff --git a/sys/netsmb/smb.h b/sys/netsmb/smb.h
index a12746538b6c..4cb813a2c8df 100644
--- a/sys/netsmb/smb.h
+++ b/sys/netsmb/smb.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb.h,v 1.10 2005/01/07 01:45:49 imp Exp $
  */
 
 /*
diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c
index 868fbaa0ec75..86832894ceca 100644
--- a/sys/netsmb/smb_conn.c
+++ b/sys/netsmb/smb_conn.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.15 2005/05/13 11:27:48 peadar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_conn.h b/sys/netsmb/smb_conn.h
index a83af8b15038..9359d3567985 100644
--- a/sys/netsmb/smb_conn.h
+++ b/sys/netsmb/smb_conn.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_conn.h,v 1.11 2005/01/07 01:45:49 imp Exp $
  */
 
 /*
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index e45c379ad746..7483cb22604d 100644
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_crypt.c,v 1.8 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c
index 17994cff67a2..4c2ebc705fd9 100644
--- a/sys/netsmb/smb_dev.c
+++ b/sys/netsmb/smb_dev.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_dev.c,v 1.27.2.1 2005/08/13 21:24:17 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netsmb/smb_dev.h b/sys/netsmb/smb_dev.h
index 1454ab3e3ff4..0071da810911 100644
--- a/sys/netsmb/smb_dev.h
+++ b/sys/netsmb/smb_dev.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_dev.h,v 1.5 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETSMB_DEV_H_
 #define _NETSMB_DEV_H_
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index 26bbe75879a4..2a8b24c8f730 100644
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_iod.c,v 1.16 2005/01/07 01:45:49 imp Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 7099645be59b..fc8a0fd4b80a 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_rq.c,v 1.16 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_rq.h b/sys/netsmb/smb_rq.h
index c016d9d28831..60f91aa36c62 100644
--- a/sys/netsmb/smb_rq.h
+++ b/sys/netsmb/smb_rq.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_rq.h,v 1.4 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETSMB_SMB_RQ_H_
 #define	_NETSMB_SMB_RQ_H_
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c
index 953456e1c85f..abe6b938e781 100644
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_smb.c,v 1.13 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index 0fb48ecbdacb..a0ed09d16ad5 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_subr.c,v 1.18 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h
index 9b38bfa772aa..c152ae2cd646 100644
--- a/sys/netsmb/smb_subr.h
+++ b/sys/netsmb/smb_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_subr.h,v 1.12 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETSMB_SMB_SUBR_H_
 #define _NETSMB_SMB_SUBR_H_
diff --git a/sys/netsmb/smb_tran.h b/sys/netsmb/smb_tran.h
index 4d8955da036d..8e9031ccbbf7 100644
--- a/sys/netsmb/smb_tran.h
+++ b/sys/netsmb/smb_tran.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_tran.h,v 1.4 2005/01/07 01:45:49 imp Exp $
  */
 
 #ifndef _NETSMB_SMB_TRAN_H_
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index 6c17e5d7575c..784251b25343 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.22 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/condvar.h>
diff --git a/sys/netsmb/smb_trantcp.h b/sys/netsmb/smb_trantcp.h
index 6251b0ef0d70..d1b905ac7b29 100644
--- a/sys/netsmb/smb_trantcp.h
+++ b/sys/netsmb/smb_trantcp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_trantcp.h,v 1.4 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETSMB_SMB_TRANTCP_H_
 #define	_NETSMB_SMB_TRANTCP_H_
diff --git a/sys/netsmb/smb_usr.c b/sys/netsmb/smb_usr.c
index 2916ee840eee..01a7dbd99bd6 100644
--- a/sys/netsmb/smb_usr.c
+++ b/sys/netsmb/smb_usr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_usr.c,v 1.6 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 54c3f418f9ff..88c32c90565e 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs/nfs_common.c,v 1.117.2.1 2005/10/09 03:21:56 delphij Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 7c0613095939..a50ecc916618 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_common.h,v 1.37.2.1 2005/10/09 03:21:56 delphij Exp $
  */
 
 
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index 2da7a66afce5..51909f125d49 100644
--- a/sys/nfs/nfsproto.h
+++ b/sys/nfs/nfsproto.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsproto.h,v 1.11 2005/01/07 01:45:50 imp Exp $
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 0d7935f9a467..15d639c17245 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/rpcv2.h,v 1.14 2005/01/07 01:45:50 imp Exp $
  */
 
 
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index 67546718282a..393abb2606da 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/xdr_subs.h,v 1.15 2005/01/07 01:45:50 imp Exp $
  */
 
 
diff --git a/sys/nfs4client/nfs4.h b/sys/nfs4client/nfs4.h
index 4bcc6a7f3121..5b6f41b9b4e5 100644
--- a/sys/nfs4client/nfs4.h
+++ b/sys/nfs4client/nfs4.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4.h,v 1.25 2003/11/05 14:58:58 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_dev.c b/sys/nfs4client/nfs4_dev.c
index ab089b42255f..27e1a2c534be 100644
--- a/sys/nfs4client/nfs4_dev.c
+++ b/sys/nfs4client/nfs4_dev.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_dev.c,v 1.7 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_dev.c,v 1.10 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_dev.h b/sys/nfs4client/nfs4_dev.h
index be14ce2cdb33..c5c38e7f31c0 100644
--- a/sys/nfs4client/nfs4_dev.h
+++ b/sys/nfs4client/nfs4_dev.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_dev.h,v 1.3 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_dev.h,v 1.3 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_idmap.c b/sys/nfs4client/nfs4_idmap.c
index 7eae5ec09079..32d8e4c20b40 100644
--- a/sys/nfs4client/nfs4_idmap.c
+++ b/sys/nfs4client/nfs4_idmap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_idmap.c,v 1.5 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_idmap.c,v 1.4 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_idmap.h b/sys/nfs4client/nfs4_idmap.h
index 0b09cf43444d..7ced68c93651 100644
--- a/sys/nfs4client/nfs4_idmap.h
+++ b/sys/nfs4client/nfs4_idmap.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_idmap.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_idmap.h,v 1.2 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_socket.c b/sys/nfs4client/nfs4_socket.c
index c33bcbb8c885..05142ffec36b 100644
--- a/sys/nfs4client/nfs4_socket.c
+++ b/sys/nfs4client/nfs4_socket.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_socket.c,v 1.4 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs_socket.c,v 1.12 2003/11/05 14:59:01 rees Exp $ */
 
 /*-
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_socket.c,v 1.4 2005/01/07 01:45:50 imp Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfs4client/nfs4_subs.c b/sys/nfs4client/nfs4_subs.c
index 739e39fed1cc..0f2b6901faea 100644
--- a/sys/nfs4client/nfs4_subs.c
+++ b/sys/nfs4client/nfs4_subs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_subs.c,v 1.5 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_subs.c,v 1.52 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vfs.h b/sys/nfs4client/nfs4_vfs.h
index 61999ac925b6..eb33195cca98 100644
--- a/sys/nfs4client/nfs4_vfs.h
+++ b/sys/nfs4client/nfs4_vfs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vfs.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_vfs.h,v 1.4 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vfs_subs.c b/sys/nfs4client/nfs4_vfs_subs.c
index ced9e23954f8..098420c84ac3 100644
--- a/sys/nfs4client/nfs4_vfs_subs.c
+++ b/sys/nfs4client/nfs4_vfs_subs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vfs_subs.c,v 1.4 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_vfs_subs.c,v 1.5 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vfsops.c b/sys/nfs4client/nfs4_vfsops.c
index 27249b8a8c9c..c2f34b2cbd6d 100644
--- a/sys/nfs4client/nfs4_vfsops.c
+++ b/sys/nfs4client/nfs4_vfsops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vfsops.c,v 1.20 2005/03/24 07:37:22 jeff Exp $ */
 /* $Id: nfs_vfsops.c,v 1.38 2003/11/05 14:59:01 rees Exp $ */
 
 /*-
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_vfsops.c,v 1.20 2005/03/24 07:37:22 jeff Exp $");
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"
diff --git a/sys/nfs4client/nfs4_vn.h b/sys/nfs4client/nfs4_vn.h
index 2f5f7306187f..ee79b79b1781 100644
--- a/sys/nfs4client/nfs4_vn.h
+++ b/sys/nfs4client/nfs4_vn.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vn.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_vn.h,v 1.5 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vn_subs.c b/sys/nfs4client/nfs4_vn_subs.c
index bd42d5e0a9e1..0bdfa883718d 100644
--- a/sys/nfs4client/nfs4_vn_subs.c
+++ b/sys/nfs4client/nfs4_vn_subs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vn_subs.c,v 1.4 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_vn_subs.c,v 1.9 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vnops.c b/sys/nfs4client/nfs4_vnops.c
index 1abbeb96a7fd..04351eca21ae 100644
--- a/sys/nfs4client/nfs4_vnops.c
+++ b/sys/nfs4client/nfs4_vnops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vnops.c,v 1.31 2005/04/25 05:11:19 jeff Exp $ */
 /* $Id: nfs_vnops.c,v 1.45 2003/11/05 14:59:02 rees Exp $ */
 
 /*-
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_vnops.c,v 1.31 2005/04/25 05:11:19 jeff Exp $");
 
 /*
  * vnode op calls for Sun NFS version 2 and 3
diff --git a/sys/nfs4client/nfs4m_subs.h b/sys/nfs4client/nfs4m_subs.h
index 60d0758637de..c4a716878b2e 100644
--- a/sys/nfs4client/nfs4m_subs.h
+++ b/sys/nfs4client/nfs4m_subs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4m_subs.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4m_subs.h,v 1.36 2003/11/05 14:59:01 rees Exp $ */
 
 /*-
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index 82aa281e6eba..0141e4908080 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.64 2005/04/26 20:45:29 des Exp $");
 
 #include "opt_bootp.h"
 
diff --git a/sys/nfsclient/krpc.h b/sys/nfsclient/krpc.h
index 44b84e019fb1..7778f2392c53 100644
--- a/sys/nfsclient/krpc.h
+++ b/sys/nfsclient/krpc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/nfsclient/krpc.h,v 1.8 2001/09/18 23:31:50 peter Exp $	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index e840317f842a..2f30f4691169 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/krpc_subr.c,v 1.29 2005/03/16 08:13:08 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index dd8cfd00eedb..7c35f8a906f0 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfs.h,v 1.90 2005/01/24 12:31:06 phk Exp $
  */
 
 #ifndef _NFSCLIENT_NFS_H_
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 35bf6c23742c..bb92fef17fcc 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.152 2005/06/16 15:43:17 green Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c
index 9f17cd9330a9..6235ed7ed97e 100644
--- a/sys/nfsclient/nfs_diskless.c
+++ b/sys/nfsclient/nfs_diskless.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.11 2005/04/26 20:47:59 des Exp $");
 
 #include "opt_bootp.h"
 
diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c
index ec021e9d7445..ee29a57f8627 100644
--- a/sys/nfsclient/nfs_lock.c
+++ b/sys/nfsclient/nfs_lock.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.40.4.1 2005/10/27 18:35:19 glebius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_lock.h b/sys/nfsclient/nfs_lock.h
index b49d12cfee92..e47f73bfcfd5 100644
--- a/sys/nfsclient/nfs_lock.h
+++ b/sys/nfsclient/nfs_lock.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *      from nfs_lock.h,v 2.2 1998/04/28 19:38:41 don Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfs_lock.h,v 1.6 2004/12/06 08:31:32 phk Exp $
  */
 
 /*
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 8740fb8048f7..d0ccf7adf88d 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_nfsiod.c,v 1.86 2005/02/07 18:21:50 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 4878de2a9088..b9196cdf097c 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.76.2.1 2005/10/09 03:15:36 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 6ca91baa0f39..881e8061bbec 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.125.2.3 2005/10/09 03:21:56 delphij Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 4fe6ee43e4ea..af4eea48b14d 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.140 2005/03/13 12:14:56 jeff Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 9cf9b2b45db5..2a98d51adfcc 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.177 2005/06/10 23:50:40 green Exp $");
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index d5ea20991460..66db36e3eacc 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.258 2005/04/14 07:08:34 jeff Exp $");
 
 /*
  * vnode op calls for Sun NFS version 2 and 3
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 7ebf1a058fb7..71cea24ca9ad 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsargs.h,v 1.68 2005/06/10 23:50:40 green Exp $
  */
 
 #ifndef _NFSCLIENT_NFSARGS_H_
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index 69ee035d3019..b88088360ac0 100644
--- a/sys/nfsclient/nfsdiskless.h
+++ b/sys/nfsclient/nfsdiskless.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsdiskless.h,v 1.17 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSDISKLESS_H_
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index 8083a47e93fc..d04ba7f637b3 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsm_subs.h,v 1.36 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSM_SUBS_H_
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index a8bcc1422367..efea31f4478f 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsmount.h,v 1.30 2005/06/10 23:50:40 green Exp $
  */
 
 #ifndef _NFSCLIENT_NFSMOUNT_H_
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index b9a2caf7c38c..77e39e7fc51d 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsnode.h,v 1.55 2005/03/16 11:28:19 phk Exp $
  */
 
 #ifndef _NFSCLIENT_NFSNODE_H_
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 8028429fc927..e2362232ca13 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsstats.h,v 1.65 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSSTATS_H_
diff --git a/sys/nfsclient/nlminfo.h b/sys/nfsclient/nlminfo.h
index 7d3e0ff0be9e..11bcad583443 100644
--- a/sys/nfsclient/nlminfo.h
+++ b/sys/nfsclient/nlminfo.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *      from BSDI nlminfo.h,v 2.1 1998/03/18 01:30:38 don Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nlminfo.h,v 1.2.16.1 2005/10/27 18:35:19 glebius Exp $
  */
 
 /*
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index e8d5d2163485..45b1aa596ccb 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.78 2005/04/17 16:25:36 rwatson Exp $
  */
 
 #ifndef _NFSSERVER_NFS_H_
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 4a028fa7d265..f9299d903997 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.156 2005/04/17 16:25:36 rwatson Exp $");
 
 /*
  * nfs version 2 and 3 server calls to vnode ops
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index 7873ea23f8b3..3813e6ffab60 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.40 2005/01/07 01:45:51 imp Exp $");
 
 /*
  * Reference: Chet Juszczak, "Improving the Performance and Correctness
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 22c7feb2ad01..bd6e68953688 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.94 2005/01/19 22:53:40 ps Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 912b5a7bf20b..abe94fb16929 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.136 2005/03/28 18:51:58 sam Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 8b2f82031739..04fd75d08900 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.103 2005/03/26 11:29:02 delphij Exp $");
 
 #include "opt_inet6.h"
 #include "opt_mac.h"
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 82e7e25bb284..d10d594f38e5 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfsm_subs.h,v 1.37 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSM_SUBS_H_
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index 3f58a51a82c2..b4b685396c51 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfsrvcache.h,v 1.17 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVCACHE_H_
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index d149e52c2df9..21309b526527 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfsrvstats.h,v 1.65 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVSTATS_H_
diff --git a/sys/opencrypto/cast.c b/sys/opencrypto/cast.c
index a16ab7d9fa4b..7ed3bd58b722 100644
--- a/sys/opencrypto/cast.c
+++ b/sys/opencrypto/cast.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/cast.c,v 1.3 2005/01/07 02:29:16 imp Exp $");
 
 #include <sys/types.h>
 #include <opencrypto/cast.h>
diff --git a/sys/opencrypto/cast.h b/sys/opencrypto/cast.h
index 8e2d0d19349b..048d5eef6a8e 100644
--- a/sys/opencrypto/cast.h
+++ b/sys/opencrypto/cast.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cast.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*      $OpenBSD: cast.h,v 1.2 2002/03/14 01:26:51 millert Exp $       */
 
 /*-
diff --git a/sys/opencrypto/castsb.h b/sys/opencrypto/castsb.h
index ed13058c804f..2845ac8fb543 100644
--- a/sys/opencrypto/castsb.h
+++ b/sys/opencrypto/castsb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/castsb.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*      $OpenBSD: castsb.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $       */
 /*-
  *	CAST-128 in C
diff --git a/sys/opencrypto/criov.c b/sys/opencrypto/criov.c
index f90404eb37fc..31fafca3e341 100644
--- a/sys/opencrypto/criov.c
+++ b/sys/opencrypto/criov.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.3 2005/01/07 02:29:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index 297e180601a1..a959f8b6e455 100644
--- a/sys/opencrypto/crypto.c
+++ b/sys/opencrypto/crypto.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.16 2005/01/07 02:29:16 imp Exp $");
 
 #define	CRYPTO_TIMING				/* enable timing support */
 
diff --git a/sys/opencrypto/crypto_if.m b/sys/opencrypto/crypto_if.m
index 2720cc1fe109..99cbe6608119 100644
--- a/sys/opencrypto/crypto_if.m
+++ b/sys/opencrypto/crypto_if.m
@@ -29,7 +29,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/opencrypto/crypto_if.m,v 1.2 2005/01/07 02:29:16 imp Exp $
 #
 
 #include <crypto/cryptodev.h>
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index e0b779d4b1cf..fcc68b27a029 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.25.2.1 2005/08/19 12:04:19 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h
index 07f83332e54e..2b569b10468e 100644
--- a/sys/opencrypto/cryptodev.h
+++ b/sys/opencrypto/cryptodev.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.10 2005/01/07 02:29:16 imp Exp $	*/
 /*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c
index d251d96438e1..1b45004d9f05 100644
--- a/sys/opencrypto/cryptosoft.c
+++ b/sys/opencrypto/cryptosoft.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.9 2005/03/11 12:37:06 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/cryptosoft.h b/sys/opencrypto/cryptosoft.h
index bf1385252819..a0bafd9e504b 100644
--- a/sys/opencrypto/cryptosoft.h
+++ b/sys/opencrypto/cryptosoft.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cryptosoft.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*	$OpenBSD: cryptosoft.h,v 1.10 2002/04/22 23:10:09 deraadt Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/deflate.c
index 49021d772c9d..7d5a9fd4a5f9 100644
--- a/sys/opencrypto/deflate.c
+++ b/sys/opencrypto/deflate.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/deflate.c,v 1.4 2005/05/30 05:01:44 scottl Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/opencrypto/deflate.h b/sys/opencrypto/deflate.h
index 5c8ebd41e8de..7976b1afb8bb 100644
--- a/sys/opencrypto/deflate.h
+++ b/sys/opencrypto/deflate.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/deflate.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /* $OpenBSD: deflate.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
 
 /*-
diff --git a/sys/opencrypto/rmd160.c b/sys/opencrypto/rmd160.c
index f97a6f4dc857..b223eefc4ea5 100644
--- a/sys/opencrypto/rmd160.c
+++ b/sys/opencrypto/rmd160.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/rmd160.c,v 1.3 2005/01/07 02:29:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/rmd160.h b/sys/opencrypto/rmd160.h
index 60dce64251ca..c5da99cde696 100644
--- a/sys/opencrypto/rmd160.h
+++ b/sys/opencrypto/rmd160.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/rmd160.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*	$OpenBSD: rmd160.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
 /*-
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
diff --git a/sys/opencrypto/skipjack.c b/sys/opencrypto/skipjack.c
index 0899e382ead0..c1cb9c6d65f0 100644
--- a/sys/opencrypto/skipjack.c
+++ b/sys/opencrypto/skipjack.c
@@ -13,7 +13,7 @@
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/skipjack.c,v 1.3 2005/01/07 02:29:16 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/opencrypto/skipjack.h b/sys/opencrypto/skipjack.h
index 3e88418ce217..9cc66ee28604 100644
--- a/sys/opencrypto/skipjack.h
+++ b/sys/opencrypto/skipjack.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/skipjack.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*	$OpenBSD: skipjack.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c
index a24d6da2106f..ff1973269ea6 100644
--- a/sys/opencrypto/xform.c
+++ b/sys/opencrypto/xform.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/xform.c,v 1.5.2.1 2005/08/30 15:01:50 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/xform.h b/sys/opencrypto/xform.h
index ae6665be7393..abc2fbf4b606 100644
--- a/sys/opencrypto/xform.h
+++ b/sys/opencrypto/xform.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/xform.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*	$OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $	*/
 
 /*-
diff --git a/sys/pc98/apm/apm_bioscall.S b/sys/pc98/apm/apm_bioscall.S
index fa42734a7cbf..2d84ecf7a481 100644
--- a/sys/pc98/apm/apm_bioscall.S
+++ b/sys/pc98/apm/apm_bioscall.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/apm/apm_bioscall.S,v 1.1 2005/04/20 12:28:19 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/30line.h b/sys/pc98/cbus/30line.h
index c2e0f107a260..e9430507eb62 100644
--- a/sys/pc98/cbus/30line.h
+++ b/sys/pc98/cbus/30line.h
@@ -25,7 +25,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/sys/pc98/cbus/30line.h,v 1.7 2005/01/09 22:17:39 imp Exp $
  */
 
 #ifndef __PC98_PC98_30LINE_H__
diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index ca18b24e4144..d71733c2e010 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/cbus.h,v 1.21 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/cbus/cbus_dma.c b/sys/pc98/cbus/cbus_dma.c
index 255f7e0ebd13..6e95d2bbc87d 100644
--- a/sys/pc98/cbus/cbus_dma.c
+++ b/sys/pc98/cbus/cbus_dma.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/cbus_dma.c,v 1.23 2005/05/14 10:14:56 nyan Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/pc98/cbus/cbus_dmareg.h b/sys/pc98/cbus/cbus_dmareg.h
index 9401b916560e..fc4f36eb76ec 100644
--- a/sys/pc98/cbus/cbus_dmareg.h
+++ b/sys/pc98/cbus/cbus_dmareg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/cbus_dmareg.h,v 1.1 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifndef _PC98_CBUS_CBUS_DMAREG_H_
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 0260e7bf2cbe..fae65f84eb2e 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/clock.c,v 1.148.2.1 2005/07/18 19:52:05 jhb Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 3b366a180909..279d5dfac1b3 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -50,7 +50,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/fdc.c,v 1.160 2005/05/10 12:02:16 nyan Exp $
  */
 
 #include "opt_fdc.h"
diff --git a/sys/pc98/cbus/fdc_cbus.c b/sys/pc98/cbus/fdc_cbus.c
index 098ee5daefe2..f25adcc693b0 100644
--- a/sys/pc98/cbus/fdc_cbus.c
+++ b/sys/pc98/cbus/fdc_cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/fdc_cbus.c,v 1.6 2005/05/14 10:51:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h
index 6d8e7e115d0d..3c09142c743c 100644
--- a/sys/pc98/cbus/fdcreg.h
+++ b/sys/pc98/cbus/fdcreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/fdcreg.h,v 1.11 2004/04/07 04:59:58 imp Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/fdcvar.h b/sys/pc98/cbus/fdcvar.h
index 4ae53d95ac59..0fa8ffa2b7f4 100644
--- a/sys/pc98/cbus/fdcvar.h
+++ b/sys/pc98/cbus/fdcvar.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/fdcvar.h,v 1.3 2004/07/17 10:07:19 nyan Exp $
  */
 
 /* XXX should audit this file to see if additional copyrights needed */
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index f9c2f586f630..8e3434ec2fa1 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -25,7 +25,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/sys/pc98/cbus/gdc.c,v 1.48 2005/05/10 12:02:16 nyan Exp $
  */
 
 #include "opt_gdc.h"
diff --git a/sys/pc98/cbus/nmi.c b/sys/pc98/cbus/nmi.c
index 431dd060cc19..86605f9fd266 100644
--- a/sys/pc98/cbus/nmi.c
+++ b/sys/pc98/cbus/nmi.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/nmi.c,v 1.2 2004/04/07 04:59:58 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/syslog.h>
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 085b69206378..e4baadced564 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/olpt.c,v 1.29 2005/05/10 12:30:30 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/olptreg.h b/sys/pc98/cbus/olptreg.h
index 80bc704f006c..0751585df35e 100644
--- a/sys/pc98/cbus/olptreg.h
+++ b/sys/pc98/cbus/olptreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/olptreg.h,v 1.2 2005/05/14 10:51:16 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index 7eed7ca52be7..ba23fba98f0d 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -25,7 +25,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/sys/pc98/cbus/pckbd.c,v 1.30 2005/05/12 13:39:31 nyan Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/pc98/cbus/pckbdtables.h b/sys/pc98/cbus/pckbdtables.h
index 5386f52174eb..fa307acf140a 100644
--- a/sys/pc98/cbus/pckbdtables.h
+++ b/sys/pc98/cbus/pckbdtables.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/pckbdtables.h,v 1.1 2005/05/12 13:39:31 nyan Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/pc98/cbus/pmc.c b/sys/pc98/cbus/pmc.c
index 13eade08322b..c760fba1a71a 100644
--- a/sys/pc98/cbus/pmc.c
+++ b/sys/pc98/cbus/pmc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/pmc.c,v 1.5 2004/06/03 06:10:02 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/cbus/ppc.c b/sys/pc98/cbus/ppc.c
index e04e3fb0cdd5..4f644630c2f9 100644
--- a/sys/pc98/cbus/ppc.c
+++ b/sys/pc98/cbus/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/ppc.c,v 1.19 2005/05/10 12:02:16 nyan Exp $
  *
  */
 
diff --git a/sys/pc98/cbus/ppcreg.h b/sys/pc98/cbus/ppcreg.h
index 2aa5ce49d89a..77ba808092d6 100644
--- a/sys/pc98/cbus/ppcreg.h
+++ b/sys/pc98/cbus/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/ppcreg.h,v 1.4 2001/06/26 11:53:12 nyan Exp $
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/pc98/cbus/sc_machdep.h b/sys/pc98/cbus/sc_machdep.h
index ea7b3ba7069a..d09fd1a00f11 100644
--- a/sys/pc98/cbus/sc_machdep.h
+++ b/sys/pc98/cbus/sc_machdep.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/sys/pc98/cbus/sc_machdep.h,v 1.5 2001/07/14 08:07:26 nyan Exp $
  */
 
 #ifndef _PC98_PC98_SC_MACHDEP_H_
diff --git a/sys/pc98/cbus/scgdcrndr.c b/sys/pc98/cbus/scgdcrndr.c
index f8ea8d137c05..e574564ce47f 100644
--- a/sys/pc98/cbus/scgdcrndr.c
+++ b/sys/pc98/cbus/scgdcrndr.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/sys/pc98/cbus/scgdcrndr.c,v 1.13 2005/05/29 11:53:14 nyan Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/cbus/scterm-sck.c b/sys/pc98/cbus/scterm-sck.c
index 7029c072a799..1519bd6be3d5 100644
--- a/sys/pc98/cbus/scterm-sck.c
+++ b/sys/pc98/cbus/scterm-sck.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/sys/pc98/cbus/scterm-sck.c,v 1.16 2005/04/13 13:26:48 nyan Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 2d0ea3f03284..f3aab100cb5f 100644
--- a/sys/pc98/cbus/scvtb.c
+++ b/sys/pc98/cbus/scvtb.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/sys/pc98/cbus/scvtb.c,v 1.13 2003/02/19 05:47:40 imp Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 007e1b2e8c96..95fd5d2d2e9d 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/sio.c,v 1.234 2005/05/10 12:02:16 nyan Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/pc98/cbus/sio_cbus.c b/sys/pc98/cbus/sio_cbus.c
index 2df560cd90cd..0c5715716e7c 100644
--- a/sys/pc98/cbus/sio_cbus.c
+++ b/sys/pc98/cbus/sio_cbus.c
@@ -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/sys/pc98/cbus/sio_cbus.c,v 1.9 2005/05/14 10:51:16 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 7247f48c9a42..7d7f379bf7ea 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.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/sys/pc98/cbus/syscons_cbus.c,v 1.22 2005/05/14 09:10:01 nyan Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/compile/.cvsignore b/sys/pc98/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/pc98/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/pc98/conf/.cvsignore b/sys/pc98/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/pc98/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index bb0dab4a11ca..9520fea1aad4 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/pc98
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/DEFAULTS,v 1.1.4.1 2005/10/28 19:22:41 jhb Exp $
 
 # Not yet, this would break all existing configs
 #machine		pc98 i386
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 08b0097f4f4d..4a2ad22f37c6 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.269.2.5.2.1 2005/10/28 19:22:41 jhb Exp $
 
 machine		pc98 i386
 cpu		I486_CPU
diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index 1c033dafe9fa..e07b429eec39 100644
--- a/sys/pc98/conf/GENERIC.hints
+++ b/sys/pc98/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.23.2.1 2005/10/07 15:56:30 nyan Exp $
 
 hint.atacbus.0.at="isa"
 hint.atacbus.0.port="0x640"
diff --git a/sys/pc98/conf/Makefile b/sys/pc98/conf/Makefile
index 2c006e9c2c80..c87a6d7b4ec4 100644
--- a/sys/pc98/conf/Makefile
+++ b/sys/pc98/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/Makefile,v 1.3 2003/02/26 23:36:59 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 52d526ac1aaa..986025cf6ee6 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.59.2.3 2005/10/07 15:56:30 nyan Exp $
 #
 
 #
diff --git a/sys/pc98/include/_bus.h b/sys/pc98/include/_bus.h
index 8070792dffc9..57805c65dac0 100644
--- a/sys/pc98/include/_bus.h
+++ b/sys/pc98/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/_bus.h,v 1.3 2005/04/19 21:07:00 imp Exp $
  */
 
 #ifndef PC98_INCLUDE__BUS_H
diff --git a/sys/pc98/include/_inttypes.h b/sys/pc98/include/_inttypes.h
index 327018581cd3..3302e303393a 100644
--- a/sys/pc98/include/_inttypes.h
+++ b/sys/pc98/include/_inttypes.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_inttypes.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/_inttypes.h>
diff --git a/sys/pc98/include/_limits.h b/sys/pc98/include/_limits.h
index 21e2fb6f73d3..20aceddd4765 100644
--- a/sys/pc98/include/_limits.h
+++ b/sys/pc98/include/_limits.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_limits.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/_limits.h>
diff --git a/sys/pc98/include/_stdint.h b/sys/pc98/include/_stdint.h
index bb4242a75b9c..6b35e89e3c30 100644
--- a/sys/pc98/include/_stdint.h
+++ b/sys/pc98/include/_stdint.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_stdint.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/_stdint.h>
diff --git a/sys/pc98/include/_types.h b/sys/pc98/include/_types.h
index 63da67a982a2..feb3b9a4c727 100644
--- a/sys/pc98/include/_types.h
+++ b/sys/pc98/include/_types.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_types.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/_types.h>
diff --git a/sys/pc98/include/apicreg.h b/sys/pc98/include/apicreg.h
index a9766d5bfd6a..3a67488c3f80 100644
--- a/sys/pc98/include/apicreg.h
+++ b/sys/pc98/include/apicreg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/apicreg.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/apicreg.h>
diff --git a/sys/pc98/include/apicvar.h b/sys/pc98/include/apicvar.h
index 4f52d8200943..9ef1cda30c5a 100644
--- a/sys/pc98/include/apicvar.h
+++ b/sys/pc98/include/apicvar.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/apicvar.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/apicvar.h>
diff --git a/sys/pc98/include/apm_bios.h b/sys/pc98/include/apm_bios.h
index 261ae3726d91..e1cef24ebf91 100644
--- a/sys/pc98/include/apm_bios.h
+++ b/sys/pc98/include/apm_bios.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/apm_bios.h,v 1.2 2005/04/03 23:26:05 imp Exp $
  */
 
 #ifndef _PC98_INCLUDE_APM_BIOS_H_
diff --git a/sys/pc98/include/apm_segments.h b/sys/pc98/include/apm_segments.h
index fac544b04273..11d32968d2a8 100644
--- a/sys/pc98/include/apm_segments.h
+++ b/sys/pc98/include/apm_segments.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/apm_segments.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/apm_segments.h>
diff --git a/sys/pc98/include/asm.h b/sys/pc98/include/asm.h
index aa141634f7de..dbcf127a02cb 100644
--- a/sys/pc98/include/asm.h
+++ b/sys/pc98/include/asm.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/asm.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/asm.h>
diff --git a/sys/pc98/include/asmacros.h b/sys/pc98/include/asmacros.h
index 98f3839356bf..1130ebd27670 100644
--- a/sys/pc98/include/asmacros.h
+++ b/sys/pc98/include/asmacros.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/asmacros.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/asmacros.h>
diff --git a/sys/pc98/include/atomic.h b/sys/pc98/include/atomic.h
index e6550e4bc6ec..ff28c25c7c98 100644
--- a/sys/pc98/include/atomic.h
+++ b/sys/pc98/include/atomic.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/atomic.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/atomic.h>
diff --git a/sys/pc98/include/bootinfo.h b/sys/pc98/include/bootinfo.h
index c627e432227a..5e1e25ff08c3 100644
--- a/sys/pc98/include/bootinfo.h
+++ b/sys/pc98/include/bootinfo.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/bootinfo.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/bootinfo.h>
diff --git a/sys/pc98/include/bus.h b/sys/pc98/include/bus.h
index 64a8194fa35a..13bbdcdbac11 100644
--- a/sys/pc98/include/bus.h
+++ b/sys/pc98/include/bus.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/sys/pc98/include/bus.h,v 1.5 2005/04/19 21:07:00 imp Exp $
  */
 
 /*	$NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $	*/
diff --git a/sys/pc98/include/bus_dma.h b/sys/pc98/include/bus_dma.h
index 4fdad3f5a787..40e5ccc6dfc3 100644
--- a/sys/pc98/include/bus_dma.h
+++ b/sys/pc98/include/bus_dma.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/bus_dma.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/bus_dma.h>
diff --git a/sys/pc98/include/clock.h b/sys/pc98/include/clock.h
index a2a654ad52d5..6821f5fc7d8e 100644
--- a/sys/pc98/include/clock.h
+++ b/sys/pc98/include/clock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/clock.h,v 1.2 2005/04/13 13:12:12 nyan Exp $
  */
 
 #ifndef _PC98_INCLUDE_CLOCK_H_
diff --git a/sys/pc98/include/cpu.h b/sys/pc98/include/cpu.h
index 6da74edee9a6..33a1def66df1 100644
--- a/sys/pc98/include/cpu.h
+++ b/sys/pc98/include/cpu.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cpu.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cpu.h>
diff --git a/sys/pc98/include/cpufunc.h b/sys/pc98/include/cpufunc.h
index deb0c39b3800..a5026cae54f5 100644
--- a/sys/pc98/include/cpufunc.h
+++ b/sys/pc98/include/cpufunc.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cpufunc.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cpufunc.h>
diff --git a/sys/pc98/include/cputypes.h b/sys/pc98/include/cputypes.h
index dbea880f7064..b7cd9d946b15 100644
--- a/sys/pc98/include/cputypes.h
+++ b/sys/pc98/include/cputypes.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cputypes.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cputypes.h>
diff --git a/sys/pc98/include/cserial.h b/sys/pc98/include/cserial.h
index c7fc61094299..f3bbf652eb0d 100644
--- a/sys/pc98/include/cserial.h
+++ b/sys/pc98/include/cserial.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cserial.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cserial.h>
diff --git a/sys/pc98/include/db_machdep.h b/sys/pc98/include/db_machdep.h
index a1b0c147664f..87d0910624f1 100644
--- a/sys/pc98/include/db_machdep.h
+++ b/sys/pc98/include/db_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/db_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/db_machdep.h>
diff --git a/sys/pc98/include/elf.h b/sys/pc98/include/elf.h
index 39937596f169..1554b697e4af 100644
--- a/sys/pc98/include/elf.h
+++ b/sys/pc98/include/elf.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/elf.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/elf.h>
diff --git a/sys/pc98/include/endian.h b/sys/pc98/include/endian.h
index 911c53e39ccd..2a1f09c69d0f 100644
--- a/sys/pc98/include/endian.h
+++ b/sys/pc98/include/endian.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/endian.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/endian.h>
diff --git a/sys/pc98/include/exec.h b/sys/pc98/include/exec.h
index e86bada4aaa0..d24f8e3f6a73 100644
--- a/sys/pc98/include/exec.h
+++ b/sys/pc98/include/exec.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/exec.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/exec.h>
diff --git a/sys/pc98/include/float.h b/sys/pc98/include/float.h
index 28e3b02a5acc..7f03394cfc56 100644
--- a/sys/pc98/include/float.h
+++ b/sys/pc98/include/float.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/float.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/float.h>
diff --git a/sys/pc98/include/floatingpoint.h b/sys/pc98/include/floatingpoint.h
index c61de43cd1ae..043d750ce0ac 100644
--- a/sys/pc98/include/floatingpoint.h
+++ b/sys/pc98/include/floatingpoint.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/floatingpoint.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/floatingpoint.h>
diff --git a/sys/pc98/include/frame.h b/sys/pc98/include/frame.h
index 89d90c053215..dc6972967117 100644
--- a/sys/pc98/include/frame.h
+++ b/sys/pc98/include/frame.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/frame.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/frame.h>
diff --git a/sys/pc98/include/gdb_machdep.h b/sys/pc98/include/gdb_machdep.h
index dcb25bb3faff..e58dcadc706e 100644
--- a/sys/pc98/include/gdb_machdep.h
+++ b/sys/pc98/include/gdb_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/gdb_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/gdb_machdep.h>
diff --git a/sys/pc98/include/i4b_cause.h b/sys/pc98/include/i4b_cause.h
index 4d8c957d32db..b89001bb3b79 100644
--- a/sys/pc98/include/i4b_cause.h
+++ b/sys/pc98/include/i4b_cause.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/i4b_cause.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/i4b_cause.h>
diff --git a/sys/pc98/include/i4b_debug.h b/sys/pc98/include/i4b_debug.h
index 74d0f138317c..76283357e540 100644
--- a/sys/pc98/include/i4b_debug.h
+++ b/sys/pc98/include/i4b_debug.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/i4b_debug.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/i4b_debug.h>
diff --git a/sys/pc98/include/i4b_ioctl.h b/sys/pc98/include/i4b_ioctl.h
index d3d8a57a1909..22ec23a52b73 100644
--- a/sys/pc98/include/i4b_ioctl.h
+++ b/sys/pc98/include/i4b_ioctl.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/i4b_ioctl.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/i4b_ioctl.h>
diff --git a/sys/pc98/include/i4b_rbch_ioctl.h b/sys/pc98/include/i4b_rbch_ioctl.h
index dd03b06d5636..793340cdce08 100644
--- a/sys/pc98/include/i4b_rbch_ioctl.h
+++ b/sys/pc98/include/i4b_rbch_ioctl.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/i4b_rbch_ioctl.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/i4b_rbch_ioctl.h>
diff --git a/sys/pc98/include/i4b_tel_ioctl.h b/sys/pc98/include/i4b_tel_ioctl.h
index 617eeab51e3b..952544344b76 100644
--- a/sys/pc98/include/i4b_tel_ioctl.h
+++ b/sys/pc98/include/i4b_tel_ioctl.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/i4b_tel_ioctl.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/i4b_tel_ioctl.h>
diff --git a/sys/pc98/include/i4b_trace.h b/sys/pc98/include/i4b_trace.h
index 88a372579886..fa1eb823f382 100644
--- a/sys/pc98/include/i4b_trace.h
+++ b/sys/pc98/include/i4b_trace.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/i4b_trace.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/i4b_trace.h>
diff --git a/sys/pc98/include/ieeefp.h b/sys/pc98/include/ieeefp.h
index 67f0c099406e..aa1f85e4bf4b 100644
--- a/sys/pc98/include/ieeefp.h
+++ b/sys/pc98/include/ieeefp.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ieeefp.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/ieeefp.h>
diff --git a/sys/pc98/include/in_cksum.h b/sys/pc98/include/in_cksum.h
index e7227d4479df..04160e917087 100644
--- a/sys/pc98/include/in_cksum.h
+++ b/sys/pc98/include/in_cksum.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/in_cksum.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/in_cksum.h>
diff --git a/sys/pc98/include/intr_machdep.h b/sys/pc98/include/intr_machdep.h
index 9fccf8af6742..1d0b5455e049 100644
--- a/sys/pc98/include/intr_machdep.h
+++ b/sys/pc98/include/intr_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/intr_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/intr_machdep.h>
diff --git a/sys/pc98/include/ioctl_bt848.h b/sys/pc98/include/ioctl_bt848.h
index 668fd4a3a6c1..69b730e8e678 100644
--- a/sys/pc98/include/ioctl_bt848.h
+++ b/sys/pc98/include/ioctl_bt848.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ioctl_bt848.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/ioctl_bt848.h>
diff --git a/sys/pc98/include/ioctl_meteor.h b/sys/pc98/include/ioctl_meteor.h
index 1a750bdd7215..bf3e97743f7d 100644
--- a/sys/pc98/include/ioctl_meteor.h
+++ b/sys/pc98/include/ioctl_meteor.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ioctl_meteor.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/ioctl_meteor.h>
diff --git a/sys/pc98/include/iodev.h b/sys/pc98/include/iodev.h
index 683ea7929264..34b050f7321d 100644
--- a/sys/pc98/include/iodev.h
+++ b/sys/pc98/include/iodev.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/iodev.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/iodev.h>
diff --git a/sys/pc98/include/kdb.h b/sys/pc98/include/kdb.h
index 9d412d45d261..9be2601e9f40 100644
--- a/sys/pc98/include/kdb.h
+++ b/sys/pc98/include/kdb.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/kdb.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/kdb.h>
diff --git a/sys/pc98/include/legacyvar.h b/sys/pc98/include/legacyvar.h
index 0e521280241c..ac552ef07fa5 100644
--- a/sys/pc98/include/legacyvar.h
+++ b/sys/pc98/include/legacyvar.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/legacyvar.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/legacyvar.h>
diff --git a/sys/pc98/include/limits.h b/sys/pc98/include/limits.h
index b51a993d7933..16fc746117ca 100644
--- a/sys/pc98/include/limits.h
+++ b/sys/pc98/include/limits.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/limits.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/limits.h>
diff --git a/sys/pc98/include/md_var.h b/sys/pc98/include/md_var.h
index 7d0fb7262651..b67f2284e586 100644
--- a/sys/pc98/include/md_var.h
+++ b/sys/pc98/include/md_var.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/md_var.h,v 1.2 2005/04/03 23:27:10 imp Exp $
  */
 
 #ifndef _PC98_INCLUDE_MD_VAR_H_
diff --git a/sys/pc98/include/memdev.h b/sys/pc98/include/memdev.h
index 46e230161712..41add3bd98ef 100644
--- a/sys/pc98/include/memdev.h
+++ b/sys/pc98/include/memdev.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/memdev.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/memdev.h>
diff --git a/sys/pc98/include/metadata.h b/sys/pc98/include/metadata.h
index 1d783ec90591..715107173f2d 100644
--- a/sys/pc98/include/metadata.h
+++ b/sys/pc98/include/metadata.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/metadata.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/metadata.h>
diff --git a/sys/pc98/include/mp_watchdog.h b/sys/pc98/include/mp_watchdog.h
index f0b91c00c4ad..2616bcf10091 100644
--- a/sys/pc98/include/mp_watchdog.h
+++ b/sys/pc98/include/mp_watchdog.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/mp_watchdog.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/mp_watchdog.h>
diff --git a/sys/pc98/include/mptable.h b/sys/pc98/include/mptable.h
index 2f6fb2d4aa65..5bc5f8282802 100644
--- a/sys/pc98/include/mptable.h
+++ b/sys/pc98/include/mptable.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/mptable.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/mptable.h>
diff --git a/sys/pc98/include/mutex.h b/sys/pc98/include/mutex.h
index a79c8f700e6f..51ad36cc56aa 100644
--- a/sys/pc98/include/mutex.h
+++ b/sys/pc98/include/mutex.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/mutex.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/mutex.h>
diff --git a/sys/pc98/include/npx.h b/sys/pc98/include/npx.h
index c1c0712a26aa..5d15fb30d55c 100644
--- a/sys/pc98/include/npx.h
+++ b/sys/pc98/include/npx.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/npx.h,v 1.2 2005/05/12 12:47:41 nyan Exp $
  */
 
 #ifndef _PC98_INCLUDE_NPX_H_
diff --git a/sys/pc98/include/param.h b/sys/pc98/include/param.h
index 85ca250ce78d..f303349c9173 100644
--- a/sys/pc98/include/param.h
+++ b/sys/pc98/include/param.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/param.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/param.h>
diff --git a/sys/pc98/include/pc/bios.h b/sys/pc98/include/pc/bios.h
index d804fdec3618..f77ab543d9c5 100644
--- a/sys/pc98/include/pc/bios.h
+++ b/sys/pc98/include/pc/bios.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pc/bios.h,v 1.1 2005/04/01 23:19:43 imp Exp $ */
 
 #include <i386/pc/bios.h>
diff --git a/sys/pc98/include/pc/display.h b/sys/pc98/include/pc/display.h
index 0a906c885d8c..c1f2f41577bf 100644
--- a/sys/pc98/include/pc/display.h
+++ b/sys/pc98/include/pc/display.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/pc/display.h,v 1.2 2005/04/13 13:12:12 nyan Exp $
  */
 
 #ifndef _PC98_INCLUDE_PC_DISPLAY_H_
diff --git a/sys/pc98/include/pc/vesa.h b/sys/pc98/include/pc/vesa.h
index 2c1c3eb0c573..5af57cf43803 100644
--- a/sys/pc98/include/pc/vesa.h
+++ b/sys/pc98/include/pc/vesa.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pc/vesa.h,v 1.1 2005/04/01 23:19:43 imp Exp $ */
 
 #include <i386/pc/vesa.h>
diff --git a/sys/pc98/include/pcaudioio.h b/sys/pc98/include/pcaudioio.h
index 1e9eee52265f..02b0faf9e17e 100644
--- a/sys/pc98/include/pcaudioio.h
+++ b/sys/pc98/include/pcaudioio.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcaudioio.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/pcaudioio.h>
diff --git a/sys/pc98/include/pcb.h b/sys/pc98/include/pcb.h
index 20b7d1843664..dd27783c8bd0 100644
--- a/sys/pc98/include/pcb.h
+++ b/sys/pc98/include/pcb.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcb.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pcb.h>
diff --git a/sys/pc98/include/pcb_ext.h b/sys/pc98/include/pcb_ext.h
index 81f25f63ebfd..31288d22d82a 100644
--- a/sys/pc98/include/pcb_ext.h
+++ b/sys/pc98/include/pcb_ext.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcb_ext.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pcb_ext.h>
diff --git a/sys/pc98/include/pci_cfgreg.h b/sys/pc98/include/pci_cfgreg.h
index dc9207deb23a..964acec52c34 100644
--- a/sys/pc98/include/pci_cfgreg.h
+++ b/sys/pc98/include/pci_cfgreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/pci_cfgreg.h,v 1.2 2005/04/03 23:26:44 imp Exp $
  */
 
 #ifndef _PC98_INCLUDE_PCI_CFGREG_H_
diff --git a/sys/pc98/include/pcpu.h b/sys/pc98/include/pcpu.h
index 9edf432c2d49..99fd41a60f89 100644
--- a/sys/pc98/include/pcpu.h
+++ b/sys/pc98/include/pcpu.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcpu.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pcpu.h>
diff --git a/sys/pc98/include/pcvt_ioctl.h b/sys/pc98/include/pcvt_ioctl.h
index 1a6ade724907..72643d8502b0 100644
--- a/sys/pc98/include/pcvt_ioctl.h
+++ b/sys/pc98/include/pcvt_ioctl.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcvt_ioctl.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/pcvt_ioctl.h>
diff --git a/sys/pc98/include/pecoff_machdep.h b/sys/pc98/include/pecoff_machdep.h
index b9e6d29ab4b5..177e93639782 100644
--- a/sys/pc98/include/pecoff_machdep.h
+++ b/sys/pc98/include/pecoff_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pecoff_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pecoff_machdep.h>
diff --git a/sys/pc98/include/perfmon.h b/sys/pc98/include/perfmon.h
index c4e13f5189a4..a4cbc0af6fdf 100644
--- a/sys/pc98/include/perfmon.h
+++ b/sys/pc98/include/perfmon.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/perfmon.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/perfmon.h>
diff --git a/sys/pc98/include/pmap.h b/sys/pc98/include/pmap.h
index f17c14e4c476..5f952f67796e 100644
--- a/sys/pc98/include/pmap.h
+++ b/sys/pc98/include/pmap.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pmap.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pmap.h>
diff --git a/sys/pc98/include/pmc_mdep.h b/sys/pc98/include/pmc_mdep.h
index 5ad152e6ee98..b2ed869a1ae5 100644
--- a/sys/pc98/include/pmc_mdep.h
+++ b/sys/pc98/include/pmc_mdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pmc_mdep.h,v 1.1 2005/04/19 21:06:06 imp Exp $ */
 
 #include <i386/pmc_mdep.h>
diff --git a/sys/pc98/include/ppireg.h b/sys/pc98/include/ppireg.h
index e2f914655741..2ff816d834c0 100644
--- a/sys/pc98/include/ppireg.h
+++ b/sys/pc98/include/ppireg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/ppireg.h,v 1.1 2005/05/14 09:10:02 nyan Exp $
  */
 
 #ifndef _MACHINE_PPIREG_H_
diff --git a/sys/pc98/include/privatespace.h b/sys/pc98/include/privatespace.h
index 5db57c3230e9..e6bf6ca766ba 100644
--- a/sys/pc98/include/privatespace.h
+++ b/sys/pc98/include/privatespace.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/privatespace.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/privatespace.h>
diff --git a/sys/pc98/include/proc.h b/sys/pc98/include/proc.h
index 77c2355a7500..b400836866b6 100644
--- a/sys/pc98/include/proc.h
+++ b/sys/pc98/include/proc.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/proc.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/proc.h>
diff --git a/sys/pc98/include/profile.h b/sys/pc98/include/profile.h
index 791bffbf73f5..6d0cc3ae638a 100644
--- a/sys/pc98/include/profile.h
+++ b/sys/pc98/include/profile.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/profile.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/profile.h>
diff --git a/sys/pc98/include/psl.h b/sys/pc98/include/psl.h
index db40cf0efb4c..18141db73bd4 100644
--- a/sys/pc98/include/psl.h
+++ b/sys/pc98/include/psl.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/psl.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/psl.h>
diff --git a/sys/pc98/include/ptrace.h b/sys/pc98/include/ptrace.h
index 9253dc353119..736a8ba7f447 100644
--- a/sys/pc98/include/ptrace.h
+++ b/sys/pc98/include/ptrace.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ptrace.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/ptrace.h>
diff --git a/sys/pc98/include/reg.h b/sys/pc98/include/reg.h
index c7f2a43708cc..90def0f938c4 100644
--- a/sys/pc98/include/reg.h
+++ b/sys/pc98/include/reg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/reg.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/reg.h>
diff --git a/sys/pc98/include/reloc.h b/sys/pc98/include/reloc.h
index 3666ec106817..d5d6ba338a12 100644
--- a/sys/pc98/include/reloc.h
+++ b/sys/pc98/include/reloc.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/reloc.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/reloc.h>
diff --git a/sys/pc98/include/resource.h b/sys/pc98/include/resource.h
index 43349bfa2a8f..4ceca483efff 100644
--- a/sys/pc98/include/resource.h
+++ b/sys/pc98/include/resource.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/resource.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/resource.h>
diff --git a/sys/pc98/include/runq.h b/sys/pc98/include/runq.h
index f6b60cf932cd..52dec171dc3f 100644
--- a/sys/pc98/include/runq.h
+++ b/sys/pc98/include/runq.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/runq.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/runq.h>
diff --git a/sys/pc98/include/segments.h b/sys/pc98/include/segments.h
index 062c3df6d18d..f4bc29ee649c 100644
--- a/sys/pc98/include/segments.h
+++ b/sys/pc98/include/segments.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/segments.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/segments.h>
diff --git a/sys/pc98/include/setjmp.h b/sys/pc98/include/setjmp.h
index 9d8a3a99dd18..781cfadcfdeb 100644
--- a/sys/pc98/include/setjmp.h
+++ b/sys/pc98/include/setjmp.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/setjmp.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/setjmp.h>
diff --git a/sys/pc98/include/sf_buf.h b/sys/pc98/include/sf_buf.h
index ee9d94623c83..0ec21c1271f3 100644
--- a/sys/pc98/include/sf_buf.h
+++ b/sys/pc98/include/sf_buf.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/sf_buf.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/sf_buf.h>
diff --git a/sys/pc98/include/sigframe.h b/sys/pc98/include/sigframe.h
index 6d7a9c5c9c96..77c833d400de 100644
--- a/sys/pc98/include/sigframe.h
+++ b/sys/pc98/include/sigframe.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/sigframe.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/sigframe.h>
diff --git a/sys/pc98/include/signal.h b/sys/pc98/include/signal.h
index 0c5f6dd9a62c..207019d361ca 100644
--- a/sys/pc98/include/signal.h
+++ b/sys/pc98/include/signal.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/signal.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/signal.h>
diff --git a/sys/pc98/include/smapi.h b/sys/pc98/include/smapi.h
index 0d83e8467aa5..66597032e2b3 100644
--- a/sys/pc98/include/smapi.h
+++ b/sys/pc98/include/smapi.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/smapi.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/smapi.h>
diff --git a/sys/pc98/include/smp.h b/sys/pc98/include/smp.h
index 28d98e8d44a4..99692c81e5fb 100644
--- a/sys/pc98/include/smp.h
+++ b/sys/pc98/include/smp.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/smp.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/smp.h>
diff --git a/sys/pc98/include/smptests.h b/sys/pc98/include/smptests.h
index c98bee75960e..3b749c9a48ce 100644
--- a/sys/pc98/include/smptests.h
+++ b/sys/pc98/include/smptests.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/smptests.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/smptests.h>
diff --git a/sys/pc98/include/speaker.h b/sys/pc98/include/speaker.h
index 31eb9b6e98c3..49f71e53de8b 100644
--- a/sys/pc98/include/speaker.h
+++ b/sys/pc98/include/speaker.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/speaker.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/speaker.h>
diff --git a/sys/pc98/include/specialreg.h b/sys/pc98/include/specialreg.h
index 1e87205b2e8d..8aaff7856705 100644
--- a/sys/pc98/include/specialreg.h
+++ b/sys/pc98/include/specialreg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/specialreg.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/specialreg.h>
diff --git a/sys/pc98/include/stdarg.h b/sys/pc98/include/stdarg.h
index bba2f9ff6ad1..5218efa256f4 100644
--- a/sys/pc98/include/stdarg.h
+++ b/sys/pc98/include/stdarg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/stdarg.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/stdarg.h>
diff --git a/sys/pc98/include/sysarch.h b/sys/pc98/include/sysarch.h
index 42fae7648684..6061fc9bbc03 100644
--- a/sys/pc98/include/sysarch.h
+++ b/sys/pc98/include/sysarch.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/sysarch.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/sysarch.h>
diff --git a/sys/pc98/include/timerreg.h b/sys/pc98/include/timerreg.h
index 59c223c5d3dc..05248ad4f1e7 100644
--- a/sys/pc98/include/timerreg.h
+++ b/sys/pc98/include/timerreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/timerreg.h,v 1.2 2005/05/28 13:40:27 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/include/trap.h b/sys/pc98/include/trap.h
index 9c147ae1327e..8f76c547ea60 100644
--- a/sys/pc98/include/trap.h
+++ b/sys/pc98/include/trap.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/trap.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/trap.h>
diff --git a/sys/pc98/include/tss.h b/sys/pc98/include/tss.h
index e97ed51e8de2..39f078d780de 100644
--- a/sys/pc98/include/tss.h
+++ b/sys/pc98/include/tss.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/tss.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/tss.h>
diff --git a/sys/pc98/include/ucontext.h b/sys/pc98/include/ucontext.h
index 83422140243c..81fb3e1be4c9 100644
--- a/sys/pc98/include/ucontext.h
+++ b/sys/pc98/include/ucontext.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ucontext.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/ucontext.h>
diff --git a/sys/pc98/include/varargs.h b/sys/pc98/include/varargs.h
index 21f5ce3c1c98..fceecb46c285 100644
--- a/sys/pc98/include/varargs.h
+++ b/sys/pc98/include/varargs.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/varargs.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/varargs.h>
diff --git a/sys/pc98/include/vm86.h b/sys/pc98/include/vm86.h
index 5dfa21858fc0..5cfbfa3105ff 100644
--- a/sys/pc98/include/vm86.h
+++ b/sys/pc98/include/vm86.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/vm86.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/vm86.h>
diff --git a/sys/pc98/include/vmparam.h b/sys/pc98/include/vmparam.h
index 2004749c42c4..0f627f0b208f 100644
--- a/sys/pc98/include/vmparam.h
+++ b/sys/pc98/include/vmparam.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/vmparam.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/vmparam.h>
diff --git a/sys/pc98/linux/linux.h b/sys/pc98/linux/linux.h
index d330a96f7c95..ee926be2211e 100644
--- a/sys/pc98/linux/linux.h
+++ b/sys/pc98/linux/linux.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/linux/linux.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/linux/linux.h>
diff --git a/sys/pc98/linux/linux_ipc64.h b/sys/pc98/linux/linux_ipc64.h
index 4fcdb641693f..b5e95848b29b 100644
--- a/sys/pc98/linux/linux_ipc64.h
+++ b/sys/pc98/linux/linux_ipc64.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/linux/linux_ipc64.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/linux/linux_ipc64.h>
diff --git a/sys/pc98/linux/linux_proto.h b/sys/pc98/linux/linux_proto.h
index f5ccdd18f567..02fd96fdc47f 100644
--- a/sys/pc98/linux/linux_proto.h
+++ b/sys/pc98/linux/linux_proto.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/linux/linux_proto.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/linux/linux_proto.h>
diff --git a/sys/pc98/pc98/busio.s b/sys/pc98/pc98/busio.s
index 915dcae21bf0..a95985a39ffc 100644
--- a/sys/pc98/pc98/busio.s
+++ b/sys/pc98/pc98/busio.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/pc98/busio.s,v 1.4 2005/01/07 02:29:17 imp Exp $ */
 /*	$NecBSD: busio.s,v 1.16.4.1 1999/08/16 09:06:08 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/pc98/pc98/busiosubr.c b/sys/pc98/pc98/busiosubr.c
index 8776d3fe6fd4..0dd831e61bdb 100644
--- a/sys/pc98/pc98/busiosubr.c
+++ b/sys/pc98/pc98/busiosubr.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/pc98/busiosubr.c,v 1.5 2005/01/07 02:29:17 imp Exp $ */
 /*	$NecBSD: busiosubr.c,v 1.30.4.4 1999/08/28 02:25:35 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/pc98/pc98/canbepm.c b/sys/pc98/pc98/canbepm.c
index 5c347a07e187..059defeef209 100644
--- a/sys/pc98/pc98/canbepm.c
+++ b/sys/pc98/pc98/canbepm.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbepm.c,v 1.3 2003/02/04 16:17:13 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/canbus.c b/sys/pc98/pc98/canbus.c
index b4564eb6cdb7..b8ab691aee58 100644
--- a/sys/pc98/pc98/canbus.c
+++ b/sys/pc98/pc98/canbus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbus.c,v 1.5 2005/03/20 05:22:57 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/canbus.h b/sys/pc98/pc98/canbus.h
index b63cc765cd6f..ce47a56342d7 100644
--- a/sys/pc98/pc98/canbus.h
+++ b/sys/pc98/pc98/canbus.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbus.h,v 1.3 2003/02/04 16:17:13 nyan Exp $
  */
 
 #ifndef _PC98_PC98_CANBUS_H_
diff --git a/sys/pc98/pc98/canbus_if.m b/sys/pc98/pc98/canbus_if.m
index 42d2cd52929c..85e5235d0f71 100644
--- a/sys/pc98/pc98/canbus_if.m
+++ b/sys/pc98/pc98/canbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/pc98/canbus_if.m,v 1.3 2005/01/07 02:29:17 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/pc98/pc98/canbusvars.h b/sys/pc98/pc98/canbusvars.h
index fc2acc11a976..afaec674d436 100644
--- a/sys/pc98/pc98/canbusvars.h
+++ b/sys/pc98/pc98/canbusvars.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbusvars.h,v 1.3 2003/02/04 16:17:13 nyan Exp $
  */
 
 #ifndef _PC98_PC98_CANBUSVARS_H_
diff --git a/sys/pc98/pc98/epsonio.h b/sys/pc98/pc98/epsonio.h
index a3180f010054..a41826a0a340 100644
--- a/sys/pc98/pc98/epsonio.h
+++ b/sys/pc98/pc98/epsonio.h
@@ -24,7 +24,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/sys/pc98/pc98/epsonio.h,v 1.9 2005/01/07 02:29:17 imp Exp $
  */
 
 #ifndef __PC98_PC98_EPSONIO_H__
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index d93975d7d592..ad306a460439 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.363.2.1 2005/07/28 17:22:39 nyan Exp $");
 
 #include "opt_atalk.h"
 #include "opt_compat.h"
diff --git a/sys/pc98/pc98/pc98_machdep.c b/sys/pc98/pc98/pc98_machdep.c
index c82647f5a402..96b48df39770 100644
--- a/sys/pc98/pc98/pc98_machdep.c
+++ b/sys/pc98/pc98/pc98_machdep.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/sys/pc98/pc98/pc98_machdep.c,v 1.25 2005/05/10 12:02:17 nyan Exp $
  */
 
 #include "opt_pc98.h"
diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h
index 9bce98106531..d067dfcb8bcf 100644
--- a/sys/pc98/pc98/pc98_machdep.h
+++ b/sys/pc98/pc98/pc98_machdep.h
@@ -24,7 +24,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/sys/pc98/pc98/pc98_machdep.h,v 1.12 2005/01/07 02:29:17 imp Exp $
  */
 
 #ifndef __PC98_PC98_PC98_MACHDEP_H__
diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h
index 315664a16e16..375b40df849b 100644
--- a/sys/pccard/cardinfo.h
+++ b/sys/pccard/cardinfo.h
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pccard/cardinfo.h,v 1.30 2005/01/07 02:29:17 imp Exp $ */
 
 #ifndef	_PCCARD_CARDINFO_H_
 #define	_PCCARD_CARDINFO_H_
diff --git a/sys/pccard/cis.h b/sys/pccard/cis.h
index 6cc935b80ff2..adaa57c6b025 100644
--- a/sys/pccard/cis.h
+++ b/sys/pccard/cis.h
@@ -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/sys/pccard/cis.h,v 1.5 2005/01/07 02:29:17 imp Exp $
  *
  */
 
diff --git a/sys/pccard/driver.h b/sys/pccard/driver.h
index f5705ab935f3..25590734306b 100644
--- a/sys/pccard/driver.h
+++ b/sys/pccard/driver.h
@@ -3,7 +3,7 @@
  * Bruce Evans, November 1995.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pccard/driver.h,v 1.14 2001/03/22 05:49:18 imp Exp $
  */
 
 #ifndef _PCCARD_DRIVER_H_
diff --git a/sys/pccard/i82365.h b/sys/pccard/i82365.h
index 1057d7c4963f..c0ed0bebadc4 100644
--- a/sys/pccard/i82365.h
+++ b/sys/pccard/i82365.h
@@ -34,7 +34,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/sys/pccard/i82365.h,v 1.29 2005/01/07 02:29:17 imp Exp $
  */
 
 #define	PCIC_I82365	0		/* Intel i82365SL-A/B or clone */
diff --git a/sys/pccard/meciareg.h b/sys/pccard/meciareg.h
index b54ae4d61843..a528d171481f 100644
--- a/sys/pccard/meciareg.h
+++ b/sys/pccard/meciareg.h
@@ -4,7 +4,7 @@
  * PC9801 original PCMCIA controller code for NS/A,Ne,NX/C,NR/L.
  * by Noriyuki Hosobuchi <hoso@ce.mbn.or.jp>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pccard/meciareg.h,v 1.2 2001/05/15 23:53:18 imp Exp $
  */
 
 /*--- I/O port definition */
diff --git a/sys/pccard/pccard_nbk.h b/sys/pccard/pccard_nbk.h
index fed7310eb708..085d5a71db4e 100644
--- a/sys/pccard/pccard_nbk.h
+++ b/sys/pccard/pccard_nbk.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pccard/pccard_nbk.h,v 1.7 2005/01/07 02:29:17 imp Exp $
  */
 
 #ifndef PCCARD_PCCARD_NBK_H
diff --git a/sys/pccard/pcic_pci.h b/sys/pccard/pcic_pci.h
index d2a96d280a67..07bc7d7ff4fe 100644
--- a/sys/pccard/pcic_pci.h
+++ b/sys/pccard/pcic_pci.h
@@ -26,7 +26,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/sys/pccard/pcic_pci.h,v 1.37 2005/01/07 02:29:17 imp Exp $
  */
 
 /* Share the devid database with NEWCARD */
diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h
index de2940c7a1ec..a184c2afc902 100644
--- a/sys/pccard/pcicvar.h
+++ b/sys/pccard/pcicvar.h
@@ -21,7 +21,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/sys/pccard/pcicvar.h,v 1.30 2005/01/07 02:29:17 imp Exp $
  */
 
 /*
diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h
index 030ff7ed47fd..d611def0a771 100644
--- a/sys/pccard/slot.h
+++ b/sys/pccard/slot.h
@@ -34,7 +34,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/sys/pccard/slot.h,v 1.40 2005/01/07 02:29:17 imp Exp $
  */
 
 #ifndef _PCCARD_SLOT_H
diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index a31c4d06f965..2ee279747925 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.46 2004/10/24 07:12:13 alc Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_ali.c b/sys/pci/agp_ali.c
index f39476b09409..6064924a5694 100644
--- a/sys/pci/agp_ali.c
+++ b/sys/pci/agp_ali.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_ali.c,v 1.17 2005/02/27 13:05:34 cognet Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index bb1d20e14d64..188413e65a19 100644
--- a/sys/pci/agp_amd.c
+++ b/sys/pci/agp_amd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_amd.c,v 1.22 2005/02/24 21:32:55 imp Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_amd64.c b/sys/pci/agp_amd64.c
index efa71a506738..6d6436b4fdc2 100644
--- a/sys/pci/agp_amd64.c
+++ b/sys/pci/agp_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_amd64.c,v 1.7 2005/04/08 18:04:39 obrien Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 3cb8fd429a2b..9eeb38c97894 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_i810.c,v 1.32 2005/02/24 21:32:55 imp Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_if.m b/sys/pci/agp_if.m
index faf7b1ab8fdf..705d98fa3499 100644
--- a/sys/pci/agp_if.m
+++ b/sys/pci/agp_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pci/agp_if.m,v 1.3 2005/01/07 02:29:18 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c
index 7e8477b93c10..70c664190b68 100644
--- a/sys/pci/agp_intel.c
+++ b/sys/pci/agp_intel.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_intel.c,v 1.27 2005/02/24 21:32:55 imp Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_nvidia.c b/sys/pci/agp_nvidia.c
index e49c1404299d..6d6add6b335b 100644
--- a/sys/pci/agp_nvidia.c
+++ b/sys/pci/agp_nvidia.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_nvidia.c,v 1.9 2005/04/02 01:10:09 obrien Exp $");
 
 /*
  * Written using information gleaned from the
diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c
index 0f3b31a41da1..f8a1f5640c39 100644
--- a/sys/pci/agp_sis.c
+++ b/sys/pci/agp_sis.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_sis.c,v 1.18 2005/02/24 21:32:55 imp Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c
index f2cd381f2734..a79d0b30c2d7 100644
--- a/sys/pci/agp_via.c
+++ b/sys/pci/agp_via.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_via.c,v 1.22 2005/06/26 04:01:11 anholt Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agppriv.h b/sys/pci/agppriv.h
index 7e846d17cdff..dba984fb62e8 100644
--- a/sys/pci/agppriv.h
+++ b/sys/pci/agppriv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/agppriv.h,v 1.5 2004/06/16 09:47:20 phk Exp $
  */
 
 #ifndef _PCI_AGPPRIV_H_
diff --git a/sys/pci/agpreg.h b/sys/pci/agpreg.h
index 4b2d5b3088dc..d934560923d3 100644
--- a/sys/pci/agpreg.h
+++ b/sys/pci/agpreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/agpreg.h,v 1.13 2004/08/16 12:25:48 obrien Exp $
  */
 
 #ifndef _PCI_AGPREG_H_
diff --git a/sys/pci/agpvar.h b/sys/pci/agpvar.h
index 0869c26d2b86..797c88a680f9 100644
--- a/sys/pci/agpvar.h
+++ b/sys/pci/agpvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/agpvar.h,v 1.2 2001/12/19 08:54:29 mdodd Exp $
  */
 
 #ifndef _PCI_AGPVAR_H_
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index e6f81493a800..89b9fabcc62c 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/alpm.c,v 1.24 2005/05/29 04:42:29 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index 2c8af6266ed2..137d10f3ac83 100644
--- a/sys/pci/amdpm.c
+++ b/sys/pci/amdpm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/amdpm.c,v 1.15 2005/05/29 04:42:29 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/dc21040reg.h b/sys/pci/dc21040reg.h
index c0ff1916578f..432f494d2b9d 100644
--- a/sys/pci/dc21040reg.h
+++ b/sys/pci/dc21040reg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: dc21040reg.h,v 1.15 1998/05/22 18:50:59 matt Exp $	*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/dc21040reg.h,v 1.7 2002/06/02 20:05:55 schweikh Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Matt Thomas <matt@3am-software.com>
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 4a4ec5350105..a2a8d8f1ab43 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.160.2.6 2005/10/09 04:11:19 delphij Exp $");
 
 /*
  * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
diff --git a/sys/pci/if_dcreg.h b/sys/pci/if_dcreg.h
index ecf9962fcf55..24527d88c3ce 100644
--- a/sys/pci/if_dcreg.h
+++ b/sys/pci/if_dcreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_dcreg.h,v 1.44.2.1 2005/08/26 14:52:36 jhb Exp $
  */
 
 /*
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index c153f3748eab..0dad9bd7fadd 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_de.c,v 1.162.2.4 2005/08/25 05:01:23 rwatson Exp $");
 
 #define	TULIP_HDR_DATA
 
diff --git a/sys/pci/if_devar.h b/sys/pci/if_devar.h
index 46ff1ea81f52..e7f5d261eeef 100644
--- a/sys/pci/if_devar.h
+++ b/sys/pci/if_devar.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $	*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/if_devar.h,v 1.32.2.1 2005/08/05 19:07:19 jhb Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 3a10bb190229..39c32bc43363 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_mn.c,v 1.48 2005/06/10 16:49:22 brooks Exp $");
 
 /*
  * Stuff to describe the MUNIC32X and FALC54 chips.
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 3c41ff1ce61f..6f079d07ee98 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_pcn.c,v 1.69.2.4 2005/10/09 04:11:19 delphij Exp $");
 
 /*
  * AMD Am79c972 fast ethernet PCI NIC driver. Datasheets are available
diff --git a/sys/pci/if_pcnreg.h b/sys/pci/if_pcnreg.h
index 84e4a3f66d89..d58a2b5a8e9a 100644
--- a/sys/pci/if_pcnreg.h
+++ b/sys/pci/if_pcnreg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_pcnreg.h,v 1.11.2.1 2005/08/26 14:33:05 jhb Exp $
  */
 
 /*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 23da0b275d10..4a9e39036349 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.152.2.4 2005/10/07 14:00:06 glebius Exp $");
 
 /*
  * RealTek 8129/8139 PCI NIC driver
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index c8b3c0b6c968..69e327b430f7 100644
--- a/sys/pci/if_rlreg.h
+++ b/sys/pci/if_rlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.51.2.2 2005/10/06 20:17:17 jhb Exp $
  */
 
 /*
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 7b2538bd8d12..fe667629d252 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_sf.c,v 1.82.2.5 2005/10/09 04:11:19 delphij Exp $");
 
 /*
  * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
diff --git a/sys/pci/if_sfreg.h b/sys/pci/if_sfreg.h
index 652f804faa3d..859c55031bc3 100644
--- a/sys/pci/if_sfreg.h
+++ b/sys/pci/if_sfreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sfreg.h,v 1.14.2.1 2005/08/26 14:50:16 jhb Exp $
  */
 
 /*
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 9dd4a4c768de..a120a090bdbf 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.132.2.6 2005/10/09 04:11:19 delphij Exp $");
 
 /*
  * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
diff --git a/sys/pci/if_sisreg.h b/sys/pci/if_sisreg.h
index eab53e153acc..aacd42fdc9f7 100644
--- a/sys/pci/if_sisreg.h
+++ b/sys/pci/if_sisreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.33.2.1 2005/09/29 18:52:21 jhb Exp $
  */
 
 /*
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 6ae2352792e2..5a02249f6e7b 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.106.2.4 2005/10/09 04:11:19 delphij Exp $");
 
 /*
  * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
@@ -136,7 +136,7 @@ MODULE_DEPEND(sk, miibus, 1, 1, 1);
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_sk.c,v 1.106.2.4 2005/10/09 04:11:19 delphij Exp $";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h
index e8b6b8ae45c5..36ecc47132f0 100644
--- a/sys/pci/if_skreg.h
+++ b/sys/pci/if_skreg.h
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_skreg.h,v 1.29 2005/06/10 16:49:23 brooks Exp $
  */
 
 /*-
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 02815b9df73b..9b3e6a3dbfaf 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_ste.c,v 1.84.2.6 2005/10/09 04:11:19 delphij Exp $");
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/pci/if_stereg.h b/sys/pci/if_stereg.h
index eab5164062b3..ab74be879982 100644
--- a/sys/pci/if_stereg.h
+++ b/sys/pci/if_stereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_stereg.h,v 1.18.2.2 2005/09/15 19:16:29 jhb Exp $
  */
 
 /*
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index a6126df1834e..07038bfb2da9 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_ti.c,v 1.107.2.3 2005/10/09 04:11:19 delphij Exp $");
 
 #include "opt_ti.h"
 
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index 1bcdfbc44f83..299a6d8d5cbc 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_tireg.h,v 1.31 2005/06/10 16:49:23 brooks Exp $
  */
 
 /*
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 6743912f88fe..09f88c201c5d 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_tl.c,v 1.99.2.4 2005/10/09 04:11:19 delphij Exp $");
 
 /*
  * Texas Instruments ThunderLAN driver for FreeBSD 2.2.6 and 3.x.
diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h
index 7f3dfb971d03..1a55e8cee422 100644
--- a/sys/pci/if_tlreg.h
+++ b/sys/pci/if_tlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_tlreg.h,v 1.21.2.1 2005/09/26 19:36:38 jhb Exp $
  */
 
 
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 8f15b84404e2..48bb1002d8e9 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.104.2.4 2005/10/09 04:11:20 delphij Exp $");
 
 /*
  * VIA Rhine fast ethernet PCI NIC driver
diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h
index 7d426560a4f1..06cfe3644514 100644
--- a/sys/pci/if_vrreg.h
+++ b/sys/pci/if_vrreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_vrreg.h,v 1.22 2005/06/10 16:49:23 brooks Exp $
  */
 
 /*
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 205e007efb61..90a49a1d0718 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_wb.c,v 1.79.2.4 2005/10/09 04:11:20 delphij Exp $");
 
 /*
  * Winbond fast ethernet PCI NIC driver
diff --git a/sys/pci/if_wbreg.h b/sys/pci/if_wbreg.h
index 95ecbefc1c8e..965844ced3f9 100644
--- a/sys/pci/if_wbreg.h
+++ b/sys/pci/if_wbreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_wbreg.h,v 1.12.2.1 2005/09/21 21:06:39 jhb Exp $
  */
 
 /*
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 7ecbfa6de54f..c1c32bd2e6fb 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.190.2.6 2005/10/09 04:11:20 delphij Exp $");
 
 /*
  * 3Com 3c90x Etherlink XL PCI NIC driver
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index f999b71fa74c..7dab376a42b6 100644
--- a/sys/pci/if_xlreg.h
+++ b/sys/pci/if_xlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_xlreg.h,v 1.55.2.1 2005/08/26 14:46:22 jhb Exp $
  */
 
 #define XL_EE_READ	0x0080	/* read, 5 bit address */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 1e454bb8413c..1c50fea52780 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/intpm.c,v 1.33 2005/05/29 04:42:29 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/intpmreg.h b/sys/pci/intpmreg.h
index 73816e7748d5..7fd49024eb88 100644
--- a/sys/pci/intpmreg.h
+++ b/sys/pci/intpmreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/intpmreg.h,v 1.2 1999/08/28 00:51:01 peter Exp $
  */
 
 /*Register Difinition for Intel Chipset with ACPI Support*/
diff --git a/sys/pci/locate.pl b/sys/pci/locate.pl
index 89688e1c6af2..dfd8e54f93bc 100755
--- a/sys/pci/locate.pl
+++ b/sys/pci/locate.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $FreeBSD$
+# $FreeBSD: src/sys/pci/locate.pl,v 1.4 2000/06/27 22:41:12 alfred Exp $
 
 use strict;
 
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 1520c10aff1d..ded490a2ad2a 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -40,7 +40,7 @@
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/ncr.c,v 1.188 2005/02/25 03:43:43 imp Exp $");
 
 
 #define NCR_DATE "pl30 98/1/1"
diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h
index 34f1618f8d49..fede60ac6f5c 100644
--- a/sys/pci/ncrreg.h
+++ b/sys/pci/ncrreg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** $FreeBSD$
+** $FreeBSD: src/sys/pci/ncrreg.h,v 1.15 2005/01/07 05:01:24 scottl Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
diff --git a/sys/pci/ti_fw.h b/sys/pci/ti_fw.h
index 89f5c9f9dae7..e06ef85370dd 100644
--- a/sys/pci/ti_fw.h
+++ b/sys/pci/ti_fw.h
@@ -2,7 +2,7 @@
  * Firmware for Alteon Tigon 1 chip.
  * Generated by genfw.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/ti_fw.h,v 1.10 2002/06/26 03:34:52 ken Exp $
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x4;
diff --git a/sys/pci/ti_fw2.h b/sys/pci/ti_fw2.h
index e54c920531e5..6d46ed297dc3 100644
--- a/sys/pci/ti_fw2.h
+++ b/sys/pci/ti_fw2.h
@@ -2,7 +2,7 @@
  * Generated by Ken's special genfw.c
  * Built on Wed Aug  2 17:21:09 MDT 2000 by ken@roadwarrior.plutotech.com
  * OS: FreeBSD 5.0-CURRENT
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/ti_fw2.h,v 1.11 2002/06/26 03:34:52 ken Exp $
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x4;
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index 685eccd468f4..e9c7dd055759 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/viapm.c,v 1.10 2005/05/29 04:42:29 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/xmaciireg.h b/sys/pci/xmaciireg.h
index 38cd8cbbfb34..d19df20023c3 100644
--- a/sys/pci/xmaciireg.h
+++ b/sys/pci/xmaciireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/xmaciireg.h,v 1.4 2005/01/07 02:29:18 imp Exp $
  */
 
 /*
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 0ca567f8853c..eba1360df8b0 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/xrpu.c,v 1.41 2005/02/24 21:32:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/yukonreg.h b/sys/pci/yukonreg.h
index 51d9f3a3a0f9..635c84987200 100644
--- a/sys/pci/yukonreg.h
+++ b/sys/pci/yukonreg.h
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/yukonreg.h,v 1.2 2005/01/07 02:29:18 imp Exp $
  */
 
 /* General Purpose Status Register (GPSR) */
diff --git a/sys/posix4/_semaphore.h b/sys/posix4/_semaphore.h
index a7bd5d836be7..b3f280ef18f1 100644
--- a/sys/posix4/_semaphore.h
+++ b/sys/posix4/_semaphore.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/posix4/_semaphore.h,v 1.4 2005/01/07 02:29:19 imp Exp $
  */
 #ifndef __SEMAPHORE_H_
 #define __SEMAPHORE_H_
diff --git a/sys/posix4/ksched.c b/sys/posix4/ksched.c
index a266c575df52..40ce5de23863 100644
--- a/sys/posix4/ksched.c
+++ b/sys/posix4/ksched.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/posix4/ksched.c,v 1.26 2005/01/07 02:29:19 imp Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/posix4/ksem.h b/sys/posix4/ksem.h
index 71979da328bb..a110fe3302c2 100644
--- a/sys/posix4/ksem.h
+++ b/sys/posix4/ksem.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/posix4/ksem.h,v 1.2 2005/05/04 10:39:14 rwatson Exp $
  */
 
 #ifndef _POSIX4_KSEM_H_
diff --git a/sys/posix4/mqueue.h b/sys/posix4/mqueue.h
index 8fb98fbed9ed..f04c72aaa960 100644
--- a/sys/posix4/mqueue.h
+++ b/sys/posix4/mqueue.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/posix4/mqueue.h,v 1.6 2002/09/20 17:54:34 mike Exp $
  */
 
 /* mqueue.h: POSIX 1003.1b Message Queues */
diff --git a/sys/posix4/p1003_1b.c b/sys/posix4/p1003_1b.c
index 7f366f1483cc..939a5252ca4d 100644
--- a/sys/posix4/p1003_1b.c
+++ b/sys/posix4/p1003_1b.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/posix4/p1003_1b.c,v 1.24 2005/03/31 22:54:48 jhb Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/posix4/posix4.h b/sys/posix4/posix4.h
index b17e9270e675..ae5077a84d28 100644
--- a/sys/posix4/posix4.h
+++ b/sys/posix4/posix4.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/posix4/posix4.h,v 1.13 2003/02/19 05:47:42 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/posix4/posix4_mib.c b/sys/posix4/posix4_mib.c
index 19092164a9ec..6e16ff491cf4 100644
--- a/sys/posix4/posix4_mib.c
+++ b/sys/posix4/posix4_mib.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/posix4/posix4_mib.c,v 1.9 2004/12/01 23:16:37 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/posix4/sched.h b/sys/posix4/sched.h
index 92fad6da914d..0079d9ac21c3 100644
--- a/sys/posix4/sched.h
+++ b/sys/posix4/sched.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/posix4/sched.h,v 1.7 2002/10/03 06:27:50 mike Exp $
  */
 
 /* sched.h: POSIX 1003.1b Process Scheduling header */
diff --git a/sys/posix4/semaphore.h b/sys/posix4/semaphore.h
index 180625221f2e..b2daf3459ee1 100644
--- a/sys/posix4/semaphore.h
+++ b/sys/posix4/semaphore.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/posix4/semaphore.h,v 1.11 2004/02/03 22:27:03 deischen Exp $
  */
 
 /* semaphore.h: POSIX 1003.1b semaphores */
diff --git a/sys/powerpc/compile/.cvsignore b/sys/powerpc/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/powerpc/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/powerpc/conf/.cvsignore b/sys/powerpc/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/powerpc/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 10efafcd72ab..97d51ec6ea8d 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.48.2.2 2005/09/22 12:36:39 kensmith Exp $
 
 machine		powerpc
 cpu		OEA
diff --git a/sys/powerpc/conf/GENERIC.hints b/sys/powerpc/conf/GENERIC.hints
index e8c0da7a1d7e..907a3bc53de6 100644
--- a/sys/powerpc/conf/GENERIC.hints
+++ b/sys/powerpc/conf/GENERIC.hints
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/GENERIC.hints,v 1.1 2004/07/19 02:08:22 grehan Exp $
diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h
index 5561ce734127..14f73643dcc9 100644
--- a/sys/powerpc/include/_bus.h
+++ b/sys/powerpc/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_bus.h,v 1.1 2005/04/18 21:45:34 imp Exp $
  */
 
 #ifndef POWERPC_INCLUDE__BUS_H
diff --git a/sys/powerpc/include/_inttypes.h b/sys/powerpc/include/_inttypes.h
index 7da589d8a771..4f957ef7f2b1 100644
--- a/sys/powerpc/include/_inttypes.h
+++ b/sys/powerpc/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index 260475d0273b..08e592da71a2 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_limits.h,v 1.28 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h
index 0d8aedfff5d6..4a62d2430315 100644
--- a/sys/powerpc/include/_stdint.h
+++ b/sys/powerpc/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index c6babcf4a108..065883511ce4 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_types.h,v 1.7 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/powerpc/include/asm.h b/sys/powerpc/include/asm.h
index 34d8ad65e8d7..a84bb7fe6cfa 100644
--- a/sys/powerpc/include/asm.h
+++ b/sys/powerpc/include/asm.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: asm.h,v 1.6.18.1 2000/07/25 08:37:14 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/asm.h,v 1.10 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h
index 9faa5bc94611..534f589bd683 100644
--- a/sys/powerpc/include/atomic.h
+++ b/sys/powerpc/include/atomic.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/atomic.h,v 1.11.2.3 2005/10/06 18:12:06 jhb Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/powerpc/include/bat.h b/sys/powerpc/include/bat.h
index 27c6d5a895f6..969af237b9be 100644
--- a/sys/powerpc/include/bat.h
+++ b/sys/powerpc/include/bat.h
@@ -65,7 +65,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: bat.h,v 1.2 1999/12/18 01:36:06 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/bat.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_BAT_H_
diff --git a/sys/powerpc/include/bootinfo.h b/sys/powerpc/include/bootinfo.h
index aa967ac59689..3eaa2afe3d19 100644
--- a/sys/powerpc/include/bootinfo.h
+++ b/sys/powerpc/include/bootinfo.h
@@ -24,7 +24,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/bootinfo.h,v 1.9 2005/01/07 02:29:19 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h
index c7bbf16b7745..670ff1457889 100644
--- a/sys/powerpc/include/bus.h
+++ b/sys/powerpc/include/bus.h
@@ -66,7 +66,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: bus.h,v 1.9.4.1 2000/06/30 16:27:30 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/bus.h,v 1.17 2005/04/18 21:45:34 imp Exp $
  */
 
 #ifndef	_MACPPC_BUS_H_
diff --git a/sys/powerpc/include/bus_dma.h b/sys/powerpc/include/bus_dma.h
index d10a0557bc6b..522550eabd3f 100644
--- a/sys/powerpc/include/bus_dma.h
+++ b/sys/powerpc/include/bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/include/bus_dma.h,v 1.1 2005/03/14 16:46:28 scottl Exp $ */
 
 #ifndef _POWERPC_BUS_DMA_H_
 #define _POWERPC_BUS_DMA_H_
diff --git a/sys/powerpc/include/clock.h b/sys/powerpc/include/clock.h
index fb4525927a99..233b20a715a2 100644
--- a/sys/powerpc/include/clock.h
+++ b/sys/powerpc/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/clock.h,v 1.10 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h
index 73a882b402b0..7dd4254522a7 100644
--- a/sys/powerpc/include/cpu.h
+++ b/sys/powerpc/include/cpu.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: cpu.h,v 1.11 2000/05/26 21:19:53 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/cpu.h,v 1.18 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
index f02ff3bd55a3..4b09d31f3abd 100644
--- a/sys/powerpc/include/cpufunc.h
+++ b/sys/powerpc/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/cpufunc.h,v 1.21 2004/08/07 00:20:00 grehan Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/powerpc/include/db_machdep.h b/sys/powerpc/include/db_machdep.h
index 8873d43ac8bd..16a47b40f2c7 100644
--- a/sys/powerpc/include/db_machdep.h
+++ b/sys/powerpc/include/db_machdep.h
@@ -25,7 +25,7 @@
  *
  *	$OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $
  *	$NetBSD: db_machdep.h,v 1.4.22.1 2000/08/05 11:10:43 wiz Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/db_machdep.h,v 1.8 2005/01/07 02:29:19 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/elf.h b/sys/powerpc/include/elf.h
index 4c644725a95d..3a3dd0c6bc6c 100644
--- a/sys/powerpc/include/elf.h
+++ b/sys/powerpc/include/elf.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.7 2004/11/02 09:47:01 ssouhlal Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h
index bc96b9e4fc81..aa42f3cc1253 100644
--- a/sys/powerpc/include/endian.h
+++ b/sys/powerpc/include/endian.h
@@ -28,7 +28,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  *	$NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/endian.h,v 1.14 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/powerpc/include/exec.h b/sys/powerpc/include/exec.h
index f5a2bb26f61f..9252dbb4d20e 100644
--- a/sys/powerpc/include/exec.h
+++ b/sys/powerpc/include/exec.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/exec.h,v 1.3 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/powerpc/include/float.h b/sys/powerpc/include/float.h
index 5ac715a04180..8e6b1dc4b64e 100644
--- a/sys/powerpc/include/float.h
+++ b/sys/powerpc/include/float.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
  *	from: FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/float.h,v 1.8 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/powerpc/include/floatingpoint.h b/sys/powerpc/include/floatingpoint.h
index e62e47415a74..dbc365dabc01 100644
--- a/sys/powerpc/include/floatingpoint.h
+++ b/sys/powerpc/include/floatingpoint.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/floatingpoint.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h
index d712b9458903..fce64aa67c72 100644
--- a/sys/powerpc/include/fpu.h
+++ b/sys/powerpc/include/fpu.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: fpu.h,v 1.2 1999/12/07 15:14:56 danw Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/fpu.h,v 1.3 2003/02/05 11:37:59 benno Exp $
  */
 
 #ifndef	_MACHINE_FPU_H_
diff --git a/sys/powerpc/include/frame.h b/sys/powerpc/include/frame.h
index dcb4f7a102d3..e99379a16431 100644
--- a/sys/powerpc/include/frame.h
+++ b/sys/powerpc/include/frame.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: frame.h,v 1.2 1999/01/10 10:13:15 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/frame.h,v 1.10 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_FRAME_H_
diff --git a/sys/powerpc/include/hid.h b/sys/powerpc/include/hid.h
index 3739839af252..ca7ccdb3501b 100644
--- a/sys/powerpc/include/hid.h
+++ b/sys/powerpc/include/hid.h
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: hid.h,v 1.2 2001/08/22 21:05:25 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.3 2005/02/04 01:14:38 grehan Exp $
  */
 
 #ifndef _POWERPC_HID_H_
diff --git a/sys/powerpc/include/ieee.h b/sys/powerpc/include/ieee.h
index 793012de4435..e5879a5fa0ad 100644
--- a/sys/powerpc/include/ieee.h
+++ b/sys/powerpc/include/ieee.h
@@ -37,7 +37,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ieee.h,v 1.3 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_IEEE_H_
diff --git a/sys/powerpc/include/ieeefp.h b/sys/powerpc/include/ieeefp.h
index 820fffe1cd9c..c9f7d65edb2b 100644
--- a/sys/powerpc/include/ieeefp.h
+++ b/sys/powerpc/include/ieeefp.h
@@ -2,7 +2,7 @@
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  * $NetBSD: ieeefp.h,v 1.2 1999/07/07 01:52:26 danw Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ieeefp.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/powerpc/include/in_cksum.h b/sys/powerpc/include/in_cksum.h
index 09920062a0ae..09a7fa9c6c88 100644
--- a/sys/powerpc/include/in_cksum.h
+++ b/sys/powerpc/include/in_cksum.h
@@ -29,7 +29,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/in_cksum.h,v 1.3 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/powerpc/include/interruptvar.h b/sys/powerpc/include/interruptvar.h
index 3a8a4824e712..758e97db0947 100644
--- a/sys/powerpc/include/interruptvar.h
+++ b/sys/powerpc/include/interruptvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/interruptvar.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_INTERRUPTVAR_H_
diff --git a/sys/powerpc/include/intr.h b/sys/powerpc/include/intr.h
index 8bc417c6a9bd..165b1b308ae1 100644
--- a/sys/powerpc/include/intr.h
+++ b/sys/powerpc/include/intr.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: intr.h,v 1.6 2000/02/11 13:15:44 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/intr.h,v 1.4 2002/03/20 23:17:49 alfred Exp $
  */
 
 #ifndef _MACPPC_INTR_H_
diff --git a/sys/powerpc/include/intr_machdep.h b/sys/powerpc/include/intr_machdep.h
index f4024d3c9b8b..d76870c59ae8 100644
--- a/sys/powerpc/include/intr_machdep.h
+++ b/sys/powerpc/include/intr_machdep.h
@@ -22,7 +22,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/sys/powerpc/include/intr_machdep.h,v 1.5 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_INTR_MACHDEP_H_
diff --git a/sys/powerpc/include/ipl.h b/sys/powerpc/include/ipl.h
index 15ec74ce8f80..05b1faa71f0b 100644
--- a/sys/powerpc/include/ipl.h
+++ b/sys/powerpc/include/ipl.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/include/ipl.h,v 1.1 2001/06/16 07:14:04 benno Exp $ */
 
 /*
  * An empty file now,
diff --git a/sys/powerpc/include/kdb.h b/sys/powerpc/include/kdb.h
index 2cfc06349d12..0d066d51b847 100644
--- a/sys/powerpc/include/kdb.h
+++ b/sys/powerpc/include/kdb.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/sys/powerpc/include/kdb.h,v 1.3 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index 35eea1f619de..c270280abcbf 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/limits.h,v 1.28 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index 9e98647f395d..2afe33079f8a 100644
--- a/sys/powerpc/include/md_var.h
+++ b/sys/powerpc/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/md_var.h,v 1.26 2003/08/16 16:57:57 marcel Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/powerpc/include/memdev.h b/sys/powerpc/include/memdev.h
index 69072d9889ca..ee3e4cf5dfb9 100644
--- a/sys/powerpc/include/memdev.h
+++ b/sys/powerpc/include/memdev.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/sys/powerpc/include/memdev.h,v 1.1 2004/08/16 13:07:40 ssouhlal Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/powerpc/include/metadata.h b/sys/powerpc/include/metadata.h
index 124d46b1b551..b0abfe670311 100644
--- a/sys/powerpc/include/metadata.h
+++ b/sys/powerpc/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/metadata.h,v 1.3 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/powerpc/include/mutex.h b/sys/powerpc/include/mutex.h
index 0b7fe2633e26..5507ef686e03 100644
--- a/sys/powerpc/include/mutex.h
+++ b/sys/powerpc/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/mutex.h,v 1.28 2001/12/18 00:27:17 jhb Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/powerpc/include/nexusvar.h b/sys/powerpc/include/nexusvar.h
index df8a0f69b92c..b6d5bde9e9e2 100644
--- a/sys/powerpc/include/nexusvar.h
+++ b/sys/powerpc/include/nexusvar.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/nexusvar.h,v 1.3 2004/01/13 11:20:52 grehan Exp $
  */
 
 #ifndef _MACHINE_NEXUSVAR_H_
diff --git a/sys/powerpc/include/ofw_machdep.h b/sys/powerpc/include/ofw_machdep.h
index 7f3aa0ea1638..f3007f5ec5ce 100644
--- a/sys/powerpc/include/ofw_machdep.h
+++ b/sys/powerpc/include/ofw_machdep.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ofw_machdep.h,v 1.2 2004/08/16 13:07:40 ssouhlal Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_
diff --git a/sys/powerpc/include/openpicreg.h b/sys/powerpc/include/openpicreg.h
index 2fa393d20fd2..af2277584868 100644
--- a/sys/powerpc/include/openpicreg.h
+++ b/sys/powerpc/include/openpicreg.h
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from NetBSD: openpicreg.h,v 1.3 2001/08/30 03:08:52 briggs Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/openpicreg.h,v 1.3 2002/07/09 11:26:09 benno Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h
index 850580eb254b..d25980ff1036 100644
--- a/sys/powerpc/include/openpicvar.h
+++ b/sys/powerpc/include/openpicvar.h
@@ -22,7 +22,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/sys/powerpc/include/openpicvar.h,v 1.4 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_POWERPC_OPENPICVAR_H_
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index 15d8e7aed4aa..f7288c4dbc1d 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/param.h,v 1.15 2004/11/20 02:29:50 das Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h
index b608f14ef82e..6156388fb31c 100644
--- a/sys/powerpc/include/pcb.h
+++ b/sys/powerpc/include/pcb.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pcb.h,v 1.4 2000/06/04 11:57:17 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pcb.h,v 1.8 2004/07/12 22:17:20 grehan Exp $
  */
 
 #ifndef _MACHINE_PCB_H_
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index 406394d5aa42..e2800b7558d6 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pcpu.h,v 1.22 2004/07/12 22:18:02 grehan Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/powerpc/include/pio.h b/sys/powerpc/include/pio.h
index bf2cb5b67fcc..44b5e03b5183 100644
--- a/sys/powerpc/include/pio.h
+++ b/sys/powerpc/include/pio.h
@@ -30,7 +30,7 @@
  *
  *	$NetBSD: pio.h,v 1.1 1998/05/15 10:15:54 tsubai Exp $
  *	$OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pio.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_PIO_H_
diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h
index e28042caf67f..a36fd3041ce9 100644
--- a/sys/powerpc/include/pmap.h
+++ b/sys/powerpc/include/pmap.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pmap.h,v 1.17 2000/03/30 16:18:24 jdolecek Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.17 2004/08/26 04:15:36 alc Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
diff --git a/sys/powerpc/include/pmc_mdep.h b/sys/powerpc/include/pmc_mdep.h
index d5417c3cedb6..836f48608c68 100644
--- a/sys/powerpc/include/pmc_mdep.h
+++ b/sys/powerpc/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/powerpc/include/powerpc.h b/sys/powerpc/include/powerpc.h
index 3de078899dd3..760bd5d823e5 100644
--- a/sys/powerpc/include/powerpc.h
+++ b/sys/powerpc/include/powerpc.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: powerpc.h,v 1.3 2000/06/01 00:49:59 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/powerpc.h,v 1.6 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_POWERPC_H_
diff --git a/sys/powerpc/include/proc.h b/sys/powerpc/include/proc.h
index c958fb76f0fb..d6a5110acd3e 100644
--- a/sys/powerpc/include/proc.h
+++ b/sys/powerpc/include/proc.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: proc.h,v 1.2 1997/04/16 22:57:48 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/proc.h,v 1.7 2005/04/04 21:53:55 jhb Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/powerpc/include/profile.h b/sys/powerpc/include/profile.h
index a592bcde2457..8ea66659b6d2 100644
--- a/sys/powerpc/include/profile.h
+++ b/sys/powerpc/include/profile.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/profile.h,v 1.5 2005/06/11 10:59:02 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/powerpc/include/psl.h b/sys/powerpc/include/psl.h
index a7ab6f1354b3..208f9383d397 100644
--- a/sys/powerpc/include/psl.h
+++ b/sys/powerpc/include/psl.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: psl.h,v 1.5 2000/11/19 19:52:37 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/psl.h,v 1.4 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_PSL_H_
diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h
index 3e9ac4fd2528..dee3e3ad52d7 100644
--- a/sys/powerpc/include/pte.h
+++ b/sys/powerpc/include/pte.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pte.h,v 1.2 1998/08/31 14:43:40 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pte.h,v 1.4 2002/05/09 14:09:16 benno Exp $
  */
 
 #ifndef	_MACHINE_PTE_H_
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index eef24f829b48..eda14e76b566 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ptrace.h,v 1.13 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h
index 640365546e7c..e48e9953dc76 100644
--- a/sys/powerpc/include/reg.h
+++ b/sys/powerpc/include/reg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: reg.h,v 1.4 2000/06/04 09:30:44 tsubai Exp $	*/
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/powerpc/include/reg.h,v 1.6 2004/07/29 13:39:27 ssouhlal Exp $	*/
 
 #ifndef _POWERPC_REG_H_
 #define	_POWERPC_REG_H_
diff --git a/sys/powerpc/include/reloc.h b/sys/powerpc/include/reloc.h
index 6e5053602772..7f04ae0f3515 100644
--- a/sys/powerpc/include/reloc.h
+++ b/sys/powerpc/include/reloc.h
@@ -29,5 +29,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/reloc.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
diff --git a/sys/powerpc/include/resource.h b/sys/powerpc/include/resource.h
index edde5eb29908..f01480a95884 100644
--- a/sys/powerpc/include/resource.h
+++ b/sys/powerpc/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/include/resource.h,v 1.4 2005/01/07 02:29:19 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/powerpc/include/runq.h b/sys/powerpc/include/runq.h
index e906fa192c6c..bff28141e758 100644
--- a/sys/powerpc/include/runq.h
+++ b/sys/powerpc/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/runq.h,v 1.3 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/powerpc/include/sc_machdep.h b/sys/powerpc/include/sc_machdep.h
index 4f3526fabcf0..9dbef5aeb48c 100644
--- a/sys/powerpc/include/sc_machdep.h
+++ b/sys/powerpc/include/sc_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/sc_machdep.h,v 1.1 2004/01/21 05:16:23 grehan Exp $
  */
 
 #ifndef	_MACHINE_SC_MACHDEP_H_
diff --git a/sys/powerpc/include/setjmp.h b/sys/powerpc/include/setjmp.h
index e453044dbf3b..1d066be28866 100644
--- a/sys/powerpc/include/setjmp.h
+++ b/sys/powerpc/include/setjmp.h
@@ -1,6 +1,6 @@
 /*-
  *	$NetBSD: setjmp.h,v 1.3 1998/09/16 23:51:27 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/setjmp.h,v 1.4 2002/10/05 05:47:56 mike Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/powerpc/include/sf_buf.h b/sys/powerpc/include/sf_buf.h
index 6997419c6423..19157377320f 100644
--- a/sys/powerpc/include/sf_buf.h
+++ b/sys/powerpc/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/sf_buf.h,v 1.2 2004/04/18 08:10:04 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/powerpc/include/sigframe.h b/sys/powerpc/include/sigframe.h
index d0e886e9bc90..f0f1dfd56502 100644
--- a/sys/powerpc/include/sigframe.h
+++ b/sys/powerpc/include/sigframe.h
@@ -25,7 +25,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/sys/powerpc/include/sigframe.h,v 1.4 2002/09/19 04:46:36 grehan Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/powerpc/include/signal.h b/sys/powerpc/include/signal.h
index b1f32e65c2e7..1bb5630e2289 100644
--- a/sys/powerpc/include/signal.h
+++ b/sys/powerpc/include/signal.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: signal.h,v 1.4 1998/09/14 02:48:34 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/signal.h,v 1.5 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/powerpc/include/smp.h b/sys/powerpc/include/smp.h
index 15ec74ce8f80..388792b65417 100644
--- a/sys/powerpc/include/smp.h
+++ b/sys/powerpc/include/smp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/include/smp.h,v 1.1 2001/06/16 07:14:04 benno Exp $ */
 
 /*
  * An empty file now,
diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h
index f3919f1a550f..aba401687b78 100644
--- a/sys/powerpc/include/spr.h
+++ b/sys/powerpc/include/spr.h
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: spr.h,v 1.25 2002/08/14 15:38:40 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.6 2005/02/04 01:17:04 grehan Exp $
  */
 #ifndef _POWERPC_SPR_H_
 #define	_POWERPC_SPR_H_
diff --git a/sys/powerpc/include/sr.h b/sys/powerpc/include/sr.h
index 2ef7b3585076..09d919eb9432 100644
--- a/sys/powerpc/include/sr.h
+++ b/sys/powerpc/include/sr.h
@@ -22,7 +22,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/sys/powerpc/include/sr.h,v 1.5 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_SR_H_
diff --git a/sys/powerpc/include/stdarg.h b/sys/powerpc/include/stdarg.h
index d0af5bb3324f..850a7e1521ba 100644
--- a/sys/powerpc/include/stdarg.h
+++ b/sys/powerpc/include/stdarg.h
@@ -25,7 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: stdarg.h,v 1.5 2000/02/27 17:50:21 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/stdarg.h,v 1.9 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/powerpc/include/trap.h b/sys/powerpc/include/trap.h
index 6cb1c1a70509..44d001fe92ea 100644
--- a/sys/powerpc/include/trap.h
+++ b/sys/powerpc/include/trap.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/powerpc/include/trap.h,v 1.4 2005/01/07 02:29:19 imp Exp $ 
  */
 
 #ifndef	_POWERPC_TRAP_H_
diff --git a/sys/powerpc/include/ucontext.h b/sys/powerpc/include/ucontext.h
index 58b6a80bd2ac..b3f227c26945 100644
--- a/sys/powerpc/include/ucontext.h
+++ b/sys/powerpc/include/ucontext.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: signal.h,v 1.4 1998/09/14 02:48:34 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ucontext.h,v 1.5 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_UCONTEXT_H_
diff --git a/sys/powerpc/include/varargs.h b/sys/powerpc/include/varargs.h
index fed04c9463ed..6fc17e0a5f21 100644
--- a/sys/powerpc/include/varargs.h
+++ b/sys/powerpc/include/varargs.h
@@ -25,7 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  *	$NetBSD: varargs.h,v 1.5 2000/02/27 17:50:22 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/varargs.h,v 1.6 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h
index 6bcea668bf90..61f14e70f436 100644
--- a/sys/powerpc/include/vmparam.h
+++ b/sys/powerpc/include/vmparam.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: vmparam.h,v 1.11 2000/02/11 19:25:16 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/vmparam.h,v 1.4 2004/03/02 06:49:21 grehan Exp $
  */
 
 #ifndef _MACHINE_VMPARAM_H_
diff --git a/sys/powerpc/ofw/ofw_pci.c b/sys/powerpc/ofw/ofw_pci.c
index ca4b36eb0456..fe45ea52e888 100644
--- a/sys/powerpc/ofw/ofw_pci.c
+++ b/sys/powerpc/ofw/ofw_pci.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from NetBSD: pci_machdep.c,v 1.18 2001/07/22 11:29:48 wiz Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/ofw/ofw_pci.c,v 1.5 2005/01/07 02:29:20 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/ofw/ofw_pci.h b/sys/powerpc/ofw/ofw_pci.h
index 8d78f9189e80..e34ed2b09605 100644
--- a/sys/powerpc/ofw/ofw_pci.h
+++ b/sys/powerpc/ofw/ofw_pci.h
@@ -22,7 +22,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/sys/powerpc/ofw/ofw_pci.h,v 1.2 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef	_POWERPC_OFW_PCI_H_
diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c
index 6307d050a671..bf1453346455 100644
--- a/sys/powerpc/ofw/ofw_pcib_pci.c
+++ b/sys/powerpc/ofw/ofw_pcib_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/ofw/ofw_pcib_pci.c,v 1.4 2004/08/16 15:45:26 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c
index 1296ea6be578..d8ed43fc0199 100644
--- a/sys/powerpc/ofw/ofw_syscons.c
+++ b/sys/powerpc/ofw/ofw_syscons.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/ofw/ofw_syscons.c,v 1.7.2.2 2005/10/05 21:48:03 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/ofw/ofw_syscons.h b/sys/powerpc/ofw/ofw_syscons.h
index af33c52d6d81..f3a2e4d98524 100644
--- a/sys/powerpc/ofw/ofw_syscons.h
+++ b/sys/powerpc/ofw/ofw_syscons.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/ofw/ofw_syscons.h,v 1.4 2005/02/25 02:29:01 grehan Exp $
  */
 
 #ifndef _OFW_SYSCONS_H_
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c
index 141f56ec7071..d96df10cce5f 100644
--- a/sys/powerpc/powermac/ata_kauai.c
+++ b/sys/powerpc/powermac/ata_kauai.c
@@ -26,7 +26,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.13 2005/05/14 02:11:45 grehan Exp $");
 
 /*
  * Mac 'Kauai' PCI ATA controller
diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c
index f582a5ceef88..35584cf1bccb 100644
--- a/sys/powerpc/powermac/ata_macio.c
+++ b/sys/powerpc/powermac/ata_macio.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.19 2005/05/01 13:11:29 grehan Exp $
  */
 
 /*
diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c
index ee6809d0aaa1..26424b907927 100644
--- a/sys/powerpc/powermac/grackle.c
+++ b/sys/powerpc/powermac/grackle.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/grackle.c,v 1.7 2005/01/07 02:29:20 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powermac/gracklevar.h b/sys/powerpc/powermac/gracklevar.h
index bb5b150e074a..e066266c110d 100644
--- a/sys/powerpc/powermac/gracklevar.h
+++ b/sys/powerpc/powermac/gracklevar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/gracklevar.h,v 1.2 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef	_POWERPC_POWERMAC_GRACKLEVAR_H_
diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c
index 2d39ef406300..dbf55e78d463 100644
--- a/sys/powerpc/powermac/hrowpic.c
+++ b/sys/powerpc/powermac/hrowpic.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/hrowpic.c,v 1.10 2005/01/07 02:29:20 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/powermac/hrowpicvar.h b/sys/powerpc/powermac/hrowpicvar.h
index 6a536ccb4d44..9950ee841ca5 100644
--- a/sys/powerpc/powermac/hrowpicvar.h
+++ b/sys/powerpc/powermac/hrowpicvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/hrowpicvar.h,v 1.2 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef  _POWERPC_POWERMAC_HROWPICVAR_H_
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index a16903ce0966..461029d68830 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/macio.c,v 1.18 2005/01/07 02:29:20 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/powermac/maciovar.h b/sys/powerpc/powermac/maciovar.h
index 1f1d0de39f74..1df001a17334 100644
--- a/sys/powerpc/powermac/maciovar.h
+++ b/sys/powerpc/powermac/maciovar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/maciovar.h,v 1.6 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef _MACIO_MACIOVAR_H_
diff --git a/sys/powerpc/powermac/openpic_macio.c b/sys/powerpc/powermac/openpic_macio.c
index c04c3731ff9f..5ae52fe716e7 100644
--- a/sys/powerpc/powermac/openpic_macio.c
+++ b/sys/powerpc/powermac/openpic_macio.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powermac/openpic_macio.c,v 1.9 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powermac/pswitch.c b/sys/powerpc/powermac/pswitch.c
index 9dfb34b2f7f1..425054dc680c 100644
--- a/sys/powerpc/powermac/pswitch.c
+++ b/sys/powerpc/powermac/pswitch.c
@@ -22,7 +22,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/sys/powerpc/powermac/pswitch.c,v 1.4 2005/01/07 02:29:20 imp Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c
index 0464593f3da0..71b9a7393cd8 100644
--- a/sys/powerpc/powermac/uninorth.c
+++ b/sys/powerpc/powermac/uninorth.c
@@ -22,7 +22,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/sys/powerpc/powermac/uninorth.c,v 1.13 2005/05/29 08:51:21 grehan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h
index d2ee8d793e3c..15139e393215 100644
--- a/sys/powerpc/powermac/uninorthvar.h
+++ b/sys/powerpc/powermac/uninorthvar.h
@@ -22,7 +22,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/sys/powerpc/powermac/uninorthvar.h,v 1.4 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef	_POWERPC_POWERMAC_UNINORTHVAR_H_
diff --git a/sys/powerpc/powerpc/atomic.S b/sys/powerpc/powerpc/atomic.S
index c6f669a6670b..c13f5a5252df 100644
--- a/sys/powerpc/powerpc/atomic.S
+++ b/sys/powerpc/powerpc/atomic.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/atomic.S,v 1.3 2005/01/07 02:29:20 imp Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index aa21ddcb0f4b..992353b7b4b5 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/autoconf.c,v 1.15 2005/05/29 23:44:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/bcopy.c b/sys/powerpc/powerpc/bcopy.c
index af9e3bfd82db..9b9e486e56d1 100644
--- a/sys/powerpc/powerpc/bcopy.c
+++ b/sys/powerpc/powerpc/bcopy.c
@@ -39,7 +39,7 @@ static char *rcsid = "$NetBSD: bcopy.c,v 1.2 1997/04/16 22:09:41 thorpej Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/bcopy.c,v 1.5 2004/04/07 04:59:59 imp Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 2fe0a6d6d9d3..fe4ab759c3eb 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/busdma_machdep.c,v 1.25 2005/07/09 06:53:52 grehan Exp $");
 
 /*
  * MacPPC bus dma support routines
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index 8d738ec14d09..4a60e08b1786 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.20 2005/02/04 01:41:38 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/copyinout.c b/sys/powerpc/powerpc/copyinout.c
index 7fa91ceaaf11..762d2b77c43e 100644
--- a/sys/powerpc/powerpc/copyinout.c
+++ b/sys/powerpc/powerpc/copyinout.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.11 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/copystr.c b/sys/powerpc/powerpc/copystr.c
index 1a159d87185b..d66bd81fc1c0 100644
--- a/sys/powerpc/powerpc/copystr.c
+++ b/sys/powerpc/powerpc/copystr.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/copystr.c,v 1.2 2003/04/03 21:36:33 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c
index b409a3c5f2c3..555e2f48c49c 100644
--- a/sys/powerpc/powerpc/cpu.c
+++ b/sys/powerpc/powerpc/cpu.c
@@ -55,7 +55,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.7 2005/02/04 01:59:48 grehan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/db_disasm.c b/sys/powerpc/powerpc/db_disasm.c
index 67f90d254401..e8dfd657409c 100644
--- a/sys/powerpc/powerpc/db_disasm.c
+++ b/sys/powerpc/powerpc/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_disasm.c,v 1.2 2002/10/04 01:19:18 grehan Exp $	*/
 /*	$NetBSD: db_disasm.c,v 1.12 2002/01/05 22:07:26 jhawk Exp $	*/
 /*	$OpenBSD: db_disasm.c,v 1.2 1996/12/28 06:21:48 rahnds Exp $	*/
 
diff --git a/sys/powerpc/powerpc/db_hwwatch.c b/sys/powerpc/powerpc/db_hwwatch.c
index d6db0b0f63bd..4e19f0fcf8f3 100644
--- a/sys/powerpc/powerpc/db_hwwatch.c
+++ b/sys/powerpc/powerpc/db_hwwatch.c
@@ -22,7 +22,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/sys/powerpc/powerpc/db_hwwatch.c,v 1.2 2005/01/07 02:29:20 imp Exp $
  */
 #include <sys/param.h>
 
diff --git a/sys/powerpc/powerpc/db_interface.c b/sys/powerpc/powerpc/db_interface.c
index 9ea90463e76e..a7b28579d935 100644
--- a/sys/powerpc/powerpc/db_interface.c
+++ b/sys/powerpc/powerpc/db_interface.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_interface.c,v 1.5 2004/07/27 07:04:58 grehan Exp $ */
 /*	$NetBSD: db_interface.c,v 1.20 2002/05/13 20:30:09 matt Exp $ */
 /*	$OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $	*/
 
diff --git a/sys/powerpc/powerpc/db_memrw.c b/sys/powerpc/powerpc/db_memrw.c
index e27bc67fafe5..dd0e78d823fd 100644
--- a/sys/powerpc/powerpc/db_memrw.c
+++ b/sys/powerpc/powerpc/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_memrw.c,v 1.4 2005/01/07 02:29:20 imp Exp $ */
 /*	$NetBSD: db_memrw.c,v 1.5 2001/12/27 10:25:41 dbj Exp $	*/
 /*	$OpenBSD: db_memrw.c,v 1.2 1996/12/28 06:21:52 rahnds Exp $	*/
 
diff --git a/sys/powerpc/powerpc/db_trace.c b/sys/powerpc/powerpc/db_trace.c
index a32625a2832f..7be290009c0c 100644
--- a/sys/powerpc/powerpc/db_trace.c
+++ b/sys/powerpc/powerpc/db_trace.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_trace.c,v 1.9 2005/01/07 02:29:20 imp Exp $ */
 /*	$NetBSD: db_trace.c,v 1.20 2002/05/13 20:30:09 matt Exp $	*/
 /*	$OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $	*/
 
diff --git a/sys/powerpc/powerpc/elf_machdep.c b/sys/powerpc/powerpc/elf_machdep.c
index 6063e7bc793c..acdc8f58960e 100644
--- a/sys/powerpc/powerpc/elf_machdep.c
+++ b/sys/powerpc/powerpc/elf_machdep.c
@@ -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/sys/powerpc/powerpc/elf_machdep.c,v 1.22 2004/08/11 02:35:05 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/extintr.c b/sys/powerpc/powerpc/extintr.c
index f24d866ee661..45bedb333ac4 100644
--- a/sys/powerpc/powerpc/extintr.c
+++ b/sys/powerpc/powerpc/extintr.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/extintr.c,v 1.9 2003/04/03 21:36:33 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c
index c4cc326da431..5aecb27900b6 100644
--- a/sys/powerpc/powerpc/fpu.c
+++ b/sys/powerpc/powerpc/fpu.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/fpu.c,v 1.7 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/powerpc/powerpc/fuswintr.c b/sys/powerpc/powerpc/fuswintr.c
index cb5abb7b9a18..b19a0feedabd 100644
--- a/sys/powerpc/powerpc/fuswintr.c
+++ b/sys/powerpc/powerpc/fuswintr.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/fuswintr.c,v 1.3 2003/04/03 21:36:33 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 4df090738897..a6da8070881b 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/genassym.c,v 1.55 2004/11/20 02:28:14 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/in_cksum.c b/sys/powerpc/powerpc/in_cksum.c
index a65ed7dddfbe..21ad7046a51c 100644
--- a/sys/powerpc/powerpc/in_cksum.c
+++ b/sys/powerpc/powerpc/in_cksum.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/in_cksum.c,v 1.3 2005/01/07 02:29:20 imp Exp $ */
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/interrupt.c b/sys/powerpc/powerpc/interrupt.c
index 08a43b719e14..e23defabfbc1 100644
--- a/sys/powerpc/powerpc/interrupt.c
+++ b/sys/powerpc/powerpc/interrupt.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/interrupt.c,v 1.4 2005/01/07 02:29:20 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index 0cde8c57738b..aa743c3a0f8b 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -57,7 +57,7 @@
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
  *	form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.6 2004/07/02 20:21:43 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/locore.S b/sys/powerpc/powerpc/locore.S
index f4a23791fe1b..5101c464c487 100644
--- a/sys/powerpc/powerpc/locore.S
+++ b/sys/powerpc/powerpc/locore.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/locore.S,v 1.21 2005/01/07 02:29:20 imp Exp $ */
 /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index a74cc27286e4..c70513e43960 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.89.2.1 2005/08/08 07:02:12 grehan Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c
index c7f3020551e1..82a43c388122 100644
--- a/sys/powerpc/powerpc/mem.c
+++ b/sys/powerpc/powerpc/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mem.c,v 1.1 2004/08/16 13:07:40 ssouhlal Exp $");
 
 /*
  * Memory special file
diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c
index edc744669f48..0b6e2df2994b 100644
--- a/sys/powerpc/powerpc/mp_machdep.c
+++ b/sys/powerpc/powerpc/mp_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/powerpc/powerpc/mp_machdep.c,v 1.12 2004/11/27 06:51:38 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c
index 277e58c3053e..3664368ff23f 100644
--- a/sys/powerpc/powerpc/nexus.c
+++ b/sys/powerpc/powerpc/nexus.c
@@ -52,7 +52,7 @@
  *
  * 	from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/nexus.c,v 1.12 2005/01/07 02:29:20 imp Exp $
  */
 #include "opt_psim.h"
 
diff --git a/sys/powerpc/powerpc/ofw_machdep.c b/sys/powerpc/powerpc/ofw_machdep.c
index b4c97a256948..348cff352cf7 100644
--- a/sys/powerpc/powerpc/ofw_machdep.c
+++ b/sys/powerpc/powerpc/ofw_machdep.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.13 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/powerpc/powerpc/ofwmagic.S b/sys/powerpc/powerpc/ofwmagic.S
index 55af6d254440..2b0ae8999b74 100644
--- a/sys/powerpc/powerpc/ofwmagic.S
+++ b/sys/powerpc/powerpc/ofwmagic.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/ofwmagic.S,v 1.3 2004/08/16 15:45:27 marius Exp $ */
 /* $NetBSD: ofwmagic.S,v 1.2 1997/10/09 08:38:18 jtc Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
index b1b79fdaf2b9..faacd906a7d6 100644
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -22,7 +22,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/sys/powerpc/powerpc/openpic.c,v 1.13 2005/01/07 02:29:20 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/pic_if.m b/sys/powerpc/powerpc/pic_if.m
index 0952c4eb420e..8065f4a5a51f 100644
--- a/sys/powerpc/powerpc/pic_if.m
+++ b/sys/powerpc/powerpc/pic_if.m
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 # from: src/sys/kern/bus_if.m,v 1.21 2002/04/21 11:16:10 markm Exp
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/powerpc/pic_if.m,v 1.2 2005/01/07 02:29:20 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c
index 018437de7630..efd22434d155 100644
--- a/sys/powerpc/powerpc/pmap.c
+++ b/sys/powerpc/powerpc/pmap.c
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.99.2.1 2005/09/13 05:11:37 grehan Exp $");
 
 /*
  * Manages physical address maps.
diff --git a/sys/powerpc/powerpc/sc_machdep.c b/sys/powerpc/powerpc/sc_machdep.c
index a81ffddbb211..1e923cfabd54 100644
--- a/sys/powerpc/powerpc/sc_machdep.c
+++ b/sys/powerpc/powerpc/sc_machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/sc_machdep.c,v 1.1 2004/01/21 05:16:23 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/setjmp.S b/sys/powerpc/powerpc/setjmp.S
index b372e40e3ff0..0e4af71ec4a0 100644
--- a/sys/powerpc/powerpc/setjmp.S
+++ b/sys/powerpc/powerpc/setjmp.S
@@ -1,4 +1,4 @@
-/*	$FreeBSD$  */
+/*	$FreeBSD: src/sys/powerpc/powerpc/setjmp.S,v 1.1 2002/07/10 12:26:17 benno Exp $  */
 /*	from:	NetBSD: setjmp.S,v 1.1 1998/01/27 15:13:12 sakamoto Exp $  */
 /*	from:	OpenBSD: setjmp.S,v 1.2 1996/12/28 06:22:18 rahnds Exp 	*/
 /* kernel version of this file, does not have signal goop */
diff --git a/sys/powerpc/powerpc/sigcode.S b/sys/powerpc/powerpc/sigcode.S
index af0ed49e153b..f5b9a55709cf 100644
--- a/sys/powerpc/powerpc/sigcode.S
+++ b/sys/powerpc/powerpc/sigcode.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/sigcode.S,v 1.4 2005/01/07 02:29:20 imp Exp $ */
 /* $NetBSD: sigcode.S,v 1.1 1999/11/17 14:56:11 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/powerpc/suswintr.c b/sys/powerpc/powerpc/suswintr.c
index 0252201e8a4b..16a7070d199e 100644
--- a/sys/powerpc/powerpc/suswintr.c
+++ b/sys/powerpc/powerpc/suswintr.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/suswintr.c,v 1.3 2004/02/11 07:48:19 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/swtch.S b/sys/powerpc/powerpc/swtch.S
index 038e788b9175..3838a3cc5f65 100644
--- a/sys/powerpc/powerpc/swtch.S
+++ b/sys/powerpc/powerpc/swtch.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/swtch.S,v 1.21 2005/01/07 02:29:20 imp Exp $ */
 /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/syncicache.c b/sys/powerpc/powerpc/syncicache.c
index 9a5b8c60370b..f05ebc706013 100644
--- a/sys/powerpc/powerpc/syncicache.c
+++ b/sys/powerpc/powerpc/syncicache.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/syncicache.c,v 1.5 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #if	defined(_KERNEL) || defined(_STANDALONE)
diff --git a/sys/powerpc/powerpc/sys_machdep.c b/sys/powerpc/powerpc/sys_machdep.c
index 86e6e077c3f4..9a97da198609 100644
--- a/sys/powerpc/powerpc/sys_machdep.c
+++ b/sys/powerpc/powerpc/sys_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/sys_machdep.c,v 1.5 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 85bdab95ccd1..2910fe5f53db 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.54.2.1 2005/08/08 07:02:12 grehan Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/powerpc/powerpc/trap_subr.S b/sys/powerpc/powerpc/trap_subr.S
index 58ff1d24d489..0379d69734b2 100644
--- a/sys/powerpc/powerpc/trap_subr.S
+++ b/sys/powerpc/powerpc/trap_subr.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/trap_subr.S,v 1.14.2.1 2005/08/08 07:02:12 grehan Exp $ */
 /* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c
index bd2f1b447e81..5f6d95d13196 100644
--- a/sys/powerpc/powerpc/uio_machdep.c
+++ b/sys/powerpc/powerpc/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uio_machdep.c,v 1.5 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/powerpc/powerpc/uma_machdep.c b/sys/powerpc/powerpc/uma_machdep.c
index 9fff32e2d7bd..a20827891b17 100644
--- a/sys/powerpc/powerpc/uma_machdep.c
+++ b/sys/powerpc/powerpc/uma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uma_machdep.c,v 1.3 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 4b896eaf7e42..98217082f9a9 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.110 2005/07/10 23:31:10 davidxu Exp $
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c
index f01cd978688b..c4bdc39ae979 100644
--- a/sys/powerpc/psim/ata_iobus.c
+++ b/sys/powerpc/psim/ata_iobus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/ata_iobus.c,v 1.13 2005/04/12 15:59:54 ssouhlal Exp $
  */
 
 /*
diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c
index c16a388e67d8..12d115811ba8 100644
--- a/sys/powerpc/psim/iobus.c
+++ b/sys/powerpc/psim/iobus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/iobus.c,v 1.8 2005/01/07 02:29:21 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/psim/iobusvar.h b/sys/powerpc/psim/iobusvar.h
index 1ab7f7eaed90..c3b46c08bd84 100644
--- a/sys/powerpc/psim/iobusvar.h
+++ b/sys/powerpc/psim/iobusvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/iobusvar.h,v 1.3 2005/01/07 02:29:21 imp Exp $
  */
 
 #ifndef _PSIM_IOBUSVAR_H_
diff --git a/sys/powerpc/psim/openpic_iobus.c b/sys/powerpc/psim/openpic_iobus.c
index 9be65a85bc7a..9ddac584fdbf 100644
--- a/sys/powerpc/psim/openpic_iobus.c
+++ b/sys/powerpc/psim/openpic_iobus.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/psim/openpic_iobus.c,v 1.6 2005/01/07 02:29:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/psim/psim-tree b/sys/powerpc/psim/psim-tree
index 62391c5ed950..ad8c1b8b5374 100644
--- a/sys/powerpc/psim/psim-tree
+++ b/sys/powerpc/psim/psim-tree
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/psim/psim-tree,v 1.2 2004/02/04 13:23:05 grehan Exp $
 #
 # Simple psim h/w description
 #
diff --git a/sys/powerpc/psim/sio_iobus.c b/sys/powerpc/psim/sio_iobus.c
index 1d6c6017cf1c..3ae0fd017739 100644
--- a/sys/powerpc/psim/sio_iobus.c
+++ b/sys/powerpc/psim/sio_iobus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/sio_iobus.c,v 1.3 2005/05/29 04:42:30 nyan Exp $
  */
 
 /*
diff --git a/sys/rpc/rpcclnt.c b/sys/rpc/rpcclnt.c
index 698c956cd6d8..5a7c457be823 100644
--- a/sys/rpc/rpcclnt.c
+++ b/sys/rpc/rpcclnt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.13.2.1 2005/09/29 18:40:36 rwatson Exp $ */
 /* $Id: rpcclnt.c,v 1.9 2003/11/05 14:59:03 rees Exp $ */
 
 /*-
diff --git a/sys/rpc/rpcclnt.h b/sys/rpc/rpcclnt.h
index f57c4dc91dce..0c2a8f1c182a 100644
--- a/sys/rpc/rpcclnt.h
+++ b/sys/rpc/rpcclnt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcclnt.h,v 1.5 2005/01/07 02:29:21 imp Exp $ */
 /*	$OpenBSD: nfsmount.h,v 1.11 2002/03/14 01:27:13 millert Exp $	*/
 /*	$NetBSD: nfsmount.h,v 1.10 1996/02/18 11:54:03 fvdl Exp $	*/
 
diff --git a/sys/rpc/rpcm_subs.h b/sys/rpc/rpcm_subs.h
index ac789f3c593a..7d53fce42b3d 100644
--- a/sys/rpc/rpcm_subs.h
+++ b/sys/rpc/rpcm_subs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcm_subs.h,v 1.3 2005/01/07 02:29:21 imp Exp $ */
 /*	$OpenBSD: nfsm_subs.h,v 1.11 2000/01/05 20:50:52 millert Exp $	*/
 /*	$NetBSD: nfsm_subs.h,v 1.10 1996/03/20 21:59:56 fvdl Exp $	*/
 
diff --git a/sys/security/mac/mac_inet.c b/sys/security/mac/mac_inet.c
index beb65eff8f85..ee278a86ff0c 100644
--- a/sys/security/mac/mac_inet.c
+++ b/sys/security/mac/mac_inet.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.1 2004/02/26 03:51:04 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index bcb95a22cada..03486649127a 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.112 2004/10/22 11:07:18 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac/mac_label.c b/sys/security/mac/mac_label.c
index f6d92ef87072..c16f63808c36 100644
--- a/sys/security/mac/mac_label.c
+++ b/sys/security/mac/mac_label.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_label.c,v 1.3 2004/10/22 11:08:52 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 8883e666f67d..10dc313992ce 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.117 2005/07/05 23:39:50 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 16de8423f55a..d81a28fb996c 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_pipe.c,v 1.106 2004/05/30 20:27:19 phk Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_posix_sem.c b/sys/security/mac/mac_posix_sem.c
index 7304bb251594..f44e76925a3d 100644
--- a/sys/security/mac/mac_posix_sem.c
+++ b/sys/security/mac/mac_posix_sem.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_posix_sem.c,v 1.1 2005/05/04 10:39:14 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_posix.h"
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 436c55b878e2..85f471a005fa 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.108 2005/04/18 13:36:57 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_socket.c b/sys/security/mac/mac_socket.c
index 7af1749ca838..6cdd46cbd2a8 100644
--- a/sys/security/mac/mac_socket.c
+++ b/sys/security/mac/mac_socket.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_socket.c,v 1.4 2005/07/05 22:49:09 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 6cd643058a50..5b3e94b3fd22 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_system.c,v 1.105 2005/06/10 04:44:38 csjp Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_sysv_msg.c b/sys/security/mac/mac_sysv_msg.c
index d2ab15ab594d..0a1b5dd50262 100644
--- a/sys/security/mac/mac_sysv_msg.c
+++ b/sys/security/mac/mac_sysv_msg.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_sysv_msg.c,v 1.2 2005/02/24 16:08:41 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_sysv_sem.c b/sys/security/mac/mac_sysv_sem.c
index 76be27601bf0..d90d39ae08d0 100644
--- a/sys/security/mac/mac_sysv_sem.c
+++ b/sys/security/mac/mac_sysv_sem.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_sysv_sem.c,v 1.2 2005/06/07 05:03:27 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_sysv_shm.c b/sys/security/mac/mac_sysv_shm.c
index 175774fd7e43..276fdaf3f5cc 100644
--- a/sys/security/mac/mac_sysv_shm.c
+++ b/sys/security/mac/mac_sysv_shm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_sysv_shm.c,v 1.1 2004/11/17 13:14:24 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 59aa61bc792d..309cce0b5f14 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.108.2.2 2005/10/05 10:31:03 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_devfs.h"
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 6735c2593fd7..7650a02f9679 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.87.2.3 2005/10/05 10:31:04 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_biba/mac_biba.h b/sys/security/mac_biba/mac_biba.h
index 05eefab05b0d..e2c5cae5a4cd 100644
--- a/sys/security/mac_biba/mac_biba.h
+++ b/sys/security/mac_biba/mac_biba.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_biba/mac_biba.h,v 1.7 2004/07/16 02:03:50 rwatson Exp $
  */
 /*
  * Definitions for the TrustedBSD Biba integrity policy module.
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index 39b3a5951288..0e3ff59ec2d4 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.25.2.1 2005/08/17 14:35:20 avatar Exp $
  */
 
 /*
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.h b/sys/security/mac_bsdextended/mac_bsdextended.h
index 4ddc21e15b29..645c6b8b9a9d 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.h
+++ b/sys/security/mac_bsdextended/mac_bsdextended.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.h,v 1.5 2004/10/21 11:29:56 rwatson Exp $
  */
 
 #ifndef _SYS_SECURITY_MAC_BSDEXTENDED_H
diff --git a/sys/security/mac_ifoff/mac_ifoff.c b/sys/security/mac_ifoff/mac_ifoff.c
index c80d3dd84941..b0f4114922c2 100644
--- a/sys/security/mac_ifoff/mac_ifoff.c
+++ b/sys/security/mac_ifoff/mac_ifoff.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_ifoff/mac_ifoff.c,v 1.9 2004/02/22 00:33:11 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index bcffa92135ce..de41dbab072b 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.35.2.3 2005/10/05 10:31:04 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_lomac/mac_lomac.h b/sys/security/mac_lomac/mac_lomac.h
index 9edba981aa07..a6ffc5d5cc89 100644
--- a/sys/security/mac_lomac/mac_lomac.h
+++ b/sys/security/mac_lomac/mac_lomac.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.h,v 1.4 2005/01/23 14:26:09 rwatson Exp $
  */
 /*
  * Definitions for the TrustedBSD LOMAC integrity policy module.
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index 76e2cdaa485f..e6ed45ae804d 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.72.2.3 2005/10/05 10:31:04 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_mls/mac_mls.h b/sys/security/mac_mls/mac_mls.h
index 7bed921b87fb..d4f0d348838c 100644
--- a/sys/security/mac_mls/mac_mls.h
+++ b/sys/security/mac_mls/mac_mls.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.h,v 1.8 2004/07/16 02:03:50 rwatson Exp $
  */
 /*
  * Definitions for the TrustedBSD MLS confidentiality policy module.
diff --git a/sys/security/mac_none/mac_none.c b/sys/security/mac_none/mac_none.c
index d36d4296f223..010a04fb6912 100644
--- a/sys/security/mac_none/mac_none.c
+++ b/sys/security/mac_none/mac_none.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_none/mac_none.c,v 1.31.8.1 2005/09/26 14:36:53 phk Exp $
  */
 
 /*
diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c
index fe3d8e81677d..ab954e5f213b 100644
--- a/sys/security/mac_partition/mac_partition.c
+++ b/sys/security/mac_partition/mac_partition.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.10.8.1 2005/09/26 14:36:53 phk Exp $
  */
 
 /*
diff --git a/sys/security/mac_partition/mac_partition.h b/sys/security/mac_partition/mac_partition.h
index f5675e2e428c..2765ac209fee 100644
--- a/sys/security/mac_partition/mac_partition.h
+++ b/sys/security/mac_partition/mac_partition.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_partition/mac_partition.h,v 1.3 2004/02/22 00:33:12 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_portacl/mac_portacl.c b/sys/security/mac_portacl/mac_portacl.c
index 07dd147e1ab5..2f2cf1336246 100644
--- a/sys/security/mac_portacl/mac_portacl.c
+++ b/sys/security/mac_portacl/mac_portacl.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_portacl/mac_portacl.c,v 1.7 2004/12/08 11:46:44 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_seeotheruids/mac_seeotheruids.c b/sys/security/mac_seeotheruids/mac_seeotheruids.c
index d2e856f87eb8..6647712eee52 100644
--- a/sys/security/mac_seeotheruids/mac_seeotheruids.c
+++ b/sys/security/mac_seeotheruids/mac_seeotheruids.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_seeotheruids/mac_seeotheruids.c,v 1.7 2005/01/03 12:08:18 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index 36b10ea6cf62..cb0c03cf896f 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.52.2.4 2005/10/05 10:31:04 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
index 921e641f7e91..13231ae40f52 100644
--- a/sys/security/mac_test/mac_test.c
+++ b/sys/security/mac_test/mac_test.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.60.2.3 2005/10/05 10:31:05 rwatson Exp $
  */
 
 /*
diff --git a/sys/sparc64/central/central.c b/sys/sparc64/central/central.c
index ef3ef3701899..2d1050053b4f 100644
--- a/sys/sparc64/central/central.c
+++ b/sys/sparc64/central/central.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.8 2005/05/19 15:09:56 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/compile/.cvsignore b/sys/sparc64/compile/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/sparc64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/sparc64/conf/.cvsignore b/sys/sparc64/conf/.cvsignore
deleted file mode 100644
index 232298edb15f..000000000000
--- a/sys/sparc64/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 39330778a31e..01d4ac676116 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.96.2.4 2005/09/22 12:36:39 kensmith Exp $
 
 machine		sparc64
 cpu		SUN4U
diff --git a/sys/sparc64/conf/GENERIC.hints b/sys/sparc64/conf/GENERIC.hints
index e8c0da7a1d7e..30d9b32767d6 100644
--- a/sys/sparc64/conf/GENERIC.hints
+++ b/sys/sparc64/conf/GENERIC.hints
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/GENERIC.hints,v 1.1 2001/08/14 03:27:02 jake Exp $
diff --git a/sys/sparc64/conf/Makefile b/sys/sparc64/conf/Makefile
index 2c006e9c2c80..50f097a1ffcf 100644
--- a/sys/sparc64/conf/Makefile
+++ b/sys/sparc64/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/Makefile,v 1.2 2003/02/26 23:36:59 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index fa34268f4337..9f3cd0563772 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.19 2005/06/10 20:58:59 marius Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/sparc64/creator/creator.h b/sys/sparc64/creator/creator.h
index 87fe9808cd78..c9c7aa919e54 100644
--- a/sys/sparc64/creator/creator.h
+++ b/sys/sparc64/creator/creator.h
@@ -45,7 +45,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/creator/creator.h,v 1.5 2005/07/10 11:16:34 marius Exp $
  */
 
 #ifndef _DEV_FB_CREATOR_H_
diff --git a/sys/sparc64/creator/creator_upa.c b/sys/sparc64/creator/creator_upa.c
index 0c0a00c1c8fc..d84bf3ff8eec 100644
--- a/sys/sparc64/creator/creator_upa.c
+++ b/sys/sparc64/creator/creator_upa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/creator/creator_upa.c,v 1.9 2005/07/10 11:16:34 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 73f83379dd32..4a5c912ac124 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.23 2005/06/04 20:31:20 marius Exp $");
 
 /*
  * UltraSPARC 5 and beyond Ebus support.
diff --git a/sys/sparc64/ebus/ebusreg.h b/sys/sparc64/ebus/ebusreg.h
index fd192e67ffb5..f519559f76a6 100644
--- a/sys/sparc64/ebus/ebusreg.h
+++ b/sys/sparc64/ebus/ebusreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/sparc64/ebus/ebusreg.h,v 1.2 2005/01/07 02:29:21 imp Exp $	*/
 /*	$OpenBSD: ebusreg.h,v 1.4 2001/10/01 18:08:04 jason Exp $	*/
 /*	$NetBSD: ebusreg.h,v 1.1 1999/06/04 13:29:13 mrg Exp $	*/
 
diff --git a/sys/sparc64/fhc/clkbrd.c b/sys/sparc64/fhc/clkbrd.c
index db32c1f94ffb..9284366287b6 100644
--- a/sys/sparc64/fhc/clkbrd.c
+++ b/sys/sparc64/fhc/clkbrd.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/clkbrd.c,v 1.1 2005/03/19 01:04:48 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/fhc/clkbrdreg.h b/sys/sparc64/fhc/clkbrdreg.h
index 6aa3c1accbf1..d64cb385dcb3 100644
--- a/sys/sparc64/fhc/clkbrdreg.h
+++ b/sys/sparc64/fhc/clkbrdreg.h
@@ -25,7 +25,7 @@
  *
  *	from: OpenBSD: clkbrdreg.h,v 1.2 2004/10/01 15:36:30 jason Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/fhc/clkbrdreg.h,v 1.1 2005/03/19 01:04:48 marius Exp $
  */
 
 #define	CLK_CTRL	0x00
diff --git a/sys/sparc64/fhc/fhc.c b/sys/sparc64/fhc/fhc.c
index 8559040aa6b4..2ef9af7bba36 100644
--- a/sys/sparc64/fhc/fhc.c
+++ b/sys/sparc64/fhc/fhc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc.c,v 1.13 2005/06/05 10:16:27 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/fhc/fhc_central.c b/sys/sparc64/fhc/fhc_central.c
index a63fb3e7a8b3..d255a589da7c 100644
--- a/sys/sparc64/fhc/fhc_central.c
+++ b/sys/sparc64/fhc/fhc_central.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>                                                         
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_central.c,v 1.8 2005/05/19 15:09:56 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/fhc/fhc_nexus.c b/sys/sparc64/fhc/fhc_nexus.c
index c6c286005387..e9c063bffb3e 100644
--- a/sys/sparc64/fhc/fhc_nexus.c
+++ b/sys/sparc64/fhc/fhc_nexus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>                                                         
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_nexus.c,v 1.7 2005/05/19 15:09:56 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/fhc/fhcreg.h b/sys/sparc64/fhc/fhcreg.h
index 2c6043abf793..63555ecefcf7 100644
--- a/sys/sparc64/fhc/fhcreg.h
+++ b/sys/sparc64/fhc/fhcreg.h
@@ -50,7 +50,7 @@
  *
  *	from: OpenBSD: fhcreg.h,v 1.3 2004/09/28 16:26:03 jason Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/fhc/fhcreg.h,v 1.3 2005/03/19 00:48:34 marius Exp $
  */
 
 #ifndef _SPARC64_FHC_FHCREG_H_
diff --git a/sys/sparc64/fhc/fhcvar.h b/sys/sparc64/fhc/fhcvar.h
index 299a93300cae..f09d8ce176ee 100644
--- a/sys/sparc64/fhc/fhcvar.h
+++ b/sys/sparc64/fhc/fhcvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/fhc/fhcvar.h,v 1.5 2005/03/19 00:50:28 marius Exp $
  */
 
 #ifndef _SPARC64_FHC_FHCVAR_H_
diff --git a/sys/sparc64/include/_bus.h b/sys/sparc64/include/_bus.h
index c3db34192084..92785e0ee6e2 100644
--- a/sys/sparc64/include/_bus.h
+++ b/sys/sparc64/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_bus.h,v 1.1 2005/04/18 21:45:34 imp Exp $
  */
 
 #ifndef SPARC64_INCLUDE__BUS_H
diff --git a/sys/sparc64/include/_inttypes.h b/sys/sparc64/include/_inttypes.h
index e6b2536ff379..9b669288cc07 100644
--- a/sys/sparc64/include/_inttypes.h
+++ b/sys/sparc64/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_inttypes.h,v 1.2 2002/06/30 05:48:03 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/sparc64/include/_limits.h b/sys/sparc64/include/_limits.h
index 5ec6df78b885..f49a2cef817a 100644
--- a/sys/sparc64/include/_limits.h
+++ b/sys/sparc64/include/_limits.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_limits.h,v 1.12 2005/01/07 02:29:21 imp Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/sparc64/include/_stdint.h b/sys/sparc64/include/_stdint.h
index 1aed3e3b4efc..f3844dd34206 100644
--- a/sys/sparc64/include/_stdint.h
+++ b/sys/sparc64/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_
diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h
index f810c159a6ef..6cb1982d3738 100644
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
@@ -29,7 +29,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_types.h,v 1.8 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/sparc64/include/asi.h b/sys/sparc64/include/asi.h
index 78850dc55d4a..ec9f0701578e 100644
--- a/sys/sparc64/include/asi.h
+++ b/sys/sparc64/include/asi.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: asi.h,v 1.3 1997/08/08 14:31:42 torek
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/asi.h,v 1.9 2002/07/16 16:22:25 tmm Exp $
  */
 
 #ifndef	_MACHINE_ASI_H_
diff --git a/sys/sparc64/include/asm.h b/sys/sparc64/include/asm.h
index 8182fe77fe76..f36a728ce8b9 100644
--- a/sys/sparc64/include/asm.h
+++ b/sys/sparc64/include/asm.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
  *	from: FreeBSD: src/sys/i386/include/asm.h,v 1.7 2000/01/25
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/asm.h,v 1.7 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/sparc64/include/asmacros.h b/sys/sparc64/include/asmacros.h
index a0e317b218e4..49ff40250155 100644
--- a/sys/sparc64/include/asmacros.h
+++ b/sys/sparc64/include/asmacros.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/asmacros.h,v 1.19 2004/06/06 21:26:48 phk Exp $
  */
 
 #ifndef	_MACHINE_ASMACROS_H_
diff --git a/sys/sparc64/include/atomic.h b/sys/sparc64/include/atomic.h
index 77d455bfce5a..5122c859b598 100644
--- a/sys/sparc64/include/atomic.h
+++ b/sys/sparc64/include/atomic.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/atomic.h,v 1.20 2001/02/11
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/atomic.h,v 1.8.8.2 2005/10/06 18:12:06 jhb Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h
index 97a4baa76b40..213a5d70f47b 100644
--- a/sys/sparc64/include/bus.h
+++ b/sys/sparc64/include/bus.h
@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.37 2005/04/18 21:45:34 imp Exp $
  */
 
 #ifndef	_MACHINE_BUS_H_
diff --git a/sys/sparc64/include/bus_common.h b/sys/sparc64/include/bus_common.h
index 216f592c8d5c..bbda1926ab5d 100644
--- a/sys/sparc64/include/bus_common.h
+++ b/sys/sparc64/include/bus_common.h
@@ -33,7 +33,7 @@
  *	form: @(#)sbusreg.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_common.h,v 1.5 2005/01/07 02:29:21 imp Exp $
  */
 
 #ifndef _MACHINE_BUS_COMMON_H_
diff --git a/sys/sparc64/include/bus_dma.h b/sys/sparc64/include/bus_dma.h
index e2b89a1263a5..253d71d8efc5 100644
--- a/sys/sparc64/include/bus_dma.h
+++ b/sys/sparc64/include/bus_dma.h
@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_dma.h,v 1.1 2005/03/14 16:46:28 scottl Exp $
  */
 
 #ifndef _SPARC64_BUS_DMA_H
diff --git a/sys/sparc64/include/bus_private.h b/sys/sparc64/include/bus_private.h
index ba15cd908014..68bbb3cd5e90 100644
--- a/sys/sparc64/include/bus_private.h
+++ b/sys/sparc64/include/bus_private.h
@@ -25,7 +25,7 @@
  *
  *	from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.25 2002/01/05
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_private.h,v 1.7 2004/06/28 04:04:43 scottl Exp $
  */
 
 #ifndef	_MACHINE_BUS_PRIVATE_H_
diff --git a/sys/sparc64/include/cache.h b/sys/sparc64/include/cache.h
index d0cf824fdd7b..77da86bc87f0 100644
--- a/sys/sparc64/include/cache.h
+++ b/sys/sparc64/include/cache.h
@@ -39,7 +39,7 @@
  *	from: @(#)cache.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: cache.h,v 1.3 2000/08/01 00:28:02 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/cache.h,v 1.12 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_CACHE_H_
diff --git a/sys/sparc64/include/ccr.h b/sys/sparc64/include/ccr.h
index 2b7ac84ec9b6..76b0888f6f0d 100644
--- a/sys/sparc64/include/ccr.h
+++ b/sys/sparc64/include/ccr.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ccr.h,v 1.2 2001/12/29 06:50:25 jake Exp $
  */
 
 #ifndef	_MACHINE_CCR_H_
diff --git a/sys/sparc64/include/clock.h b/sys/sparc64/include/clock.h
index fbedfea57de9..33b950227c8b 100644
--- a/sys/sparc64/include/clock.h
+++ b/sys/sparc64/include/clock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/clock.h,v 1.6 2002/10/05 20:14:49 mux Exp $
  */
 
 #ifndef	_MACHINE_CLOCK_H_
diff --git a/sys/sparc64/include/cpu.h b/sys/sparc64/include/cpu.h
index 4dfe1e9af0fa..0297be838291 100644
--- a/sys/sparc64/include/cpu.h
+++ b/sys/sparc64/include/cpu.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
  *	from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.15 2004/08/03 18:44:27 mux Exp $
  */
 
 #ifndef	_MACHINE_CPU_H_
diff --git a/sys/sparc64/include/cpufunc.h b/sys/sparc64/include/cpufunc.h
index 211eec3c2be1..5c6d574aca05 100644
--- a/sys/sparc64/include/cpufunc.h
+++ b/sys/sparc64/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.20.2.1 2005/08/05 19:46:13 jhb Exp $
  */
 
 #ifndef	_MACHINE_CPUFUNC_H_
diff --git a/sys/sparc64/include/db_machdep.h b/sys/sparc64/include/db_machdep.h
index 439df3699df5..dfcb4f6f3216 100644
--- a/sys/sparc64/include/db_machdep.h
+++ b/sys/sparc64/include/db_machdep.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/db_machdep.h,v 1.9 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/sparc64/include/elf.h b/sys/sparc64/include/elf.h
index d4f1824fce79..f86a313c741a 100644
--- a/sys/sparc64/include/elf.h
+++ b/sys/sparc64/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.12 2003/09/25 01:10:26 peter Exp $
  */
 
 #ifndef	_MACHINE_ELF_H_
diff --git a/sys/sparc64/include/endian.h b/sys/sparc64/include/endian.h
index a643dd3537c8..3804d85f46c8 100644
--- a/sys/sparc64/include/endian.h
+++ b/sys/sparc64/include/endian.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.15 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/sparc64/include/exec.h b/sys/sparc64/include/exec.h
index c0f93b68bf90..89b285a357e9 100644
--- a/sys/sparc64/include/exec.h
+++ b/sys/sparc64/include/exec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/exec.h,v 1.3 2001/08/09 02:09:34 obrien Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/sparc64/include/float.h b/sys/sparc64/include/float.h
index cf78df0c6b55..fd1e01725b6a 100644
--- a/sys/sparc64/include/float.h
+++ b/sys/sparc64/include/float.h
@@ -32,7 +32,7 @@
  *
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/float.h,v 1.6 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/sparc64/include/floatingpoint.h b/sys/sparc64/include/floatingpoint.h
index d47756a00c6c..5645490723ca 100644
--- a/sys/sparc64/include/floatingpoint.h
+++ b/sys/sparc64/include/floatingpoint.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/floatingpoint.h,v 1.2 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/sparc64/include/fp.h b/sys/sparc64/include/fp.h
index bf0d79a8aba6..241a6ba6b635 100644
--- a/sys/sparc64/include/fp.h
+++ b/sys/sparc64/include/fp.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/fp.h,v 1.9 2003/04/01 04:02:44 jake Exp $
  */
 
 #ifndef	_MACHINE_FP_H_
diff --git a/sys/sparc64/include/frame.h b/sys/sparc64/include/frame.h
index 500a38fafe26..094be1085dcd 100644
--- a/sys/sparc64/include/frame.h
+++ b/sys/sparc64/include/frame.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/frame.h,v 1.15 2004/07/10 23:05:38 marcel Exp $
  */
 
 #ifndef	_MACHINE_FRAME_H_
diff --git a/sys/sparc64/include/fsr.h b/sys/sparc64/include/fsr.h
index 61a81f7ef965..105754b77aba 100644
--- a/sys/sparc64/include/fsr.h
+++ b/sys/sparc64/include/fsr.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/fsr.h,v 1.3 2002/09/14 17:58:54 tmm Exp $
  */
 
 #ifndef	_MACHINE_FSR_H_
diff --git a/sys/sparc64/include/gdb_machdep.h b/sys/sparc64/include/gdb_machdep.h
index efbc5e78524b..008e5c4b7d3e 100644
--- a/sys/sparc64/include/gdb_machdep.h
+++ b/sys/sparc64/include/gdb_machdep.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/sys/sparc64/include/gdb_machdep.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/sparc64/include/idprom.h b/sys/sparc64/include/idprom.h
index df76a7f73122..53425f0115a2 100644
--- a/sys/sparc64/include/idprom.h
+++ b/sys/sparc64/include/idprom.h
@@ -30,7 +30,7 @@
  *
  *	from: NetBSD: idprom.h,v 1.2 1998/09/05 23:57:26 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/idprom.h,v 1.2 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IDPROM_H_
diff --git a/sys/sparc64/include/ieee.h b/sys/sparc64/include/ieee.h
index 82ba9a1ae62f..f4eb76212705 100644
--- a/sys/sparc64/include/ieee.h
+++ b/sys/sparc64/include/ieee.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ieee.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IEEE_H_
diff --git a/sys/sparc64/include/ieeefp.h b/sys/sparc64/include/ieeefp.h
index 11264949acee..eb7911dfe4a6 100644
--- a/sys/sparc64/include/ieeefp.h
+++ b/sys/sparc64/include/ieeefp.h
@@ -1,7 +1,7 @@
 /*-
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ieeefp.h,v 1.4 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/sparc64/include/in_cksum.h b/sys/sparc64/include/in_cksum.h
index 7fbba02de676..dfa76dd133cd 100644
--- a/sys/sparc64/include/in_cksum.h
+++ b/sys/sparc64/include/in_cksum.h
@@ -55,7 +55,7 @@
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
  *	from: FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.5 2000/05/06
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/in_cksum.h,v 1.2 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/sparc64/include/instr.h b/sys/sparc64/include/instr.h
index d6befbbc3ffe..b789ff4105cc 100644
--- a/sys/sparc64/include/instr.h
+++ b/sys/sparc64/include/instr.h
@@ -31,7 +31,7 @@
  *
  *	from: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/instr.h,v 1.7 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_INSTR_H_
diff --git a/sys/sparc64/include/intr_machdep.h b/sys/sparc64/include/intr_machdep.h
index 9d297307625b..c4c332a57c3a 100644
--- a/sys/sparc64/include/intr_machdep.h
+++ b/sys/sparc64/include/intr_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/intr_machdep.h,v 1.13 2003/07/16 00:08:43 jmg Exp $
  */
 
 #ifndef	_MACHINE_INTR_MACHDEP_H_
diff --git a/sys/sparc64/include/iommureg.h b/sys/sparc64/include/iommureg.h
index e36d837f7a29..f1d8fdfe7293 100644
--- a/sys/sparc64/include/iommureg.h
+++ b/sys/sparc64/include/iommureg.h
@@ -33,7 +33,7 @@
  *	from: @(#)sbusreg.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/iommureg.h,v 1.6 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IOMMUREG_H_
diff --git a/sys/sparc64/include/iommuvar.h b/sys/sparc64/include/iommuvar.h
index 9c290c0748cb..039cb7c35c76 100644
--- a/sys/sparc64/include/iommuvar.h
+++ b/sys/sparc64/include/iommuvar.h
@@ -27,7 +27,7 @@
  *
  *	from: NetBSD: iommuvar.h,v 1.9 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/iommuvar.h,v 1.15 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IOMMUVAR_H_
diff --git a/sys/sparc64/include/kdb.h b/sys/sparc64/include/kdb.h
index e5b39c04d2bb..d0d469b66341 100644
--- a/sys/sparc64/include/kdb.h
+++ b/sys/sparc64/include/kdb.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/sys/sparc64/include/kdb.h,v 1.2 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/sparc64/include/kerneldump.h b/sys/sparc64/include/kerneldump.h
index 7fad3fce88dd..04d43f32454a 100644
--- a/sys/sparc64/include/kerneldump.h
+++ b/sys/sparc64/include/kerneldump.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/kerneldump.h,v 1.2 2003/04/08 06:35:08 jake Exp $
  */
 
 #ifndef _MACHINE_KERNELDUMP_H_
diff --git a/sys/sparc64/include/ktr.h b/sys/sparc64/include/ktr.h
index e6b7f28a6a52..c715529c6fd7 100644
--- a/sys/sparc64/include/ktr.h
+++ b/sys/sparc64/include/ktr.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ktr.h,v 1.5 2003/04/26 17:00:10 obrien Exp $
  */
 
 #ifndef _MACHINE_KTR_H_
diff --git a/sys/sparc64/include/limits.h b/sys/sparc64/include/limits.h
index 679dcec51b31..ba392a15c556 100644
--- a/sys/sparc64/include/limits.h
+++ b/sys/sparc64/include/limits.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/limits.h,v 1.12 2005/03/04 21:26:07 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/sparc64/include/lsu.h b/sys/sparc64/include/lsu.h
index a8787dcabdc7..66d595f5a722 100644
--- a/sys/sparc64/include/lsu.h
+++ b/sys/sparc64/include/lsu.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/lsu.h,v 1.2 2002/07/16 16:24:03 tmm Exp $
  */
 
 #ifndef	_MACHINE_LSU_H_
diff --git a/sys/sparc64/include/md_var.h b/sys/sparc64/include/md_var.h
index 34a3437ac06a..530ec260afca 100644
--- a/sys/sparc64/include/md_var.h
+++ b/sys/sparc64/include/md_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/md_var.h,v 1.16 2005/01/19 18:24:07 jhb Exp $
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/sparc64/include/memdev.h b/sys/sparc64/include/memdev.h
index 671a6b467d7e..f1205ca76b2e 100644
--- a/sys/sparc64/include/memdev.h
+++ b/sys/sparc64/include/memdev.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/sys/sparc64/include/memdev.h,v 1.1 2004/08/01 11:40:54 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/sparc64/include/metadata.h b/sys/sparc64/include/metadata.h
index d14e1f150d63..781b40b165c0 100644
--- a/sys/sparc64/include/metadata.h
+++ b/sys/sparc64/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/metadata.h,v 1.5 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/sparc64/include/mutex.h b/sys/sparc64/include/mutex.h
index c9b2e1ddde07..25cdbc6111e5 100644
--- a/sys/sparc64/include/mutex.h
+++ b/sys/sparc64/include/mutex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/mutex.h,v 1.5 2001/12/18 00:27:18 jhb Exp $
  */
 
 #ifndef	_MACHINE_MUTEX_H_
diff --git a/sys/sparc64/include/nexusvar.h b/sys/sparc64/include/nexusvar.h
index dd8ebfc73c3b..c9b22cc04e82 100644
--- a/sys/sparc64/include/nexusvar.h
+++ b/sys/sparc64/include/nexusvar.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/nexusvar.h,v 1.3 2004/04/30 19:50:50 tmm Exp $
  */
 
 #ifndef _MACHINE_NEXUSVAR_H_
diff --git a/sys/sparc64/include/ofw_bus.h b/sys/sparc64/include/ofw_bus.h
index 1e9004e15d77..44d45cd253f6 100644
--- a/sys/sparc64/include/ofw_bus.h
+++ b/sys/sparc64/include/ofw_bus.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_bus.h,v 1.7 2004/08/16 15:45:27 marius Exp $
  */
 
 #ifndef	_MACHINE_OFW_BUS_H_
diff --git a/sys/sparc64/include/ofw_machdep.h b/sys/sparc64/include/ofw_machdep.h
index ac1fcc1ea1ed..19cc30088082 100644
--- a/sys/sparc64/include/ofw_machdep.h
+++ b/sys/sparc64/include/ofw_machdep.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_machdep.h,v 1.6 2005/02/12 19:13:51 marius Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_
diff --git a/sys/sparc64/include/ofw_mem.h b/sys/sparc64/include/ofw_mem.h
index af9089ed034a..ed6f54984024 100644
--- a/sys/sparc64/include/ofw_mem.h
+++ b/sys/sparc64/include/ofw_mem.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_mem.h,v 1.3 2003/06/07 18:29:29 jake Exp $
  */
 
 #ifndef _MACHINE_OFW_MEM_H_
diff --git a/sys/sparc64/include/ofw_upa.h b/sys/sparc64/include/ofw_upa.h
index 959c9d234c4b..b62f4d538410 100644
--- a/sys/sparc64/include/ofw_upa.h
+++ b/sys/sparc64/include/ofw_upa.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_upa.h,v 1.4 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_OFW_UPA_H_
diff --git a/sys/sparc64/include/param.h b/sys/sparc64/include/param.h
index 779e36cda194..8c53736b25bc 100644
--- a/sys/sparc64/include/param.h
+++ b/sys/sparc64/include/param.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/param.h,v 1.19.4.1 2005/10/17 00:19:30 kris Exp $
  */
 
 /*
diff --git a/sys/sparc64/include/pcb.h b/sys/sparc64/include/pcb.h
index 1f1e8dcb2540..8aa9bcf4f6e3 100644
--- a/sys/sparc64/include/pcb.h
+++ b/sys/sparc64/include/pcb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pcb.h,v 1.17 2004/07/10 19:56:00 marcel Exp $
  */
 
 #ifndef	_MACHINE_PCB_H_
diff --git a/sys/sparc64/include/pcpu.h b/sys/sparc64/include/pcpu.h
index 4e025c1a6c42..cc161a93fe59 100644
--- a/sys/sparc64/include/pcpu.h
+++ b/sys/sparc64/include/pcpu.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pcpu.h,v 1.20 2005/04/16 14:57:38 marius Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/sparc64/include/pmap.h b/sys/sparc64/include/pmap.h
index 049968ac273d..b8f146b5ec20 100644
--- a/sys/sparc64/include/pmap.h
+++ b/sys/sparc64/include/pmap.h
@@ -33,7 +33,7 @@
  *	from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h        7.4 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.44 2005/02/18 15:37:34 marius Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
diff --git a/sys/sparc64/include/pmc_mdep.h b/sys/sparc64/include/pmc_mdep.h
index cf643c7b4f39..6951e12d2297 100644
--- a/sys/sparc64/include/pmc_mdep.h
+++ b/sys/sparc64/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/sparc64/include/proc.h b/sys/sparc64/include/proc.h
index bfd1268e433c..4a60e9d25930 100644
--- a/sys/sparc64/include/proc.h
+++ b/sys/sparc64/include/proc.h
@@ -28,7 +28,7 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/proc.h,v 1.14 2005/04/04 21:53:55 jhb Exp $
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/sparc64/include/profile.h b/sys/sparc64/include/profile.h
index 8779ea59024c..617a41760c00 100644
--- a/sys/sparc64/include/profile.h
+++ b/sys/sparc64/include/profile.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.8 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/sparc64/include/pstate.h b/sys/sparc64/include/pstate.h
index 4f536303c82b..eb25a4871b98 100644
--- a/sys/sparc64/include/pstate.h
+++ b/sys/sparc64/include/pstate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pstate.h,v 1.7 2001/12/29 07:01:34 jake Exp $
  */
 
 #ifndef	_MACHINE_PSTATE_H_
diff --git a/sys/sparc64/include/ptrace.h b/sys/sparc64/include/ptrace.h
index 49b1e1c0ee9a..855520fdbdbf 100644
--- a/sys/sparc64/include/ptrace.h
+++ b/sys/sparc64/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ptrace.h,v 1.8 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef	_MACHINE_PTRACE_H_
diff --git a/sys/sparc64/include/reg.h b/sys/sparc64/include/reg.h
index d2241861d209..66bd5904fcd3 100644
--- a/sys/sparc64/include/reg.h
+++ b/sys/sparc64/include/reg.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
  *	from: FreeBSD: src/sys/i386/include/reg.h,v 1.23 2000/09/21
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/reg.h,v 1.14 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef	_MACHINE_REG_H_
diff --git a/sys/sparc64/include/reloc.h b/sys/sparc64/include/reloc.h
index 6e5053602772..b6c5f5c544b4 100644
--- a/sys/sparc64/include/reloc.h
+++ b/sys/sparc64/include/reloc.h
@@ -29,5 +29,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/reloc.h,v 1.2 2005/01/07 02:29:22 imp Exp $
  */
diff --git a/sys/sparc64/include/resource.h b/sys/sparc64/include/resource.h
index 229d14f253b0..34da1c6fd43b 100644
--- a/sys/sparc64/include/resource.h
+++ b/sys/sparc64/include/resource.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/resource.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_RESOURCE_H_
diff --git a/sys/sparc64/include/runq.h b/sys/sparc64/include/runq.h
index 6d03646fd539..61ad384c5618 100644
--- a/sys/sparc64/include/runq.h
+++ b/sys/sparc64/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/runq.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/sparc64/include/sc_machdep.h b/sys/sparc64/include/sc_machdep.h
index 3a492f2383ba..c91a45d04320 100644
--- a/sys/sparc64/include/sc_machdep.h
+++ b/sys/sparc64/include/sc_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sc_machdep.h,v 1.1 2003/08/24 00:47:40 jake Exp $
  */
 
 #ifndef	_MACHINE_SC_MACHDEP_H_
diff --git a/sys/sparc64/include/setjmp.h b/sys/sparc64/include/setjmp.h
index c38bcabadd65..adf06b6601c6 100644
--- a/sys/sparc64/include/setjmp.h
+++ b/sys/sparc64/include/setjmp.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	From: FreeBSD: src/sys/i386/include/setjmp.h,v 1.5 2000/10/06
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/setjmp.h,v 1.8 2002/10/05 05:47:56 mike Exp $
  */
 
 #ifndef	_MACHINE_SETJMP_H_
diff --git a/sys/sparc64/include/sf_buf.h b/sys/sparc64/include/sf_buf.h
index b6ee1cc20b69..bec993b4e403 100644
--- a/sys/sparc64/include/sf_buf.h
+++ b/sys/sparc64/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sf_buf.h,v 1.1 2003/11/16 06:11:26 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/sparc64/include/sigframe.h b/sys/sparc64/include/sigframe.h
index fd40afdd1209..2ab224381747 100644
--- a/sys/sparc64/include/sigframe.h
+++ b/sys/sparc64/include/sigframe.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from:	FreeBSD: src/sys/alpha/include/sigframe.h,v 1.1 1999/09/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sigframe.h,v 1.1 2001/09/03 22:41:40 jake Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/sparc64/include/signal.h b/sys/sparc64/include/signal.h
index 853814c8fb49..90da3d971dac 100644
--- a/sys/sparc64/include/signal.h
+++ b/sys/sparc64/include/signal.h
@@ -28,7 +28,7 @@
  *
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  * 	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/signal.h,v 1.12 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/sparc64/include/smp.h b/sys/sparc64/include/smp.h
index b51425d07476..488b15ca41a1 100644
--- a/sys/sparc64/include/smp.h
+++ b/sys/sparc64/include/smp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.18 2005/03/06 20:57:08 alc Exp $
  */
 
 #ifndef	_MACHINE_SMP_H_
diff --git a/sys/sparc64/include/stdarg.h b/sys/sparc64/include/stdarg.h
index a7ff28484389..1d4ede013a61 100644
--- a/sys/sparc64/include/stdarg.h
+++ b/sys/sparc64/include/stdarg.h
@@ -35,7 +35,7 @@
  *
  *	@(#)stdarg.h	8.2 (Berkeley) 9/27/93
  *	$NetBSD: stdarg.h,v 1.11 2000/07/23 21:36:56 mycroft Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/stdarg.h,v 1.8 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/sparc64/include/sysarch.h b/sys/sparc64/include/sysarch.h
index c209ef8048d2..867a99671b99 100644
--- a/sys/sparc64/include/sysarch.h
+++ b/sys/sparc64/include/sysarch.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/sysarch.h,v 1.14 2000/09/21
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sysarch.h,v 1.4 2004/04/07 05:00:00 imp Exp $
  */
 
 /*
diff --git a/sys/sparc64/include/tick.h b/sys/sparc64/include/tick.h
index 8586a0d89f8d..418112ed10e1 100644
--- a/sys/sparc64/include/tick.h
+++ b/sys/sparc64/include/tick.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tick.h,v 1.4 2005/04/16 14:57:38 marius Exp $
  */
 
 #ifndef _MACHINE_TICK_H_
diff --git a/sys/sparc64/include/tlb.h b/sys/sparc64/include/tlb.h
index 235a18652bdb..d9829c529b99 100644
--- a/sys/sparc64/include/tlb.h
+++ b/sys/sparc64/include/tlb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tlb.h,v 1.26 2003/04/13 21:54:58 jake Exp $
  */
 
 #ifndef	_MACHINE_TLB_H_
diff --git a/sys/sparc64/include/trap.h b/sys/sparc64/include/trap.h
index 28929f4d3519..0b707c01222d 100644
--- a/sys/sparc64/include/trap.h
+++ b/sys/sparc64/include/trap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/trap.h,v 1.11 2003/04/29 21:30:59 jake Exp $
  */
 
 #ifndef	_MACHINE_TRAP_H_
diff --git a/sys/sparc64/include/tsb.h b/sys/sparc64/include/tsb.h
index fa1feffc82fa..2607a36f528c 100644
--- a/sys/sparc64/include/tsb.h
+++ b/sys/sparc64/include/tsb.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tsb.h,v 1.18 2003/04/08 06:35:08 jake Exp $
  */
 
 #ifndef	_MACHINE_TSB_H_
diff --git a/sys/sparc64/include/tstate.h b/sys/sparc64/include/tstate.h
index bead8184451c..bb1f110f8cfb 100644
--- a/sys/sparc64/include/tstate.h
+++ b/sys/sparc64/include/tstate.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tstate.h,v 1.2 2001/12/29 07:11:00 jake Exp $
  */
 
 #ifndef	_MACHINE_TSTATE_H_
diff --git a/sys/sparc64/include/tte.h b/sys/sparc64/include/tte.h
index 70337fe4113d..0c12a5020961 100644
--- a/sys/sparc64/include/tte.h
+++ b/sys/sparc64/include/tte.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tte.h,v 1.16 2003/03/27 02:16:31 jake Exp $
  */
 
 #ifndef	_MACHINE_TTE_H_
diff --git a/sys/sparc64/include/ucontext.h b/sys/sparc64/include/ucontext.h
index c05ec26a9053..9fbb1a75d1a6 100644
--- a/sys/sparc64/include/ucontext.h
+++ b/sys/sparc64/include/ucontext.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/alpha/include/ucontext.h,v 1.3 1999/10/08
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ucontext.h,v 1.8 2003/01/10 00:04:56 jake Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/sparc64/include/upa.h b/sys/sparc64/include/upa.h
index 3e56917b6383..9ab82c00108b 100644
--- a/sys/sparc64/include/upa.h
+++ b/sys/sparc64/include/upa.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/upa.h,v 1.4 2002/04/02 17:38:52 tmm Exp $
  */
 
 #ifndef _MACHINE_UPA_H_
diff --git a/sys/sparc64/include/utrap.h b/sys/sparc64/include/utrap.h
index 38a40b0166e5..e0de35d5790b 100644
--- a/sys/sparc64/include/utrap.h
+++ b/sys/sparc64/include/utrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/utrap.h,v 1.4 2003/04/29 21:30:59 jake Exp $
  */
 
 #ifndef	_MACHINE_UTRAP_H_
diff --git a/sys/sparc64/include/varargs.h b/sys/sparc64/include/varargs.h
index a168c6e33c32..a477054c4c13 100644
--- a/sys/sparc64/include/varargs.h
+++ b/sys/sparc64/include/varargs.h
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.3 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/varargs.h,v 1.8 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/sparc64/include/ver.h b/sys/sparc64/include/ver.h
index fec56ce04e9c..25620ad239cb 100644
--- a/sys/sparc64/include/ver.h
+++ b/sys/sparc64/include/ver.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ver.h,v 1.5 2004/12/24 16:21:46 scottl Exp $
  */
 
 #ifndef	_MACHINE_VER_H_
diff --git a/sys/sparc64/include/vmparam.h b/sys/sparc64/include/vmparam.h
index de4112b13d76..59794351e14f 100644
--- a/sys/sparc64/include/vmparam.h
+++ b/sys/sparc64/include/vmparam.h
@@ -37,7 +37,7 @@
  *
  *	from: @(#)vmparam.h     5.9 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/vmparam.h,v 1.33 2000/03/30
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/vmparam.h,v 1.14 2002/12/27 19:31:26 jake Exp $
  */
 
 
diff --git a/sys/sparc64/include/watch.h b/sys/sparc64/include/watch.h
index bb658f9efb53..232b532ef1cc 100644
--- a/sys/sparc64/include/watch.h
+++ b/sys/sparc64/include/watch.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/watch.h,v 1.2 2003/04/08 06:35:08 jake Exp $
  */
 
 #ifndef	_MACHINE_WATCH_H_
diff --git a/sys/sparc64/include/wstate.h b/sys/sparc64/include/wstate.h
index 7ce0a495d5d2..d2253ce02a1b 100644
--- a/sys/sparc64/include/wstate.h
+++ b/sys/sparc64/include/wstate.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: wstate.h,v 1.4 1997/09/18 13:05:51 torek Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/wstate.h,v 1.4 2002/02/25 18:37:17 jake Exp $
  */
 
 #ifndef	_MACHINE_WSTATE_H_
diff --git a/sys/sparc64/isa/isa.c b/sys/sparc64/isa/isa.c
index 4147e376a593..b89b567fdbf6 100644
--- a/sys/sparc64/isa/isa.c
+++ b/sys/sparc64/isa/isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/isa/isa.c,v 1.16 2005/05/19 15:47:37 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/isa/isa_dma.c b/sys/sparc64/isa/isa_dma.c
index 19c464485a8e..44ff4d555ea7 100644
--- a/sys/sparc64/isa/isa_dma.c
+++ b/sys/sparc64/isa/isa_dma.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/isa/isa_dma.c,v 1.2 2005/02/06 13:46:39 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/isa/ofw_isa.c b/sys/sparc64/isa/ofw_isa.c
index d3ae4d036941..c2d037b0524d 100644
--- a/sys/sparc64/isa/ofw_isa.c
+++ b/sys/sparc64/isa/ofw_isa.c
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: ebus.c,v 1.26 2001/09/10 16:27:53 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/isa/ofw_isa.c,v 1.9 2005/01/07 02:29:22 imp Exp $
  */
 
 /*
diff --git a/sys/sparc64/isa/ofw_isa.h b/sys/sparc64/isa/ofw_isa.h
index 74b48c0ed00d..59db14d14069 100644
--- a/sys/sparc64/isa/ofw_isa.h
+++ b/sys/sparc64/isa/ofw_isa.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: ebus.c,v 1.26 2001/09/10 16:27:53 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/isa/ofw_isa.h,v 1.5 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _SPARC64_ISA_OFW_ISA_H_
diff --git a/sys/sparc64/pci/apb.c b/sys/sparc64/pci/apb.c
index 2dbe7d0d5d03..7e601a1e0a16 100644
--- a/sys/sparc64/pci/apb.c
+++ b/sys/sparc64/pci/apb.c
@@ -30,7 +30,7 @@
  *
  *	from: FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.3 2000/12/13
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/apb.c,v 1.11 2005/04/28 03:33:46 marcel Exp $
  */
 
 /*
diff --git a/sys/sparc64/pci/ofw_pci.c b/sys/sparc64/pci/ofw_pci.c
index 764c362038ae..112ec1d94f9f 100644
--- a/sys/sparc64/pci/ofw_pci.c
+++ b/sys/sparc64/pci/ofw_pci.c
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psycho.c,v 1.35 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/ofw_pci.c,v 1.15 2005/01/07 02:29:22 imp Exp $
  */
 
 #include "opt_ofw_pci.h"
diff --git a/sys/sparc64/pci/ofw_pci.h b/sys/sparc64/pci/ofw_pci.h
index f87f65a30ce9..679da054c584 100644
--- a/sys/sparc64/pci/ofw_pci.h
+++ b/sys/sparc64/pci/ofw_pci.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/ofw_pci.h,v 1.9 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _SPARC64_PCI_OFW_PCI_H_
diff --git a/sys/sparc64/pci/ofw_pci_if.m b/sys/sparc64/pci/ofw_pci_if.m
index cd729eb308db..111a928a9e1a 100644
--- a/sys/sparc64/pci/ofw_pci_if.m
+++ b/sys/sparc64/pci/ofw_pci_if.m
@@ -22,7 +22,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/pci/ofw_pci_if.m,v 1.6 2005/01/07 02:29:22 imp Exp $
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/sparc64/pci/ofw_pcib.c b/sys/sparc64/pci/ofw_pcib.c
index bf2f1d7236b7..edacbc9b2992 100644
--- a/sys/sparc64/pci/ofw_pcib.c
+++ b/sys/sparc64/pci/ofw_pcib.c
@@ -30,7 +30,7 @@
  *
  *	from: FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.3 2000/12/13
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/ofw_pcib.c,v 1.4 2004/08/12 17:41:32 marius Exp $
  */
 
 #include "opt_ofw_pci.h"
diff --git a/sys/sparc64/pci/ofw_pcib_subr.c b/sys/sparc64/pci/ofw_pcib_subr.c
index b297d3402c95..6dab19e39e8e 100644
--- a/sys/sparc64/pci/ofw_pcib_subr.c
+++ b/sys/sparc64/pci/ofw_pcib_subr.c
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/ofw_pcib_subr.c,v 1.4 2004/08/12 17:41:32 marius Exp $
  */
 
 #include "opt_ofw_pci.h"
diff --git a/sys/sparc64/pci/ofw_pcib_subr.h b/sys/sparc64/pci/ofw_pcib_subr.h
index 8c17e2caeae3..836d4cd0c034 100644
--- a/sys/sparc64/pci/ofw_pcib_subr.h
+++ b/sys/sparc64/pci/ofw_pcib_subr.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/ofw_pcib_subr.h,v 1.3 2004/08/12 17:41:32 marius Exp $
  */
 
 #ifndef _SPARC64_PCI_OFW_PCI_SUBR_H
diff --git a/sys/sparc64/pci/ofw_pcibus.c b/sys/sparc64/pci/ofw_pcibus.c
index a9b9ad99581f..249be1df42a1 100644
--- a/sys/sparc64/pci/ofw_pcibus.c
+++ b/sys/sparc64/pci/ofw_pcibus.c
@@ -26,7 +26,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/sys/sparc64/pci/ofw_pcibus.c,v 1.6 2005/03/23 18:16:26 jmg Exp $
  */
 
 #include "opt_ofw_pci.h"
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index e6f759d5d9b6..9b2ae10ec4ac 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.53 2005/01/07 02:29:22 imp Exp $
  */
 
 /*
diff --git a/sys/sparc64/pci/psychoreg.h b/sys/sparc64/pci/psychoreg.h
index 0d3a43438b37..fe54ffc43f2b 100644
--- a/sys/sparc64/pci/psychoreg.h
+++ b/sys/sparc64/pci/psychoreg.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/psychoreg.h,v 1.9 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _SPARC64_PCI_PSYCHOREG_H_
diff --git a/sys/sparc64/pci/psychovar.h b/sys/sparc64/pci/psychovar.h
index 4bd3b69a1809..6a11f9828175 100644
--- a/sys/sparc64/pci/psychovar.h
+++ b/sys/sparc64/pci/psychovar.h
@@ -27,7 +27,7 @@
  *
  *	from: NetBSD: psychovar.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/psychovar.h,v 1.12 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _SPARC64_PCI_PSYCHOVAR_H_
diff --git a/sys/sparc64/sbus/dma_sbus.c b/sys/sparc64/sbus/dma_sbus.c
index 9f34a8fc3b23..2116449285c4 100644
--- a/sys/sparc64/sbus/dma_sbus.c
+++ b/sys/sparc64/sbus/dma_sbus.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.1 2005/05/19 14:51:10 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sbus/lsi64854.c b/sys/sparc64/sbus/lsi64854.c
index 72bf36c5e06c..dc8fc1dd0358 100644
--- a/sys/sparc64/sbus/lsi64854.c
+++ b/sys/sparc64/sbus/lsi64854.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/lsi64854.c,v 1.7 2005/05/19 14:51:10 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sbus/lsi64854reg.h b/sys/sparc64/sbus/lsi64854reg.h
index 802e9d6be82e..02218f8efb5c 100644
--- a/sys/sparc64/sbus/lsi64854reg.h
+++ b/sys/sparc64/sbus/lsi64854reg.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/sparc64/sbus/lsi64854reg.h,v 1.3 2005/04/17 17:41:32 marius Exp $ */
 
 /*
  * LSI 64854 DMA engine. Contains three independent channels
diff --git a/sys/sparc64/sbus/lsi64854var.h b/sys/sparc64/sbus/lsi64854var.h
index 3b5e20c479aa..d54b9d1664ad 100644
--- a/sys/sparc64/sbus/lsi64854var.h
+++ b/sys/sparc64/sbus/lsi64854var.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/sparc64/sbus/lsi64854var.h,v 1.5 2005/05/19 14:51:10 marius Exp $ */
 
 struct lsi64854_softc {
 	device_t		sc_dev;
diff --git a/sys/sparc64/sbus/ofw_sbus.h b/sys/sparc64/sbus/ofw_sbus.h
index 8db6a3217364..942e01fa1fa7 100644
--- a/sys/sparc64/sbus/ofw_sbus.h
+++ b/sys/sparc64/sbus/ofw_sbus.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: sbusvar.h,v 1.12 2001/09/24 23:49:34 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sbus/ofw_sbus.h,v 1.1 2002/02/13 16:11:36 tmm Exp $
  */
 
 #ifndef _SPARC64_SBUS_OFW_SBUS_H_
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 1c245d342786..8ad0ee285688 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.35 2005/05/19 14:47:31 marius Exp $");
 
 /*
  * SBus support.
diff --git a/sys/sparc64/sbus/sbusreg.h b/sys/sparc64/sbus/sbusreg.h
index 8b47d67372a6..b20a96c15d3c 100644
--- a/sys/sparc64/sbus/sbusreg.h
+++ b/sys/sparc64/sbus/sbusreg.h
@@ -21,7 +21,7 @@
  *
  *	from: NetBSD: sbusreg.h,v 1.7 1999/06/07 05:28:03 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sbus/sbusreg.h,v 1.2 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _SPARC64_SBUS_SBUSREG_H_
diff --git a/sys/sparc64/sbus/sbusvar.h b/sys/sparc64/sbus/sbusvar.h
index e4f2895e261a..e645d1ae3926 100644
--- a/sys/sparc64/sbus/sbusvar.h
+++ b/sys/sparc64/sbus/sbusvar.h
@@ -73,7 +73,7 @@
  *	from: @(#)sbusvar.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: sbusvar.h,v 1.7 1999/06/05 05:30:43 mrg Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sbus/sbusvar.h,v 1.6 2005/05/19 14:47:31 marius Exp $
  */
 
 #ifndef _SPARC64_SBUS_SBUSVAR_H_
diff --git a/sys/sparc64/sparc64/autoconf.c b/sys/sparc64/sparc64/autoconf.c
index dd8044de95e0..932f9836a643 100644
--- a/sys/sparc64/sparc64/autoconf.c
+++ b/sys/sparc64/sparc64/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/autoconf.c,v 1.13 2005/05/29 23:44:22 marcel Exp $
  */
 
 #include "opt_isa.h"
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 7a9bdf3f68c5..58d6e221d4ff 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -97,7 +97,7 @@
  *	and
  * 	from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.43 2005/01/15 09:20:47 scottl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/cache.c b/sys/sparc64/sparc64/cache.c
index 48d324af12af..e15ce9f536e2 100644
--- a/sys/sparc64/sparc64/cache.c
+++ b/sys/sparc64/sparc64/cache.c
@@ -68,7 +68,7 @@
  *	from: @(#)cache.c	8.2 (Berkeley) 10/30/93
  *	from: NetBSD: cache.c,v 1.5 2000/12/06 01:47:50 mrg Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/cache.c,v 1.20 2005/01/07 02:29:23 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/cheetah.c b/sys/sparc64/sparc64/cheetah.c
index 14f099d37138..4ab753e5e056 100644
--- a/sys/sparc64/sparc64/cheetah.c
+++ b/sys/sparc64/sparc64/cheetah.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/cheetah.c,v 1.5 2003/11/11 06:41:54 jake Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sparc64/sparc64/clock.c b/sys/sparc64/sparc64/clock.c
index 37341fd3ba43..dc4d75d97f10 100644
--- a/sys/sparc64/sparc64/clock.c
+++ b/sys/sparc64/sparc64/clock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/clock.c,v 1.10 2003/02/03 17:53:15 jake Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/counter.c b/sys/sparc64/sparc64/counter.c
index 3e934659f9b0..cf7f453170fa 100644
--- a/sys/sparc64/sparc64/counter.c
+++ b/sys/sparc64/sparc64/counter.c
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/counter.c,v 1.6 2004/09/30 14:30:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_disasm.c b/sys/sparc64/sparc64/db_disasm.c
index 32bdcca9069b..93cd503f4f7a 100644
--- a/sys/sparc64/sparc64/db_disasm.c
+++ b/sys/sparc64/sparc64/db_disasm.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.
  *	from: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/db_disasm.c,v 1.8 2005/01/07 02:29:23 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_hwwatch.c b/sys/sparc64/sparc64/db_hwwatch.c
index ca92c37220c7..904fd0df1396 100644
--- a/sys/sparc64/sparc64/db_hwwatch.c
+++ b/sys/sparc64/sparc64/db_hwwatch.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/db_hwwatch.c,v 1.5 2003/08/22 07:38:08 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_interface.c b/sys/sparc64/sparc64/db_interface.c
index 77e1493652eb..7af3888102ab 100644
--- a/sys/sparc64/sparc64/db_interface.c
+++ b/sys/sparc64/sparc64/db_interface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/db_interface.c,v 1.10 2004/07/10 23:47:20 marcel Exp $
  */
 
 #include <sys/param.h> 
diff --git a/sys/sparc64/sparc64/db_trace.c b/sys/sparc64/sparc64/db_trace.c
index dc6e4bb5bc92..180ae6e09a14 100644
--- a/sys/sparc64/sparc64/db_trace.c
+++ b/sys/sparc64/sparc64/db_trace.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/db_trace.c,v 1.23 2004/11/27 06:51:38 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/dump_machdep.c b/sys/sparc64/sparc64/dump_machdep.c
index 005a10c8deba..3378e50ac04f 100644
--- a/sys/sparc64/sparc64/dump_machdep.c
+++ b/sys/sparc64/sparc64/dump_machdep.c
@@ -24,7 +24,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/sys/sparc64/sparc64/dump_machdep.c,v 1.8 2005/01/07 02:29:23 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index e6b895590f0f..a0c6294d56e1 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/eeprom.c,v 1.9 2005/05/19 21:16:50 marius Exp $");
 
 /*
  * clock (eeprom) attaches at EBus, FireHose or SBus
diff --git a/sys/sparc64/sparc64/elf_machdep.c b/sys/sparc64/sparc64/elf_machdep.c
index edc18ac0e195..d43bc8a43bc4 100644
--- a/sys/sparc64/sparc64/elf_machdep.c
+++ b/sys/sparc64/sparc64/elf_machdep.c
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: NetBSD: mdreloc.c,v 1.5 2001/04/25 12:24:51 kleink Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.19 2004/08/11 02:35:06 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S
index 8b865523a0fb..ca23c7841b89 100644
--- a/sys/sparc64/sparc64/exception.S
+++ b/sys/sparc64/sparc64/exception.S
@@ -54,7 +54,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/exception.S,v 1.70 2005/04/16 15:05:56 marius Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/gdb_machdep.c b/sys/sparc64/sparc64/gdb_machdep.c
index 97e613560511..d303194ab9f6 100644
--- a/sys/sparc64/sparc64/gdb_machdep.c
+++ b/sys/sparc64/sparc64/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/gdb_machdep.c,v 1.3 2005/01/07 02:29:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/genassym.c b/sys/sparc64/sparc64/genassym.c
index c01ff588c1f9..acee7ee18eda 100644
--- a/sys/sparc64/sparc64/genassym.c
+++ b/sys/sparc64/sparc64/genassym.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.57 2005/04/16 15:05:56 marius Exp $");
 
 #include "opt_kstack_pages.h"
 
diff --git a/sys/sparc64/sparc64/identcpu.c b/sys/sparc64/sparc64/identcpu.c
index 4ba6ebe4f29d..68ff3a54a2b5 100644
--- a/sys/sparc64/sparc64/identcpu.c
+++ b/sys/sparc64/sparc64/identcpu.c
@@ -6,7 +6,7 @@
  * As long as the above copyright statement and this notice remain
  * unchanged, you can do what ever you want with this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/identcpu.c,v 1.14 2005/01/07 02:29:23 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/in_cksum.c b/sys/sparc64/sparc64/in_cksum.c
index 8239b110e772..88f5de167ff6 100644
--- a/sys/sparc64/sparc64/in_cksum.c
+++ b/sys/sparc64/sparc64/in_cksum.c
@@ -54,7 +54,7 @@
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  * 	from: FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.22 2000/11/25
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/in_cksum.c,v 1.2 2004/04/07 05:00:01 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S
index 6a4318125ce1..829d476c5f10 100644
--- a/sys/sparc64/sparc64/interrupt.S
+++ b/sys/sparc64/sparc64/interrupt.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.8 2005/04/16 15:05:56 marius Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c
index 24f71daa24b2..42ad46e5057f 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/intr_machdep.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.23 2005/04/16 15:05:56 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index 178ac4e2b49e..9140eb24b47e 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -97,7 +97,7 @@
  *	from: @(#)sbus.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommu.c,v 1.42 2001/08/06 22:02:58 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.43 2005/01/31 07:28:04 scottl Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/locore.S b/sys/sparc64/sparc64/locore.S
index deb1033fe4a2..2f6ed9fff2db 100644
--- a/sys/sparc64/sparc64/locore.S
+++ b/sys/sparc64/sparc64/locore.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/locore.S,v 1.21 2003/04/29 00:37:41 jake Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index 89e12d080fda..2dbc71f59429 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.125 2005/04/16 15:00:09 marius Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index 5960fe85cf35..f1034fb68f8b 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mem.c,v 1.15 2004/08/15 21:37:52 marius Exp $");
 
 /*
  * Memory special file
diff --git a/sys/sparc64/sparc64/mp_exception.S b/sys/sparc64/sparc64/mp_exception.S
index eca488258085..a5c96496c475 100644
--- a/sys/sparc64/sparc64/mp_exception.S
+++ b/sys/sparc64/sparc64/mp_exception.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_exception.S,v 1.12 2003/06/19 05:27:04 jake Exp $");
 
 #include <machine/asi.h>
 #include <machine/ktr.h>
diff --git a/sys/sparc64/sparc64/mp_locore.S b/sys/sparc64/sparc64/mp_locore.S
index 718e7c8f4c44..618ee6f7a08e 100644
--- a/sys/sparc64/sparc64/mp_locore.S
+++ b/sys/sparc64/sparc64/mp_locore.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_locore.S,v 1.7 2003/04/29 00:37:41 jake Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/mp_machdep.c b/sys/sparc64/sparc64/mp_machdep.c
index 140f94416d38..7085067de2b0 100644
--- a/sys/sparc64/sparc64/mp_machdep.c
+++ b/sys/sparc64/sparc64/mp_machdep.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.29 2005/04/16 14:57:38 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c
index eb88c23cf006..dab7449ba801 100644
--- a/sys/sparc64/sparc64/nexus.c
+++ b/sys/sparc64/sparc64/nexus.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/nexus.c,v 1.17 2005/05/21 20:19:27 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index f7458dcc62fd..25d66a79b36a 100644
--- a/sys/sparc64/sparc64/ofw_bus.c
+++ b/sys/sparc64/sparc64/ofw_bus.c
@@ -54,7 +54,7 @@
  *
  *	from: $NetBSD: ofw_machdep.c,v 1.16 2001/07/20 00:07:14 eeh Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/ofw_bus.c,v 1.12 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/ofw_machdep.c b/sys/sparc64/sparc64/ofw_machdep.c
index 016b43292245..a2bdf1356770 100644
--- a/sys/sparc64/sparc64/ofw_machdep.c
+++ b/sys/sparc64/sparc64/ofw_machdep.c
@@ -25,7 +25,7 @@
  */
  
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/ofw_machdep.c,v 1.14 2005/05/21 20:17:01 marius Exp $");
 
 /*
  * Some Open Firmware helper functions that are likely machine dependent.
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index 8d620580d280..5d48a30f27b1 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *      from:   @(#)pmap.c      7.7 (Berkeley)  5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.148 2005/06/10 03:33:36 alc Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/prof_machdep.c b/sys/sparc64/sparc64/prof_machdep.c
index 065a1daa44c2..fe8012b8b14c 100644
--- a/sys/sparc64/sparc64/prof_machdep.c
+++ b/sys/sparc64/sparc64/prof_machdep.c
@@ -26,7 +26,7 @@
  *
  *	from: src/sys/i386/isa/prof_machdep.c,v 1.16 2000/07/04 11:25:19
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/prof_machdep.c,v 1.1 2002/07/29 00:45:13 jake Exp $
  */
 
 #ifdef GUPROF
diff --git a/sys/sparc64/sparc64/rtc.c b/sys/sparc64/sparc64/rtc.c
index be8e009df0bb..a499368b3a77 100644
--- a/sys/sparc64/sparc64/rtc.c
+++ b/sys/sparc64/sparc64/rtc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/rtc.c,v 1.4 2005/06/04 23:24:50 marius Exp $");
 
 /*
  * The `rtc' device is a MC146818 compatible clock found on the ISA bus
diff --git a/sys/sparc64/sparc64/rwindow.c b/sys/sparc64/sparc64/rwindow.c
index 5ea877413bd8..7be296361f7f 100644
--- a/sys/sparc64/sparc64/rwindow.c
+++ b/sys/sparc64/sparc64/rwindow.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: trap.c,v 1.17.2.9 1999/10/19 15:29:52 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/rwindow.c,v 1.9 2004/11/27 06:51:38 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/sc_machdep.c b/sys/sparc64/sparc64/sc_machdep.c
index 032f793b8b51..73a237f4c8d7 100644
--- a/sys/sparc64/sparc64/sc_machdep.c
+++ b/sys/sparc64/sparc64/sc_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/sc_machdep.c,v 1.2 2005/05/21 20:38:26 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/spitfire.c b/sys/sparc64/sparc64/spitfire.c
index abbcdaee3cfa..36bd393e80a8 100644
--- a/sys/sparc64/sparc64/spitfire.c
+++ b/sys/sparc64/sparc64/spitfire.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/spitfire.c,v 1.5 2003/11/11 06:41:54 jake Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sparc64/sparc64/support.S b/sys/sparc64/sparc64/support.S
index 57ca63792420..dd2f7f1fb10e 100644
--- a/sys/sparc64/sparc64/support.S
+++ b/sys/sparc64/sparc64/support.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/support.S,v 1.29 2003/11/11 06:41:54 jake Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/swtch.S b/sys/sparc64/sparc64/swtch.S
index df5f0ab089c5..3d10e1286a65 100644
--- a/sys/sparc64/sparc64/swtch.S
+++ b/sys/sparc64/sparc64/swtch.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/swtch.S,v 1.33 2004/05/26 12:06:52 tmm Exp $");
 
 #include <machine/asmacros.h>
 #include <machine/asi.h>
diff --git a/sys/sparc64/sparc64/sys_machdep.c b/sys/sparc64/sparc64/sys_machdep.c
index 9ac5fbc212a4..5f731d02b4e1 100644
--- a/sys/sparc64/sparc64/sys_machdep.c
+++ b/sys/sparc64/sparc64/sys_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/sys_machdep.c,v 1.14 2005/01/19 18:24:07 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/tick.c b/sys/sparc64/sparc64/tick.c
index 3c6c7f125945..cd2f78e6ee10 100644
--- a/sys/sparc64/sparc64/tick.c
+++ b/sys/sparc64/sparc64/tick.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/tick.c,v 1.16 2005/04/16 14:57:38 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/sparc64/sparc64/tlb.c b/sys/sparc64/sparc64/tlb.c
index 2226e0227822..60f455a42453 100644
--- a/sys/sparc64/sparc64/tlb.c
+++ b/sys/sparc64/sparc64/tlb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/tlb.c,v 1.8 2003/08/22 07:38:08 imp Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index 4629dea27627..7fdc3497b683 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -37,7 +37,7 @@
  *
  *      from: @(#)trap.c        7.4 (Berkeley) 5/13/91
  * 	from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.74 2005/04/12 23:18:54 jhb Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/tsb.c b/sys/sparc64/sparc64/tsb.c
index 8e99633d6f12..ec07c6c8aa26 100644
--- a/sys/sparc64/sparc64/tsb.c
+++ b/sys/sparc64/sparc64/tsb.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI: pmap.c,v 1.28.2.15 2000/04/27 03:10:31 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/tsb.c,v 1.37 2005/02/12 03:48:54 alc Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/uio_machdep.c b/sys/sparc64/sparc64/uio_machdep.c
index 4a670fa512ef..99e293b40abc 100644
--- a/sys/sparc64/sparc64/uio_machdep.c
+++ b/sys/sparc64/sparc64/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/uio_machdep.c,v 1.8 2005/01/07 02:29:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index 9dd80fdb8a55..f13467112c94 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -40,7 +40,7 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * 	from: FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.167 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.74 2005/07/10 23:31:11 davidxu Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sys/_iovec.h b/sys/sys/_iovec.h
index bd7207332938..12499c342161 100644
--- a/sys/sys/_iovec.h
+++ b/sys/sys/_iovec.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_iovec.h,v 1.4 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS__IOVEC_H_
diff --git a/sys/sys/_label.h b/sys/sys/_label.h
index 8c10079ea122..5dae68725db2 100644
--- a/sys/sys/_label.h
+++ b/sys/sys/_label.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_label.h,v 1.6 2004/05/10 18:38:07 rwatson Exp $
  */
 #ifndef _SYS__LABEL_H_
 #define	_SYS__LABEL_H_
diff --git a/sys/sys/_lock.h b/sys/sys/_lock.h
index 1770487d709f..14018c823339 100644
--- a/sys/sys/_lock.h
+++ b/sys/sys/_lock.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_lock.h,v 1.10 2004/06/19 14:58:35 bde Exp $
  */
 
 #ifndef _SYS__LOCK_H_
diff --git a/sys/sys/_mutex.h b/sys/sys/_mutex.h
index 9b24459456bd..b1fb0455fd0f 100644
--- a/sys/sys/_mutex.h
+++ b/sys/sys/_mutex.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_mutex.h,v 1.11 2004/01/25 01:59:26 rwatson Exp $
  */
 
 #ifndef _SYS__MUTEX_H_
diff --git a/sys/sys/_null.h b/sys/sys/_null.h
index 9e965f100b1a..8e497498df10 100644
--- a/sys/sys/_null.h
+++ b/sys/sys/_null.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/sys/sys/_null.h,v 1.7 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef NULL
diff --git a/sys/sys/_pthreadtypes.h b/sys/sys/_pthreadtypes.h
index 6337540afba9..0e7effa437db 100644
--- a/sys/sys/_pthreadtypes.h
+++ b/sys/sys/_pthreadtypes.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_pthreadtypes.h,v 1.1 2005/05/31 15:18:17 rodrigc Exp $
  */
 
 #ifndef _SYS__PTHREADTYPES_H_
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 06826701f740..a0a29fd4a815 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_sigset.h,v 1.36 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS__SIGSET_H_
diff --git a/sys/sys/_task.h b/sys/sys/_task.h
index 2a51e1b07b97..99e097b6434c 100644
--- a/sys/sys/_task.h
+++ b/sys/sys/_task.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_task.h,v 1.4 2005/04/24 16:52:45 sam Exp $
  */
 
 #ifndef _SYS__TASK_H_
diff --git a/sys/sys/_timespec.h b/sys/sys/_timespec.h
index 9dcd5f8910dc..c7507690efff 100644
--- a/sys/sys/_timespec.h
+++ b/sys/sys/_timespec.h
@@ -28,7 +28,7 @@
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
  * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/_timespec.h,v 1.5 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sys/_timeval.h b/sys/sys/_timeval.h
index d9ea6f5edbdd..9784bcfce154 100644
--- a/sys/sys/_timeval.h
+++ b/sys/sys/_timeval.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_timeval.h,v 1.1 2002/12/31 04:08:41 mike Exp $
  */
 
 #ifndef _SYS__TIMEVAL_H_
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index cde80d949392..d423dfb083cd 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_types.h,v 1.21 2005/03/22 01:19:17 das Exp $
  */
 
 #ifndef _SYS__TYPES_H_
diff --git a/sys/sys/aac_ioctl.h b/sys/sys/aac_ioctl.h
index f01cf70e506e..25d2029ce17d 100644
--- a/sys/sys/aac_ioctl.h
+++ b/sys/sys/aac_ioctl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/aac_ioctl.h,v 1.11 2004/12/09 22:20:25 scottl Exp $
  */
 
 /*
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 167a90ccb922..5a3dac6c0cfe 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/acct.h,v 1.18 2004/06/17 17:16:52 phk Exp $
  */
 
 #ifndef _SYS_ACCT_H_
diff --git a/sys/sys/acl.h b/sys/sys/acl.h
index 4b96a403969f..d539e1c451b5 100644
--- a/sys/sys/acl.h
+++ b/sys/sys/acl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/acl.h,v 1.28 2005/05/12 22:01:18 rwatson Exp $
  */
 /* 
  * Developed by the TrustedBSD Project.
diff --git a/sys/sys/agpio.h b/sys/sys/agpio.h
index 8c1294f69863..a265415bb3e4 100644
--- a/sys/sys/agpio.h
+++ b/sys/sys/agpio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/agpio.h,v 1.4 2003/10/23 18:08:56 jhb Exp $
  */
 
 #ifndef _SYS_AGPIO_H_
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index f0c2a11576ed..eed26bf69ce5 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/aio.h,v 1.30 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_AIO_H_
diff --git a/sys/sys/alq.h b/sys/sys/alq.h
index bc4961e094c8..32c592f2ec68 100644
--- a/sys/sys/alq.h
+++ b/sys/sys/alq.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/sys/sys/alq.h,v 1.6 2005/04/16 12:12:26 rwatson Exp $
  *
  */
 #ifndef _SYS_ALQ_H_
diff --git a/sys/sys/assym.h b/sys/sys/assym.h
index 9316a4e4996c..c9dc097a9469 100644
--- a/sys/sys/assym.h
+++ b/sys/sys/assym.h
@@ -25,7 +25,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/sys/sys/assym.h,v 1.5 2004/03/12 21:45:32 trhodes Exp $
  */
 
 #ifndef _SYS_ASSYM_H_
diff --git a/sys/sys/ata.h b/sys/sys/ata.h
index cb18a4a9292d..0d1354bbdb3c 100644
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
@@ -25,7 +25,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/sys/sys/ata.h,v 1.26.2.2 2005/08/25 16:16:45 sos Exp $
  */
 
 #ifndef _SYS_ATA_H_
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 8dcae46de028..97c56da754e1 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bio.h,v 1.144 2005/06/12 22:33:06 jeff Exp $
  */
 
 #ifndef _SYS_BIO_H_
diff --git a/sys/sys/bitstring.h b/sys/sys/bitstring.h
index 125ef51d8895..ab91c81c2d32 100644
--- a/sys/sys/bitstring.h
+++ b/sys/sys/bitstring.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bitstring.h,v 1.5 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_BITSTRING_H_
diff --git a/sys/sys/blist.h b/sys/sys/blist.h
index 5f4d66ee8c98..132ec236e640 100644
--- a/sys/sys/blist.h
+++ b/sys/sys/blist.h
@@ -49,7 +49,7 @@
  *		that.  Managing something like 512MB worth of 4K blocks 
  *		eats around 32 KBytes of memory. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/blist.h,v 1.9 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_BLIST_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index a3dde53a008a..c26f21bfc8ca 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/buf.h,v 1.187.2.3 2005/10/04 04:41:26 truckman Exp $
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h
index cab7fb002299..9d7c55b61fd8 100644
--- a/sys/sys/bufobj.h
+++ b/sys/sys/bufobj.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bufobj.h,v 1.15 2005/06/10 23:50:41 green Exp $
  */
 
 /*
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index b811b145a63a..b2b0a46b89b1 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bus.h,v 1.70 2005/04/12 15:20:36 imp Exp $
  */
 
 #ifndef _SYS_BUS_H_
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 3151d0bc6209..f71ae46264de 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -67,7 +67,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/sys/sys/bus_dma.h,v 1.29 2005/03/15 14:57:29 jmg Exp $ */
 
 #ifndef _BUS_DMA_H_
 #define _BUS_DMA_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index a55456254640..428008ff1b72 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/callout.h,v 1.28.2.1 2005/09/12 13:43:34 glebius Exp $
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index c8488cb84e34..59273fabf36e 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.88.2.1 2005/10/09 07:48:48 netchild Exp $
  */
 
 #ifndef	_SYS_CDEFS_H_
@@ -379,7 +379,7 @@
  * Embed the rcs id of a source file in the resulting library.  Note that in
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *	__FBSDID("$FreeBSD$");
+ *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.88.2.1 2005/10/09 07:48:48 netchild Exp $");
  */
 #ifndef	__FBSDID
 #if !defined(lint) && !defined(STRIP_FBSDID)
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index 3614d19ee0d2..7b3a1d679c28 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cdio.h,v 1.26 2005/01/30 08:12:37 sobomax Exp $
  */
 
 /*
diff --git a/sys/sys/cdrio.h b/sys/sys/cdrio.h
index b664a585af15..f3258551adb7 100644
--- a/sys/sys/cdrio.h
+++ b/sys/sys/cdrio.h
@@ -25,7 +25,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/sys/sys/cdrio.h,v 1.9 2002/10/18 22:03:38 njl Exp $
  */
 
 #ifndef	_SYS_CDRIO_H_
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index aa55f7cbc02c..d36a1ed10e34 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/chio.h,v 1.17 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef	_SYS_CHIO_H_
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 5edc145a976d..cda18a5bf2de 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/clist.h,v 1.11 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_CLIST_H_
diff --git a/sys/sys/clock.h b/sys/sys/clock.h
index 1c71d0e37d0b..a53ccd85c34d 100644
--- a/sys/sys/clock.h
+++ b/sys/sys/clock.h
@@ -35,7 +35,7 @@
  *
  *	$NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/clock.h,v 1.1 2002/04/04 23:39:08 tmm Exp $
  */
 
 #ifndef _SYS_CLOCK_H_
diff --git a/sys/sys/condvar.h b/sys/sys/condvar.h
index a8c9db72c0b1..05eb57dec252 100644
--- a/sys/sys/condvar.h
+++ b/sys/sys/condvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/condvar.h,v 1.12 2004/05/05 21:57:44 jhb Exp $
  */
 
 #ifndef	_SYS_CONDVAR_H_
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index cecd71a51c6c..e68341474d50 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/conf.h,v 1.222.2.3 2005/09/26 14:36:54 phk Exp $
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index f9cbe2c5def2..4c1dc90d7cce 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cons.h,v 1.37 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index 505ef060d964..ad388e9932af 100644
--- a/sys/sys/consio.h
+++ b/sys/sys/consio.h
@@ -25,7 +25,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/sys/sys/consio.h,v 1.17 2005/05/15 07:35:49 nyan Exp $
  */
 
 #ifndef	_SYS_CONSIO_H_
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 7bd5898bad76..b45c0308d8e9 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/copyright.h,v 1.19 2005/01/07 02:29:23 imp Exp $
  */
 
 
diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h
index e2337ab020f7..7d369bf4e127 100644
--- a/sys/sys/cpu.h
+++ b/sys/sys/cpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cpu.h,v 1.3 2005/02/19 06:13:25 njl Exp $
  */
 
 #ifndef _SYS_CPU_H_
diff --git a/sys/sys/ctype.h b/sys/sys/ctype.h
index 5022d40c15b2..507085326799 100644
--- a/sys/sys/ctype.h
+++ b/sys/sys/ctype.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ctype.h,v 1.4 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_CTYPE_H_
diff --git a/sys/sys/dataacq.h b/sys/sys/dataacq.h
index 69afbf9a08c4..300fadcdf359 100644
--- a/sys/sys/dataacq.h
+++ b/sys/sys/dataacq.h
@@ -1,7 +1,7 @@
 /*
  * Header for general data acquisition definitions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dataacq.h,v 1.5 2000/05/01 20:11:13 peter Exp $
  */
 
 #ifndef	_SYS_DATAACQ_H_
diff --git a/sys/sys/device_port.h b/sys/sys/device_port.h
index 51010bd8babc..3abd3b7992a9 100644
--- a/sys/sys/device_port.h
+++ b/sys/sys/device_port.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/device_port.h,v 1.2 2005/01/19 01:31:33 imp Exp $
  */
 
 #if defined(__NetBSD__)
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 1a017cb31ca5..07fd4d455b91 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/devicestat.h,v 1.26 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _DEVICESTAT_H
diff --git a/sys/sys/digiio.h b/sys/sys/digiio.h
index 7382c0a77f77..d593bb27323c 100644
--- a/sys/sys/digiio.h
+++ b/sys/sys/digiio.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/digiio.h,v 1.4 2001/06/20 14:51:58 brian Exp $
  */
 
 /*
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index 799ad9ed353c..1bdefdb42fb1 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dir.h,v 1.10 2005/03/02 21:33:29 joerg Exp $
  */
 
 #ifndef _SYS_DIR_H_
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index b2686f6c23f8..c5fb25adb7f9 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.3 (Berkeley) 8/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dirent.h,v 1.14 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef	_SYS_DIRENT_H_
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index b9ab4f335871..95ceb7334148 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/disk.h,v 1.40 2005/01/07 02:29:23 imp Exp $
  *
  */
 
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index f7d81c3b1ccd..e9d1f19539e1 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/disklabel.h,v 1.107 2005/04/07 22:09:02 cognet Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 932d4f4d148c..ab098a149b03 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/diskmbr.h,v 1.100 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_DISKMBR_H_
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 3b2dc94802a2..3ff28f9442cd 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/diskpc98.h,v 1.103 2005/05/08 11:30:26 nyan Exp $
  */
 
 #ifndef _SYS_DISKPC98_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index a9bdf45d549e..a4b7bdb90428 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dkstat.h,v 1.18 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_DKSTAT_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 1ec4447401a0..def66b64e1f2 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/domain.h,v 1.21 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/dvdio.h b/sys/sys/dvdio.h
index 37940719a1b6..eac709e51027 100644
--- a/sys/sys/dvdio.h
+++ b/sys/sys/dvdio.h
@@ -25,7 +25,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/sys/sys/dvdio.h,v 1.5 2002/03/04 21:08:35 sos Exp $
  */
 
 #ifndef _SYS_DVDIO_H_
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index 55ba93debf86..5dfe9c8b0523 100644
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf32.h,v 1.8 2002/05/30 08:32:18 dfr Exp $
  */
 
 #ifndef _SYS_ELF32_H_
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index 9118d437181d..30aee19aa486 100644
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf64.h,v 1.10 2002/05/30 08:32:18 dfr Exp $
  */
 
 #ifndef _SYS_ELF64_H_
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index 2e77d29937ec..f637c9a50f28 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf_common.h,v 1.15 2004/05/05 02:38:54 marcel Exp $
  */
 
 #ifndef _SYS_ELF_COMMON_H_
diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index cc0c471ad90c..5aed2992a7e6 100644
--- a/sys/sys/elf_generic.h
+++ b/sys/sys/elf_generic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf_generic.h,v 1.6 2002/07/20 02:56:11 peter Exp $
  */
 
 #ifndef _SYS_ELF_GENERIC_H_
diff --git a/sys/sys/endian.h b/sys/sys/endian.h
index 35a43804b92c..33b43072d880 100644
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/endian.h,v 1.6 2003/10/15 20:05:57 obrien Exp $
  */
 
 #ifndef _SYS_ENDIAN_H_
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 77b5f67a1734..87146c5ac1a7 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/errno.h,v 1.28 2005/04/02 12:33:28 das Exp $
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/eui64.h b/sys/sys/eui64.h
index 33300a779d3b..129215028fef 100644
--- a/sys/sys/eui64.h
+++ b/sys/sys/eui64.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/eui64.h,v 1.2 2005/01/07 02:29:23 imp Exp $
  */
 #ifndef _SYS_EUI64_H
 #define _SYS_EUI64_H
diff --git a/sys/sys/event.h b/sys/sys/event.h
index c2921c43c09a..ba8055e04c4d 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/event.h,v 1.32 2005/07/01 16:28:32 ssouhlal Exp $
  */
 
 #ifndef _SYS_EVENT_H_
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index 83ffc1443ee1..0a963fc708dc 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/eventhandler.h,v 1.33 2004/12/06 10:53:39 jkoshy Exp $
  */
 
 #ifndef SYS_EVENTHANDLER_H
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index bdb3adf57271..778befe0e6fa 100644
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/eventvar.h,v 1.6 2004/08/15 06:24:42 jmg Exp $
  */
 
 #ifndef _SYS_EVENTVAR_H_
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 8c95c36e6874..ff4c4651cc26 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/exec.h,v 1.32 2005/03/23 08:27:59 das Exp $
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h
index 30daac76af67..56514777b0e4 100644
--- a/sys/sys/extattr.h
+++ b/sys/sys/extattr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/extattr.h,v 1.12 2003/06/04 04:04:24 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index c7183dfc38c0..7f92efb8d707 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -32,7 +32,7 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fbio.h,v 1.16 2005/05/21 20:40:51 marius Exp $
  */
 
 #ifndef _SYS_FBIO_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 4b7b511f0cfa..2fb656eaee73 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fcntl.h,v 1.16 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index e3ffc249cb7c..f6a44daad07f 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fdcio.h,v 1.21 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index ca6f6e838381..d61c230576ec 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.3 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/file.h,v 1.70 2005/02/10 12:27:58 phk Exp $
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 661fa5e72fd4..bc90a73ca4f0 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/filedesc.h,v 1.72.2.1 2005/10/09 03:13:49 delphij Exp $
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index 8f2731a4e3fc..05d1a6c542e1 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/filio.h,v 1.9 2005/03/08 21:32:19 phk Exp $
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/fnv_hash.h b/sys/sys/fnv_hash.h
index 2dbed339113f..5f05ac81632e 100644
--- a/sys/sys/fnv_hash.h
+++ b/sys/sys/fnv_hash.h
@@ -5,7 +5,7 @@
  * This is an implementation of the algorithms posted above.
  * This file is placed in the public domain by Peter Wemm.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fnv_hash.h,v 1.3 2005/01/07 02:29:23 imp Exp $
  */
 
 typedef u_int32_t Fnv32_t;
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index ac405abb726e..5531b817a59b 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/gmon.h,v 1.19 2004/06/14 18:39:28 bms Exp $
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/gpt.h b/sys/sys/gpt.h
index 6c0b7ae92f34..7263e81858a1 100644
--- a/sys/sys/gpt.h
+++ b/sys/sys/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/sys/sys/gpt.h,v 1.8 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_GPT_H_
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h
index 914522d9b7fc..50309f71f185 100644
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/iconv.h,v 1.11.2.1 2005/09/08 15:48:35 imura Exp $
  */
 #ifndef _SYS_ICONV_H_
 #define _SYS_ICONV_H_
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index b1d0f0d09973..693d5410c74a 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact.h,v 1.38 2005/02/25 11:49:42 sobomax Exp $
  */
 
 #ifndef _SYS_IMGACT_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index 1c1596fdcec4..5a7368b8bf77 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact_aout.h,v 1.23 2005/05/08 02:20:10 maxim Exp $
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 345478744fde..8975a75e1b73 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -25,7 +25,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/sys/sys/imgact_elf.h,v 1.27 2004/08/11 02:35:06 marcel Exp $
  */
 
 #ifndef _SYS_IMGACT_ELF_H_
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index b8461a6cf4e4..54a9381f8a17 100644
--- a/sys/sys/inflate.h
+++ b/sys/sys/inflate.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/inflate.h,v 1.14 2005/01/07 02:29:23 imp Exp $
  *
  */
 #ifndef	_SYS_INFLATE_H_
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 9833b226eb42..1b21783ad447 100644
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.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/sys/sys/interrupt.h,v 1.30 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_INTERRUPT_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 7d25b393f3ec..67eb299d2c0a 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioccom.h,v 1.15 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index fd54f6d42ed1..53c57d5ffe9b 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioctl.h,v 1.14 2005/03/02 21:33:29 joerg Exp $
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index bdd295729b66..4d5503cb4dfb 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioctl_compat.h,v 1.8 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index 57b3186f5c5c..77be86b10876 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ipc.h,v 1.25 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index 0be8fac05c53..45e611d7f182 100644
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/jail.h,v 1.26 2005/06/09 18:49:19 pjd Exp $
  *
  */
 
diff --git a/sys/sys/joystick.h b/sys/sys/joystick.h
index 6f2eb5bc2829..a205c8d61fff 100644
--- a/sys/sys/joystick.h
+++ b/sys/sys/joystick.h
@@ -25,7 +25,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/sys/sys/joystick.h,v 1.6 2005/01/07 19:31:43 keramida Exp $
  */
 
 #ifndef	_SYS_JOYSTICK_H_
diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
index a4b1f04b6ca3..99a77cb9c385 100644
--- a/sys/sys/kbio.h
+++ b/sys/sys/kbio.h
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kbio.h,v 1.7.14.1 2005/07/20 18:56:21 emax Exp $
  */
 
 #ifndef	_SYS_KBIO_H_
diff --git a/sys/sys/kdb.h b/sys/sys/kdb.h
index ece16fc5aff8..d9fd7ce800b2 100644
--- a/sys/sys/kdb.h
+++ b/sys/sys/kdb.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/sys/sys/kdb.h,v 1.5 2005/04/20 20:52:46 ps Exp $
  */
 
 #ifndef _SYS_KDB_H_
diff --git a/sys/sys/kenv.h b/sys/sys/kenv.h
index 0a30ddb35d16..efca13adcbeb 100644
--- a/sys/sys/kenv.h
+++ b/sys/sys/kenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kenv.h,v 1.1 2002/04/17 13:06:36 mux Exp $
  */
 
 #ifndef _SYS_KENV_H_
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index e132c4b230fe..1582fc250683 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kernel.h,v 1.126 2005/04/17 15:08:34 stefanf Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/kerneldump.h b/sys/sys/kerneldump.h
index 8be5bcd65eec..2a157b087ac0 100644
--- a/sys/sys/kerneldump.h
+++ b/sys/sys/kerneldump.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kerneldump.h,v 1.7 2005/06/29 22:28:46 peter Exp $
  */
 
 #ifndef _SYS_KERNELDUMP_H
diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index d2cd0da6b74b..296ea070b3dc 100644
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/kobj.h,v 1.9 2003/10/16 09:16:28 dfr Exp $
  */
 
 #ifndef _SYS_KOBJ_H_
diff --git a/sys/sys/kse.h b/sys/sys/kse.h
index 9eb544912844..07f3d7f97a95 100644
--- a/sys/sys/kse.h
+++ b/sys/sys/kse.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kse.h,v 1.28 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_KSE_H_
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index 5f41cfc3c008..fe270225102b 100644
--- a/sys/sys/kthread.h
+++ b/sys/sys/kthread.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kthread.h,v 1.8 2002/10/02 07:44:28 scottl Exp $
  */
 
 #ifndef _SYS_KTHREAD_H_
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 6e074c418657..66bba48e73a8 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ktr.h,v 1.32.2.1 2005/09/12 13:39:47 glebius Exp $
  */
 
 /*
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index e2815164a7b5..50ea969c3f2d 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ktrace.h,v 1.29 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 63c0e17a3881..13748b163de0 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/libkern.h,v 1.49.2.1 2005/08/16 08:10:59 pjd Exp $
  */
 
 #ifndef _SYS_LIBKERN_H_
diff --git a/sys/sys/limits.h b/sys/sys/limits.h
index 9d2029290aa5..f676150173df 100644
--- a/sys/sys/limits.h
+++ b/sys/sys/limits.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/limits.h,v 1.9 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_LIMITS_H_
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 659aa4b56025..25fb238887cd 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linedisc.h,v 1.192 2004/06/26 08:44:04 phk Exp $
  */
 
 #ifndef _SYS_LINEDISC_H_
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index 6695c268c842..3cc9bc60f4a1 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.h
@@ -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/sys/sys/link_aout.h,v 1.25 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index d1c2900cf151..68f9dd0951a5 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -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/sys/sys/link_elf.h,v 1.26 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index ba91af249aae..0cbcbea6ec7e 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linker.h,v 1.39 2004/08/27 01:10:16 iedowse Exp $
  */
 
 #ifndef _SYS_LINKER_H_
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index 5f55beb5a3b7..2e8d9e0099a0 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linker_set.h,v 1.17 2005/03/02 21:33:29 joerg Exp $
  */
 
 #ifndef _SYS_LINKER_SET_H_
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 90a8e3bf5c2a..0ba5f5192af4 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lock.h,v 1.52 2005/04/22 22:37:41 jeff Exp $
  */
 
 #ifndef _SYS_LOCK_H_
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 27bb84f3381f..9c72442a9de8 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lockf.h,v 1.18.4.1 2005/10/27 18:35:19 glebius Exp $
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index 248ac71f8b97..dfdd3e3585e0 100644
--- a/sys/sys/lockmgr.h
+++ b/sys/sys/lockmgr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lockmgr.h,v 1.47 2005/03/31 05:18:19 jeff Exp $
  */
 
 #ifndef	_SYS_LOCKMGR_H_
diff --git a/sys/sys/mac.h b/sys/sys/mac.h
index 65d879dca1a2..714bb6a3459e 100644
--- a/sys/sys/mac.h
+++ b/sys/sys/mac.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mac.h,v 1.67.2.2 2005/10/05 10:31:05 rwatson Exp $
  */
 /*
  * Userland/kernel interface for Mandatory Access Control.
diff --git a/sys/sys/mac_policy.h b/sys/sys/mac_policy.h
index 24e3b4139b27..ae5a5351bba0 100644
--- a/sys/sys/mac_policy.h
+++ b/sys/sys/mac_policy.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mac_policy.h,v 1.66.2.3 2005/10/05 10:31:05 rwatson Exp $
  */
 /*
  * Kernel interface for MAC policy modules.
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index ef0aa17dfa6d..decf7f10624a 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/malloc.h,v 1.80.2.1 2005/07/23 17:11:33 rwatson Exp $
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbpool.h b/sys/sys/mbpool.h
index f292f29721ab..df709548249c 100644
--- a/sys/sys/mbpool.h
+++ b/sys/sys/mbpool.h
@@ -34,7 +34,7 @@
  * interfaces on 64bit machines). This assists network interfaces that may need
  * huge numbers of mbufs.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mbpool.h,v 1.2 2005/01/07 02:29:23 imp Exp $
  */
 #ifndef _SYS_MBPOOL_H_
 #define	_SYS_MBPOOL_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index a07b685e018e..e856807ecafc 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mbuf.h,v 1.170.2.2 2005/08/10 17:02:28 sam Exp $
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h
index 9a1107713835..a49511ef4156 100644
--- a/sys/sys/mchain.h
+++ b/sys/sys/mchain.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mchain.h,v 1.8 2005/01/07 02:29:23 imp Exp $
  */
 #ifndef _SYS_MCHAIN_H_
 #define _SYS_MCHAIN_H_
diff --git a/sys/sys/md4.h b/sys/sys/md4.h
index 5ad9e99421ac..21e6c94a1f49 100644
--- a/sys/sys/md4.h
+++ b/sys/sys/md4.h
@@ -1,5 +1,5 @@
 /* MD4.H - header file for MD4C.C
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/md4.h,v 1.2 2005/01/07 02:29:23 imp Exp $
  */
 
 /*-
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index aeebc7e0b030..cfc1c2e78948 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,5 +1,5 @@
 /* MD5.H - header file for MD5C.C
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/md5.h,v 1.18 2005/02/10 12:20:42 phk Exp $
  */
 
 /*-
diff --git a/sys/sys/mdioctl.h b/sys/sys/mdioctl.h
index 57dc04c5fdef..72c21a3ac1a2 100644
--- a/sys/sys/mdioctl.h
+++ b/sys/sys/mdioctl.h
@@ -37,7 +37,7 @@
  *
  * From: src/sys/sys/vnioctl.h,v 1.4
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mdioctl.h,v 1.20 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_MDIOCTL_H_
diff --git a/sys/sys/memrange.h b/sys/sys/memrange.h
index ace778d5bfd4..8adb04bc723b 100644
--- a/sys/sys/memrange.h
+++ b/sys/sys/memrange.h
@@ -1,7 +1,7 @@
 /*
  * Memory range attribute operations, peformed on /dev/mem
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/memrange.h,v 1.7 2004/08/04 18:30:31 markm Exp $
  */
 
 /* Memory range attributes */
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index 0f7416f183e2..ff55bd2f9a2f 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mman.h,v 1.40 2005/04/02 12:33:31 das Exp $
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/module.h b/sys/sys/module.h
index 5beb9bb6f22c..760b53d8667f 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/module.h,v 1.21 2004/07/13 19:36:59 phk Exp $
  */
 
 #ifndef _SYS_MODULE_H_
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 6cc890986e8c..68bddd644078 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mount.h,v 1.197.2.1 2005/08/15 06:01:36 ssouhlal Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h
index 054ce20938cb..2af46f23905b 100644
--- a/sys/sys/mouse.h
+++ b/sys/sys/mouse.h
@@ -20,7 +20,7 @@
  * 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/sys/sys/mouse.h,v 1.23 2005/04/13 07:25:45 mdodd Exp $
  */
 
 #ifndef _SYS_MOUSE_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 325df939a362..6f08d1656532 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/msg.h,v 1.20 2005/01/07 02:29:23 imp Exp $ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*-
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 439f5f0beade..d32bf568fdca 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/msgbuf.h,v 1.27 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 1ad8004e95af..b8aca6764da8 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mtio.h,v 1.29 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef	_SYS_MTIO_H_
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 46cbe68f9297..5b0452960357 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mutex.h,v 1.79.2.2 2005/08/05 20:21:46 jhb Exp $
  */
 
 #ifndef _SYS_MUTEX_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 9b62a3d3cb67..4f46ff72eb71 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/namei.h,v 1.47 2005/04/27 09:00:47 jeff Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
index a4e11c3975a9..6537470f5f31 100644
--- a/sys/sys/nlist_aout.h
+++ b/sys/sys/nlist_aout.h
@@ -33,7 +33,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/nlist_aout.h,v 1.11 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_NLIST_AOUT_H_
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 8e30ac5b059b..317d32bc3c59 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/param.h,v 1.244.2.2 2005/08/13 21:27:58 rwatson Exp $
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h
index d8d8156fe8e3..f5ddec60aed2 100644
--- a/sys/sys/pciio.h
+++ b/sys/sys/pciio.h
@@ -24,7 +24,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/sys/sys/pciio.h,v 1.6 2001/09/05 01:22:14 obrien Exp $
  *
  */
 
diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h
index c5c59447e7ba..a5738de4900f 100644
--- a/sys/sys/pcpu.h
+++ b/sys/sys/pcpu.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pcpu.h,v 1.16 2005/04/26 17:07:40 jhb Exp $
  */
 
 #ifndef _SYS_PCPU_H_
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index 9e3233f71221..f2073806d708 100644
--- a/sys/sys/pioctl.h
+++ b/sys/sys/pioctl.h
@@ -33,7 +33,7 @@
 /*
  * procfs ioctl definitions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pioctl.h,v 1.14 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_PIOCTL_H
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index 1d3729fc38c9..7f599f59e680 100644
--- a/sys/sys/pipe.h
+++ b/sys/sys/pipe.h
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pipe.h,v 1.29 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_PIPE_H_
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 0195a8dba203..3690d9127124 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pmc.h,v 1.8 2005/07/09 17:29:36 jkoshy Exp $
  */
 
 #ifndef _SYS_PMC_H_
diff --git a/sys/sys/pmckern.h b/sys/sys/pmckern.h
index d489fe629d7a..54b12b094887 100644
--- a/sys/sys/pmckern.h
+++ b/sys/sys/pmckern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pmckern.h,v 1.4.2.1 2005/08/15 18:46:13 jkoshy Exp $
  */
 
 /*
diff --git a/sys/sys/pmclog.h b/sys/sys/pmclog.h
index 026c667ffb9d..2686a886e725 100644
--- a/sys/sys/pmclog.h
+++ b/sys/sys/pmclog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pmclog.h,v 1.2 2005/06/30 19:01:26 jkoshy Exp $
  */
 
 #ifndef	_SYS_PMCLOG_H_
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index c955f321c752..9ea42b9ddfc5 100644
--- a/sys/sys/poll.h
+++ b/sys/sys/poll.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $
  */
 
 #ifndef _SYS_POLL_H_
diff --git a/sys/sys/power.h b/sys/sys/power.h
index 62784b2e49d3..941a7329c838 100644
--- a/sys/sys/power.h
+++ b/sys/sys/power.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/power.h,v 1.3 2002/07/15 14:06:03 markm Exp $
  */
 
 #ifndef _SYS_POWER_H_
diff --git a/sys/sys/priority.h b/sys/sys/priority.h
index 986bd3eb7074..53420c88106b 100644
--- a/sys/sys/priority.h
+++ b/sys/sys/priority.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/priority.h,v 1.3 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_PRIORITY_H_
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 78be719c84b3..539ccce6a105 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/proc.h,v 1.432.2.2 2005/10/04 04:41:26 truckman Exp $
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index b03e73dd8c42..9a1e02506281 100644
--- a/sys/sys/procfs.h
+++ b/sys/sys/procfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/procfs.h,v 1.5 2004/07/15 03:52:17 davidxu Exp $
  */
 
 #ifndef _SYS_PROCFS_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index d93e4523dd1b..1a5981c54962 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/protosw.h,v 1.45 2004/11/08 14:44:54 phk Exp $
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index 1292280528d3..f1d60e12cde2 100644
--- a/sys/sys/ptio.h
+++ b/sys/sys/ptio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ptio.h,v 1.3 1999/08/28 00:51:57 peter Exp $
  */
 
 #ifndef _SYS_PTIO_H_
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 93b1a7d6d0fc..6faa431204de 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ptrace.h,v 1.27 2005/06/30 07:49:22 peter Exp $
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index d3f4d6103e76..211225602425 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/queue.h,v 1.60.2.1 2005/08/16 22:41:39 phk Exp $
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 5cf1611e359c..1070c397f874 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.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/sys/sys/random.h,v 1.34 2004/10/12 14:55:59 rwatson Exp $
  */
 
 #ifndef	_SYS_RANDOM_H_
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index 6b8e25e61cdd..8713597ed82a 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/reboot.h,v 1.26 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/refcount.h b/sys/sys/refcount.h
index 5316dd938f78..0a1d0b6ffb39 100644
--- a/sys/sys/refcount.h
+++ b/sys/sys/refcount.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/refcount.h,v 1.1.2.1 2005/10/06 18:13:19 jhb Exp $
  */
 
 #ifndef __SYS_REFCOUNT_H__
diff --git a/sys/sys/regression.h b/sys/sys/regression.h
index 8ee757ed170a..0ce5be6d9ec8 100644
--- a/sys/sys/regression.h
+++ b/sys/sys/regression.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/regression.h,v 1.3 2004/05/10 18:38:07 rwatson Exp $
  */
 #ifndef _SYS_REGRESSION_H_
 #define	_SYS_REGRESSION_H_
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index ccb21648f5e8..48f2626ddcec 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/resource.h,v 1.29 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 2697b66a4cbe..114d8caaa16a 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/resourcevar.h,v 1.47 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index c043e8037c57..655e38c92e2c 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rman.h,v 1.27 2005/04/12 06:21:58 imp Exp $
  */
 
 #ifndef _SYS_RMAN_H_
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index 21268fc60bbe..c221ecbeade5 100644
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rtprio.h,v 1.14 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_RTPRIO_H_
diff --git a/sys/sys/runq.h b/sys/sys/runq.h
index 433d0e05e19c..5de4e16126b3 100644
--- a/sys/sys/runq.h
+++ b/sys/sys/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/runq.h,v 1.6 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef	_RUNQ_H_
diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index 0c1e6e1e0cf8..dd35beb49ccc 100644
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.h
@@ -25,7 +25,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/sys/sys/sbuf.h,v 1.14 2004/07/09 11:35:30 des Exp $
  */
 
 #ifndef _SYS_SBUF_H_
diff --git a/sys/sys/sched.h b/sys/sys/sched.h
index ff555d21ef83..450d02dbe52d 100644
--- a/sys/sys/sched.h
+++ b/sys/sys/sched.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/sys/sys/sched.h,v 1.24 2005/04/19 04:01:25 jkoshy Exp $
  */
 
 #ifndef _SYS_SCHED_H_
diff --git a/sys/sys/select.h b/sys/sys/select.h
index 342a8491fb12..9bfb4948748f 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/select.h,v 1.19 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h
index 946da8c9de44..add8f5e54d24 100644
--- a/sys/sys/selinfo.h
+++ b/sys/sys/selinfo.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/selinfo.h,v 1.18 2004/08/15 06:24:42 jmg Exp $
  */
 
 #ifndef _SYS_SELINFO_H_
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index 9c96ddf9e19d..fdda740cfeaf 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/sem.h,v 1.29 2004/11/17 13:12:06 rwatson Exp $ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/sema.h b/sys/sys/sema.h
index cdce5982311c..588cadb3a09b 100644
--- a/sys/sys/sema.h
+++ b/sys/sys/sema.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sema.h,v 1.4 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef	_SYS_SEMA_H_
diff --git a/sys/sys/serial.h b/sys/sys/serial.h
index 8c223af24cf9..33b0559952e8 100644
--- a/sys/sys/serial.h
+++ b/sys/sys/serial.h
@@ -27,7 +27,7 @@
  * (both async and sync), but which do not necessarily have anything to
  * do with tty processing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/serial.h,v 1.2 2004/06/25 10:56:43 phk Exp $
  */
 
 #ifndef _SYS_SERIAL_H_
diff --git a/sys/sys/sf_buf.h b/sys/sys/sf_buf.h
index af420652029b..82a6f4ee74c8 100644
--- a/sys/sys/sf_buf.h
+++ b/sys/sys/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sf_buf.h,v 1.5 2004/11/08 00:43:46 alc Exp $
  */
 
 #ifndef _SYS_SF_BUF_H_
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 0e6b86b9681d..b35f9b531e02 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/shm.h,v 1.23 2005/04/02 12:33:36 das Exp $ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*-
diff --git a/sys/sys/sigio.h b/sys/sys/sigio.h
index 62ece6d4c28a..c72c18f3bb27 100644
--- a/sys/sys/sigio.h
+++ b/sys/sys/sigio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sigio.h,v 1.3 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_SIGIO_H_
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 425bf337ee06..11c75a808cd7 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/signal.h,v 1.45 2004/06/11 11:43:46 phk Exp $
  */
 
 #ifndef _SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 42bc5fbc7472..8e29b29f5072 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/signalvar.h,v 1.68 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_SIGNALVAR_H_
diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h
index 7f36029edc92..e36ecb05e2ad 100644
--- a/sys/sys/sleepqueue.h
+++ b/sys/sys/sleepqueue.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sleepqueue.h,v 1.6 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_SLEEPQUEUE_H_
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index 88c6ae27d0b0..ada4a2e876de 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/smp.h,v 1.84 2005/04/30 20:01:00 dwhite Exp $
  */
 
 #ifndef _SYS_SMP_H_
diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h
index b25aa494ff8e..1ac375703cc9 100644
--- a/sys/sys/snoop.h
+++ b/sys/sys/snoop.h
@@ -12,7 +12,7 @@
  *
  * Snoop stuff.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/snoop.h,v 1.24.2.1 2005/09/24 13:19:20 cognet Exp $
  */
 
 #ifndef _SYS_SNOOP_H_
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index bb00346ee081..d9b2320738a5 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/socket.h,v 1.88.2.1 2005/09/27 21:14:10 rwatson Exp $
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 5311a60cb60c..8ef0bff976ac 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/socketvar.h,v 1.141 2005/07/09 12:24:40 jhb Exp $
  */
 
 #ifndef _SYS_SOCKETVAR_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 82059a43d988..0aed3d91ffae 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sockio.h,v 1.28 2005/06/05 03:13:13 thompsa Exp $
  */
 
 #ifndef _SYS_SOCKIO_H_
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 4ae5fe3640c1..5e82be24aa71 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -29,7 +29,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/soundcard.h,v 1.44 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_SOUNDCARD_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 10a3739cc440..5b72c135f9d2 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stat.h,v 1.41 2005/03/22 01:19:18 das Exp $
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/statvfs.h b/sys/sys/statvfs.h
index 24fd8e02f6a6..4db5bc040c79 100644
--- a/sys/sys/statvfs.h
+++ b/sys/sys/statvfs.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/statvfs.h,v 1.4 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_STATVFS_H_
diff --git a/sys/sys/stddef.h b/sys/sys/stddef.h
index 8e7f206d6197..3e0b15dff51e 100644
--- a/sys/sys/stddef.h
+++ b/sys/sys/stddef.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stddef.h,v 1.2 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _SYS_STDDEF_H_
diff --git a/sys/sys/stdint.h b/sys/sys/stdint.h
index 27f6dae997fd..b0d6632637fe 100644
--- a/sys/sys/stdint.h
+++ b/sys/sys/stdint.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stdint.h,v 1.4 2002/08/21 16:20:01 mike Exp $
  */
 
 #ifndef _SYS_STDINT_H_
diff --git a/sys/sys/sun_disklabel.h b/sys/sys/sun_disklabel.h
index ac85e19706a5..c135ac4bf95d 100644
--- a/sys/sys/sun_disklabel.h
+++ b/sys/sys/sun_disklabel.h
@@ -34,7 +34,7 @@
  *	@(#)sun_disklabel.h	8.1 (Berkeley) 6/11/93
  *	$NetBSD: disklabel.h,v 1.2 1998/08/22 14:55:28 mrg Exp $
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/sys/sun_disklabel.h,v 1.11 2005/03/30 09:33:10 joerg Exp $ 
  */
 
 #ifndef _SYS_SUN_DISKLABEL_H_
diff --git a/sys/sys/sx.h b/sys/sys/sx.h
index f88fb867a422..4c3b7d9a5496 100644
--- a/sys/sys/sx.h
+++ b/sys/sys/sx.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sx.h,v 1.21.2.1 2005/09/21 21:05:19 jhb Exp $
  */
 
 #ifndef	_SYS_SX_H_
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 916d10a15ba5..ccd61b8e73b6 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syscall.h,v 1.178 2005/07/08 15:06:58 jhb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198 2005/07/08 15:01:13 jhb Exp 
  */
 
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index ad20a5ed2714..edd41e08ae1f 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -1,6 +1,6 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $FreeBSD$
+# $FreeBSD: src/sys/sys/syscall.mk,v 1.133 2005/07/08 15:06:58 jhb Exp $
 # created from FreeBSD: src/sys/kern/syscalls.master,v 1.198 2005/07/08 15:01:13 jhb Exp 
 MIASM =  \
 	syscall.o \
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 75d21e099663..2ac70e99de27 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.31 2005/07/07 18:17:55 jhb Exp $
  */
 
 #ifndef _SYS_SYSCALLSUBR_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index c9532aca6d56..4c086a13d913 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysctl.h,v 1.138 2005/04/18 02:10:37 das Exp $
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 2ac793ce8ee8..ebad57950804 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysent.h,v 1.45 2005/05/29 20:08:39 rwatson Exp $
  */
 
 #ifndef _SYS_SYSENT_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 0d477be87bcb..f782bc153df1 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syslimits.h,v 1.21 2005/03/02 21:33:29 joerg Exp $
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index fe2d0fee7cb3..914334148e64 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syslog.h,v 1.26 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 6cf68eab8c77..3111cbed8553 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysproto.h,v 1.177 2005/07/08 15:06:58 jhb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198 2005/07/08 15:01:13 jhb Exp 
  */
 
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index cbd95ee316ff..c1388cae1835 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/systm.h,v 1.234.2.1 2005/08/30 15:14:39 pjd Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index 1a69e58a1a22..d5d30d72d7bc 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/taskqueue.h,v 1.14 2005/05/01 00:38:11 sam Exp $
  */
 
 #ifndef _SYS_TASKQUEUE_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index f9e173cfe9f2..9a3cb2e1ce30 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/termios.h,v 1.20 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/thr.h b/sys/sys/thr.h
index 155e79bce94f..f3999315d440 100644
--- a/sys/sys/thr.h
+++ b/sys/sys/thr.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/sys/sys/thr.h,v 1.6 2005/04/23 02:36:07 davidxu Exp $
  *
  */
 
diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h
index 442dceb012c0..7b4dca4465fe 100644
--- a/sys/sys/tiio.h
+++ b/sys/sys/tiio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/tiio.h,v 1.1 2002/06/26 03:37:47 ken Exp $
  */
 /*
  * The ti_stats structure below is from code with the following copyright, 
diff --git a/sys/sys/time.h b/sys/sys/time.h
index e6adbea7557c..026846d61e45 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/time.h,v 1.69 2005/04/02 12:33:27 das Exp $
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 2a88f6b3f7d8..ccd83fb4471a 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timeb.h,v 1.9 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef _SYS_TIMEB_H_
diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h
index cde9396145fd..53308f62c6a8 100644
--- a/sys/sys/timepps.h
+++ b/sys/sys/timepps.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timepps.h,v 1.19 2005/01/07 02:29:24 imp Exp $
  *
  * The is a FreeBSD version of the RFC 2783 API for Pulse Per Second 
  * timing interfaces.  
diff --git a/sys/sys/timers.h b/sys/sys/timers.h
index 232141068ef2..b4eeca166f82 100644
--- a/sys/sys/timers.h
+++ b/sys/sys/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timers.h,v 1.5 2005/01/07 02:29:24 imp Exp $
  *
  * Description : Basic timers header.
  */
diff --git a/sys/sys/times.h b/sys/sys/times.h
index b6b1e1dba1ea..d5c34f13bf78 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/times.h,v 1.9 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/timespec.h b/sys/sys/timespec.h
index 96f80e2ec09c..903821faa89b 100644
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
@@ -28,7 +28,7 @@
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
  * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/timespec.h,v 1.4 2005/01/07 02:29:24 imp Exp $
  */
 
 /*
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index d5a818b4c0e9..37094977bf5c 100644
--- a/sys/sys/timetc.h
+++ b/sys/sys/timetc.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timetc.h,v 1.58 2003/08/16 08:23:52 phk Exp $
  */
 
 #ifndef _SYS_TIMETC_H_
diff --git a/sys/sys/timex.h b/sys/sys/timex.h
index cf877ffc47dd..df3ed74d2ce3 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -45,7 +45,7 @@
  * 17 Sep 93    David L. Mills
  *      Created file
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timex.h,v 1.18 2005/01/07 02:29:24 imp Exp $
  */
 /*
  * This header file defines the Network Time Protocol (NTP) interfaces
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 6682ec7762f1..55af99b57a7e 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $	*/
 /*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/tree.h,v 1.3 2005/06/10 11:44:57 harti Exp $ */
 
 /*-
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index d9f104aef81d..9b60b8d6dfbf 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/tty.h,v 1.97 2004/10/18 21:51:27 phk Exp $
  */
 
 #ifndef _SYS_TTY_H_
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 67d69e55c4a7..6cd4529218f8 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttychars.h,v 1.9 2004/06/21 22:57:16 phk Exp $
  */
 
 #ifndef _SYS_TTYCHARS_H_
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index 07db4ec4a532..a5012b8d0504 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttycom.h,v 1.23 2004/06/25 21:54:49 phk Exp $
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index d21dddf5afe6..6517cbbc7ffc 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttydefaults.h,v 1.19 2004/11/03 19:16:55 phk Exp $
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index f6e3791b4491..9f9bde1bd1b8 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttydev.h,v 1.11 2004/06/21 22:57:16 phk Exp $
  */
 
 /* COMPATIBILITY HEADER FILE */
diff --git a/sys/sys/turnstile.h b/sys/sys/turnstile.h
index e4b3910441b5..1e71f051fc9b 100644
--- a/sys/sys/turnstile.h
+++ b/sys/sys/turnstile.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/turnstile.h,v 1.7 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_TURNSTILE_H_
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 5a0951c1999b..dddb7d411e28 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/types.h,v 1.92 2005/05/31 15:18:17 rodrigc Exp $
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
index 85a5fd640e5e..6ca4dda86c06 100644
--- a/sys/sys/ucontext.h
+++ b/sys/sys/ucontext.h
@@ -25,7 +25,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/sys/sys/ucontext.h,v 1.11 2003/11/09 20:31:04 marcel Exp $
  */
 
 #ifndef _SYS_UCONTEXT_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index b11513677bfe..b3bbc3f4c916 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ucred.h,v 1.52 2005/06/28 02:23:56 delphij Exp $
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index b5c0ece906a9..9721937b2c90 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/uio.h,v 1.39 2005/07/07 18:17:55 jhb Exp $
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/umtx.h b/sys/sys/umtx.h
index 896d24dba5bc..ed3c09fe80a0 100644
--- a/sys/sys/umtx.h
+++ b/sys/sys/umtx.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/sys/sys/umtx.h,v 1.16 2005/03/05 09:15:03 davidxu Exp $
  *
  */
 
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 97aebb5be2e0..5365a772b736 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.3 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/un.h,v 1.29 2005/04/13 00:01:46 mdodd Exp $
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 839c333018cb..4ef699e56af8 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/unistd.h,v 1.41 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index a1186dedbae2..b134fc2f7af9 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/unpcb.h,v 1.19 2005/04/13 00:01:46 mdodd Exp $
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 5c84837ef05f..66f9a6d01839 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/user.h,v 1.66 2005/06/09 19:09:02 gad Exp $
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 410e06566b36..50876a54d900 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/utsname.h,v 1.11 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/uuid.h b/sys/sys/uuid.h
index 7adf8b64a4a6..c16eccd585d6 100644
--- a/sys/sys/uuid.h
+++ b/sys/sys/uuid.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/sys/sys/uuid.h,v 1.4 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_UUID_H_
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 793f32d37738..0c695b7edf2e 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vmmeter.h,v 1.26 2004/06/08 10:37:30 tjr Exp $
  */
 
 #ifndef _SYS_VMMETER_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 3c84baf54425..d356bb1959b8 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vnode.h,v 1.304.2.2 2005/09/18 07:10:57 phk Exp $
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index c16821cd11e7..3fff81b0f6e0 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/wait.h,v 1.21 2005/01/05 22:19:44 jhb Exp $
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h
index a67b68b4392d..abfb37b0ea4f 100644
--- a/sys/sys/watchdog.h
+++ b/sys/sys/watchdog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/watchdog.h,v 1.3 2004/02/28 20:06:58 phk Exp $
  */
 #ifndef _SYS_WATCHDOG_H
 #define	_SYS_WATCHDOG_H
diff --git a/sys/sys/xrpuio.h b/sys/sys/xrpuio.h
index 94bd38d0a3ef..928e200f5587 100644
--- a/sys/sys/xrpuio.h
+++ b/sys/sys/xrpuio.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/xrpuio.h,v 1.3 2005/01/07 02:29:24 imp Exp $
  *
  */
 
diff --git a/sys/tools/acpi_quirks2h.awk b/sys/tools/acpi_quirks2h.awk
index 1aa08dc30019..03a62cc7eded 100644
--- a/sys/tools/acpi_quirks2h.awk
+++ b/sys/tools/acpi_quirks2h.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/acpi_quirks2h.awk,v 1.3 2005/01/07 02:29:25 imp Exp $
 
 #-
 # Copyright (c) 2004 Mark Santcroos <marks@ripe.net>
diff --git a/sys/tools/emu10k1-mkalsa.sh b/sys/tools/emu10k1-mkalsa.sh
index 2e78f5bd0499..c83c9b0868b4 100644
--- a/sys/tools/emu10k1-mkalsa.sh
+++ b/sys/tools/emu10k1-mkalsa.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/emu10k1-mkalsa.sh,v 1.1 2004/02/05 22:51:16 peter Exp $
 
 GREP=${GREP:-grep}
 CC=${CC:-cc}
diff --git a/sys/tools/makeobjops.awk b/sys/tools/makeobjops.awk
index 61994f36e588..c74f712b79a8 100644
--- a/sys/tools/makeobjops.awk
+++ b/sys/tools/makeobjops.awk
@@ -34,7 +34,7 @@
 # From src/sys/kern/makedevops.pl,v 1.12 1999/11/22 14:40:04 n_hibma Exp
 # From src/sys/kern/makeobjops.pl,v 1.8 2001/11/16 02:02:42 joe Exp
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/makeobjops.awk,v 1.6 2005/01/07 02:29:25 imp Exp $
 
 #
 #   Script to produce kobj front-end sugar.
diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk
index 01d3a5ca4318..b0c068066995 100644
--- a/sys/tools/miidevs2h.awk
+++ b/sys/tools/miidevs2h.awk
@@ -65,7 +65,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/sys/tools/miidevs2h.awk,v 1.6 2005/01/07 02:29:25 imp Exp $
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/tools/pccarddevs2h.awk b/sys/tools/pccarddevs2h.awk
index 2e52290b8e83..508ab34a6332 100644
--- a/sys/tools/pccarddevs2h.awk
+++ b/sys/tools/pccarddevs2h.awk
@@ -1,6 +1,6 @@
 #! /usr/bin/awk -f
 #	$NetBSD: devlist2h.awk,v 1.3 1998/09/05 14:42:06 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/pccarddevs2h.awk,v 1.4 2005/01/07 02:29:25 imp Exp $
 
 #-
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/tools/usbdevs2h.awk b/sys/tools/usbdevs2h.awk
index e6db3bdef979..fe3bd3d3f907 100644
--- a/sys/tools/usbdevs2h.awk
+++ b/sys/tools/usbdevs2h.awk
@@ -1,7 +1,7 @@
 #! /usr/bin/awk -f
 #-
 #	$NetBSD: usb/devlist2h.awk,v 1.9 2001/01/18 20:28:22 jdolecek Exp $
-#  $FreeBSD$
+#  $FreeBSD: src/sys/tools/usbdevs2h.awk,v 1.7 2005/01/07 02:29:25 imp Exp $
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
 # All rights reserved.
diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk
index 8c992fee292e..b59155023564 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -30,7 +30,7 @@
 
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/vnode_if.awk,v 1.50 2005/06/09 20:20:30 ssouhlal Exp $
 #
 # Script to produce VFS front-end sugar.
 #
@@ -146,7 +146,7 @@ common_head = \
     " * This file is produced automatically.\n" \
     " * Do not modify anything in here by hand.\n" \
     " *\n" \
-    " * Created from $FreeBSD$\n" \
+    " * Created from $FreeBSD: src/sys/tools/vnode_if.awk,v 1.50 2005/06/09 20:20:30 ssouhlal Exp $\n" \
     " */\n" \
     "\n";
 
diff --git a/sys/ufs/ffs/README.snapshot b/sys/ufs/ffs/README.snapshot
index 7704c7ee3475..2ca5a1937fa7 100644
--- a/sys/ufs/ffs/README.snapshot
+++ b/sys/ufs/ffs/README.snapshot
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/ufs/ffs/README.snapshot,v 1.4 2002/12/12 00:31:45 trhodes Exp $
 
 Soft Updates Status
 
diff --git a/sys/ufs/ffs/README.softupdates b/sys/ufs/ffs/README.softupdates
index 3b9c675c09fb..a965f4faaecf 100644
--- a/sys/ufs/ffs/README.softupdates
+++ b/sys/ufs/ffs/README.softupdates
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/ufs/ffs/README.softupdates,v 1.9 2000/07/08 02:31:21 mckusick Exp $
 
 Using Soft Updates
 
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index dc0f263b35d3..6d160bbc9db9 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.132.2.1.2.1 2005/10/29 07:00:45 scottl Exp $");
 
 #include "opt_quota.h"
 
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 97f4fdae9d1e..7f130e849f56 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.50 2005/02/08 17:23:39 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 470e513189fd..f21f501674fe 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.69 2005/04/03 10:29:55 jeff Exp $
  */
 
 #ifndef _UFS_FFS_EXTERN_H
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 33b65bf22604..86f2c20155e5 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_inode.c,v 1.106 2005/04/05 08:49:41 jeff Exp $");
 
 #include "opt_quota.h"
 
diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c
index 3afa6c3bd119..3e08733348f3 100644
--- a/sys/ufs/ffs/ffs_rawread.c
+++ b/sys/ufs/ffs/ffs_rawread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_rawread.c,v 1.25.2.1 2005/09/12 15:56:07 tegge Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index 98a1f232ed5a..aeb1d7628806 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.103.2.1.2.1 2005/10/29 07:00:45 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 7687113ecf00..d7b70ff241a3 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.181.2.4 2005/10/02 08:25:33 truckman Exp $");
 
 /*
  * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index e34bc1372a2e..71ec3197801a 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.40 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index 848d47805c31..dcb936763cbd 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_tables.c,v 1.12 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 #include <ufs/ufs/dinode.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index c40d5bbb10ad..73e994c23040 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.290.2.3.2.1 2005/10/29 07:00:45 scottl Exp $");
 
 #include "opt_mac.h"
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index e631db625f34..c7bc7c9e21a1 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.157.4.1 2005/10/29 07:00:45 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 572996ec5935..c30982940f25 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.48 2005/02/20 08:02:15 delphij Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index 38486447ac9a..d5be16329156 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)softdep.h	9.7 (McKusick) 6/21/00
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/softdep.h,v 1.17.2.1 2005/08/10 14:09:25 ups Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/ufs/ufs/README.acls b/sys/ufs/ufs/README.acls
index 28a9d4f59d87..ef752c73b255 100644
--- a/sys/ufs/ufs/README.acls
+++ b/sys/ufs/ufs/README.acls
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/ufs/ufs/README.acls,v 1.6 2002/10/19 16:09:16 rwatson Exp $
 
   UFS Access Control Lists Copyright
 
diff --git a/sys/ufs/ufs/README.extattr b/sys/ufs/ufs/README.extattr
index a3be6e6a45dc..a6e07d02c4c0 100644
--- a/sys/ufs/ufs/README.extattr
+++ b/sys/ufs/ufs/README.extattr
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/ufs/ufs/README.extattr,v 1.5 2002/10/18 21:11:36 rwatson Exp $
 
   UFS Extended Attributes Copyright
 
diff --git a/sys/ufs/ufs/acl.h b/sys/ufs/ufs/acl.h
index b53e3284df1e..6c3cc990470b 100644
--- a/sys/ufs/ufs/acl.h
+++ b/sys/ufs/ufs/acl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/acl.h,v 1.5 2003/08/04 03:29:13 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index bb167563c1d9..f9a90462a1c2 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -62,7 +62,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.15 2005/01/07 02:29:26 imp Exp $
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index b535220b66b5..61ca8193b402 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dir.h,v 1.11 2005/01/07 02:29:26 imp Exp $
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/dirhash.h b/sys/ufs/ufs/dirhash.h
index e81913938a47..d1946710ac05 100644
--- a/sys/ufs/ufs/dirhash.h
+++ b/sys/ufs/ufs/dirhash.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dirhash.h,v 1.5 2005/01/07 02:29:26 imp Exp $
  */
 
 #ifndef _UFS_UFS_DIRHASH_H_
diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h
index cf3222767172..a1e570748490 100644
--- a/sys/ufs/ufs/extattr.h
+++ b/sys/ufs/ufs/extattr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/extattr.h,v 1.20 2005/01/31 08:16:45 imp Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 0417f9c7cdc5..7904bc3f7ed9 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/inode.h,v 1.49 2005/03/14 10:21:16 phk Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 1b6b80db418f..b58418873b9c 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/quota.h,v 1.27 2005/01/07 02:29:26 imp Exp $
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c
index e3005f49cc1b..deb149747551 100644
--- a/sys/ufs/ufs/ufs_acl.c
+++ b/sys/ufs/ufs/ufs_acl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_acl.c,v 1.20 2004/08/15 06:24:42 jmg Exp $");
 
 #include "opt_ufs.h"
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 8c1e7cdcb0ea..0a32bd617664 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_bmap.c,v 1.64 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index d15bae1a0790..1191759a64a1 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.21.2.1 2005/08/20 04:27:15 iedowse Exp $");
 
 #include "opt_ufs.h"
 
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 59b15b1c8b18..c2b8849c5c62 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_extattr.c,v 1.81.4.1 2005/10/16 16:52:14 rwatson Exp $");
 
 #include "opt_ufs.h"
 
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 40a659dfdac6..1de0bc9649c8 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_extern.h,v 1.55 2005/03/14 10:21:16 phk Exp $
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index b7214d2691aa..878cb4806f50 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_inode.c,v 1.63.2.1 2005/09/27 17:03:53 delphij Exp $");
 
 #include "opt_quota.h"
 #include "opt_ufs.h"
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index a683e352a0d3..e5be24382611 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_lookup.c,v 1.77.4.1 2005/10/19 20:31:45 truckman Exp $");
 
 #include "opt_ffs_broken_fixme.h"
 #include "opt_ufs.h"
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 8c703ba8fd34..d0516c08d18f 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.74 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 75b1d0d0b17d..8d9799647393 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vfsops.c,v 1.45 2005/03/24 07:32:50 jeff Exp $");
 
 #include "opt_quota.h"
 #include "opt_ufs.h"
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 8b7208879b1c..f2c2b18280c7 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.271 2005/06/09 20:20:31 ssouhlal Exp $");
 
 #include "opt_mac.h"
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index dd6a740c9662..3a28968e63c3 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.34 2005/01/24 10:01:10 jeff Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 485571b5b904..6f345741e90e 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/default_pager.c,v 1.35 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 376badd9fa9c..425745c9da63 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/device_pager.c,v 1.78 2005/06/10 17:27:54 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c
index 2140a0bf08b2..f97c58dc1ef4 100644
--- a/sys/vm/memguard.c
+++ b/sys/vm/memguard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/memguard.c,v 1.5 2005/02/16 21:45:59 bmilekic Exp $");
 
 /*
  * MemGuard is a simple replacement allocator for debugging only
diff --git a/sys/vm/memguard.h b/sys/vm/memguard.h
index 10ca96de26ff..b5b706c16362 100644
--- a/sys/vm/memguard.h
+++ b/sys/vm/memguard.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/sys/vm/memguard.h,v 1.2 2005/02/16 21:45:59 bmilekic Exp $
  */
 
 void	memguard_init(vm_map_t parent_map, unsigned long size);
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index 9575970e36d5..8570c6526fb1 100644
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/phys_pager.c,v 1.23 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 4eb8f5ad1f45..65bc846431df 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/pmap.h,v 1.71 2005/06/10 03:33:36 alc Exp $
  */
 
 /*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index dc23576d1576..a9d8b0dfc00a 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.273.2.1 2005/08/20 06:07:55 alc Exp $");
 
 #include "opt_mac.h"
 #include "opt_swap.h"
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 49a8e6feb322..aa377bf6234a 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/swap_pager.h,v 1.50 2005/01/07 02:29:27 imp Exp $
  */
 
 #ifndef	_VM_SWAP_PAGER_H_
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index 52bbe2c3b40e..c532c6282efc 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.h
@@ -24,7 +24,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/sys/vm/uma.h,v 1.22.2.5 2005/07/28 12:10:19 rwatson Exp $
  *
  */
 
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 50541d0e8f24..a057ae8cc9c4 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.119.2.10 2005/07/28 12:10:19 rwatson Exp $");
 
 /* I should really use ktr.. */
 /*
diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c
index 9075bf960858..5a5e37ab4509 100644
--- a/sys/vm/uma_dbg.c
+++ b/sys/vm/uma_dbg.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/uma_dbg.c,v 1.20.2.1 2005/08/20 13:31:05 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/uma_dbg.h b/sys/vm/uma_dbg.h
index 341cecbf8de3..f85311d0124e 100644
--- a/sys/vm/uma_dbg.h
+++ b/sys/vm/uma_dbg.h
@@ -24,7 +24,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/sys/vm/uma_dbg.h,v 1.8.2.1 2005/08/20 13:31:05 rwatson Exp $
  *
  */
 
diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index 6e8620662f26..0a77e4dccdd8 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_int.h
@@ -24,7 +24,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/sys/vm/uma_int.h,v 1.31.2.6 2005/08/15 09:01:11 rwatson Exp $
  *
  */
 
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 102a934bc8e2..e92a7ec33ec9 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -55,7 +55,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm.h,v 1.26 2005/04/01 20:00:11 jhb Exp $
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_contig.c b/sys/vm/vm_contig.c
index 3d57203d1cbc..a822dfaaf354 100644
--- a/sys/vm/vm_contig.c
+++ b/sys/vm/vm_contig.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.43.2.1 2005/08/15 14:28:48 tegge Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 4fc827513604..7266667dfa6b 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_extern.h,v 1.76 2005/04/01 20:00:11 jhb Exp $
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 07c2de077848..26f1f3a3445b 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.205.2.2 2005/10/09 03:08:28 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 9deb3630d52c..3f0f9081914c 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.213 2005/05/23 23:01:53 ups Exp $");
 
 #include "opt_vm.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index 9125366fc78a..e466da4b263c 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_init.c,v 1.46 2005/04/25 19:22:05 kris Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 86d1f12348a3..a8a0c92df887 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.122 2005/01/07 02:29:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 2f283e3ff9c6..398d76f46c2f 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_kern.h,v 1.28 2005/01/07 02:29:27 imp Exp $
  */
 
 #ifndef _VM_VM_KERN_H_
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 519163b997fe..cdd528ca6731 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.366.2.1 2005/10/09 03:07:29 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 69cb35d61745..5d9f70c9581a 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_map.h,v 1.117 2005/01/07 02:29:27 imp Exp $
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index c5d3abc118d0..b6466220694c 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.85 2005/05/08 23:56:16 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 7c9e56d61f8b..4430c16b19c8 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.200.2.1 2005/10/09 03:05:23 delphij Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 0436074f8abf..7b313c7a0b5a 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.349.2.1.2.1 2005/10/26 20:22:00 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 2de99093d333..bd5ef5c77d43 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_object.h,v 1.111 2005/05/03 11:11:26 jeff Exp $
  */
 
 /*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 2e3211fce69e..c9183c47233a 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.304 2005/03/15 14:14:09 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 4ca7d2481709..e37ebc277809 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_page.h,v 1.136.2.1 2005/08/15 09:02:01 rwatson Exp $
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 6860dd65a298..f86556bb8ed0 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.268.2.1 2005/08/12 16:43:27 tegge Exp $");
 
 #include "opt_vm.h"
 #include <sys/param.h>
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 1b74fab74f0e..e82b1ae819f4 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pageout.h,v 1.41 2005/01/07 02:29:27 imp Exp $
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c
index 1ed1d3e57d29..33aae4035efb 100644
--- a/sys/vm/vm_pageq.c
+++ b/sys/vm/vm_pageq.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.18 2005/06/10 03:33:36 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index d6025ab6fe5c..87c0acb39b11 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pager.c,v 1.105.2.1 2005/08/15 14:04:47 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 652073cac339..7ebffda10318 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pager.h,v 1.50 2005/05/18 22:08:52 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index dc3abe75820d..d21efa5e6c49 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_param.h,v 1.21 2005/01/07 02:29:27 imp Exp $
  */
 
 /*
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index cd98be975e34..e502b3b81baa 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_unix.c,v 1.46 2005/01/07 02:29:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/vm/vm_zeroidle.c b/sys/vm/vm_zeroidle.c
index 46e1c261f7d9..8f2794216d6d 100644
--- a/sys/vm/vm_zeroidle.c
+++ b/sys/vm/vm_zeroidle.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.34.2.1 2005/10/09 03:25:37 delphij Exp $");
 
 #include <opt_sched.h>
 
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 703f967e2a37..92991c9d4613 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vnode_pager.c,v 1.221.2.2 2005/08/15 14:04:47 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index aa9be03c17ba..f88c8460ac2b 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vnode_pager.h,v 1.20 2005/01/24 21:21:59 phk Exp $
  */
 
 #ifndef	_VNODE_PAGER_
diff --git a/tools/KSE/ksetest/Makefile b/tools/KSE/ksetest/Makefile
index 885d06993c7b..fa9640b8fe79 100644
--- a/tools/KSE/ksetest/Makefile
+++ b/tools/KSE/ksetest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/KSE/ksetest/Makefile,v 1.4 2004/12/21 08:47:20 ru Exp $
 
 PROG=		ksetest
 NO_MAN=
diff --git a/tools/KSE/ksetest/kse_asm.S b/tools/KSE/ksetest/kse_asm.S
index 20dc1dbba258..e37f24d2b440 100644
--- a/tools/KSE/ksetest/kse_asm.S
+++ b/tools/KSE/ksetest/kse_asm.S
@@ -24,11 +24,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/ksetest/kse_asm.S,v 1.8 2002/11/23 04:39:52 davidxu Exp $
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/KSE/ksetest/kse_asm.S,v 1.8 2002/11/23 04:39:52 davidxu Exp $");
 
 /*
  * Where do we define these?
diff --git a/tools/KSE/ksetest/kse_threads_test.c b/tools/KSE/ksetest/kse_threads_test.c
index 3ab09f98a1e3..908c042a5786 100644
--- a/tools/KSE/ksetest/kse_threads_test.c
+++ b/tools/KSE/ksetest/kse_threads_test.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/ksetest/kse_threads_test.c,v 1.6 2003/02/20 08:24:22 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/KSE/ksetest/simplelock.h b/tools/KSE/ksetest/simplelock.h
index 2dae6abd5d08..b1af67833b87 100644
--- a/tools/KSE/ksetest/simplelock.h
+++ b/tools/KSE/ksetest/simplelock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/ksetest/simplelock.h,v 1.3 2003/02/08 06:33:37 davidxu Exp $
  */
 
 #ifndef _SIMPLELOCK_H
diff --git a/tools/KSE/rr/Makefile b/tools/KSE/rr/Makefile
index 45e1dbb7923a..b3abb62c5d0c 100644
--- a/tools/KSE/rr/Makefile
+++ b/tools/KSE/rr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/KSE/rr/Makefile,v 1.2 2004/12/21 08:47:20 ru Exp $
 
 PROG=		rr	
 NO_MAN=
diff --git a/tools/KSE/rr/kse_asm.S b/tools/KSE/rr/kse_asm.S
index 20dc1dbba258..c079d9ed6147 100644
--- a/tools/KSE/rr/kse_asm.S
+++ b/tools/KSE/rr/kse_asm.S
@@ -24,11 +24,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/rr/kse_asm.S,v 1.1.1.1 2003/02/26 01:05:09 davidxu Exp $
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/KSE/rr/kse_asm.S,v 1.1.1.1 2003/02/26 01:05:09 davidxu Exp $");
 
 /*
  * Where do we define these?
diff --git a/tools/KSE/rr/rr.c b/tools/KSE/rr/rr.c
index a75ce2e505e2..a82d67365e3a 100644
--- a/tools/KSE/rr/rr.c
+++ b/tools/KSE/rr/rr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/rr/rr.c,v 1.2 2003/03/21 08:21:39 davidxu Exp $
  */
 
 /*
diff --git a/tools/KSE/rr/simplelock.h b/tools/KSE/rr/simplelock.h
index 2dae6abd5d08..7b60d13274fd 100644
--- a/tools/KSE/rr/simplelock.h
+++ b/tools/KSE/rr/simplelock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/rr/simplelock.h,v 1.1.1.1 2003/02/26 01:05:09 davidxu Exp $
  */
 
 #ifndef _SIMPLELOCK_H
diff --git a/tools/LibraryReport/LibraryReport.tcl b/tools/LibraryReport/LibraryReport.tcl
index fbf63896c71d..963a6e56cc13 100755
--- a/tools/LibraryReport/LibraryReport.tcl
+++ b/tools/LibraryReport/LibraryReport.tcl
@@ -50,7 +50,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/LibraryReport/LibraryReport.tcl,v 1.5 1999/08/28 00:54:21 peter Exp $
 #
 
 #########################################################################################
diff --git a/tools/README b/tools/README
index 99ec8e9241f7..eedb1fa1bb61 100644
--- a/tools/README
+++ b/tools/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/README,v 1.3 2000/08/13 14:46:31 alex Exp $
 
 This directory tree contains tools used for the maintenance and
 testing of FreeBSD.  There is no toplevel Makefile structure since
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 9f0faddd13d8..dbd1e24f66de 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/Makefile,v 1.12 2005/05/16 09:32:41 ru Exp $
 
 .PATH: ${.CURDIR}/../../include
 
diff --git a/tools/build/cross-build/Makefile b/tools/build/cross-build/Makefile
index 69c1e9c49844..9a26024ef493 100644
--- a/tools/build/cross-build/Makefile
+++ b/tools/build/cross-build/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/cross-build/Makefile,v 1.1 2005/03/02 16:40:51 ru Exp $
 
 NO_OBJ=
 SCRIPTS=	date.sh hostname.sh
diff --git a/tools/build/cross-build/date.sh b/tools/build/cross-build/date.sh
index f697a7f0cd54..56040f5a8f1a 100644
--- a/tools/build/cross-build/date.sh
+++ b/tools/build/cross-build/date.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/build/cross-build/date.sh,v 1.1 2005/03/02 16:40:51 ru Exp $
 #
 
 exec /bin/date -r0 "$@"
diff --git a/tools/build/cross-build/hostname.sh b/tools/build/cross-build/hostname.sh
index 855741beca85..4e133840d3e3 100644
--- a/tools/build/cross-build/hostname.sh
+++ b/tools/build/cross-build/hostname.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/build/cross-build/hostname.sh,v 1.1 2005/03/02 16:40:51 ru Exp $
 #
 
 echo dummy
diff --git a/tools/build/dummy.c b/tools/build/dummy.c
index b656a0305a97..562d0b6fb337 100644
--- a/tools/build/dummy.c
+++ b/tools/build/dummy.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/build/dummy.c,v 1.1 2003/04/05 20:30:30 imp Exp $
  *
  * Empty file to keep linker happy.
  */
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile
index 4c2389a1b098..6c7465348b51 100644
--- a/tools/build/make_check/Makefile
+++ b/tools/build/make_check/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/make_check/Makefile,v 1.28 2005/03/02 12:33:22 harti Exp $
 
 # Test for broken LHS expansion.
 # This *must* cause make(1) to detect a recursive variable, and fail as such.
diff --git a/tools/build/make_check/regress.t b/tools/build/make_check/regress.t
index e37f3328bdf6..92389088a82c 100644
--- a/tools/build/make_check/regress.t
+++ b/tools/build/make_check/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/build/make_check/regress.t,v 1.2 2005/03/02 12:33:22 harti Exp $
 
 cd `dirname $0`
 make all
diff --git a/tools/build/make_check/shell_test.sh b/tools/build/make_check/shell_test.sh
index 46169eb6efc2..60d63605a819 100644
--- a/tools/build/make_check/shell_test.sh
+++ b/tools/build/make_check/shell_test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/build/make_check/shell_test.sh,v 1.2 2005/03/02 12:33:22 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot
index 0707ae2b0d67..176c930db1d3 100644
--- a/tools/build/mk/Makefile.boot
+++ b/tools/build/mk/Makefile.boot
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/mk/Makefile.boot,v 1.2 2005/02/27 11:22:58 ru Exp $
 
 CFLAGS+=	-I${WORLDTMP}/legacy/usr/include
 DPADD+=		${WORLDTMP}/legacy/usr/lib/libegacy.a
diff --git a/tools/build/mk/bsd.lib.mk b/tools/build/mk/bsd.lib.mk
index 744f5b5a8b9d..3be67c2168cb 100644
--- a/tools/build/mk/bsd.lib.mk
+++ b/tools/build/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/mk/bsd.lib.mk,v 1.1 2003/04/12 15:07:46 ru Exp $
 
 .include "../../../share/mk/bsd.lib.mk"
 .include "Makefile.boot"
diff --git a/tools/build/mk/bsd.prog.mk b/tools/build/mk/bsd.prog.mk
index d650665d6200..3172e159084c 100644
--- a/tools/build/mk/bsd.prog.mk
+++ b/tools/build/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/mk/bsd.prog.mk,v 1.1 2003/04/12 15:07:46 ru Exp $
 
 .include "../../../share/mk/bsd.prog.mk"
 .include "Makefile.boot"
diff --git a/tools/debugscripts/README b/tools/debugscripts/README
index bd28cdc547af..c10dc625e966 100644
--- a/tools/debugscripts/README
+++ b/tools/debugscripts/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/debugscripts/README,v 1.2 2004/08/04 18:03:43 jmg Exp $
 
 This directory contains gdb macros for kernel debugging.  When you
 build a debug kernel, the target "gdbinit" in the kernel Makefile will
diff --git a/tools/debugscripts/dot.gdbinit b/tools/debugscripts/dot.gdbinit
index 683922a77e9d..74692f8e3b42 100644
--- a/tools/debugscripts/dot.gdbinit
+++ b/tools/debugscripts/dot.gdbinit
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/dot.gdbinit,v 1.8 2004/11/19 03:51:12 obrien Exp $
 # .gdbinit file for remote serial debugging.
 # see gdbinit(9) for further details.
 #
diff --git a/tools/debugscripts/gdbinit.i386 b/tools/debugscripts/gdbinit.i386
index e02b2063f509..95b2af22f19a 100644
--- a/tools/debugscripts/gdbinit.i386
+++ b/tools/debugscripts/gdbinit.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/gdbinit.i386,v 1.4 2004/11/20 02:32:42 das Exp $
 # Assembler-level macros for i386
 # Disassemble the next 10 instructions.
 define xi
diff --git a/tools/debugscripts/gdbinit.kernel b/tools/debugscripts/gdbinit.kernel
index 91d85c22a57c..1e712c02c7a1 100644
--- a/tools/debugscripts/gdbinit.kernel
+++ b/tools/debugscripts/gdbinit.kernel
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/gdbinit.kernel,v 1.8 2004/11/20 02:32:42 das Exp $
 # General kernel macros
 
 # Print the command name of the current process
diff --git a/tools/debugscripts/kgdb b/tools/debugscripts/kgdb
index ae580b301d41..c57fa4ced6e2 100644
--- a/tools/debugscripts/kgdb
+++ b/tools/debugscripts/kgdb
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/kgdb,v 1.2 2005/03/20 02:08:21 jmg Exp $
 
 crashpath="/var/crash"
 kld_debpy="kld_deb.py"
diff --git a/tools/debugscripts/kld_deb.py b/tools/debugscripts/kld_deb.py
index 0ea12ab87b97..edbc6a1417c2 100644
--- a/tools/debugscripts/kld_deb.py
+++ b/tools/debugscripts/kld_deb.py
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/kld_deb.py,v 1.2 2005/03/20 02:08:21 jmg Exp $
 
 import sys
 import os
diff --git a/tools/diag/README b/tools/diag/README
index 814794367921..6a5fda3064e0 100644
--- a/tools/diag/README
+++ b/tools/diag/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/diag/README,v 1.6 2002/02/06 17:50:05 phantom Exp $
 
 This directory is for diagnostic programs.
 
diff --git a/tools/diag/ac/README b/tools/diag/ac/README
index 48c1cad0db79..d7087a05f6da 100644
--- a/tools/diag/ac/README
+++ b/tools/diag/ac/README
@@ -6,4 +6,4 @@ ac              check if the contributors article is in sync with the
 ent.sh          check for ordering/content problems in .ent files (authors.ent,
                 teams.ent, etc)
 
-$FreeBSD$
+$FreeBSD: src/tools/diag/ac/README,v 1.1 2002/02/06 17:49:13 phantom Exp $
diff --git a/tools/diag/ac/cknames.pl b/tools/diag/ac/cknames.pl
index a3ffe3192f3c..d3f3055efd29 100644
--- a/tools/diag/ac/cknames.pl
+++ b/tools/diag/ac/cknames.pl
@@ -30,7 +30,7 @@
 #
 # NOTE: This script is supposed to run at freefall.freebsd.org *only*
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/ac/cknames.pl,v 1.4 2003/11/26 10:43:05 phantom Exp $
 #
 
 $debug = 0;
diff --git a/tools/diag/ac/ent.sh b/tools/diag/ac/ent.sh
index fbc2219dd4de..0901978e1ed9 100644
--- a/tools/diag/ac/ent.sh
+++ b/tools/diag/ac/ent.sh
@@ -3,7 +3,7 @@
 #
 # ent.sh -- this script checks {authors,teams}.ent files for correctness
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/ac/ent.sh,v 1.3 2003/11/26 10:43:05 phantom Exp $
 
 : ${CVSROOT=/home/dcvs}
 prefix=doc/en_US.ISO8859-1/share/sgml
diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile
index 167bf8aa8245..ab31d0e63e21 100644
--- a/tools/diag/dumpvfscache/Makefile
+++ b/tools/diag/dumpvfscache/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/dumpvfscache/Makefile,v 1.4 2004/12/21 08:47:20 ru Exp $
 
 PROG=	dumpvfscache
 DPADD=	${LIBKVM}
diff --git a/tools/diag/dumpvfscache/dumpvfscache.c b/tools/diag/dumpvfscache/dumpvfscache.c
index 3f5eb5793a8a..83ff5490e839 100644
--- a/tools/diag/dumpvfscache/dumpvfscache.c
+++ b/tools/diag/dumpvfscache/dumpvfscache.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/diag/dumpvfscache/dumpvfscache.c,v 1.4 2002/01/02 06:25:39 kbyanc Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tools/diag/httpd-error/httpd-error b/tools/diag/httpd-error/httpd-error
index a7f35be90cdc..60699c2d2f18 100755
--- a/tools/diag/httpd-error/httpd-error
+++ b/tools/diag/httpd-error/httpd-error
@@ -26,7 +26,7 @@
 #
 # httpd-error - check for Web files which do not exist on your host
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/httpd-error/httpd-error,v 1.6 2002/09/24 20:05:01 ache Exp $
 
 mode=${1}
 
diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile
index da4fe7fa1515..964241a92150 100644
--- a/tools/diag/localeck/Makefile
+++ b/tools/diag/localeck/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/localeck/Makefile,v 1.5 2004/12/21 08:47:20 ru Exp $
 
 PROG=	localeck
 NO_MAN=
diff --git a/tools/diag/localeck/docheck.sh b/tools/diag/localeck/docheck.sh
index 7f47851f7bdf..7075b56420ac 100644
--- a/tools/diag/localeck/docheck.sh
+++ b/tools/diag/localeck/docheck.sh
@@ -3,7 +3,7 @@
 # Validate all locales installed in specified directory
 # (by default check system locales)
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/localeck/docheck.sh,v 1.2 2002/02/04 16:17:19 phantom Exp $
 #
 
 LOCALEDIR=/usr/share/locale
diff --git a/tools/diag/localeck/localeck.c b/tools/diag/localeck/localeck.c
index 4ce7e458f147..d85667165ddc 100644
--- a/tools/diag/localeck/localeck.c
+++ b/tools/diag/localeck/localeck.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/diag/localeck/localeck.c,v 1.4 2002/04/22 13:44:35 des Exp $
  */
 
 #include <locale.h>
diff --git a/tools/install.sh b/tools/install.sh
index 594d4de7a135..b1388ea73469 100644
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -26,7 +26,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/tools/install.sh,v 1.7 2004/07/07 09:38:14 ru Exp $
 
 # parse install's options and ignore them completely.
 while [ $# -gt 0 ]; do
diff --git a/tools/lib32/README b/tools/lib32/README
index 21253de25d04..28915c743ad4 100644
--- a/tools/lib32/README
+++ b/tools/lib32/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/lib32/README,v 1.2 2004/11/25 04:25:21 peter Exp $
 
 Set WITH_LIB32=yes in /etc/make.conf and do a buildworld/installworld.
 
diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index c79be8751b79..6c8445d6da0b 100644
--- a/tools/make_libdeps.sh
+++ b/tools/make_libdeps.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/make_libdeps.sh,v 1.5 2004/04/13 11:06:20 ru Exp $
 
 export PATH=/usr/bin
 
diff --git a/tools/regression/README b/tools/regression/README
index 03334e41a947..19235d038568 100644
--- a/tools/regression/README
+++ b/tools/regression/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/README,v 1.13 2005/01/02 21:40:36 marcel Exp $
 
 This directory is for regression test programs.
 
diff --git a/tools/regression/TODO b/tools/regression/TODO
index e8fb9f73c673..3912983e7eb9 100644
--- a/tools/regression/TODO
+++ b/tools/regression/TODO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/TODO,v 1.1 2004/11/11 19:47:50 nik Exp $
 ---
 
 A lot of the tests written in C use assert(), only printing 'ok' at the end
diff --git a/tools/regression/aio/aiotest/Makefile b/tools/regression/aio/aiotest/Makefile
index e8dff68d7dae..f76ad143ce70 100644
--- a/tools/regression/aio/aiotest/Makefile
+++ b/tools/regression/aio/aiotest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/aio/aiotest/Makefile,v 1.2 2004/12/21 08:47:25 ru Exp $
 
 PROG=	aiotest
 NO_MAN=	YES
diff --git a/tools/regression/aio/aiotest/aiotest.c b/tools/regression/aio/aiotest/aiotest.c
index 8769dc1a93d2..ac358395ba2b 100644
--- a/tools/regression/aio/aiotest/aiotest.c
+++ b/tools/regression/aio/aiotest/aiotest.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/aio/aiotest/aiotest.c,v 1.2 2004/12/06 13:15:23 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/aio/kqueue/Makefile b/tools/regression/aio/kqueue/Makefile
index adf7441740b0..65536f441985 100644
--- a/tools/regression/aio/kqueue/Makefile
+++ b/tools/regression/aio/kqueue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/aio/kqueue/Makefile,v 1.1 2005/03/02 03:32:01 ambrisko Exp $
 
 PROG=	aio_kqueue
 NO_MAN=	YES
diff --git a/tools/regression/aio/kqueue/aio_kqueue.c b/tools/regression/aio/kqueue/aio_kqueue.c
index 36f41c030e97..d5ed67dab7bc 100644
--- a/tools/regression/aio/kqueue/aio_kqueue.c
+++ b/tools/regression/aio/kqueue/aio_kqueue.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/aio/kqueue/aio_kqueue.c,v 1.1 2005/03/02 03:32:01 ambrisko Exp $
  */
 
 /* 
diff --git a/tools/regression/aio/kqueue/lio/Makefile b/tools/regression/aio/kqueue/lio/Makefile
index 3ff569a22ce4..d1e1dbf38a1e 100644
--- a/tools/regression/aio/kqueue/lio/Makefile
+++ b/tools/regression/aio/kqueue/lio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/aio/kqueue/lio/Makefile,v 1.1 2005/03/02 04:00:55 ambrisko Exp $
 
 PROG=	lio_kqueue
 NO_MAN=	YES
diff --git a/tools/regression/aio/kqueue/lio/lio_kqueue.c b/tools/regression/aio/kqueue/lio/lio_kqueue.c
index f49a87237a42..2316943bed2d 100644
--- a/tools/regression/aio/kqueue/lio/lio_kqueue.c
+++ b/tools/regression/aio/kqueue/lio/lio_kqueue.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/aio/kqueue/lio/lio_kqueue.c,v 1.1 2005/03/02 04:00:55 ambrisko Exp $
  */
 
 /*
diff --git a/tools/regression/atm/Funcs.sh b/tools/regression/atm/Funcs.sh
index c981f101df94..453cf0c726d6 100644
--- a/tools/regression/atm/Funcs.sh
+++ b/tools/regression/atm/Funcs.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/Funcs.sh,v 1.1 2004/01/29 16:01:56 harti Exp $
 
 fatal() {
 	echo -e "$*" >&2
diff --git a/tools/regression/atm/README b/tools/regression/atm/README
index 509a08dad6db..bbb8b12ac889 100644
--- a/tools/regression/atm/README
+++ b/tools/regression/atm/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/atm/README,v 1.2 2004/08/13 09:27:21 harti Exp $
 
 This directory contains tests for the ATM stuff. Specific tests for HARP
 are in the harp subdirectory and are not automatically run. All
diff --git a/tools/regression/atm/RunTest.sh b/tools/regression/atm/RunTest.sh
index 53fe60557196..39344d9c762d 100644
--- a/tools/regression/atm/RunTest.sh
+++ b/tools/regression/atm/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/RunTest.sh,v 1.3 2004/08/13 09:27:21 harti Exp $
 
 . ./Funcs.sh
 
diff --git a/tools/regression/atm/harp/atm_udp.ng b/tools/regression/atm/harp/atm_udp.ng
index 329b6967858b..bb37e127d0bb 100644
--- a/tools/regression/atm/harp/atm_udp.ng
+++ b/tools/regression/atm/harp/atm_udp.ng
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/harp/atm_udp.ng,v 1.1 2004/01/29 15:58:06 harti Exp $
 #
 err() {
 	echo "$*" >&2
diff --git a/tools/regression/atm/harp/memory_leak.sh b/tools/regression/atm/harp/memory_leak.sh
index ac6cebb01a13..44b18a95b7d3 100644
--- a/tools/regression/atm/harp/memory_leak.sh
+++ b/tools/regression/atm/harp/memory_leak.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/harp/memory_leak.sh,v 1.1 2004/01/29 15:58:06 harti Exp $
 #
 # Perform memory leak test
 #
diff --git a/tools/regression/atm/proto_cc/RunTest.sh b/tools/regression/atm/proto_cc/RunTest.sh
index f6c7ce00d336..1acba631d7ed 100644
--- a/tools/regression/atm/proto_cc/RunTest.sh
+++ b/tools/regression/atm/proto_cc/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_cc/RunTest.sh,v 1.1 2004/08/13 09:27:21 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/atm/proto_sscfu/RunTest.sh b/tools/regression/atm/proto_sscfu/RunTest.sh
index 2f0865937224..81cb5a89585c 100644
--- a/tools/regression/atm/proto_sscfu/RunTest.sh
+++ b/tools/regression/atm/proto_sscfu/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_sscfu/RunTest.sh,v 1.1 2004/01/29 16:01:57 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/atm/proto_sscop/RunTest.sh b/tools/regression/atm/proto_sscop/RunTest.sh
index 60812deeb6ed..160cf604fba1 100644
--- a/tools/regression/atm/proto_sscop/RunTest.sh
+++ b/tools/regression/atm/proto_sscop/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_sscop/RunTest.sh,v 1.1 2004/01/29 16:01:57 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/atm/proto_uni/RunTest.sh b/tools/regression/atm/proto_uni/RunTest.sh
index 8b9c9e5e38c9..d070629b903b 100644
--- a/tools/regression/atm/proto_uni/RunTest.sh
+++ b/tools/regression/atm/proto_uni/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_uni/RunTest.sh,v 1.1 2004/01/29 16:01:57 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/ccd/layout/Makefile b/tools/regression/ccd/layout/Makefile
index 1e6b4dfe59e8..d3f40deb2c7b 100644
--- a/tools/regression/ccd/layout/Makefile
+++ b/tools/regression/ccd/layout/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ccd/layout/Makefile,v 1.1 2003/01/17 12:23:44 phk Exp $
 #
 # Regression test for ccd's layout.
 #
diff --git a/tools/regression/ccd/layout/a.c b/tools/regression/ccd/layout/a.c
index 33eea10f2a3c..5f4bd284c346 100644
--- a/tools/regression/ccd/layout/a.c
+++ b/tools/regression/ccd/layout/a.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/ccd/layout/a.c,v 1.1 2003/01/17 12:23:44 phk Exp $ */
 #include <unistd.h>
 
 static uint32_t buf[512/4];
diff --git a/tools/regression/ccd/layout/b.c b/tools/regression/ccd/layout/b.c
index 5b4ae8ed6a9e..556d9eea8cbd 100644
--- a/tools/regression/ccd/layout/b.c
+++ b/tools/regression/ccd/layout/b.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/ccd/layout/b.c,v 1.1 2003/01/17 12:23:44 phk Exp $ */
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/tools/regression/ccd/layout/ccd.sh b/tools/regression/ccd/layout/ccd.sh
index 62d4726528a8..d8102e67ede2 100644
--- a/tools/regression/ccd/layout/ccd.sh
+++ b/tools/regression/ccd/layout/ccd.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ccd/layout/ccd.sh,v 1.2 2003/06/02 19:49:09 phk Exp $
 
 set -e
 
diff --git a/tools/regression/ccd/layout/ccd0.sh b/tools/regression/ccd/layout/ccd0.sh
index 0f71b18dc96e..f540575c345b 100644
--- a/tools/regression/ccd/layout/ccd0.sh
+++ b/tools/regression/ccd/layout/ccd0.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ccd/layout/ccd0.sh,v 1.1 2003/01/17 12:23:44 phk Exp $
 
 set -e
 
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0
index 470f2dce2c0a..d6f1f036c13a 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks concatenated
 76089c8ed2249882ae0bb260dcb4a913
 4cc57a9dd953d032ae7e07edaef31203
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4
index 470f2dce2c0a..e01885b782e3 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks concatenated
 76089c8ed2249882ae0bb260dcb4a913
 4cc57a9dd953d032ae7e07edaef31203
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0
index 593c413f5966..f3829abaa602 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c3019ef8e08259f8748931f225e5cebf
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2
index 593c413f5966..dfde539ffe42 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c3019ef8e08259f8748931f225e5cebf
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4
index 9f8aebc12269..5e74f49982f9 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 4 blocks
 a77c5edd8917abb32dc165750f1af781
 8db0b90ec1fa54feca98ad8fd292b07c
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0
index 44a28186e4a1..5f3be5c8e732 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1216 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4
index 44a28186e4a1..65b368b70bbb 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1216 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0
index 6fc421a38ea6..a9a543756026 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1216 blocks interleaved at 4 blocks
 85853375739fe031c97c20e6226aae0e
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2
index 53cfc7985466..807870af00ca 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c7d32c7a0aacde7259cac3ab214bda77
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4
index ba42742e6745..73ac82f20edb 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 4 blocks
 ab2274c3b7241753a015c243417c0c29
 8db0b90ec1fa54feca98ad8fd292b07c
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0
index 12de5a4b7df4..65bcd43c6957 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4
index 12de5a4b7df4..ebd1df34e9d3 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0
index caf85b195ec9..cc1f3b8fede4 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks interleaved at 16 blocks
 9f63a6ab2d5bd7c183e338387d9c4b59
 89518c095e85649516fa08fe98bf0a3e
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2
index e00fa6c6caec..c114365db31a 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 16 blocks
 ebe23f400e868c343240761b0b52c2fd
 89518c095e85649516fa08fe98bf0a3e
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4
index 06c4890d96e1..4abab576f633 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 16 blocks
 f3f609d828a50cca082f6b6f499ca4b5
 721d9967a8e2608d111cfc24304255ca
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0
index 3b57123ba46f..432834f13611 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks interleaved at 4 blocks
 50f78fd6083bea22e664f78350e24f2f
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2
index 7cccecf330e7..31fafe269c48 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c7d32c7a0aacde7259cac3ab214bda77
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4
index db2dcd80af23..24103c02fa83 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 4 blocks
 ab2274c3b7241753a015c243417c0c29
 8db0b90ec1fa54feca98ad8fd292b07c
diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile
index 687e7dda9a16..3fdfbedfeeed 100644
--- a/tools/regression/fsx/Makefile
+++ b/tools/regression/fsx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fsx/Makefile,v 1.3 2004/12/21 08:47:20 ru Exp $
 
 PROG=	fsx
 
diff --git a/tools/regression/fsx/fsx.c b/tools/regression/fsx/fsx.c
index b57efe670c1e..8b2209bcb431 100644
--- a/tools/regression/fsx/fsx.c
+++ b/tools/regression/fsx/fsx.c
@@ -36,7 +36,7 @@
  *
  *	Updated license to APSL 2.0, 2004/7/27 - Jordan Hubbard
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/fsx/fsx.c,v 1.3 2004/07/27 20:01:43 jkh Exp $
  *
  */
 
diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile
index 2506e017a3bd..6e5eeb2d2ec8 100644
--- a/tools/regression/gaithrstress/Makefile
+++ b/tools/regression/gaithrstress/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/gaithrstress/Makefile,v 1.3 2004/12/21 08:47:20 ru Exp $
 
 PROG=	gaithrstress
 LDADD+=	-pthread
diff --git a/tools/regression/gaithrstress/gaithrstress.c b/tools/regression/gaithrstress/gaithrstress.c
index 023e0b57355b..ed00af9ed388 100644
--- a/tools/regression/gaithrstress/gaithrstress.c
+++ b/tools/regression/gaithrstress/gaithrstress.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/gaithrstress/gaithrstress.c,v 1.3 2004/02/21 22:42:54 green Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/tools/regression/geom/ConfCmp/ConfCmp.c
index 1ddf502f9110..9298f028fc20 100644
--- a/tools/regression/geom/ConfCmp/ConfCmp.c
+++ b/tools/regression/geom/ConfCmp/ConfCmp.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/geom/ConfCmp/ConfCmp.c,v 1.9 2003/03/04 19:20:52 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile
index 3be5e70f1dfe..49be2096e37c 100644
--- a/tools/regression/geom/ConfCmp/Makefile
+++ b/tools/regression/geom/ConfCmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/ConfCmp/Makefile,v 1.8 2004/12/21 08:46:55 ru Exp $
 
 PROG=	ConfCmp
 SRCS+=	ConfCmp.c
diff --git a/tools/regression/geom/ConfCmp/a1.conf b/tools/regression/geom/ConfCmp/a1.conf
index 94171cdacb10..89803598e75f 100644
--- a/tools/regression/geom/ConfCmp/a1.conf
+++ b/tools/regression/geom/ConfCmp/a1.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1a.conf b/tools/regression/geom/ConfCmp/a1a.conf
index 01110f39f8af..2d0bfac03cf6 100644
--- a/tools/regression/geom/ConfCmp/a1a.conf
+++ b/tools/regression/geom/ConfCmp/a1a.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1a.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x90712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1b.conf b/tools/regression/geom/ConfCmp/a1b.conf
index 46f423b28ec0..b974a43ac7f6 100644
--- a/tools/regression/geom/ConfCmp/a1b.conf
+++ b/tools/regression/geom/ConfCmp/a1b.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1b.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1c.conf b/tools/regression/geom/ConfCmp/a1c.conf
index 1b5a2b939c2e..8c102fe2282e 100644
--- a/tools/regression/geom/ConfCmp/a1c.conf
+++ b/tools/regression/geom/ConfCmp/a1c.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1c.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1d.conf b/tools/regression/geom/ConfCmp/a1d.conf
index a9063c554b35..e647487c21b8 100644
--- a/tools/regression/geom/ConfCmp/a1d.conf
+++ b/tools/regression/geom/ConfCmp/a1d.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1d.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a2.conf b/tools/regression/geom/ConfCmp/a2.conf
index 6688fd1ea451..4fffdd7435d8 100644
--- a/tools/regression/geom/ConfCmp/a2.conf
+++ b/tools/regression/geom/ConfCmp/a2.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2.conf,v 1.2 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/ConfCmp/a2a.conf b/tools/regression/geom/ConfCmp/a2a.conf
index 3d35fe9d32c9..54293025c0ba 100644
--- a/tools/regression/geom/ConfCmp/a2a.conf
+++ b/tools/regression/geom/ConfCmp/a2a.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2a.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x90740e0">
     <name>DEV-class</name>
     <geom id="0x90bce00">
diff --git a/tools/regression/geom/ConfCmp/a2b.conf b/tools/regression/geom/ConfCmp/a2b.conf
index 58c0e15b64f1..cc6decac53fb 100644
--- a/tools/regression/geom/ConfCmp/a2b.conf
+++ b/tools/regression/geom/ConfCmp/a2b.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2b.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/ConfCmp/a2c.conf b/tools/regression/geom/ConfCmp/a2c.conf
index 381c4106a52f..6c7cad301013 100644
--- a/tools/regression/geom/ConfCmp/a2c.conf
+++ b/tools/regression/geom/ConfCmp/a2c.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2c.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/ConfCmp/a2d.conf b/tools/regression/geom/ConfCmp/a2d.conf
index bccaed5e43fa..ff519563a100 100644
--- a/tools/regression/geom/ConfCmp/a2d.conf
+++ b/tools/regression/geom/ConfCmp/a2d.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2d.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/Data/disk.alpha.da0.xml b/tools/regression/geom/Data/disk.alpha.da0.xml
index 670fcc38d596..57b1ea9db864 100644
--- a/tools/regression/geom/Data/disk.alpha.da0.xml
+++ b/tools/regression/geom/Data/disk.alpha.da0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.alpha.da0.xml,v 1.1 2002/03/27 21:21:29 phk Exp $</FreeBSD>
   <comment>
     Yet an alpha disklabel.
   </comment>
diff --git a/tools/regression/geom/Data/disk.alpha2.da0.xml b/tools/regression/geom/Data/disk.alpha2.da0.xml
index 5b341b174d6d..933c36944641 100644
--- a/tools/regression/geom/Data/disk.alpha2.da0.xml
+++ b/tools/regression/geom/Data/disk.alpha2.da0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.alpha2.da0.xml,v 1.1 2002/03/27 21:21:29 phk Exp $</FreeBSD>
   <comment>
     alpha label which O'brien says blows up libdisk
   </comment>
diff --git a/tools/regression/geom/Data/disk.apple.xml b/tools/regression/geom/Data/disk.apple.xml
index ecdd5236497c..b9fac69013ba 100644
--- a/tools/regression/geom/Data/disk.apple.xml
+++ b/tools/regression/geom/Data/disk.apple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.apple.xml,v 1.1 2003/01/31 18:31:47 phk Exp $</FreeBSD>
   <sectorsize>512</sectorsize>
   <mediasize>366530560</mediasize>
   <fwsectors>0</fwsectors>
diff --git a/tools/regression/geom/Data/disk.beast.da0.xml b/tools/regression/geom/Data/disk.beast.da0.xml
index 96ad5f74ddef..cf51f17ac215 100644
--- a/tools/regression/geom/Data/disk.beast.da0.xml
+++ b/tools/regression/geom/Data/disk.beast.da0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.beast.da0.xml,v 1.1 2002/03/24 13:54:01 phk Exp $
     alpha BSD label from beast.freebsd.org
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.critter.ad0.xml b/tools/regression/geom/Data/disk.critter.ad0.xml
index 9e93b2414345..dcb987827a8b 100644
--- a/tools/regression/geom/Data/disk.critter.ad0.xml
+++ b/tools/regression/geom/Data/disk.critter.ad0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.critter.ad0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     This image contains the MBR and disklabel sectors from my Asus M1300
     laptop.
   </comment>
diff --git a/tools/regression/geom/Data/disk.empty.flp.xml b/tools/regression/geom/Data/disk.empty.flp.xml
index 88c603ac9567..128ede773070 100644
--- a/tools/regression/geom/Data/disk.empty.flp.xml
+++ b/tools/regression/geom/Data/disk.empty.flp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.empty.flp.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     An empty floppy disk
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.far.ad0.xml b/tools/regression/geom/Data/disk.far.ad0.xml
index 0a8d3ca9379b..de0beb17de9b 100644
--- a/tools/regression/geom/Data/disk.far.ad0.xml
+++ b/tools/regression/geom/Data/disk.far.ad0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.far.ad0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A Windows laptop.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.flat.da1.xml b/tools/regression/geom/Data/disk.flat.da1.xml
index 2302a7c66c99..81eae7e63c43 100644
--- a/tools/regression/geom/Data/disk.flat.da1.xml
+++ b/tools/regression/geom/Data/disk.flat.da1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.flat.da1.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     This image contains an interesting setup: there is an MBR+BSD
     but also another BSD at sector one which is valid but bogus.
   </comment>
diff --git a/tools/regression/geom/Data/disk.kern.flp.xml b/tools/regression/geom/Data/disk.kern.flp.xml
index 6640c4875167..5ed7adcf9ff1 100644
--- a/tools/regression/geom/Data/disk.kern.flp.xml
+++ b/tools/regression/geom/Data/disk.kern.flp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.kern.flp.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A FreeBSD kern.flp image.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.msdos.ext.xml b/tools/regression/geom/Data/disk.msdos.ext.xml
index 868a88f78237..36deb5faf6c2 100644
--- a/tools/regression/geom/Data/disk.msdos.ext.xml
+++ b/tools/regression/geom/Data/disk.msdos.ext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.msdos.ext.xml,v 1.2 2002/09/06 08:41:48 phk Exp $
     A MSDOS 6.22 disk with maximal number of extended partitions.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.msdos.flp.xml b/tools/regression/geom/Data/disk.msdos.flp.xml
index d057d1ac75d5..eaebf39f7baa 100644
--- a/tools/regression/geom/Data/disk.msdos.flp.xml
+++ b/tools/regression/geom/Data/disk.msdos.flp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.msdos.flp.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A MSDOS floppy image.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.pc98.wdc0.xml b/tools/regression/geom/Data/disk.pc98.wdc0.xml
index 6bae97fd2d92..d69a0ea59cbe 100644
--- a/tools/regression/geom/Data/disk.pc98.wdc0.xml
+++ b/tools/regression/geom/Data/disk.pc98.wdc0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.pc98.wdc0.xml,v 1.2 2002/03/28 21:42:14 phk Exp $</FreeBSD>
   <comment>
     A PC98 disklabel from Warner
   </comment>
diff --git a/tools/regression/geom/Data/disk.sun.da0.xml b/tools/regression/geom/Data/disk.sun.da0.xml
index 826581f086b0..2fb2bfdfdf45 100644
--- a/tools/regression/geom/Data/disk.sun.da0.xml
+++ b/tools/regression/geom/Data/disk.sun.da0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.sun.da0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A Solaris 8 disklabel
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.sun.da1.xml b/tools/regression/geom/Data/disk.sun.da1.xml
index 0aac8e584d4a..cb59b18c4b7a 100644
--- a/tools/regression/geom/Data/disk.sun.da1.xml
+++ b/tools/regression/geom/Data/disk.sun.da1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$	
+    $FreeBSD: src/tools/regression/geom/Data/disk.sun.da1.xml,v 1.1 2002/03/17 18:53:45 phk Exp $	
     A Solaris 8 disklabel
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.typo.ad0.xml b/tools/regression/geom/Data/disk.typo.ad0.xml
index 56383abf1c4c..8bc7a196bf2c 100644
--- a/tools/regression/geom/Data/disk.typo.ad0.xml
+++ b/tools/regression/geom/Data/disk.typo.ad0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.typo.ad0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A multislice FreeBSD disk
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile
index 7bf18af772e2..677e71fdaa72 100644
--- a/tools/regression/geom/MdLoad/Makefile
+++ b/tools/regression/geom/MdLoad/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/MdLoad/Makefile,v 1.5 2004/12/21 08:47:21 ru Exp $
 
 PROG=	MdLoad
 DPADD=	${LIBSBUF} ${LIBBSDXML}
diff --git a/tools/regression/geom/MdLoad/MdLoad.c b/tools/regression/geom/MdLoad/MdLoad.c
index 710d7d385ed5..ff1b4a86c5c2 100644
--- a/tools/regression/geom/MdLoad/MdLoad.c
+++ b/tools/regression/geom/MdLoad/MdLoad.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/geom/MdLoad/MdLoad.c,v 1.1 2003/04/09 12:34:20 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/geom/Ref/disk.alpha.da0.xml b/tools/regression/geom/Ref/disk.alpha.da0.xml
index a300f0d5734d..d7284e78f4ce 100644
--- a/tools/regression/geom/Ref/disk.alpha.da0.xml
+++ b/tools/regression/geom/Ref/disk.alpha.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.alpha.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	251658240	491520
 /dev/md34b	512	1086291968	2121664
diff --git a/tools/regression/geom/Ref/disk.alpha2.da0.xml b/tools/regression/geom/Ref/disk.alpha2.da0.xml
index 7ef7573e729e..388505796fe4 100644
--- a/tools/regression/geom/Ref/disk.alpha2.da0.xml
+++ b/tools/regression/geom/Ref/disk.alpha2.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.alpha2.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	24675840	48195
 /dev/md34b	512	4178442240	8161020
diff --git a/tools/regression/geom/Ref/disk.apple.xml b/tools/regression/geom/Ref/disk.apple.xml
index a2a0f984b47e..110b55443d72 100644
--- a/tools/regression/geom/Ref/disk.apple.xml
+++ b/tools/regression/geom/Ref/disk.apple.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.apple.xml,v 1.2 2003/04/09 13:36:28 phk Exp $
 /dev/md34	512	366530560	715880
 /dev/md34s1	512	366481408	715784
 /dev/md34s2	512	32256	63
diff --git a/tools/regression/geom/Ref/disk.beast.da0.xml b/tools/regression/geom/Ref/disk.beast.da0.xml
index b6aa32e2e031..2777cffd69d0 100644
--- a/tools/regression/geom/Ref/disk.beast.da0.xml
+++ b/tools/regression/geom/Ref/disk.beast.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.beast.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	4064280576	7938048
 /dev/md34b	512	270925824	529152
diff --git a/tools/regression/geom/Ref/disk.critter.ad0.xml b/tools/regression/geom/Ref/disk.critter.ad0.xml
index 0620bfebb1a4..a8440f507149 100644
--- a/tools/regression/geom/Ref/disk.critter.ad0.xml
+++ b/tools/regression/geom/Ref/disk.critter.ad0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.critter.ad0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	2671841280	5218440
 /dev/md34s1	512	20003848704	39070017
 /dev/md34s1a	512	1073741824	2097152
diff --git a/tools/regression/geom/Ref/disk.empty.flp.xml b/tools/regression/geom/Ref/disk.empty.flp.xml
index 659b4167ff60..c5f987fcfb31 100644
--- a/tools/regression/geom/Ref/disk.empty.flp.xml
+++ b/tools/regression/geom/Ref/disk.empty.flp.xml
@@ -1,2 +1,2 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.empty.flp.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	1474560	2880	80	2	18
diff --git a/tools/regression/geom/Ref/disk.far.ad0.xml b/tools/regression/geom/Ref/disk.far.ad0.xml
index 629816a448cd..21c3d60200d7 100644
--- a/tools/regression/geom/Ref/disk.far.ad0.xml
+++ b/tools/regression/geom/Ref/disk.far.ad0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.far.ad0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5632	11
 /dev/md34s1	512	296821760	579730
 /dev/md34s2	512	4564740096	8915508
diff --git a/tools/regression/geom/Ref/disk.flat.da1.xml b/tools/regression/geom/Ref/disk.flat.da1.xml
index 89e2df4941af..94af3345e81b 100644
--- a/tools/regression/geom/Ref/disk.flat.da1.xml
+++ b/tools/regression/geom/Ref/disk.flat.da1.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.flat.da1.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	37888	74
 /dev/md34a	512	37748736	73728
 /dev/md34b	512	268435456	524288
diff --git a/tools/regression/geom/Ref/disk.kern.flp.xml b/tools/regression/geom/Ref/disk.kern.flp.xml
index 6ff67a03c135..8009efa8b552 100644
--- a/tools/regression/geom/Ref/disk.kern.flp.xml
+++ b/tools/regression/geom/Ref/disk.kern.flp.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.kern.flp.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5632	11
 /dev/md34a	512	1474560	2880
 /dev/md34b	512	1474560	2880
diff --git a/tools/regression/geom/Ref/disk.msdos.ext.xml b/tools/regression/geom/Ref/disk.msdos.ext.xml
index dc2aced40157..2d27fe57622e 100644
--- a/tools/regression/geom/Ref/disk.msdos.ext.xml
+++ b/tools/regression/geom/Ref/disk.msdos.ext.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.msdos.ext.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	2327759360	4546405
 /dev/md34s1	512	2146765824	4192902
 /dev/md34s10	512	8193024	16002
diff --git a/tools/regression/geom/Ref/disk.msdos.flp.xml b/tools/regression/geom/Ref/disk.msdos.flp.xml
index c176c587ff43..9bc043f3fa08 100644
--- a/tools/regression/geom/Ref/disk.msdos.flp.xml
+++ b/tools/regression/geom/Ref/disk.msdos.flp.xml
@@ -1,2 +1,2 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.msdos.flp.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5632	11
diff --git a/tools/regression/geom/Ref/disk.pc98.wdc0.xml b/tools/regression/geom/Ref/disk.pc98.wdc0.xml
index 5ffb0c98d86f..33bc9d51602c 100644
--- a/tools/regression/geom/Ref/disk.pc98.wdc0.xml
+++ b/tools/regression/geom/Ref/disk.pc98.wdc0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.pc98.wdc0.xml,v 1.2 2003/04/09 13:36:28 phk Exp $
 /dev/md34	512	75264	147	1	8	17
 /dev/md34s1	512	1626603520	3176960	23360	8	17
 /dev/md34s1a	512	78643200	153600	1129	8	17
diff --git a/tools/regression/geom/Ref/disk.sun.da0.xml b/tools/regression/geom/Ref/disk.sun.da0.xml
index 15b97c821b12..9a5399e00249 100644
--- a/tools/regression/geom/Ref/disk.sun.da0.xml
+++ b/tools/regression/geom/Ref/disk.sun.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.sun.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	1529708544	2987712
 /dev/md34b	512	539320320	1053360
diff --git a/tools/regression/geom/Ref/disk.sun.da1.xml b/tools/regression/geom/Ref/disk.sun.da1.xml
index 004771be96e7..b971d32e8b1d 100644
--- a/tools/regression/geom/Ref/disk.sun.da1.xml
+++ b/tools/regression/geom/Ref/disk.sun.da1.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.sun.da1.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	262967296	513608
 /dev/md34b	512	1075994624	2101552
diff --git a/tools/regression/geom/Ref/disk.typo.ad0.xml b/tools/regression/geom/Ref/disk.typo.ad0.xml
index 6d537ddc2650..756caa807a1e 100644
--- a/tools/regression/geom/Ref/disk.typo.ad0.xml
+++ b/tools/regression/geom/Ref/disk.typo.ad0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.typo.ad0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	8585262592	16768091
 /dev/md34s1	512	3220406784	6289857
 /dev/md34s1a	512	104857600	204800
diff --git a/tools/regression/geom/RunTest.sh b/tools/regression/geom/RunTest.sh
index 46a14b4ab828..2358f2df1d50 100644
--- a/tools/regression/geom/RunTest.sh
+++ b/tools/regression/geom/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/RunTest.sh,v 1.2 2003/04/13 09:06:39 phk Exp $
 
 MD=34
 TMP=/tmp/$$
diff --git a/tools/regression/geom/RunTest.t b/tools/regression/geom/RunTest.t
index 96a353084bc9..76feeea3ad38 100644
--- a/tools/regression/geom/RunTest.t
+++ b/tools/regression/geom/RunTest.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/RunTest.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 MD=34
 TMP=/tmp/$$
diff --git a/tools/regression/geom_concat/Makefile b/tools/regression/geom_concat/Makefile
index 5df6a3becacd..19a689beb32b 100644
--- a/tools/regression/geom_concat/Makefile
+++ b/tools/regression/geom_concat/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/Makefile,v 1.1 2004/03/03 21:52:49 pjd Exp $
 #
 # Regression test for geom_concat.
 #
diff --git a/tools/regression/geom_concat/runtests.sh b/tools/regression/geom_concat/runtests.sh
index 38089c5daedf..1c2872bf212f 100644
--- a/tools/regression/geom_concat/runtests.sh
+++ b/tools/regression/geom_concat/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/runtests.sh,v 1.1 2004/03/03 21:52:49 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_concat/test-1.sh b/tools/regression/geom_concat/test-1.sh
index 9304ebdbdbda..e36d18b0046d 100644
--- a/tools/regression/geom_concat/test-1.sh
+++ b/tools/regression/geom_concat/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/test-1.sh,v 1.2 2004/07/26 16:08:32 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_concat/test-1.t b/tools/regression/geom_concat/test-1.t
index ce04ace3f359..729f90305eb6 100644
--- a/tools/regression/geom_concat/test-1.t
+++ b/tools/regression/geom_concat/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/test-1.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_concat/test-2.sh b/tools/regression/geom_concat/test-2.sh
index 990ecfc3b9ab..6c480d10d655 100644
--- a/tools/regression/geom_concat/test-2.sh
+++ b/tools/regression/geom_concat/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/test-2.sh,v 1.2 2004/07/26 16:08:32 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_concat/test-2.t b/tools/regression/geom_concat/test-2.t
index c3accffeeb2a..e4da4fd9e4b8 100644
--- a/tools/regression/geom_concat/test-2.t
+++ b/tools/regression/geom_concat/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/test-2.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_eli/attach-d.t b/tools/regression/geom_eli/attach-d.t
index de4602f705ef..c4fea1b67a0c 100644
--- a/tools/regression/geom_eli/attach-d.t
+++ b/tools/regression/geom_eli/attach-d.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/attach-d.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/delkey.t b/tools/regression/geom_eli/delkey.t
index 2a9ae409feae..8c872d2d46b6 100644
--- a/tools/regression/geom_eli/delkey.t
+++ b/tools/regression/geom_eli/delkey.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/delkey.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/detach-l.t b/tools/regression/geom_eli/detach-l.t
index ae6c3b27eb19..c24175145f6a 100644
--- a/tools/regression/geom_eli/detach-l.t
+++ b/tools/regression/geom_eli/detach-l.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/detach-l.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/init.t b/tools/regression/geom_eli/init.t
index 5e4775c846bb..40030e6bc62b 100644
--- a/tools/regression/geom_eli/init.t
+++ b/tools/regression/geom_eli/init.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/init.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/kill.t b/tools/regression/geom_eli/kill.t
index ecd910af07f4..545eb8fd4607 100644
--- a/tools/regression/geom_eli/kill.t
+++ b/tools/regression/geom_eli/kill.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/kill.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/onetime-d.t b/tools/regression/geom_eli/onetime-d.t
index d49cb642e643..4a6ceaa89b92 100644
--- a/tools/regression/geom_eli/onetime-d.t
+++ b/tools/regression/geom_eli/onetime-d.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/onetime-d.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/onetime.t b/tools/regression/geom_eli/onetime.t
index d52ef5640360..106b220be529 100644
--- a/tools/regression/geom_eli/onetime.t
+++ b/tools/regression/geom_eli/onetime.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/onetime.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/setkey.t b/tools/regression/geom_eli/setkey.t
index a219188b7b46..dd67a9f8ea21 100644
--- a/tools/regression/geom_eli/setkey.t
+++ b/tools/regression/geom_eli/setkey.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/setkey.t,v 1.1.2.1 2005/08/05 20:04:38 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_gate/Makefile b/tools/regression/geom_gate/Makefile
index c5c24adaa4dc..7cddc706f7ae 100644
--- a/tools/regression/geom_gate/Makefile
+++ b/tools/regression/geom_gate/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/Makefile,v 1.1 2004/05/03 18:29:54 pjd Exp $
 #
 # Regression tests for geom_gate.
 #
diff --git a/tools/regression/geom_gate/runtests.sh b/tools/regression/geom_gate/runtests.sh
index 38089c5daedf..f2e0c519f666 100644
--- a/tools/regression/geom_gate/runtests.sh
+++ b/tools/regression/geom_gate/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/runtests.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_gate/test-1.sh b/tools/regression/geom_gate/test-1.sh
index 44a49606ff4c..f7c55e255094 100644
--- a/tools/regression/geom_gate/test-1.sh
+++ b/tools/regression/geom_gate/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-1.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-1.t b/tools/regression/geom_gate/test-1.t
index 279e31633617..766c6452d43d 100644
--- a/tools/regression/geom_gate/test-1.t
+++ b/tools/regression/geom_gate/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-1.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-2.sh b/tools/regression/geom_gate/test-2.sh
index 498ac45d005e..3f174f153d48 100644
--- a/tools/regression/geom_gate/test-2.sh
+++ b/tools/regression/geom_gate/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-2.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-2.t b/tools/regression/geom_gate/test-2.t
index 2e5e25440064..210e2c10445d 100644
--- a/tools/regression/geom_gate/test-2.t
+++ b/tools/regression/geom_gate/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-2.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-3.sh b/tools/regression/geom_gate/test-3.sh
index ca73a5a26ba0..2ea33c67bab8 100644
--- a/tools/regression/geom_gate/test-3.sh
+++ b/tools/regression/geom_gate/test-3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-3.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-3.t b/tools/regression/geom_gate/test-3.t
index ba2b3c7de343..69e68a7da7a1 100644
--- a/tools/regression/geom_gate/test-3.t
+++ b/tools/regression/geom_gate/test-3.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-3.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_mirror/Makefile b/tools/regression/geom_mirror/Makefile
index 88687b191b6b..8fe1d53d7075 100644
--- a/tools/regression/geom_mirror/Makefile
+++ b/tools/regression/geom_mirror/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/Makefile,v 1.1 2004/07/30 23:13:45 pjd Exp $
 #
 # Regression tests for geom_mirror.
 #
diff --git a/tools/regression/geom_mirror/runtests.sh b/tools/regression/geom_mirror/runtests.sh
index 7e30b95f3069..0162ab8eeb5c 100644
--- a/tools/regression/geom_mirror/runtests.sh
+++ b/tools/regression/geom_mirror/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/runtests.sh,v 1.1 2004/07/30 23:13:45 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_mirror/test-1.sh b/tools/regression/geom_mirror/test-1.sh
index 35440d3832bf..4a742f6fcf05 100644
--- a/tools/regression/geom_mirror/test-1.sh
+++ b/tools/regression/geom_mirror/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-1.sh,v 1.2 2004/12/21 19:03:10 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_mirror/test-2.sh b/tools/regression/geom_mirror/test-2.sh
index d9fabbb5270e..ccef0471c4c5 100644
--- a/tools/regression/geom_mirror/test-2.sh
+++ b/tools/regression/geom_mirror/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-2.sh,v 1.2 2004/12/21 19:03:10 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_mirror/test-3.sh b/tools/regression/geom_mirror/test-3.sh
index 023bcc8738b7..eb61ae96cc76 100644
--- a/tools/regression/geom_mirror/test-3.sh
+++ b/tools/regression/geom_mirror/test-3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-3.sh,v 1.2 2004/12/21 19:03:10 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_mirror/test-4.sh b/tools/regression/geom_mirror/test-4.sh
index 0e2edc2c7654..eb7f0856f51d 100644
--- a/tools/regression/geom_mirror/test-4.sh
+++ b/tools/regression/geom_mirror/test-4.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-4.sh,v 1.2 2004/12/21 19:03:10 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_mirror/test-5.sh b/tools/regression/geom_mirror/test-5.sh
index ae36814f10b7..9d136d02b288 100644
--- a/tools/regression/geom_mirror/test-5.sh
+++ b/tools/regression/geom_mirror/test-5.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-5.sh,v 1.2 2004/12/21 19:03:10 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_mirror/test-6.sh b/tools/regression/geom_mirror/test-6.sh
index 65fe1abf4b3b..4e84e53fb400 100644
--- a/tools/regression/geom_mirror/test-6.sh
+++ b/tools/regression/geom_mirror/test-6.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-6.sh,v 1.2 2004/12/21 19:03:10 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_mirror/test-7.sh b/tools/regression/geom_mirror/test-7.sh
index ec2d8a0d128f..370ed9edeae3 100644
--- a/tools/regression/geom_mirror/test-7.sh
+++ b/tools/regression/geom_mirror/test-7.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-7.sh,v 1.2 2004/12/21 19:03:10 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_nop/Makefile b/tools/regression/geom_nop/Makefile
index 6cd8fbd3e033..f83c8008bdad 100644
--- a/tools/regression/geom_nop/Makefile
+++ b/tools/regression/geom_nop/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_nop/Makefile,v 1.1 2004/05/22 10:58:53 pjd Exp $
 #
 # Regression test for geom_nop.
 #
diff --git a/tools/regression/geom_nop/runtests.sh b/tools/regression/geom_nop/runtests.sh
index 38089c5daedf..467aeb2b680e 100644
--- a/tools/regression/geom_nop/runtests.sh
+++ b/tools/regression/geom_nop/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_nop/runtests.sh,v 1.1 2004/05/22 10:58:53 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_nop/test-1.sh b/tools/regression/geom_nop/test-1.sh
index 07e083573b89..33f42df4e32e 100644
--- a/tools/regression/geom_nop/test-1.sh
+++ b/tools/regression/geom_nop/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_nop/test-1.sh,v 1.1 2004/05/22 10:58:53 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_nop/test-2.sh b/tools/regression/geom_nop/test-2.sh
index 0bc31f659d9c..7b670588c96c 100644
--- a/tools/regression/geom_nop/test-2.sh
+++ b/tools/regression/geom_nop/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_nop/test-2.sh,v 1.1 2004/05/22 10:58:53 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/Makefile b/tools/regression/geom_raid3/Makefile
index 9eb76c66ffaa..4725293f7dbc 100644
--- a/tools/regression/geom_raid3/Makefile
+++ b/tools/regression/geom_raid3/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/Makefile,v 1.1 2004/08/16 09:09:23 pjd Exp $
 #
 # Regression tests for geom_raid3.
 #
diff --git a/tools/regression/geom_raid3/runtests.sh b/tools/regression/geom_raid3/runtests.sh
index b22c1ff924be..85bfddb026dd 100644
--- a/tools/regression/geom_raid3/runtests.sh
+++ b/tools/regression/geom_raid3/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/runtests.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_raid3/test-1.sh b/tools/regression/geom_raid3/test-1.sh
index 1de5420ac400..3e0fac6e60ff 100644
--- a/tools/regression/geom_raid3/test-1.sh
+++ b/tools/regression/geom_raid3/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-1.sh,v 1.2 2005/01/11 14:11:14 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-10.sh b/tools/regression/geom_raid3/test-10.sh
index 2265aa622781..bc4ec3d196e0 100644
--- a/tools/regression/geom_raid3/test-10.sh
+++ b/tools/regression/geom_raid3/test-10.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-10.sh,v 1.1 2004/08/21 18:14:55 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-11.sh b/tools/regression/geom_raid3/test-11.sh
index c91ae73985ab..0e04f725b57c 100644
--- a/tools/regression/geom_raid3/test-11.sh
+++ b/tools/regression/geom_raid3/test-11.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-11.sh,v 1.1 2004/08/22 16:26:09 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-12.sh b/tools/regression/geom_raid3/test-12.sh
index e9530ef5a122..3c40304925db 100644
--- a/tools/regression/geom_raid3/test-12.sh
+++ b/tools/regression/geom_raid3/test-12.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-12.sh,v 1.2 2004/12/21 18:48:59 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-2.sh b/tools/regression/geom_raid3/test-2.sh
index 49a7de006529..14ccfffd5abb 100644
--- a/tools/regression/geom_raid3/test-2.sh
+++ b/tools/regression/geom_raid3/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-2.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-3.sh b/tools/regression/geom_raid3/test-3.sh
index d6765903b9d8..d8e5e4934e48 100644
--- a/tools/regression/geom_raid3/test-3.sh
+++ b/tools/regression/geom_raid3/test-3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-3.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-4.sh b/tools/regression/geom_raid3/test-4.sh
index 19eed35a7bae..ae67fdf9da1f 100644
--- a/tools/regression/geom_raid3/test-4.sh
+++ b/tools/regression/geom_raid3/test-4.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-4.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-5.sh b/tools/regression/geom_raid3/test-5.sh
index 5de21960debe..f16ce7dd7b59 100644
--- a/tools/regression/geom_raid3/test-5.sh
+++ b/tools/regression/geom_raid3/test-5.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-5.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-6.sh b/tools/regression/geom_raid3/test-6.sh
index 778f38fd58a6..e8c21d1d3455 100644
--- a/tools/regression/geom_raid3/test-6.sh
+++ b/tools/regression/geom_raid3/test-6.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-6.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-7.sh b/tools/regression/geom_raid3/test-7.sh
index b39de20da437..1b4c368c7c66 100644
--- a/tools/regression/geom_raid3/test-7.sh
+++ b/tools/regression/geom_raid3/test-7.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-7.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-8.sh b/tools/regression/geom_raid3/test-8.sh
index ea319686418b..cad09a382f45 100644
--- a/tools/regression/geom_raid3/test-8.sh
+++ b/tools/regression/geom_raid3/test-8.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-8.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_raid3/test-9.sh b/tools/regression/geom_raid3/test-9.sh
index eeb5429956ce..eb326ec122f5 100644
--- a/tools/regression/geom_raid3/test-9.sh
+++ b/tools/regression/geom_raid3/test-9.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-9.sh,v 1.1 2004/08/16 09:09:23 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_shsec/Makefile b/tools/regression/geom_shsec/Makefile
index 11b4e3e6eb05..030781192512 100644
--- a/tools/regression/geom_shsec/Makefile
+++ b/tools/regression/geom_shsec/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_shsec/Makefile,v 1.1 2005/01/11 18:06:44 pjd Exp $
 #
 # Regression tests for geom_shsec.
 #
diff --git a/tools/regression/geom_shsec/runtests.sh b/tools/regression/geom_shsec/runtests.sh
index 24e017b4700d..c6f843711bb8 100644
--- a/tools/regression/geom_shsec/runtests.sh
+++ b/tools/regression/geom_shsec/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_shsec/runtests.sh,v 1.1 2005/01/11 18:06:44 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_shsec/test-1.sh b/tools/regression/geom_shsec/test-1.sh
index 0b779c04b9c0..e456fa949ed8 100644
--- a/tools/regression/geom_shsec/test-1.sh
+++ b/tools/regression/geom_shsec/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_shsec/test-1.sh,v 1.1 2005/01/11 18:06:44 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_shsec/test-2.sh b/tools/regression/geom_shsec/test-2.sh
index 8e4fceeae4ae..609abdcb19ab 100644
--- a/tools/regression/geom_shsec/test-2.sh
+++ b/tools/regression/geom_shsec/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_shsec/test-2.sh,v 1.1 2005/01/11 18:06:44 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_stripe/Makefile b/tools/regression/geom_stripe/Makefile
index de8d14baad90..76b1ef123593 100644
--- a/tools/regression/geom_stripe/Makefile
+++ b/tools/regression/geom_stripe/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_stripe/Makefile,v 1.1 2004/05/22 10:58:53 pjd Exp $
 #
 # Regression test for geom_stripe.
 #
diff --git a/tools/regression/geom_stripe/runtests.sh b/tools/regression/geom_stripe/runtests.sh
index 38089c5daedf..c5e34e6f4226 100644
--- a/tools/regression/geom_stripe/runtests.sh
+++ b/tools/regression/geom_stripe/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_stripe/runtests.sh,v 1.1 2004/05/22 10:58:53 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_stripe/test-1.sh b/tools/regression/geom_stripe/test-1.sh
index a5d4668bf945..f267367d6532 100644
--- a/tools/regression/geom_stripe/test-1.sh
+++ b/tools/regression/geom_stripe/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_stripe/test-1.sh,v 1.2 2004/07/26 16:10:27 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_stripe/test-2.sh b/tools/regression/geom_stripe/test-2.sh
index b78221de5489..e10db9aa3c23 100644
--- a/tools/regression/geom_stripe/test-2.sh
+++ b/tools/regression/geom_stripe/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_stripe/test-2.sh,v 1.2 2004/07/26 16:10:27 pjd Exp $
 
 name="test"
 base=`basename $0`
diff --git a/tools/regression/geom_uzip/.cvsignore b/tools/regression/geom_uzip/.cvsignore
deleted file mode 100644
index 1e4f1642f869..000000000000
--- a/tools/regression/geom_uzip/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-test-1.img
-test-1.img.gz
diff --git a/tools/regression/geom_uzip/Makefile b/tools/regression/geom_uzip/Makefile
index bab058e19ce6..1af46f741bee 100644
--- a/tools/regression/geom_uzip/Makefile
+++ b/tools/regression/geom_uzip/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/Makefile,v 1.1 2004/08/13 09:53:52 fjoe Exp $
 #
 # Regression test for geom_ugz.
 #
diff --git a/tools/regression/geom_uzip/etalon/etalon.txt b/tools/regression/geom_uzip/etalon/etalon.txt
index cb8acf31f650..7900b58500c0 100644
--- a/tools/regression/geom_uzip/etalon/etalon.txt
+++ b/tools/regression/geom_uzip/etalon/etalon.txt
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/etalon/etalon.txt,v 1.1 2004/08/13 09:53:52 fjoe Exp $
 #
 
 JABBERWOCKY
diff --git a/tools/regression/geom_uzip/runtests.sh b/tools/regression/geom_uzip/runtests.sh
index 60e78b540746..0f405fee5b91 100644
--- a/tools/regression/geom_uzip/runtests.sh
+++ b/tools/regression/geom_uzip/runtests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/runtests.sh,v 1.1 2004/08/13 09:53:52 fjoe Exp $
 #
 
 dir=`dirname $0`
diff --git a/tools/regression/geom_uzip/test-1.img.gz.uue b/tools/regression/geom_uzip/test-1.img.gz.uue
index 4ba70e997619..e03cd4ca75c1 100644
--- a/tools/regression/geom_uzip/test-1.img.gz.uue
+++ b/tools/regression/geom_uzip/test-1.img.gz.uue
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/test-1.img.gz.uue,v 1.2 2004/08/13 09:56:22 fjoe Exp $
 #
 
 begin 664 test-1.img.gz
diff --git a/tools/regression/geom_uzip/test-1.sh b/tools/regression/geom_uzip/test-1.sh
index 6e9144930510..23fe4578de3c 100644
--- a/tools/regression/geom_uzip/test-1.sh
+++ b/tools/regression/geom_uzip/test-1.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/test-1.sh,v 1.1 2004/08/13 09:53:52 fjoe Exp $
 #
 
 mntpoint="/mnt/test-1"
diff --git a/tools/regression/geom_uzip/test-2.sh b/tools/regression/geom_uzip/test-2.sh
index 0a9b684b9159..c3fdf95c6322 100644
--- a/tools/regression/geom_uzip/test-2.sh
+++ b/tools/regression/geom_uzip/test-2.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/test-2.sh,v 1.1 2004/08/13 09:53:52 fjoe Exp $
 #
 
 #
diff --git a/tools/regression/ia64/unaligned/test.c b/tools/regression/ia64/unaligned/test.c
index 869c86436b80..753d385b049b 100644
--- a/tools/regression/ia64/unaligned/test.c
+++ b/tools/regression/ia64/unaligned/test.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/tools/regression/ia64/unaligned/test.c,v 1.5 2005/01/28 02:58:32 marcel Exp $
  */
 
 #include <machine/float.h>
diff --git a/tools/regression/ia64/unaligned/unaligned.t b/tools/regression/ia64/unaligned/unaligned.t
index 5d061bdef574..f7dabfd016b6 100644
--- a/tools/regression/ia64/unaligned/unaligned.t
+++ b/tools/regression/ia64/unaligned/unaligned.t
@@ -24,7 +24,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/tools/regression/ia64/unaligned/unaligned.t,v 1.3 2005/01/27 23:15:58 marcel Exp $
 
 my $srcdir = `dirname $0`;
 chomp $srcdir;
diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile
index 64626c51d3c2..58923771c866 100644
--- a/tools/regression/include/tgmath/Makefile
+++ b/tools/regression/include/tgmath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/include/tgmath/Makefile,v 1.3 2004/12/21 08:47:21 ru Exp $
 
 PROG=	tgmath
 CFLAGS+= -fno-builtin -std=c99
diff --git a/tools/regression/include/tgmath/tgmath.c b/tools/regression/include/tgmath/tgmath.c
index 037810ad9df0..c69eb7139417 100644
--- a/tools/regression/include/tgmath/tgmath.c
+++ b/tools/regression/include/tgmath/tgmath.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/include/tgmath/tgmath.c,v 1.2 2004/11/11 19:47:51 nik Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/tools/regression/include/tgmath/tgmath.t b/tools/regression/include/tgmath/tgmath.t
index 8bdfd03be81b..4577b407201d 100644
--- a/tools/regression/include/tgmath/tgmath.t
+++ b/tools/regression/include/tgmath/tgmath.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/include/tgmath/tgmath.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/gen/Makefile b/tools/regression/lib/libc/gen/Makefile
index 140b789dec11..a13667791be1 100644
--- a/tools/regression/lib/libc/gen/Makefile
+++ b/tools/regression/lib/libc/gen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/gen/Makefile,v 1.2 2003/02/05 16:40:18 mike Exp $
 
 TESTS=	test-fpclassify test-wordexp
 
diff --git a/tools/regression/lib/libc/gen/test-fpclassify.c b/tools/regression/lib/libc/gen/test-fpclassify.c
index 8431fe84f557..ecf520e9b636 100644
--- a/tools/regression/lib/libc/gen/test-fpclassify.c
+++ b/tools/regression/lib/libc/gen/test-fpclassify.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/gen/test-fpclassify.c,v 1.3 2003/03/27 05:32:28 das Exp $
  */
 
 #include <assert.h>
diff --git a/tools/regression/lib/libc/gen/test-wordexp.c b/tools/regression/lib/libc/gen/test-wordexp.c
index 49490d8c52ac..a6bb86db447d 100644
--- a/tools/regression/lib/libc/gen/test-wordexp.c
+++ b/tools/regression/lib/libc/gen/test-wordexp.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/gen/test-wordexp.c,v 1.1 2003/01/04 05:50:35 tjr Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/locale/Makefile b/tools/regression/lib/libc/locale/Makefile
index 5fb9a945daf7..9912592f88aa 100644
--- a/tools/regression/lib/libc/locale/Makefile
+++ b/tools/regression/lib/libc/locale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/Makefile,v 1.8 2004/11/21 03:21:22 tjr Exp $
 
 TESTS=	test-mbrtowc	\
 	test-wcrtomb	\
diff --git a/tools/regression/lib/libc/locale/test-btowc.c b/tools/regression/lib/libc/locale/test-btowc.c
index 9ed45821e3a4..558effdae101 100644
--- a/tools/regression/lib/libc/locale/test-btowc.c
+++ b/tools/regression/lib/libc/locale/test-btowc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-btowc.c,v 1.4 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-btowc.t b/tools/regression/lib/libc/locale/test-btowc.t
index 8bdfd03be81b..330d3890af78 100644
--- a/tools/regression/lib/libc/locale/test-btowc.t
+++ b/tools/regression/lib/libc/locale/test-btowc.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-btowc.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-iswctype.c b/tools/regression/lib/libc/locale/test-iswctype.c
index ca9621a7d342..7269bd90fdcd 100644
--- a/tools/regression/lib/libc/locale/test-iswctype.c
+++ b/tools/regression/lib/libc/locale/test-iswctype.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-iswctype.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <locale.h>
diff --git a/tools/regression/lib/libc/locale/test-iswctype.t b/tools/regression/lib/libc/locale/test-iswctype.t
index 8bdfd03be81b..c3995f6f6ffe 100644
--- a/tools/regression/lib/libc/locale/test-iswctype.t
+++ b/tools/regression/lib/libc/locale/test-iswctype.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-iswctype.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mblen.c b/tools/regression/lib/libc/locale/test-mblen.c
index dd073594b13a..de215e7fb57e 100644
--- a/tools/regression/lib/libc/locale/test-mblen.c
+++ b/tools/regression/lib/libc/locale/test-mblen.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mblen.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-mblen.t b/tools/regression/lib/libc/locale/test-mblen.t
index 8bdfd03be81b..12ab8d7237d4 100644
--- a/tools/regression/lib/libc/locale/test-mblen.t
+++ b/tools/regression/lib/libc/locale/test-mblen.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mblen.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbrlen.c b/tools/regression/lib/libc/locale/test-mbrlen.c
index 3198a77922d5..4ff30ff447a1 100644
--- a/tools/regression/lib/libc/locale/test-mbrlen.c
+++ b/tools/regression/lib/libc/locale/test-mbrlen.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbrlen.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbrlen.t b/tools/regression/lib/libc/locale/test-mbrlen.t
index 8bdfd03be81b..b14e256a701d 100644
--- a/tools/regression/lib/libc/locale/test-mbrlen.t
+++ b/tools/regression/lib/libc/locale/test-mbrlen.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbrlen.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbrtowc.c b/tools/regression/lib/libc/locale/test-mbrtowc.c
index e9a2ea0bfab3..cd82ce60169c 100644
--- a/tools/regression/lib/libc/locale/test-mbrtowc.c
+++ b/tools/regression/lib/libc/locale/test-mbrtowc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbrtowc.c,v 1.5 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbrtowc.t b/tools/regression/lib/libc/locale/test-mbrtowc.t
index 8bdfd03be81b..b559b7f75443 100644
--- a/tools/regression/lib/libc/locale/test-mbrtowc.t
+++ b/tools/regression/lib/libc/locale/test-mbrtowc.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbrtowc.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbsnrtowcs.c b/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
index 585dd4eb116b..fb830dab6bd8 100644
--- a/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
+++ b/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbsnrtowcs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbsnrtowcs.t b/tools/regression/lib/libc/locale/test-mbsnrtowcs.t
index 8bdfd03be81b..45b790c896e2 100644
--- a/tools/regression/lib/libc/locale/test-mbsnrtowcs.t
+++ b/tools/regression/lib/libc/locale/test-mbsnrtowcs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbsnrtowcs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbsrtowcs.c b/tools/regression/lib/libc/locale/test-mbsrtowcs.c
index dd6a7e10c02c..a96828a7b94e 100644
--- a/tools/regression/lib/libc/locale/test-mbsrtowcs.c
+++ b/tools/regression/lib/libc/locale/test-mbsrtowcs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbsrtowcs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbsrtowcs.t b/tools/regression/lib/libc/locale/test-mbsrtowcs.t
index 8bdfd03be81b..242d194759fd 100644
--- a/tools/regression/lib/libc/locale/test-mbsrtowcs.t
+++ b/tools/regression/lib/libc/locale/test-mbsrtowcs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbsrtowcs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbstowcs.c b/tools/regression/lib/libc/locale/test-mbstowcs.c
index 18039dd9e66c..e0125226aa4d 100644
--- a/tools/regression/lib/libc/locale/test-mbstowcs.c
+++ b/tools/regression/lib/libc/locale/test-mbstowcs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbstowcs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbstowcs.t b/tools/regression/lib/libc/locale/test-mbstowcs.t
index 8bdfd03be81b..faf005b154a7 100644
--- a/tools/regression/lib/libc/locale/test-mbstowcs.t
+++ b/tools/regression/lib/libc/locale/test-mbstowcs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbstowcs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbtowc.c b/tools/regression/lib/libc/locale/test-mbtowc.c
index 5ee070c57e26..d285615f9752 100644
--- a/tools/regression/lib/libc/locale/test-mbtowc.c
+++ b/tools/regression/lib/libc/locale/test-mbtowc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbtowc.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-mbtowc.t b/tools/regression/lib/libc/locale/test-mbtowc.t
index 8bdfd03be81b..e8b70c12df10 100644
--- a/tools/regression/lib/libc/locale/test-mbtowc.t
+++ b/tools/regression/lib/libc/locale/test-mbtowc.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbtowc.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-towctrans.c b/tools/regression/lib/libc/locale/test-towctrans.c
index 6c0e428db65a..172e5d6c1efd 100644
--- a/tools/regression/lib/libc/locale/test-towctrans.c
+++ b/tools/regression/lib/libc/locale/test-towctrans.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-towctrans.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <locale.h>
diff --git a/tools/regression/lib/libc/locale/test-towctrans.t b/tools/regression/lib/libc/locale/test-towctrans.t
index 8bdfd03be81b..69dc4be902f5 100644
--- a/tools/regression/lib/libc/locale/test-towctrans.t
+++ b/tools/regression/lib/libc/locale/test-towctrans.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-towctrans.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcrtomb.c b/tools/regression/lib/libc/locale/test-wcrtomb.c
index d7ec029e8c68..bf4931117312 100644
--- a/tools/regression/lib/libc/locale/test-wcrtomb.c
+++ b/tools/regression/lib/libc/locale/test-wcrtomb.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcrtomb.c,v 1.4 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcrtomb.t b/tools/regression/lib/libc/locale/test-wcrtomb.t
index 8bdfd03be81b..47dbaf81913f 100644
--- a/tools/regression/lib/libc/locale/test-wcrtomb.t
+++ b/tools/regression/lib/libc/locale/test-wcrtomb.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcrtomb.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcsnrtombs.c b/tools/regression/lib/libc/locale/test-wcsnrtombs.c
index 2290cac06784..bf36d648fa2a 100644
--- a/tools/regression/lib/libc/locale/test-wcsnrtombs.c
+++ b/tools/regression/lib/libc/locale/test-wcsnrtombs.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcsnrtombs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcsnrtombs.t b/tools/regression/lib/libc/locale/test-wcsnrtombs.t
index 8bdfd03be81b..f4cbfe772f2f 100644
--- a/tools/regression/lib/libc/locale/test-wcsnrtombs.t
+++ b/tools/regression/lib/libc/locale/test-wcsnrtombs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcsnrtombs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcsrtombs.c b/tools/regression/lib/libc/locale/test-wcsrtombs.c
index 48fe3668f5a6..5ef3cad069c1 100644
--- a/tools/regression/lib/libc/locale/test-wcsrtombs.c
+++ b/tools/regression/lib/libc/locale/test-wcsrtombs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcsrtombs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcsrtombs.t b/tools/regression/lib/libc/locale/test-wcsrtombs.t
index 8bdfd03be81b..67693313bf7d 100644
--- a/tools/regression/lib/libc/locale/test-wcsrtombs.t
+++ b/tools/regression/lib/libc/locale/test-wcsrtombs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcsrtombs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcstombs.c b/tools/regression/lib/libc/locale/test-wcstombs.c
index f4a57700f7c4..191367f149de 100644
--- a/tools/regression/lib/libc/locale/test-wcstombs.c
+++ b/tools/regression/lib/libc/locale/test-wcstombs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcstombs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcstombs.t b/tools/regression/lib/libc/locale/test-wcstombs.t
index 8bdfd03be81b..0bf2368c999c 100644
--- a/tools/regression/lib/libc/locale/test-wcstombs.t
+++ b/tools/regression/lib/libc/locale/test-wcstombs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcstombs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wctomb.c b/tools/regression/lib/libc/locale/test-wctomb.c
index d55b3db9ec4d..d0f63d270e5c 100644
--- a/tools/regression/lib/libc/locale/test-wctomb.c
+++ b/tools/regression/lib/libc/locale/test-wctomb.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wctomb.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wctomb.t b/tools/regression/lib/libc/locale/test-wctomb.t
index 8bdfd03be81b..a8a9b5a83a0e 100644
--- a/tools/regression/lib/libc/locale/test-wctomb.t
+++ b/tools/regression/lib/libc/locale/test-wctomb.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wctomb.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/net/Makefile b/tools/regression/lib/libc/net/Makefile
index ce40836bd066..2e2c9672f1c2 100644
--- a/tools/regression/lib/libc/net/Makefile
+++ b/tools/regression/lib/libc/net/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/Makefile,v 1.2 2005/02/12 18:09:20 ru Exp $
 
 TESTS=	test-eui64_aton test-eui64_line test-eui64_ntoa
 CFLAGS+= -g -Wall
diff --git a/tools/regression/lib/libc/net/test-eui64.h b/tools/regression/lib/libc/net/test-eui64.h
index ea82a10c1487..477e3b76d9e4 100644
--- a/tools/regression/lib/libc/net/test-eui64.h
+++ b/tools/regression/lib/libc/net/test-eui64.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64.h,v 1.2 2004/05/27 17:23:32 brooks Exp $
  */
 #ifndef _TEST_EUI64_H
 #define _TEST_EUI64_H
diff --git a/tools/regression/lib/libc/net/test-eui64_aton.c b/tools/regression/lib/libc/net/test-eui64_aton.c
index e10f9854e9a0..e41e6490ecbe 100644
--- a/tools/regression/lib/libc/net/test-eui64_aton.c
+++ b/tools/regression/lib/libc/net/test-eui64_aton.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_aton.c,v 1.3 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_aton.t b/tools/regression/lib/libc/net/test-eui64_aton.t
index 8bdfd03be81b..1e7e08cd940d 100644
--- a/tools/regression/lib/libc/net/test-eui64_aton.t
+++ b/tools/regression/lib/libc/net/test-eui64_aton.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_aton.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/net/test-eui64_line.c b/tools/regression/lib/libc/net/test-eui64_line.c
index 714b4609d613..a7d1f420d26f 100644
--- a/tools/regression/lib/libc/net/test-eui64_line.c
+++ b/tools/regression/lib/libc/net/test-eui64_line.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_line.c,v 1.3 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_line.t b/tools/regression/lib/libc/net/test-eui64_line.t
index 8bdfd03be81b..f53345e9022b 100644
--- a/tools/regression/lib/libc/net/test-eui64_line.t
+++ b/tools/regression/lib/libc/net/test-eui64_line.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_line.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.c b/tools/regression/lib/libc/net/test-eui64_ntoa.c
index f7582f0a0bca..eef49ce19b80 100644
--- a/tools/regression/lib/libc/net/test-eui64_ntoa.c
+++ b/tools/regression/lib/libc/net/test-eui64_ntoa.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_ntoa.c,v 1.3 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.t b/tools/regression/lib/libc/net/test-eui64_ntoa.t
index 8bdfd03be81b..ab7104fbdcb0 100644
--- a/tools/regression/lib/libc/net/test-eui64_ntoa.t
+++ b/tools/regression/lib/libc/net/test-eui64_ntoa.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_ntoa.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/regex/Makefile b/tools/regression/lib/libc/regex/Makefile
index f91bef24ffe9..e522a8febfee 100644
--- a/tools/regression/lib/libc/regex/Makefile
+++ b/tools/regression/lib/libc/regex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/regex/Makefile,v 1.1 2004/07/19 09:00:26 tjr Exp $
 
 GROT=	../../../../../lib/libc/regex/grot
 
diff --git a/tools/regression/lib/libc/resolv/Makefile b/tools/regression/lib/libc/resolv/Makefile
index 18a6a84db3e5..5fc6b6c4a6c1 100644
--- a/tools/regression/lib/libc/resolv/Makefile
+++ b/tools/regression/lib/libc/resolv/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.1 2004/05/13 19:17:12 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/resolv/Makefile,v 1.2 2005/05/04 19:40:30 ume Exp $
 
 NOMAN=		# defined
 
diff --git a/tools/regression/lib/libc/resolv/resolv.c b/tools/regression/lib/libc/resolv/resolv.c
index dc925d3424ce..7e94e320088b 100644
--- a/tools/regression/lib/libc/resolv/resolv.c
+++ b/tools/regression/lib/libc/resolv/resolv.c
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/lib/libc/resolv/resolv.c,v 1.2 2005/05/04 12:02:10 ume Exp $ */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: resolv.c,v 1.6 2004/05/23 16:59:11 christos Exp $");
 
diff --git a/tools/regression/lib/libc/resolv/resolv.t b/tools/regression/lib/libc/resolv/resolv.t
index 278ba06d93ff..6ef72d1734b7 100644
--- a/tools/regression/lib/libc/resolv/resolv.t
+++ b/tools/regression/lib/libc/resolv/resolv.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/resolv/resolv.t,v 1.1 2005/05/05 11:26:47 ume Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/stdio/Makefile b/tools/regression/lib/libc/stdio/Makefile
index 35131e2a67c5..3e234967cc63 100644
--- a/tools/regression/lib/libc/stdio/Makefile
+++ b/tools/regression/lib/libc/stdio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/Makefile,v 1.4 2005/03/01 01:43:05 das Exp $
 
 TESTS=	test-perror test-printfloat test-scanfloat
 CFLAGS+= -lm
diff --git a/tools/regression/lib/libc/stdio/test-perror.c b/tools/regression/lib/libc/stdio/test-perror.c
index 992b734dfa39..3eef29115e2c 100644
--- a/tools/regression/lib/libc/stdio/test-perror.c
+++ b/tools/regression/lib/libc/stdio/test-perror.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-perror.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/tools/regression/lib/libc/stdio/test-perror.t b/tools/regression/lib/libc/stdio/test-perror.t
index 8bdfd03be81b..6bfb9568ac03 100644
--- a/tools/regression/lib/libc/stdio/test-perror.t
+++ b/tools/regression/lib/libc/stdio/test-perror.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/test-perror.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdio/test-printfloat.c b/tools/regression/lib/libc/stdio/test-printfloat.c
index fcacee5313ec..08d426aac89e 100644
--- a/tools/regression/lib/libc/stdio/test-printfloat.c
+++ b/tools/regression/lib/libc/stdio/test-printfloat.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-printfloat.c,v 1.9 2005/03/01 01:43:04 das Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/tools/regression/lib/libc/stdio/test-printfloat.t b/tools/regression/lib/libc/stdio/test-printfloat.t
index 8bdfd03be81b..190ba19870ea 100644
--- a/tools/regression/lib/libc/stdio/test-printfloat.t
+++ b/tools/regression/lib/libc/stdio/test-printfloat.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/test-printfloat.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdio/test-scanfloat.c b/tools/regression/lib/libc/stdio/test-scanfloat.c
index 3d4e159f310e..c3ad1dea6931 100644
--- a/tools/regression/lib/libc/stdio/test-scanfloat.c
+++ b/tools/regression/lib/libc/stdio/test-scanfloat.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-scanfloat.c,v 1.5 2005/03/01 01:43:20 das Exp $");
 
 #include <assert.h>
 #include <fenv.h>
diff --git a/tools/regression/lib/libc/stdio/test-scanfloat.t b/tools/regression/lib/libc/stdio/test-scanfloat.t
index 8bdfd03be81b..e202d7948b05 100644
--- a/tools/regression/lib/libc/stdio/test-scanfloat.t
+++ b/tools/regression/lib/libc/stdio/test-scanfloat.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/test-scanfloat.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/Makefile b/tools/regression/lib/libc/stdlib/Makefile
index c707795b6520..72b8ce2e5493 100644
--- a/tools/regression/lib/libc/stdlib/Makefile
+++ b/tools/regression/lib/libc/stdlib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/Makefile,v 1.1 2004/06/25 12:31:12 sobomax Exp $
 
 TESTS=	test-qsort	\
 	test-heapsort	\
diff --git a/tools/regression/lib/libc/stdlib/test-heapsort.c b/tools/regression/lib/libc/stdlib/test-heapsort.c
index 6ce892490714..94cbaf3fb700 100644
--- a/tools/regression/lib/libc/stdlib/test-heapsort.c
+++ b/tools/regression/lib/libc/stdlib/test-heapsort.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdlib/test-heapsort.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-heapsort.t b/tools/regression/lib/libc/stdlib/test-heapsort.t
index 8bdfd03be81b..683f43dc6981 100644
--- a/tools/regression/lib/libc/stdlib/test-heapsort.t
+++ b/tools/regression/lib/libc/stdlib/test-heapsort.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/test-heapsort.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/test-mergesort.c b/tools/regression/lib/libc/stdlib/test-mergesort.c
index 729d481d96e3..57bf8592df3b 100644
--- a/tools/regression/lib/libc/stdlib/test-mergesort.c
+++ b/tools/regression/lib/libc/stdlib/test-mergesort.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdlib/test-mergesort.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-mergesort.t b/tools/regression/lib/libc/stdlib/test-mergesort.t
index 8bdfd03be81b..131fa34f23d5 100644
--- a/tools/regression/lib/libc/stdlib/test-mergesort.t
+++ b/tools/regression/lib/libc/stdlib/test-mergesort.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/test-mergesort.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/test-qsort.c b/tools/regression/lib/libc/stdlib/test-qsort.c
index 8a508e80dbc6..1e4396d9dfad 100644
--- a/tools/regression/lib/libc/stdlib/test-qsort.c
+++ b/tools/regression/lib/libc/stdlib/test-qsort.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdlib/test-qsort.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-qsort.t b/tools/regression/lib/libc/stdlib/test-qsort.t
index 8bdfd03be81b..e2c6c70f9fec 100644
--- a/tools/regression/lib/libc/stdlib/test-qsort.t
+++ b/tools/regression/lib/libc/stdlib/test-qsort.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/test-qsort.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/test-sort.h b/tools/regression/lib/libc/stdlib/test-sort.h
index e060f72c9f62..263ff8bcf42e 100644
--- a/tools/regression/lib/libc/stdlib/test-sort.h
+++ b/tools/regression/lib/libc/stdlib/test-sort.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/stdlib/test-sort.h,v 1.1 2004/06/25 12:31:12 sobomax Exp $
  */
 
 #ifndef _TEST_SORT_H
diff --git a/tools/regression/lib/libc/string/Makefile b/tools/regression/lib/libc/string/Makefile
index af76f9d9777d..b790ffc4a931 100644
--- a/tools/regression/lib/libc/string/Makefile
+++ b/tools/regression/lib/libc/string/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/string/Makefile,v 1.3 2005/02/01 09:26:34 nik Exp $
 
 CFLAGS+=	-I/usr/local/include 
 LDFLAGS+=	-L/usr/local/lib
diff --git a/tools/regression/lib/libc/string/test-strerror.c b/tools/regression/lib/libc/string/test-strerror.c
index f5274ed7f227..e31857bf5ccc 100644
--- a/tools/regression/lib/libc/string/test-strerror.c
+++ b/tools/regression/lib/libc/string/test-strerror.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/string/test-strerror.c,v 1.3 2005/02/01 01:53:35 nik Exp $
  */
 
 #include <assert.h>
diff --git a/tools/regression/lib/libc/string/test-strerror.t b/tools/regression/lib/libc/string/test-strerror.t
index 8bdfd03be81b..43f3de3c05e7 100644
--- a/tools/regression/lib/libc/string/test-strerror.t
+++ b/tools/regression/lib/libc/string/test-strerror.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/string/test-strerror.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/Makefile b/tools/regression/lib/msun/Makefile
index 46a6947e8a82..eacc08c96293 100644
--- a/tools/regression/lib/msun/Makefile
+++ b/tools/regression/lib/msun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.5 2005/03/25 06:24:46 das Exp $
 
 TESTS=	test-fenv test-ilogb test-lrint test-lround test-next test-rem
 CFLAGS+= -O0 -lm
diff --git a/tools/regression/lib/msun/test-fenv.c b/tools/regression/lib/msun/test-fenv.c
index 71e8eedb3bc9..60618e9cfb78 100644
--- a/tools/regression/lib/msun/test-fenv.c
+++ b/tools/regression/lib/msun/test-fenv.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-fenv.c,v 1.4 2005/03/16 19:04:45 das Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/tools/regression/lib/msun/test-fenv.t b/tools/regression/lib/msun/test-fenv.t
index 8bdfd03be81b..bd12123a711c 100644
--- a/tools/regression/lib/msun/test-fenv.t
+++ b/tools/regression/lib/msun/test-fenv.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-fenv.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-ilogb.c b/tools/regression/lib/msun/test-ilogb.c
index a1440c4a20a4..f54c22f14834 100644
--- a/tools/regression/lib/msun/test-ilogb.c
+++ b/tools/regression/lib/msun/test-ilogb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/msun/test-ilogb.c,v 1.2 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <assert.h>
diff --git a/tools/regression/lib/msun/test-ilogb.t b/tools/regression/lib/msun/test-ilogb.t
index 8bdfd03be81b..a8ff9de66138 100644
--- a/tools/regression/lib/msun/test-ilogb.t
+++ b/tools/regression/lib/msun/test-ilogb.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-ilogb.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-lrint.c b/tools/regression/lib/msun/test-lrint.c
index 44bcee7cb04c..f5b4b2afac02 100644
--- a/tools/regression/lib/msun/test-lrint.c
+++ b/tools/regression/lib/msun/test-lrint.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-lrint.c,v 1.1 2005/01/11 23:13:36 das Exp $");
 
 #include <assert.h>
 #include <fenv.h>
diff --git a/tools/regression/lib/msun/test-lrint.t b/tools/regression/lib/msun/test-lrint.t
index 8bdfd03be81b..cc8fcf4976d9 100644
--- a/tools/regression/lib/msun/test-lrint.t
+++ b/tools/regression/lib/msun/test-lrint.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-lrint.t,v 1.1 2005/01/11 23:13:36 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-lround.c b/tools/regression/lib/msun/test-lround.c
index 4904abe8eefd..ee885e260e24 100644
--- a/tools/regression/lib/msun/test-lround.c
+++ b/tools/regression/lib/msun/test-lround.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-lround.c,v 1.1 2005/01/11 23:13:36 das Exp $");
 
 #include <assert.h>
 #include <fenv.h>
diff --git a/tools/regression/lib/msun/test-lround.t b/tools/regression/lib/msun/test-lround.t
index 8bdfd03be81b..bf04300809d3 100644
--- a/tools/regression/lib/msun/test-lround.t
+++ b/tools/regression/lib/msun/test-lround.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-lround.t,v 1.1 2005/01/11 23:13:36 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-next.c b/tools/regression/lib/msun/test-next.c
index c8dd0724a1a3..2e9a195e9846 100644
--- a/tools/regression/lib/msun/test-next.c
+++ b/tools/regression/lib/msun/test-next.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-next.c,v 1.1 2005/03/07 05:03:46 das Exp $");
 
 #include <fenv.h>
 #include <float.h>
diff --git a/tools/regression/lib/msun/test-next.t b/tools/regression/lib/msun/test-next.t
index 8bdfd03be81b..ca25a9ea3c27 100644
--- a/tools/regression/lib/msun/test-next.t
+++ b/tools/regression/lib/msun/test-next.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-next.t,v 1.1 2005/03/07 05:03:46 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-rem.c b/tools/regression/lib/msun/test-rem.c
index 1d7729a1313e..8f8ffd484bc8 100644
--- a/tools/regression/lib/msun/test-rem.c
+++ b/tools/regression/lib/msun/test-rem.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-rem.c,v 1.1 2005/03/25 06:24:46 das Exp $");
 
 #include <assert.h>
 #include <math.h>
diff --git a/tools/regression/lib/msun/test-rem.t b/tools/regression/lib/msun/test-rem.t
index 8bdfd03be81b..cca2d8093407 100644
--- a/tools/regression/lib/msun/test-rem.t
+++ b/tools/regression/lib/msun/test-rem.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-rem.t,v 1.1 2005/04/02 12:50:28 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/mac/mac_bsdextended/Makefile b/tools/regression/mac/mac_bsdextended/Makefile
index e19d62d989e3..24cfab4eb208 100644
--- a/tools/regression/mac/mac_bsdextended/Makefile
+++ b/tools/regression/mac/mac_bsdextended/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mac/mac_bsdextended/Makefile,v 1.1 2005/04/16 12:06:40 rwatson Exp $
 
 PROG=	test_ugidfw
 DPADD=	${LIBUGIDFW}
diff --git a/tools/regression/mac/mac_bsdextended/test_ugidfw.c b/tools/regression/mac/mac_bsdextended/test_ugidfw.c
index 398b9a3a6761..c038e0079da5 100644
--- a/tools/regression/mac/mac_bsdextended/test_ugidfw.c
+++ b/tools/regression/mac/mac_bsdextended/test_ugidfw.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/mac/mac_bsdextended/test_ugidfw.c,v 1.2 2005/04/16 18:41:00 trhodes Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/mlock/Makefile b/tools/regression/mlock/Makefile
index f32a65dc91bd..ddee616f2a78 100644
--- a/tools/regression/mlock/Makefile
+++ b/tools/regression/mlock/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mlock/Makefile,v 1.1 2005/01/03 19:56:20 rwatson Exp $
 
 PROG=	mlock
 NO_MAN=	yes
diff --git a/tools/regression/mlock/mlock.c b/tools/regression/mlock/mlock.c
index d371b2bee1d7..591f06782463 100644
--- a/tools/regression/mlock/mlock.c
+++ b/tools/regression/mlock/mlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/mlock/mlock.c,v 1.1 2005/01/03 19:56:20 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/msdosfs/msdosfstest-2.sh b/tools/regression/msdosfs/msdosfstest-2.sh
index 2262af803a5d..22f773f7103f 100644
--- a/tools/regression/msdosfs/msdosfstest-2.sh
+++ b/tools/regression/msdosfs/msdosfstest-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest-2.sh,v 1.1 2005/04/17 00:56:38 silby Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, then test to
 # make sure the case conversion issue described in msdosfs_lookup.c rev 1.46
 # is fixed.
diff --git a/tools/regression/msdosfs/msdosfstest-3.sh b/tools/regression/msdosfs/msdosfstest-3.sh
index 4d3a8fe9f116..e430be434dbf 100644
--- a/tools/regression/msdosfs/msdosfstest-3.sh
+++ b/tools/regression/msdosfs/msdosfstest-3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest-3.sh,v 1.1 2005/04/18 13:06:43 avatar Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, then
 # test to make sure the mbnambuf optimisation(msdosfs_conv.c rev 1.40)
 # doesn't break multi-byte characters.
diff --git a/tools/regression/msdosfs/msdosfstest.sh b/tools/regression/msdosfs/msdosfstest.sh
index ba2a434ce5ab..4b76c70da14c 100644
--- a/tools/regression/msdosfs/msdosfstest.sh
+++ b/tools/regression/msdosfs/msdosfstest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest.sh,v 1.2 2005/04/17 00:40:27 silby Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, copy a few
 # files to it, unmount/remount the filesystem, and make sure all is well.
 # 
diff --git a/tools/regression/net80211/ccmp/Makefile b/tools/regression/net80211/ccmp/Makefile
index 0d918b1427ab..0fb8470446ab 100644
--- a/tools/regression/net80211/ccmp/Makefile
+++ b/tools/regression/net80211/ccmp/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/net80211/ccmp/Makefile,v 1.1 2004/12/08 17:45:53 sam Exp $
 
 .PATH:	${.CURDIR}/../../../../sys/net80211
 
diff --git a/tools/regression/net80211/ccmp/test_ccmp.c b/tools/regression/net80211/ccmp/test_ccmp.c
index d78be95fde82..a48fb13c11cf 100644
--- a/tools/regression/net80211/ccmp/test_ccmp.c
+++ b/tools/regression/net80211/ccmp/test_ccmp.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/tools/regression/net80211/ccmp/test_ccmp.c,v 1.2 2005/05/05 13:16:30 avatar Exp $
  */
 
 /*
diff --git a/tools/regression/net80211/tkip/Makefile b/tools/regression/net80211/tkip/Makefile
index 1a1f7cacb4d4..928c3c108879 100644
--- a/tools/regression/net80211/tkip/Makefile
+++ b/tools/regression/net80211/tkip/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/net80211/tkip/Makefile,v 1.1 2004/12/08 17:45:53 sam Exp $
 
 .PATH:	${.CURDIR}/../../../../sys/net80211
 
diff --git a/tools/regression/net80211/tkip/test_tkip.c b/tools/regression/net80211/tkip/test_tkip.c
index 5a6397852a3f..8dcc0117a81a 100644
--- a/tools/regression/net80211/tkip/test_tkip.c
+++ b/tools/regression/net80211/tkip/test_tkip.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/tools/regression/net80211/tkip/test_tkip.c,v 1.2 2005/05/05 13:16:30 avatar Exp $
  */
 
 /*
diff --git a/tools/regression/net80211/wep/Makefile b/tools/regression/net80211/wep/Makefile
index 1ab4712b9477..b2116f478d7f 100644
--- a/tools/regression/net80211/wep/Makefile
+++ b/tools/regression/net80211/wep/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/net80211/wep/Makefile,v 1.1 2004/12/08 17:45:53 sam Exp $
 
 .PATH:	${.CURDIR}/../../../../sys/net80211
 
diff --git a/tools/regression/net80211/wep/test_wep.c b/tools/regression/net80211/wep/test_wep.c
index b498195c2c1d..ee25d65908a4 100644
--- a/tools/regression/net80211/wep/test_wep.c
+++ b/tools/regression/net80211/wep/test_wep.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/tools/regression/net80211/wep/test_wep.c,v 1.2 2005/05/05 13:16:30 avatar Exp $
  */
 
 /*
diff --git a/tools/regression/netatalk/simple_send/Makefile b/tools/regression/netatalk/simple_send/Makefile
index e01fcea90eb3..786e85fd5493 100644
--- a/tools/regression/netatalk/simple_send/Makefile
+++ b/tools/regression/netatalk/simple_send/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netatalk/simple_send/Makefile,v 1.3 2004/12/21 08:47:21 ru Exp $
 #
 
 PROG=	simple_send
diff --git a/tools/regression/netatalk/simple_send/simple_send.c b/tools/regression/netatalk/simple_send/simple_send.c
index 162253c1d1eb..371d69863964 100644
--- a/tools/regression/netatalk/simple_send/simple_send.c
+++ b/tools/regression/netatalk/simple_send/simple_send.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netatalk/simple_send/simple_send.c,v 1.2 2004/07/17 17:16:16 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet/ipsockopt/Makefile b/tools/regression/netinet/ipsockopt/Makefile
index c49ee6cbd8f7..c18e23502247 100644
--- a/tools/regression/netinet/ipsockopt/Makefile
+++ b/tools/regression/netinet/ipsockopt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/ipsockopt/Makefile,v 1.3 2004/12/21 08:47:21 ru Exp $
 #
 
 PROG=	ipsockopt
diff --git a/tools/regression/netinet/ipsockopt/ipsockopt.c b/tools/regression/netinet/ipsockopt/ipsockopt.c
index 1df6b0d3e537..eb75d360b61d 100644
--- a/tools/regression/netinet/ipsockopt/ipsockopt.c
+++ b/tools/regression/netinet/ipsockopt/ipsockopt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/ipsockopt/ipsockopt.c,v 1.4 2004/11/11 19:47:53 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet/ipsockopt/ipsockopt.t b/tools/regression/netinet/ipsockopt/ipsockopt.t
index 8bdfd03be81b..84fbb77214e3 100644
--- a/tools/regression/netinet/ipsockopt/ipsockopt.t
+++ b/tools/regression/netinet/ipsockopt/ipsockopt.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/ipsockopt/ipsockopt.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/netinet/tcpconnect/Makefile b/tools/regression/netinet/tcpconnect/Makefile
index 3456ff52ffda..4bdd676ba3fc 100644
--- a/tools/regression/netinet/tcpconnect/Makefile
+++ b/tools/regression/netinet/tcpconnect/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpconnect/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 #
 
 PROG=	tcpconnect
diff --git a/tools/regression/netinet/tcpconnect/tcpconnect.c b/tools/regression/netinet/tcpconnect/tcpconnect.c
index 5037a988d9a5..8e6741badbe0 100644
--- a/tools/regression/netinet/tcpconnect/tcpconnect.c
+++ b/tools/regression/netinet/tcpconnect/tcpconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/tcpconnect/tcpconnect.c,v 1.4 2005/05/16 00:54:47 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet/tcpfullwindowrst/Makefile b/tools/regression/netinet/tcpfullwindowrst/Makefile
index 91641cdd464c..ffa3d3004e5a 100644
--- a/tools/regression/netinet/tcpfullwindowrst/Makefile
+++ b/tools/regression/netinet/tcpfullwindowrst/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpfullwindowrst/Makefile,v 1.2 2004/12/21 08:47:22 ru Exp $
 
 PROG=	tcpfullwindowrsttest
 NO_MAN=	noman
diff --git a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t
index 49acbccf6e80..be8e25e732eb 100644
--- a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t
+++ b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t,v 1.1 2004/12/01 12:12:12 nik Exp $
 
 make tcpfullwindowrsttest 2>&1 > /dev/null
 
diff --git a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c
index ac86b9e7627a..d8647c525b9b 100644
--- a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c
+++ b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c
@@ -24,7 +24,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c,v 1.1 2004/12/01 12:12:12 nik Exp $
 
 */
 
diff --git a/tools/regression/netinet/tcpstream/Makefile b/tools/regression/netinet/tcpstream/Makefile
index 6f6491aedd08..e3737261f980 100644
--- a/tools/regression/netinet/tcpstream/Makefile
+++ b/tools/regression/netinet/tcpstream/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpstream/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 #
 
 CFLAGS+=	-Wall
diff --git a/tools/regression/netinet/tcpstream/README b/tools/regression/netinet/tcpstream/README
index df2e9b1a21da..76a7fa6d377a 100644
--- a/tools/regression/netinet/tcpstream/README
+++ b/tools/regression/netinet/tcpstream/README
@@ -17,4 +17,4 @@ seed of 100:
 
     tcpstream client 192.168.10.10 8080 100
 
-$FreeBSD$
+$FreeBSD: src/tools/regression/netinet/tcpstream/README,v 1.1 2004/09/13 16:53:40 rwatson Exp $
diff --git a/tools/regression/netinet/tcpstream/tcpstream.c b/tools/regression/netinet/tcpstream/tcpstream.c
index c8fe9a3fe098..ee44e570cf84 100644
--- a/tools/regression/netinet/tcpstream/tcpstream.c
+++ b/tools/regression/netinet/tcpstream/tcpstream.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/tcpstream/tcpstream.c,v 1.2 2004/10/23 22:07:57 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netinet/udpconnectjail/Makefile b/tools/regression/netinet/udpconnectjail/Makefile
index 01e0ee371700..8de8a8dd4a86 100644
--- a/tools/regression/netinet/udpconnectjail/Makefile
+++ b/tools/regression/netinet/udpconnectjail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/udpconnectjail/Makefile,v 1.2 2005/01/22 22:42:39 rwatson Exp $
 
 PROG=	udpconnectjail
 NO_MAN=	yes
diff --git a/tools/regression/netinet/udpconnectjail/udpconnectjail.c b/tools/regression/netinet/udpconnectjail/udpconnectjail.c
index 0c3299f01d6b..d6793f34b2b0 100644
--- a/tools/regression/netinet/udpconnectjail/udpconnectjail.c
+++ b/tools/regression/netinet/udpconnectjail/udpconnectjail.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/udpconnectjail/udpconnectjail.c,v 1.2 2005/01/16 15:01:28 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile
index 07c3445fe7c4..9c126f12a18e 100644
--- a/tools/regression/nfsmmap/test1/Makefile
+++ b/tools/regression/nfsmmap/test1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/nfsmmap/test1/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 
 PROG= test1
 NO_MAN=
diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile
index 113a3b32defa..4f1f35d0eba4 100644
--- a/tools/regression/nfsmmap/test2/Makefile
+++ b/tools/regression/nfsmmap/test2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/nfsmmap/test2/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 
 PROG= test2
 NO_MAN=
diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile
index 85db354b944d..fc2f0b52daa1 100644
--- a/tools/regression/p1003_1b/Makefile
+++ b/tools/regression/p1003_1b/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/p1003_1b/Makefile,v 1.4 2004/12/21 08:47:22 ru Exp $
 
 PROG=p1003_1b
 
diff --git a/tools/regression/p1003_1b/README b/tools/regression/p1003_1b/README
index e0b703754927..51080b6ab626 100644
--- a/tools/regression/p1003_1b/README
+++ b/tools/regression/p1003_1b/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/p1003_1b/README,v 1.1 2000/02/16 14:28:39 dufault Exp $
 
 p1003_1b: Regression tests for the scheduling facilities.
 The following should always work as of the release of 4.0:
diff --git a/tools/regression/p1003_1b/fifo.c b/tools/regression/p1003_1b/fifo.c
index 455f7f9adc5f..803b8c8680ad 100644
--- a/tools/regression/p1003_1b/fifo.c
+++ b/tools/regression/p1003_1b/fifo.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/fifo.c,v 1.1 2000/02/16 14:28:40 dufault Exp $
  */
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/tools/regression/p1003_1b/main.c b/tools/regression/p1003_1b/main.c
index 0e87c6ca68bf..4d428a2718af 100644
--- a/tools/regression/p1003_1b/main.c
+++ b/tools/regression/p1003_1b/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/p1003_1b/main.c,v 1.1 2000/02/16 14:28:40 dufault Exp $ */
 #include <stdio.h>
 
 int fifo(int argc, char *argv[]);
diff --git a/tools/regression/p1003_1b/memlock.c b/tools/regression/p1003_1b/memlock.c
index b55b4056dac8..e58167a9c8af 100644
--- a/tools/regression/p1003_1b/memlock.c
+++ b/tools/regression/p1003_1b/memlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/memlock.c,v 1.1 2000/02/16 14:28:40 dufault Exp $
  */
 #include <unistd.h>
 #include <stdio.h>
diff --git a/tools/regression/p1003_1b/p26.c b/tools/regression/p1003_1b/p26.c
index 538deaf87863..edd0cec81a62 100644
--- a/tools/regression/p1003_1b/p26.c
+++ b/tools/regression/p1003_1b/p26.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/p26.c,v 1.1 2000/02/16 14:28:41 dufault Exp $
  */
 #define _POSIX_SOURCE
 #define _POSIX_C_SOURCE 199309L
diff --git a/tools/regression/p1003_1b/prutil.c b/tools/regression/p1003_1b/prutil.c
index e0e3d6f8fa68..16ae68b3c097 100644
--- a/tools/regression/p1003_1b/prutil.c
+++ b/tools/regression/p1003_1b/prutil.c
@@ -8,7 +8,7 @@
 #include "prutil.h"
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/prutil.c,v 1.1 2000/02/16 14:28:41 dufault Exp $
  */
 void quit(const char *text)
 {
diff --git a/tools/regression/p1003_1b/prutil.h b/tools/regression/p1003_1b/prutil.h
index 3387b994b151..e4af98644568 100644
--- a/tools/regression/p1003_1b/prutil.h
+++ b/tools/regression/p1003_1b/prutil.h
@@ -2,7 +2,7 @@
 #define _PRUTIL_H_
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/prutil.h,v 1.1 2000/02/16 14:28:42 dufault Exp $
  */
 
 struct sched_param;
diff --git a/tools/regression/p1003_1b/sched.c b/tools/regression/p1003_1b/sched.c
index bd978f8d4942..8dffc583e548 100644
--- a/tools/regression/p1003_1b/sched.c
+++ b/tools/regression/p1003_1b/sched.c
@@ -28,7 +28,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/sched.c,v 1.1 2000/02/16 14:28:42 dufault Exp $
  *
  */
 
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index ac31a99f250a..c005326a2943 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -28,7 +28,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/yield.c,v 1.2 2002/04/22 13:44:35 des Exp $
  *
  */
 #include <sys/types.h>
diff --git a/tools/regression/pipe/Makefile b/tools/regression/pipe/Makefile
index cf732538b255..69791d3c5bc1 100644
--- a/tools/regression/pipe/Makefile
+++ b/tools/regression/pipe/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/pipe/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 #
 # "make" then "make regress".
 #
diff --git a/tools/regression/pipe/bigpipetest.c b/tools/regression/pipe/bigpipetest.c
index c5983fa5559e..393cd40486df 100644
--- a/tools/regression/pipe/bigpipetest.c
+++ b/tools/regression/pipe/bigpipetest.c
@@ -12,7 +12,7 @@
  * Test for the non-blocking big pipe bug (write(2) returning
  * EAGAIN while select(2) returns the descriptor as ready for write).
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/bigpipetest.c,v 1.3 2004/11/11 19:47:53 nik Exp $
  */
 
 void write_frame(int fd, char *buf, unsigned long buflen)
diff --git a/tools/regression/pipe/bigpipetest.t b/tools/regression/pipe/bigpipetest.t
index 8bdfd03be81b..dfdc46dbb5f1 100644
--- a/tools/regression/pipe/bigpipetest.t
+++ b/tools/regression/pipe/bigpipetest.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/pipe/bigpipetest.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/pipe/pipe-fstatbug.c b/tools/regression/pipe/pipe-fstatbug.c
index ed038c20a69a..52b6f2d6ead4 100644
--- a/tools/regression/pipe/pipe-fstatbug.c
+++ b/tools/regression/pipe/pipe-fstatbug.c
@@ -28,7 +28,7 @@ SUCH DAMAGE.
 #include <sys/stat.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-fstatbug.c,v 1.1 2004/07/20 07:17:19 silby Exp $
  * The goal of this program is to see if fstat reports the correct
  * data count for a pipe.  Prior to revision 1.172 of sys_pipe.c,
  * 0 would be returned once the pipe entered direct write mode.
diff --git a/tools/regression/pipe/pipe-overcommit1.c b/tools/regression/pipe/pipe-overcommit1.c
index c4686588b6bb..36aa31513079 100644
--- a/tools/regression/pipe/pipe-overcommit1.c
+++ b/tools/regression/pipe/pipe-overcommit1.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-overcommit1.c,v 1.1 2005/01/21 06:46:18 silby Exp $
  * This program just allocates as many pipes as it can to ensure
  * that using up all pipe memory doesn't cause a panic.
  */
diff --git a/tools/regression/pipe/pipe-overcommit2.c b/tools/regression/pipe/pipe-overcommit2.c
index 5979585e6e6b..d1b9f8179c2b 100644
--- a/tools/regression/pipe/pipe-overcommit2.c
+++ b/tools/regression/pipe/pipe-overcommit2.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-overcommit2.c,v 1.1 2005/01/21 06:46:18 silby Exp $
  * This program tests how sys_pipe.c handles the case where there
  * is ample memory to allocate a pipe, but the file descriptor
  * limit for that user has been exceeded.
diff --git a/tools/regression/pipe/pipe-reverse.c b/tools/regression/pipe/pipe-reverse.c
index f4ae16747d0b..81c28340a3b7 100644
--- a/tools/regression/pipe/pipe-reverse.c
+++ b/tools/regression/pipe/pipe-reverse.c
@@ -28,7 +28,7 @@ SUCH DAMAGE.
 #include <sys/stat.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-reverse.c,v 1.1 2004/07/22 02:46:25 silby Exp $
  * This program simply tests writing through the reverse direction of
  * a pipe.  Nothing too fancy, it's only needed because most pipe-using
  * programs never touch the reverse direction (it doesn't exist on
diff --git a/tools/regression/pipe/pipe-wraparound.c b/tools/regression/pipe/pipe-wraparound.c
index ab673e9b180a..d18a0b537c8c 100644
--- a/tools/regression/pipe/pipe-wraparound.c
+++ b/tools/regression/pipe/pipe-wraparound.c
@@ -28,7 +28,7 @@ SUCH DAMAGE.
 #include <sys/stat.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-wraparound.c,v 1.1 2004/07/22 02:46:25 silby Exp $
  * This program tests to make sure that wraparound writes and reads
  * are working, assuming that 16K socket buffers are used.  In order
  * to really stress the pipe code with this test, kernel modifications
diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile
index 7ec39999dff6..b399ebb5cc9d 100644
--- a/tools/regression/security/access/Makefile
+++ b/tools/regression/security/access/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/security/access/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 
 PROG=	testaccess
 NO_MAN=
diff --git a/tools/regression/security/access/testaccess.c b/tools/regression/security/access/testaccess.c
index 46bb01c4150d..5634fbfb56f0 100644
--- a/tools/regression/security/access/testaccess.c
+++ b/tools/regression/security/access/testaccess.c
@@ -29,7 +29,7 @@
  * Work sponsored by Defense Advanced Research Projects Agency under the
  * CHATS research program, CBOSS project.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/access/testaccess.c,v 1.4 2002/05/16 05:03:56 trhodes Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile
index ad09f7a696f3..e4578b29b9db 100644
--- a/tools/regression/security/proc_to_proc/Makefile
+++ b/tools/regression/security/proc_to_proc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/security/proc_to_proc/Makefile,v 1.4 2004/12/21 08:47:23 ru Exp $
 
 PROG=	testuid
 NO_MAN=
diff --git a/tools/regression/security/proc_to_proc/README b/tools/regression/security/proc_to_proc/README
index 01857b834dce..474abf4104a1 100644
--- a/tools/regression/security/proc_to_proc/README
+++ b/tools/regression/security/proc_to_proc/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/security/proc_to_proc/README,v 1.2 2001/04/12 17:46:20 rwatson Exp $
 
   Inter-Process Authorization Test Suite
   Robert Watson, TrustedBSD Project
diff --git a/tools/regression/security/proc_to_proc/scenario.c b/tools/regression/security/proc_to_proc/scenario.c
index 0e3e476df54b..cf43ab40bbfd 100644
--- a/tools/regression/security/proc_to_proc/scenario.c
+++ b/tools/regression/security/proc_to_proc/scenario.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/proc_to_proc/scenario.c,v 1.6 2004/07/17 17:01:25 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/security/proc_to_proc/scenario.h b/tools/regression/security/proc_to_proc/scenario.h
index da087207c5a7..d94bf07d071b 100644
--- a/tools/regression/security/proc_to_proc/scenario.h
+++ b/tools/regression/security/proc_to_proc/scenario.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/proc_to_proc/scenario.h,v 1.1 2001/04/11 17:21:14 rwatson Exp $
  */
 #ifndef _SCENARIO_H
 #define _SCENARIO_H
diff --git a/tools/regression/security/proc_to_proc/testuid.c b/tools/regression/security/proc_to_proc/testuid.c
index a9b81a08541c..ae76b04f0be1 100644
--- a/tools/regression/security/proc_to_proc/testuid.c
+++ b/tools/regression/security/proc_to_proc/testuid.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/proc_to_proc/testuid.c,v 1.1 2001/04/11 17:21:14 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile
index efcaa16c8e37..5db107c2f46f 100644
--- a/tools/regression/sockets/accept_fd_leak/Makefile
+++ b/tools/regression/sockets/accept_fd_leak/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accept_fd_leak/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 #
 
 PROG=	accept_fd_leak
diff --git a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
index 9bf946df887c..ddfacfb8adce 100644
--- a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
+++ b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c,v 1.5 2004/11/11 19:47:53 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
index 8bdfd03be81b..cddef2f436d0 100644
--- a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
+++ b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
index 736c796861fd..da379c9b9cfa 100644
--- a/tools/regression/sockets/accf_data_attach/Makefile
+++ b/tools/regression/sockets/accf_data_attach/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accf_data_attach/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 #
 
 PROG=	accf_data_attach
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.c b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
index 697d83aa6ef7..ec8de7719d25 100644
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.c
+++ b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/accf_data_attach/accf_data_attach.c,v 1.4 2005/06/11 11:59:48 maxim Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.t b/tools/regression/sockets/accf_data_attach/accf_data_attach.t
index 8bdfd03be81b..a2e4b2f3896d 100644
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.t
+++ b/tools/regression/sockets/accf_data_attach/accf_data_attach.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accf_data_attach/accf_data_attach.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile
index 53d34a91da17..fd634be02e76 100644
--- a/tools/regression/sockets/kqueue/Makefile
+++ b/tools/regression/sockets/kqueue/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/kqueue/Makefile,v 1.4 2004/12/21 08:47:23 ru Exp $
 #
 
 PROG=	kqueue
diff --git a/tools/regression/sockets/kqueue/kqueue.c b/tools/regression/sockets/kqueue/kqueue.c
index d46db96ad4ee..e01fd5fc8c09 100644
--- a/tools/regression/sockets/kqueue/kqueue.c
+++ b/tools/regression/sockets/kqueue/kqueue.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/kqueue/kqueue.c,v 1.3 2004/11/11 19:47:53 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/kqueue/kqueue.t b/tools/regression/sockets/kqueue/kqueue.t
index 8bdfd03be81b..af81f2615600 100644
--- a/tools/regression/sockets/kqueue/kqueue.t
+++ b/tools/regression/sockets/kqueue/kqueue.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/kqueue/kqueue.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile
index 8ee774818930..db9a28db9f18 100644
--- a/tools/regression/sockets/listenclose/Makefile
+++ b/tools/regression/sockets/listenclose/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/listenclose/Makefile,v 1.3 2005/01/22 22:41:46 rwatson Exp $
 #
 
 PROG=	listenclose
diff --git a/tools/regression/sockets/listenclose/listenclose.c b/tools/regression/sockets/listenclose/listenclose.c
index 425e39f15820..28e1d3a967a2 100644
--- a/tools/regression/sockets/listenclose/listenclose.c
+++ b/tools/regression/sockets/listenclose/listenclose.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/listenclose/listenclose.c,v 1.2 2005/05/16 00:53:38 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile
index 4d12d8cacbe8..415842fc74a5 100644
--- a/tools/regression/sockets/reconnect/Makefile
+++ b/tools/regression/sockets/reconnect/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/reconnect/Makefile,v 1.2 2005/01/22 22:41:46 rwatson Exp $
 #
 
 PROG=	reconnect
diff --git a/tools/regression/sockets/reconnect/reconnect.c b/tools/regression/sockets/reconnect/reconnect.c
index 02922bfb2a8e..164c4e9f885d 100644
--- a/tools/regression/sockets/reconnect/reconnect.c
+++ b/tools/regression/sockets/reconnect/reconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/reconnect/reconnect.c,v 1.1 2005/01/12 09:57:18 sobomax Exp $
  */
 
 /*
diff --git a/tools/regression/sockets/sigpipe/Makefile b/tools/regression/sockets/sigpipe/Makefile
index aa301b61d296..49834d0f1846 100644
--- a/tools/regression/sockets/sigpipe/Makefile
+++ b/tools/regression/sockets/sigpipe/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/sigpipe/Makefile,v 1.1 2005/03/11 12:47:14 rwatson Exp $
 #
 
 PROG=	sigpipe
diff --git a/tools/regression/sockets/sigpipe/sigpipe.c b/tools/regression/sockets/sigpipe/sigpipe.c
index 0422576ba20b..8c43e74152da 100644
--- a/tools/regression/sockets/sigpipe/sigpipe.c
+++ b/tools/regression/sockets/sigpipe/sigpipe.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/sigpipe/sigpipe.c,v 1.2 2005/03/11 13:05:18 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile
index 3d1b34e1556a..24dd602e2fa1 100644
--- a/tools/regression/sockets/socketpair/Makefile
+++ b/tools/regression/sockets/socketpair/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/socketpair/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 #
 
 PROG=	socketpair
diff --git a/tools/regression/sockets/socketpair/socketpair.c b/tools/regression/sockets/socketpair/socketpair.c
index a1d0946c7b58..ea42b1ce8072 100644
--- a/tools/regression/sockets/socketpair/socketpair.c
+++ b/tools/regression/sockets/socketpair/socketpair.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/socketpair/socketpair.c,v 1.1 2004/08/04 03:46:35 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile
index fd59d68fe335..1c3b11232878 100644
--- a/tools/regression/sockets/unix_bindconnect/Makefile
+++ b/tools/regression/sockets/unix_bindconnect/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/unix_bindconnect/Makefile,v 1.1 2005/02/20 22:21:53 rwatson Exp $
 
 PROG=	unix_bindconnect
 NO_MAN=
diff --git a/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c b/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
index 7db82a0faa44..28b4692df937 100644
--- a/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
+++ b/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c,v 1.1 2005/02/20 22:21:53 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sysvmsg/Makefile b/tools/regression/sysvmsg/Makefile
index 6892abb8b24d..b2f556b807da 100644
--- a/tools/regression/sysvmsg/Makefile
+++ b/tools/regression/sysvmsg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvmsg/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 # SysV Message Queue Regression Utility
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:56:59 thorpej Exp $
 
diff --git a/tools/regression/sysvmsg/README b/tools/regression/sysvmsg/README
index f115b9967ed1..40843b8c3fc2 100644
--- a/tools/regression/sysvmsg/README
+++ b/tools/regression/sysvmsg/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/sysvmsg/README,v 1.1 2002/08/15 06:34:37 alfred Exp $
 
 SysV IPC Message Queue Regression Utility.
 
diff --git a/tools/regression/sysvmsg/msgtest.c b/tools/regression/sysvmsg/msgtest.c
index 37981d91e624..9ecbc86e4bfc 100644
--- a/tools/regression/sysvmsg/msgtest.c
+++ b/tools/regression/sysvmsg/msgtest.c
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  * Obtained from: $NetBSD: msgtest.c,v 1.7 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sysvmsg/msgtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
  */
 
 /*
diff --git a/tools/regression/sysvsem/Makefile b/tools/regression/sysvsem/Makefile
index 5546b62a471b..4a68917abcbe 100644
--- a/tools/regression/sysvsem/Makefile
+++ b/tools/regression/sysvsem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvsem/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 # SysV Semaphores Regression Utility 
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
 
diff --git a/tools/regression/sysvsem/README b/tools/regression/sysvsem/README
index 33b9706817da..6e15daffe34d 100644
--- a/tools/regression/sysvsem/README
+++ b/tools/regression/sysvsem/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/sysvsem/README,v 1.1 2002/08/15 06:34:37 alfred Exp $
 
 SysV IPC Semaphore Regression Utility.
 
diff --git a/tools/regression/sysvsem/semtest.c b/tools/regression/sysvsem/semtest.c
index 83f73e97356f..87544afe2cbc 100644
--- a/tools/regression/sysvsem/semtest.c
+++ b/tools/regression/sysvsem/semtest.c
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: semtest.c,v 1.4 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sysvsem/semtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
  */
 
 /*
diff --git a/tools/regression/sysvshm/Makefile b/tools/regression/sysvshm/Makefile
index f26b4a7bfa32..41e6b16e512c 100644
--- a/tools/regression/sysvshm/Makefile
+++ b/tools/regression/sysvshm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvshm/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 # SysV Shared Memory Regression Utility
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
 
diff --git a/tools/regression/sysvshm/README b/tools/regression/sysvshm/README
index 4e0125eec8ef..b788f5bd1272 100644
--- a/tools/regression/sysvshm/README
+++ b/tools/regression/sysvshm/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/sysvshm/README,v 1.1 2002/08/15 06:34:37 alfred Exp $
 
 SysV IPC Shared Memory Regression Utility.
 
diff --git a/tools/regression/sysvshm/shmtest.c b/tools/regression/sysvshm/shmtest.c
index 22f626edce49..54ad443e8e83 100644
--- a/tools/regression/sysvshm/shmtest.c
+++ b/tools/regression/sysvshm/shmtest.c
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: shmtest.c,v 1.3 2002/07/20 08:36:26 grant Exp $
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sysvshm/shmtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
  */
 
 /*
diff --git a/tools/regression/tls/Makefile b/tools/regression/tls/Makefile
index 76def9685e75..64c05eadb191 100644
--- a/tools/regression/tls/Makefile
+++ b/tools/regression/tls/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/Makefile,v 1.2 2005/04/23 23:47:58 davidxu Exp $
 
 SUBDIR=libxx libyy ttls1 ttls2 ttls4
 
diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile
index 5375f930a771..1d5d5c57dc06 100644
--- a/tools/regression/tls/libxx/Makefile
+++ b/tools/regression/tls/libxx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/libxx/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 
 LIB=		xx
 SHLIB_MAJOR=	1
diff --git a/tools/regression/tls/libxx/xx.c b/tools/regression/tls/libxx/xx.c
index 6d1e73f79a05..0b031c9bea70 100644
--- a/tools/regression/tls/libxx/xx.c
+++ b/tools/regression/tls/libxx/xx.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/libxx/xx.c,v 1.1 2004/08/03 09:04:00 dfr Exp $ */
 
 extern int __thread yy1;
 int __thread xx1 = 1;
diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile
index 0acd9ee17d7b..b0791d53be05 100644
--- a/tools/regression/tls/libyy/Makefile
+++ b/tools/regression/tls/libyy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/libyy/Makefile,v 1.3 2004/12/21 08:47:25 ru Exp $
 
 LIB=		yy
 SHLIB_MAJOR=	1
diff --git a/tools/regression/tls/libyy/yy.c b/tools/regression/tls/libyy/yy.c
index c00cb8770ec4..bd0d12c65ab2 100644
--- a/tools/regression/tls/libyy/yy.c
+++ b/tools/regression/tls/libyy/yy.c
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/libyy/yy.c,v 1.1 2004/08/03 09:04:00 dfr Exp $ */
 
 int __thread yy1 = 101;
diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile
index d3b6e6521412..135c6a42c655 100644
--- a/tools/regression/tls/ttls1/Makefile
+++ b/tools/regression/tls/ttls1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls1/Makefile,v 1.4 2004/12/21 08:47:25 ru Exp $
 
 PROG=	ttls1
 LDADD+=	-L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx
diff --git a/tools/regression/tls/ttls1/ttls1.c b/tools/regression/tls/ttls1/ttls1.c
index 9c514aeecf7a..cdd4e91dde64 100644
--- a/tools/regression/tls/ttls1/ttls1.c
+++ b/tools/regression/tls/ttls1/ttls1.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/ttls1/ttls1.c,v 1.2 2004/08/05 08:07:40 dfr Exp $ */
 
 #include <stdio.h>
 
diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile
index 0a3bc95912e8..cb0fc7e9de8a 100644
--- a/tools/regression/tls/ttls2/Makefile
+++ b/tools/regression/tls/ttls2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls2/Makefile,v 1.4 2004/12/21 08:47:25 ru Exp $
 
 PROG=	ttls2
 LDADD+= -lpthread
diff --git a/tools/regression/tls/ttls2/ttls2.c b/tools/regression/tls/ttls2/ttls2.c
index f528e3dcc739..4729aadf8d4c 100644
--- a/tools/regression/tls/ttls2/ttls2.c
+++ b/tools/regression/tls/ttls2/ttls2.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/ttls2/ttls2.c,v 1.1 2004/08/03 09:04:01 dfr Exp $ */
 
 #include <stdio.h>
 #include <pthread.h>
diff --git a/tools/regression/tls/ttls3/Makefile b/tools/regression/tls/ttls3/Makefile
index b171181e74fb..fdec518d0185 100644
--- a/tools/regression/tls/ttls3/Makefile
+++ b/tools/regression/tls/ttls3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls3/Makefile,v 1.2 2004/08/16 09:35:49 dfr Exp $
 
 all: ttls3
 
diff --git a/tools/regression/tls/ttls3/elftls.S b/tools/regression/tls/ttls3/elftls.S
index 0fad08d90a7c..b979912e1f6c 100644
--- a/tools/regression/tls/ttls3/elftls.S
+++ b/tools/regression/tls/ttls3/elftls.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/regression/tls/ttls3/elftls.S,v 1.1 2004/08/03 09:04:01 dfr Exp $
  */
 
 .file "elftls.S"
diff --git a/tools/regression/tls/ttls3/tls-test-lib.c b/tools/regression/tls/ttls3/tls-test-lib.c
index bc88ad1383dd..0935a34c09de 100644
--- a/tools/regression/tls/ttls3/tls-test-lib.c
+++ b/tools/regression/tls/ttls3/tls-test-lib.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/regression/tls/ttls3/tls-test-lib.c,v 1.1 2004/08/03 09:04:01 dfr Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/tls/ttls3/tls-test.c b/tools/regression/tls/ttls3/tls-test.c
index 539b6ce1ed11..231ebcbaa70b 100644
--- a/tools/regression/tls/ttls3/tls-test.c
+++ b/tools/regression/tls/ttls3/tls-test.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/regression/tls/ttls3/tls-test.c,v 1.1 2004/08/03 09:04:01 dfr Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile
index 5fb37df580fe..f1ca413fbc0d 100644
--- a/tools/regression/tls/ttls4/Makefile
+++ b/tools/regression/tls/ttls4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls4/Makefile,v 1.1 2005/04/23 23:47:58 davidxu Exp $
 
 PROG=	ttls4
 LDADD+=	-lpthread
diff --git a/tools/regression/tls/ttls4/ttls4.c b/tools/regression/tls/ttls4/ttls4.c
index d55e51bfcd8b..91dc190a133d 100644
--- a/tools/regression/tls/ttls4/ttls4.c
+++ b/tools/regression/tls/ttls4/ttls4.c
@@ -4,7 +4,7 @@
  *
  * David Xu <davidxu@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/tls/ttls4/ttls4.c,v 1.2 2005/04/24 00:17:30 davidxu Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/usr.bin/Makefile b/tools/regression/usr.bin/Makefile
index 25c90e95aad7..90d07df0255c 100644
--- a/tools/regression/usr.bin/Makefile
+++ b/tools/regression/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/Makefile,v 1.10 2005/04/13 20:08:17 stefanf Exp $
 
 SUBDIR=	file2c join jot m4 printf sed uudecode uuencode xargs
 
diff --git a/tools/regression/usr.bin/env/Makefile b/tools/regression/usr.bin/env/Makefile
index c019964c3c3a..8d2792d69054 100644
--- a/tools/regression/usr.bin/env/Makefile
+++ b/tools/regression/usr.bin/env/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/env/Makefile,v 1.1 2005/06/20 04:17:12 gad Exp $
 
 TESTPGM?=TestProgramNotSpecifed
 
diff --git a/tools/regression/usr.bin/env/regress-env.rgdata b/tools/regression/usr.bin/env/regress-env.rgdata
index 9f562e9c9e55..337584e4c53c 100644
--- a/tools/regression/usr.bin/env/regress-env.rgdata
+++ b/tools/regression/usr.bin/env/regress-env.rgdata
@@ -23,7 +23,7 @@
 #  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #  SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/env/regress-env.rgdata,v 1.2.2.1 2005/07/25 18:52:07 gad Exp $
 #
 
 testpgm=/usr/bin/env
diff --git a/tools/regression/usr.bin/env/regress-sb.rb b/tools/regression/usr.bin/env/regress-sb.rb
index b692ef2e87f9..74af7f49b843 100644
--- a/tools/regression/usr.bin/env/regress-sb.rb
+++ b/tools/regression/usr.bin/env/regress-sb.rb
@@ -24,7 +24,7 @@
 #  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #  SUCH DAMAGE.
 # -------+---------+---------+-------- + --------+---------+---------+---------+
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/env/regress-sb.rb,v 1.1 2005/06/20 04:17:12 gad Exp $
 # -------+---------+---------+-------- + --------+---------+---------+---------+
 #   This script was written to provide a battery of regression-tests for some
 # changes I am making to the `env' command.  I wrote a new script for this
diff --git a/tools/regression/usr.bin/file2c/Makefile b/tools/regression/usr.bin/file2c/Makefile
index b937d41a4e4a..2c7dae4b2079 100644
--- a/tools/regression/usr.bin/file2c/Makefile
+++ b/tools/regression/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/file2c/Makefile,v 1.2 2002/06/24 14:22:35 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/file2c/regress.sh b/tools/regression/usr.bin/file2c/regress.sh
index 4492e91c05e7..8ffb73618d98 100644
--- a/tools/regression/usr.bin/file2c/regress.sh
+++ b/tools/regression/usr.bin/file2c/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/file2c/regress.sh,v 1.5 2005/05/15 07:35:34 marcel Exp $
 
 echo 1..9
 
diff --git a/tools/regression/usr.bin/file2c/regress.t b/tools/regression/usr.bin/file2c/regress.t
index a82aacd9886f..106d0ecd157e 100644
--- a/tools/regression/usr.bin/file2c/regress.t
+++ b/tools/regression/usr.bin/file2c/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/file2c/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/join/Makefile b/tools/regression/usr.bin/join/Makefile
index b937d41a4e4a..f227f317e567 100644
--- a/tools/regression/usr.bin/join/Makefile
+++ b/tools/regression/usr.bin/join/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/join/Makefile,v 1.2 2002/06/24 14:22:37 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/join/regress.sh b/tools/regression/usr.bin/join/regress.sh
index 5807c14fd7e5..c5b614802796 100644
--- a/tools/regression/usr.bin/join/regress.sh
+++ b/tools/regression/usr.bin/join/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/join/regress.sh,v 1.4 2004/11/11 19:47:54 nik Exp $
 
 echo 1..1
 
diff --git a/tools/regression/usr.bin/join/regress.t b/tools/regression/usr.bin/join/regress.t
index a82aacd9886f..aa7f37cc1dfb 100644
--- a/tools/regression/usr.bin/join/regress.t
+++ b/tools/regression/usr.bin/join/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/join/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/jot/Makefile b/tools/regression/usr.bin/jot/Makefile
index b937d41a4e4a..04b0644bdc53 100644
--- a/tools/regression/usr.bin/jot/Makefile
+++ b/tools/regression/usr.bin/jot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/jot/Makefile,v 1.2 2002/06/24 14:22:40 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/jot/regress.sh b/tools/regression/usr.bin/jot/regress.sh
index c2d81f82cc9b..1de4ce490521 100644
--- a/tools/regression/usr.bin/jot/regress.sh
+++ b/tools/regression/usr.bin/jot/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/jot/regress.sh,v 1.4 2004/11/11 19:47:54 nik Exp $
 
 echo 1..1
 
diff --git a/tools/regression/usr.bin/jot/regress.t b/tools/regression/usr.bin/jot/regress.t
index a82aacd9886f..ef298ff18b2e 100644
--- a/tools/regression/usr.bin/jot/regress.t
+++ b/tools/regression/usr.bin/jot/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/jot/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/m4/Makefile b/tools/regression/usr.bin/m4/Makefile
index 99036706a818..badbadc49872 100644
--- a/tools/regression/usr.bin/m4/Makefile
+++ b/tools/regression/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/m4/Makefile,v 1.3 2002/06/24 14:29:19 jmallett Exp $
 
 all:
 	@sh ${.CURDIR}/regress.sh ${.CURDIR}
diff --git a/tools/regression/usr.bin/m4/regress.sh b/tools/regression/usr.bin/m4/regress.sh
index 9619d520b00e..e3e203df8d64 100644
--- a/tools/regression/usr.bin/m4/regress.sh
+++ b/tools/regression/usr.bin/m4/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/m4/regress.sh,v 1.4 2004/11/11 19:47:54 nik Exp $
 
 # Go into the regression test directory, handed to us by make(1)
 TESTDIR=$1
diff --git a/tools/regression/usr.bin/m4/regress.t b/tools/regression/usr.bin/m4/regress.t
index c36d8342d32a..9c96275a7d03 100644
--- a/tools/regression/usr.bin/m4/regress.t
+++ b/tools/regression/usr.bin/m4/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/m4/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/make/README b/tools/regression/usr.bin/make/README
index 6c577ad49882..d780df388c19 100644
--- a/tools/regression/usr.bin/make/README
+++ b/tools/regression/usr.bin/make/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/usr.bin/make/README,v 1.3 2005/06/01 11:25:38 harti Exp $
 
 This directory contains regression tests for make(1).
 
diff --git a/tools/regression/usr.bin/make/all.sh b/tools/regression/usr.bin/make/all.sh
index 42f9e73e6abc..3b5a2ca1eb49 100644
--- a/tools/regression/usr.bin/make/all.sh
+++ b/tools/regression/usr.bin/make/all.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/all.sh,v 1.1 2005/04/28 13:20:45 harti Exp $
 
 # find all test scripts below our current directory
 SCRIPTS=`find . -name test.t`
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile b/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
index 5a8b065d20c9..3c804387974e 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile,v 1.1 2005/05/31 14:12:59 harti Exp $
 # This test checks the code reading archive files. The archive file
 # is a BSD4.4 file with __.SYMTAB and #1/N long file names.
 
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t b/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
index eba6aed9e385..63d64dedd2c7 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t,v 1.1 2005/05/31 14:12:59 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
index cd999daaad4e..525d5ead3c34 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile,v 1.1 2005/05/31 14:12:59 harti Exp $
 # This test checks the code reading archive files. The archive file
 # is a BSD4.4 file with __.SYMTAB and #1/N long file names.
 #
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
index aa65a3e9587b..65566898cf4b 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t,v 1.1 2005/05/31 14:12:59 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile b/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
index b8f5116195ed..e848c5138eb9 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
+++ b/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile,v 1.1 2005/05/31 14:13:00 harti Exp $
 # This test checks the code reading archive files. The archive file
 # is an old BSD file with __.SYMTAB and no long file names. Filenames
 # are truncated to 16 characters.
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t b/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
index 03f7800a78d9..41d6b9fd9c2a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
+++ b/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t,v 1.1 2005/05/31 14:13:00 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t0/test.t b/tools/regression/usr.bin/make/basic/t0/test.t
index d71a39a8a1a3..62baf6a67989 100644
--- a/tools/regression/usr.bin/make/basic/t0/test.t
+++ b/tools/regression/usr.bin/make/basic/t0/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t0/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t1/Makefile b/tools/regression/usr.bin/make/basic/t1/Makefile
index d120087831ce..0aaaafd5fb8d 100644
--- a/tools/regression/usr.bin/make/basic/t1/Makefile
+++ b/tools/regression/usr.bin/make/basic/t1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t1/Makefile,v 1.1 2005/05/31 14:13:02 harti Exp $
 #
 # Just a target and nothing else. No target on command line.
 #
diff --git a/tools/regression/usr.bin/make/basic/t1/test.t b/tools/regression/usr.bin/make/basic/t1/test.t
index 4131f5da859b..d3669cf73984 100644
--- a/tools/regression/usr.bin/make/basic/t1/test.t
+++ b/tools/regression/usr.bin/make/basic/t1/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t1/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t2/Makefile b/tools/regression/usr.bin/make/basic/t2/Makefile
index ab8fe4956e45..942118b8f377 100644
--- a/tools/regression/usr.bin/make/basic/t2/Makefile
+++ b/tools/regression/usr.bin/make/basic/t2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t2/Makefile,v 1.1 2005/05/31 14:13:02 harti Exp $
 #
 # Just a target and a command. No command line targets.
 #
diff --git a/tools/regression/usr.bin/make/basic/t2/test.t b/tools/regression/usr.bin/make/basic/t2/test.t
index f5866bb9c3ce..8e6ad41c180c 100644
--- a/tools/regression/usr.bin/make/basic/t2/test.t
+++ b/tools/regression/usr.bin/make/basic/t2/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t2/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t3/test.t b/tools/regression/usr.bin/make/basic/t3/test.t
index 782d27c59fc6..07e029d907e2 100644
--- a/tools/regression/usr.bin/make/basic/t3/test.t
+++ b/tools/regression/usr.bin/make/basic/t3/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t3/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/common.sh b/tools/regression/usr.bin/make/common.sh
index 34aacf8f22e7..9bebae926183 100644
--- a/tools/regression/usr.bin/make/common.sh
+++ b/tools/regression/usr.bin/make/common.sh
@@ -2,7 +2,7 @@
 #
 # Common code used run regression tests for usr.bin/make.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/common.sh,v 1.3 2005/06/01 11:25:38 harti Exp $
 
 #
 # Output a message and exit with an error.
diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/tools/regression/usr.bin/make/shell/builtin/Makefile
index 03764784e1a0..9aa45007a89e 100644
--- a/tools/regression/usr.bin/make/shell/builtin/Makefile
+++ b/tools/regression/usr.bin/make/shell/builtin/Makefile
@@ -5,7 +5,7 @@
 # will really execute ls, while the line with meta characters will execute
 # our special shell.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/builtin/Makefile,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 .SHELL: path="${.CURDIR}/sh"
 
diff --git a/tools/regression/usr.bin/make/shell/builtin/sh b/tools/regression/usr.bin/make/shell/builtin/sh
index 3a507b87f674..395e45771c90 100644
--- a/tools/regression/usr.bin/make/shell/builtin/sh
+++ b/tools/regression/usr.bin/make/shell/builtin/sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/builtin/sh,v 1.1 2005/05/31 14:13:03 harti Exp $
 echo "$@"
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/tools/regression/usr.bin/make/shell/builtin/test.t
index 1798afcc3207..3ac27f99beb5 100644
--- a/tools/regression/usr.bin/make/shell/builtin/test.t
+++ b/tools/regression/usr.bin/make/shell/builtin/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/builtin/test.t,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/meta/Makefile b/tools/regression/usr.bin/make/shell/meta/Makefile
index bcf19d052bbc..f0ef51552f93 100644
--- a/tools/regression/usr.bin/make/shell/meta/Makefile
+++ b/tools/regression/usr.bin/make/shell/meta/Makefile
@@ -5,7 +5,7 @@
 # will really execute ls, while the line with meta characters will execute
 # our special shell.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/meta/Makefile,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 .SHELL: path="${.OBJDIR}/sh"
 
diff --git a/tools/regression/usr.bin/make/shell/meta/sh b/tools/regression/usr.bin/make/shell/meta/sh
index 3a507b87f674..a0fc349f33af 100644
--- a/tools/regression/usr.bin/make/shell/meta/sh
+++ b/tools/regression/usr.bin/make/shell/meta/sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/meta/sh,v 1.1 2005/05/31 14:13:03 harti Exp $
 echo "$@"
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/tools/regression/usr.bin/make/shell/meta/test.t
index 588b73ccc9f6..7af535ab9fcd 100644
--- a/tools/regression/usr.bin/make/shell/meta/test.t
+++ b/tools/regression/usr.bin/make/shell/meta/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/meta/test.t,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/path/Makefile b/tools/regression/usr.bin/make/shell/path/Makefile
index fe40b645510e..16cb25a8b113 100644
--- a/tools/regression/usr.bin/make/shell/path/Makefile
+++ b/tools/regression/usr.bin/make/shell/path/Makefile
@@ -7,7 +7,7 @@
 # Be sure to include a meta-character into the command line, so that
 # really our shell is executed.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path/Makefile,v 1.2 2005/05/31 14:13:03 harti Exp $
 #
 
 .ifmake sh_test
diff --git a/tools/regression/usr.bin/make/shell/path/sh b/tools/regression/usr.bin/make/shell/path/sh
index 46169eb6efc2..401a16f7e0b2 100644
--- a/tools/regression/usr.bin/make/shell/path/sh
+++ b/tools/regression/usr.bin/make/shell/path/sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path/sh,v 1.1 2005/05/31 14:13:03 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/tools/regression/usr.bin/make/shell/path/test.t
index 72ff252af70e..68d6357d2d3a 100644
--- a/tools/regression/usr.bin/make/shell/path/test.t
+++ b/tools/regression/usr.bin/make/shell/path/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path/test.t,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/path_select/Makefile b/tools/regression/usr.bin/make/shell/path_select/Makefile
index 05cfb27f3fd9..c89a4b20ef27 100644
--- a/tools/regression/usr.bin/make/shell/path_select/Makefile
+++ b/tools/regression/usr.bin/make/shell/path_select/Makefile
@@ -7,7 +7,7 @@
 # Be sure to include a meta-character into the command line, so that
 # really our shell is executed.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path_select/Makefile,v 1.2 2005/05/31 14:13:04 harti Exp $
 #
 
 .ifmake sh_test
diff --git a/tools/regression/usr.bin/make/shell/path_select/shell b/tools/regression/usr.bin/make/shell/path_select/shell
index 46169eb6efc2..8e5f2781113a 100644
--- a/tools/regression/usr.bin/make/shell/path_select/shell
+++ b/tools/regression/usr.bin/make/shell/path_select/shell
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path_select/shell,v 1.1 2005/05/31 14:13:04 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/tools/regression/usr.bin/make/shell/path_select/test.t
index 5bac6316722e..9348b1dc69e5 100644
--- a/tools/regression/usr.bin/make/shell/path_select/test.t
+++ b/tools/regression/usr.bin/make/shell/path_select/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path_select/test.t,v 1.2 2005/05/31 14:13:04 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/tools/regression/usr.bin/make/shell/replace/Makefile
index 2160dbfb5776..885feec673a0 100644
--- a/tools/regression/usr.bin/make/shell/replace/Makefile
+++ b/tools/regression/usr.bin/make/shell/replace/Makefile
@@ -8,7 +8,7 @@
 # XXX There seems to be a problem here in -j1 mode: for the line without
 # @- make should switch on echoing again, but it doesn't.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/replace/Makefile,v 1.2 2005/05/31 14:13:04 harti Exp $
 
 .SHELL: name="shell" path="${.CURDIR}/shell"			\
 	quiet="be quiet" echo="be verbose" filter="be verbose"	\
diff --git a/tools/regression/usr.bin/make/shell/replace/shell b/tools/regression/usr.bin/make/shell/replace/shell
index 46169eb6efc2..3310b93e865e 100644
--- a/tools/regression/usr.bin/make/shell/replace/shell
+++ b/tools/regression/usr.bin/make/shell/replace/shell
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/replace/shell,v 1.1 2005/05/31 14:13:04 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/tools/regression/usr.bin/make/shell/replace/test.t
index 5c91cf9e03e8..ef94c9abb9c6 100644
--- a/tools/regression/usr.bin/make/shell/replace/test.t
+++ b/tools/regression/usr.bin/make/shell/replace/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/replace/test.t,v 1.2 2005/05/31 14:13:04 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/select/Makefile b/tools/regression/usr.bin/make/shell/select/Makefile
index e1ff0231c737..ffe1baedcd8a 100644
--- a/tools/regression/usr.bin/make/shell/select/Makefile
+++ b/tools/regression/usr.bin/make/shell/select/Makefile
@@ -4,7 +4,7 @@
 # normally don't have a ksh, we make this test conditional. This means
 # one has to recreate the test results once ksh is installed.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/select/Makefile,v 1.2 2005/05/31 14:13:05 harti Exp $
 #
 
 .ifmake sh_test
diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/tools/regression/usr.bin/make/shell/select/test.t
index 7f73f9b24e25..d5313763e853 100644
--- a/tools/regression/usr.bin/make/shell/select/test.t
+++ b/tools/regression/usr.bin/make/shell/select/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/select/test.t,v 1.2 2005/05/31 14:13:05 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/suffixes/basic/Makefile b/tools/regression/usr.bin/make/suffixes/basic/Makefile
index 45d9130eed97..20c34aecd7f0 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/Makefile
+++ b/tools/regression/usr.bin/make/suffixes/basic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/basic/Makefile,v 1.1 2005/05/31 14:13:05 harti Exp $
 #
 # Check that a simple suffix rule is correctly processed.
 
diff --git a/tools/regression/usr.bin/make/suffixes/basic/test.t b/tools/regression/usr.bin/make/suffixes/basic/test.t
index 0b387c8ce9e1..260bfd8a2e5c 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/test.t
+++ b/tools/regression/usr.bin/make/suffixes/basic/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/basic/test.t,v 1.1 2005/05/31 14:13:05 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile b/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
index d0258ad126c6..deb35cb83164 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
+++ b/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile,v 1.1 2005/05/31 14:13:05 harti Exp $
 
 test1:	TEST1.b
 	cat TEST1.a TEST2.a | diff -u - TEST1.b
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t b/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
index 6b3111836453..192ff47b960d 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
+++ b/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild1/test.t,v 1.1 2005/05/31 14:13:05 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile b/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
index 1dea7ea967ec..9a77b87474cd 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
+++ b/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile,v 1.1 2005/05/31 14:13:06 harti Exp $
 #
 # Source expansion with the source in a macro
 #
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t b/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
index 0d40e3d1a07a..848ab68bf196 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
+++ b/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild2/test.t,v 1.1 2005/05/31 14:13:06 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/syntax/enl/Makefile b/tools/regression/usr.bin/make/syntax/enl/Makefile
index 7b37e78e8226..8f6281f56719 100644
--- a/tools/regression/usr.bin/make/syntax/enl/Makefile
+++ b/tools/regression/usr.bin/make/syntax/enl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/syntax/enl/Makefile,v 1.1 2005/06/01 11:26:47 harti Exp $
 #
 # Test handling of escaped newlines.
 #
diff --git a/tools/regression/usr.bin/make/syntax/enl/test.t b/tools/regression/usr.bin/make/syntax/enl/test.t
index de8bcfebccef..c7f71c89c203 100644
--- a/tools/regression/usr.bin/make/syntax/enl/test.t
+++ b/tools/regression/usr.bin/make/syntax/enl/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/syntax/enl/test.t,v 1.1 2005/06/01 11:26:47 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/Makefile b/tools/regression/usr.bin/make/variables/modifier_M/Makefile
index f8f6d3f870ce..fa3fb86f1b1c 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/Makefile
+++ b/tools/regression/usr.bin/make/variables/modifier_M/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/modifier_M/Makefile,v 1.1 2005/05/31 14:13:07 harti Exp $
 #
 # Test the M modifier.
 #
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/test.t b/tools/regression/usr.bin/make/variables/modifier_M/test.t
index 979778f12e90..d61c6f9b0c1a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/test.t
+++ b/tools/regression/usr.bin/make/variables/modifier_M/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/modifier_M/test.t,v 1.1 2005/05/31 14:13:07 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/variables/t0/Makefile b/tools/regression/usr.bin/make/variables/t0/Makefile
index 1cc58eefa493..59df7f69d5ad 100644
--- a/tools/regression/usr.bin/make/variables/t0/Makefile
+++ b/tools/regression/usr.bin/make/variables/t0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/t0/Makefile,v 1.1 2005/05/31 14:13:07 harti Exp $
 #
 # A unsorted set of macro expansions. This should be sorted out.
 #
diff --git a/tools/regression/usr.bin/make/variables/t0/test.t b/tools/regression/usr.bin/make/variables/t0/test.t
index 7e4f42729d26..588c787ec958 100644
--- a/tools/regression/usr.bin/make/variables/t0/test.t
+++ b/tools/regression/usr.bin/make/variables/t0/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/t0/test.t,v 1.2 2005/05/31 14:13:07 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/pkill/pgrep-F.t b/tools/regression/usr.bin/pkill/pgrep-F.t
index a4c1c6cd9056..65f8f5ec266d 100644
--- a/tools/regression/usr.bin/pkill/pgrep-F.t
+++ b/tools/regression/usr.bin/pkill/pgrep-F.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-F.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-G.t b/tools/regression/usr.bin/pkill/pgrep-G.t
index b07b6089b69e..7cd744c3cdde 100644
--- a/tools/regression/usr.bin/pkill/pgrep-G.t
+++ b/tools/regression/usr.bin/pkill/pgrep-G.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-G.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-P.t b/tools/regression/usr.bin/pkill/pgrep-P.t
index d139edbb078e..8e108406a774 100644
--- a/tools/regression/usr.bin/pkill/pgrep-P.t
+++ b/tools/regression/usr.bin/pkill/pgrep-P.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-P.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-S.t b/tools/regression/usr.bin/pkill/pgrep-S.t
index 5ce98e6fa8bc..9254c8ccb2e1 100644
--- a/tools/regression/usr.bin/pkill/pgrep-S.t
+++ b/tools/regression/usr.bin/pkill/pgrep-S.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-S.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-U.t b/tools/regression/usr.bin/pkill/pgrep-U.t
index 7cc865ab5f38..9f54aa76e2a6 100644
--- a/tools/regression/usr.bin/pkill/pgrep-U.t
+++ b/tools/regression/usr.bin/pkill/pgrep-U.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-U.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-g.t b/tools/regression/usr.bin/pkill/pgrep-g.t
index 19bd7748b3e3..d65d71301b04 100644
--- a/tools/regression/usr.bin/pkill/pgrep-g.t
+++ b/tools/regression/usr.bin/pkill/pgrep-g.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-g.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-i.t b/tools/regression/usr.bin/pkill/pgrep-i.t
index cbf36ff4dac7..375574737c92 100644
--- a/tools/regression/usr.bin/pkill/pgrep-i.t
+++ b/tools/regression/usr.bin/pkill/pgrep-i.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-i.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-j.t b/tools/regression/usr.bin/pkill/pgrep-j.t
index 37c1e73f7e18..9e0562ec7c86 100644
--- a/tools/regression/usr.bin/pkill/pgrep-j.t
+++ b/tools/regression/usr.bin/pkill/pgrep-j.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-j.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-l.t b/tools/regression/usr.bin/pkill/pgrep-l.t
index 3be3402e65cd..8358d5d6dc97 100644
--- a/tools/regression/usr.bin/pkill/pgrep-l.t
+++ b/tools/regression/usr.bin/pkill/pgrep-l.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-l.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-n.t b/tools/regression/usr.bin/pkill/pgrep-n.t
index cde95fb5c057..731b735bf424 100644
--- a/tools/regression/usr.bin/pkill/pgrep-n.t
+++ b/tools/regression/usr.bin/pkill/pgrep-n.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-n.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-o.t b/tools/regression/usr.bin/pkill/pgrep-o.t
index 2b1cf5167239..f0234f665d1c 100644
--- a/tools/regression/usr.bin/pkill/pgrep-o.t
+++ b/tools/regression/usr.bin/pkill/pgrep-o.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-o.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-s.t b/tools/regression/usr.bin/pkill/pgrep-s.t
index b9d39698ed51..abb4283e553d 100644
--- a/tools/regression/usr.bin/pkill/pgrep-s.t
+++ b/tools/regression/usr.bin/pkill/pgrep-s.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-s.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-t.t b/tools/regression/usr.bin/pkill/pgrep-t.t
index 7fb580d2213f..4570aeb77be0 100644
--- a/tools/regression/usr.bin/pkill/pgrep-t.t
+++ b/tools/regression/usr.bin/pkill/pgrep-t.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-t.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-v.t b/tools/regression/usr.bin/pkill/pgrep-v.t
index 11a2be27c4ba..4934a0a6327c 100644
--- a/tools/regression/usr.bin/pkill/pgrep-v.t
+++ b/tools/regression/usr.bin/pkill/pgrep-v.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-v.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-x.t b/tools/regression/usr.bin/pkill/pgrep-x.t
index 890666496280..353f86f87a69 100644
--- a/tools/regression/usr.bin/pkill/pgrep-x.t
+++ b/tools/regression/usr.bin/pkill/pgrep-x.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-x.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-F.t b/tools/regression/usr.bin/pkill/pkill-F.t
index 732d80757bbb..0f4846dd844d 100644
--- a/tools/regression/usr.bin/pkill/pkill-F.t
+++ b/tools/regression/usr.bin/pkill/pkill-F.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-F.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-G.t b/tools/regression/usr.bin/pkill/pkill-G.t
index 0717cea792c3..a1a628fb98a3 100644
--- a/tools/regression/usr.bin/pkill/pkill-G.t
+++ b/tools/regression/usr.bin/pkill/pkill-G.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-G.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-P.t b/tools/regression/usr.bin/pkill/pkill-P.t
index 4b8ddb559e5b..8611d60b3b53 100644
--- a/tools/regression/usr.bin/pkill/pkill-P.t
+++ b/tools/regression/usr.bin/pkill/pkill-P.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-P.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-U.t b/tools/regression/usr.bin/pkill/pkill-U.t
index 16313f82836a..db2918a9d535 100644
--- a/tools/regression/usr.bin/pkill/pkill-U.t
+++ b/tools/regression/usr.bin/pkill/pkill-U.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-U.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-g.t b/tools/regression/usr.bin/pkill/pkill-g.t
index d00adacb27fb..7080afdb329c 100644
--- a/tools/regression/usr.bin/pkill/pkill-g.t
+++ b/tools/regression/usr.bin/pkill/pkill-g.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-g.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-i.t b/tools/regression/usr.bin/pkill/pkill-i.t
index 6574cbd5d25d..006a10fc288e 100644
--- a/tools/regression/usr.bin/pkill/pkill-i.t
+++ b/tools/regression/usr.bin/pkill/pkill-i.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-i.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-j.t b/tools/regression/usr.bin/pkill/pkill-j.t
index 00393f1ab86c..a71f970314f7 100644
--- a/tools/regression/usr.bin/pkill/pkill-j.t
+++ b/tools/regression/usr.bin/pkill/pkill-j.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-j.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-s.t b/tools/regression/usr.bin/pkill/pkill-s.t
index 5fc4dc6f2f94..175d42eafe96 100644
--- a/tools/regression/usr.bin/pkill/pkill-s.t
+++ b/tools/regression/usr.bin/pkill/pkill-s.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-s.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-t.t b/tools/regression/usr.bin/pkill/pkill-t.t
index 73458f56eeb1..e1592cae9f01 100644
--- a/tools/regression/usr.bin/pkill/pkill-t.t
+++ b/tools/regression/usr.bin/pkill/pkill-t.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-t.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-x.t b/tools/regression/usr.bin/pkill/pkill-x.t
index 61d5d5b5425f..649d127081c5 100644
--- a/tools/regression/usr.bin/pkill/pkill-x.t
+++ b/tools/regression/usr.bin/pkill/pkill-x.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-x.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/printf/Makefile b/tools/regression/usr.bin/printf/Makefile
index b937d41a4e4a..e2def907e10e 100644
--- a/tools/regression/usr.bin/printf/Makefile
+++ b/tools/regression/usr.bin/printf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/printf/Makefile,v 1.1 2005/04/13 20:08:17 stefanf Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/printf/regress.sh b/tools/regression/usr.bin/printf/regress.sh
index 86c600f574d1..e0cf87b5cea7 100644
--- a/tools/regression/usr.bin/printf/regress.sh
+++ b/tools/regression/usr.bin/printf/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/printf/regress.sh,v 1.2 2005/04/14 18:33:14 stefanf Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/printf/regress.t b/tools/regression/usr.bin/printf/regress.t
index a82aacd9886f..a0b9a2980179 100644
--- a/tools/regression/usr.bin/printf/regress.t
+++ b/tools/regression/usr.bin/printf/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/printf/regress.t,v 1.1 2005/04/13 20:08:17 stefanf Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/regress.m4 b/tools/regression/usr.bin/regress.m4
index 35e2ab958f00..f71a76a77999 100644
--- a/tools/regression/usr.bin/regress.m4
+++ b/tools/regression/usr.bin/regress.m4
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/regress.m4,v 1.5 2004/11/11 19:47:54 nik Exp $
 
 dnl A library of routines for doing regression tests for userland utilities.
 
diff --git a/tools/regression/usr.bin/sed/Makefile b/tools/regression/usr.bin/sed/Makefile
index b937d41a4e4a..e91662548b70 100644
--- a/tools/regression/usr.bin/sed/Makefile
+++ b/tools/regression/usr.bin/sed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/Makefile,v 1.2 2002/06/24 13:52:25 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/sed/regress.sh b/tools/regression/usr.bin/sed/regress.sh
index cd68e240c492..1302c21bc64f 100644
--- a/tools/regression/usr.bin/sed/regress.sh
+++ b/tools/regression/usr.bin/sed/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/regress.sh,v 1.9 2004/11/11 19:47:55 nik Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/sed/regress.t b/tools/regression/usr.bin/sed/regress.t
index a82aacd9886f..c05b25510c28 100644
--- a/tools/regression/usr.bin/sed/regress.t
+++ b/tools/regression/usr.bin/sed/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/uudecode/Makefile b/tools/regression/usr.bin/uudecode/Makefile
index b937d41a4e4a..104026df85f6 100644
--- a/tools/regression/usr.bin/uudecode/Makefile
+++ b/tools/regression/usr.bin/uudecode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uudecode/Makefile,v 1.2 2002/06/24 14:22:44 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/uudecode/regress.sh b/tools/regression/usr.bin/uudecode/regress.sh
index f131280c4171..6b190a0b205c 100644
--- a/tools/regression/usr.bin/uudecode/regress.sh
+++ b/tools/regression/usr.bin/uudecode/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uudecode/regress.sh,v 1.5 2004/11/11 19:47:55 nik Exp $
 
 echo 1..2
 
diff --git a/tools/regression/usr.bin/uudecode/regress.t b/tools/regression/usr.bin/uudecode/regress.t
index a82aacd9886f..d4c2889d8aab 100644
--- a/tools/regression/usr.bin/uudecode/regress.t
+++ b/tools/regression/usr.bin/uudecode/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uudecode/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/uuencode/Makefile b/tools/regression/usr.bin/uuencode/Makefile
index b937d41a4e4a..a9ecaf6341f9 100644
--- a/tools/regression/usr.bin/uuencode/Makefile
+++ b/tools/regression/usr.bin/uuencode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uuencode/Makefile,v 1.2 2002/06/24 13:52:28 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/uuencode/regress.sh b/tools/regression/usr.bin/uuencode/regress.sh
index e14b2c3049fa..41c01851705a 100644
--- a/tools/regression/usr.bin/uuencode/regress.sh
+++ b/tools/regression/usr.bin/uuencode/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uuencode/regress.sh,v 1.7 2004/11/11 19:47:55 nik Exp $
 
 echo 1..2
 
diff --git a/tools/regression/usr.bin/uuencode/regress.t b/tools/regression/usr.bin/uuencode/regress.t
index a82aacd9886f..b2d893e6de2e 100644
--- a/tools/regression/usr.bin/uuencode/regress.t
+++ b/tools/regression/usr.bin/uuencode/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uuencode/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/xargs/Makefile b/tools/regression/usr.bin/xargs/Makefile
index b937d41a4e4a..59818b1b2181 100644
--- a/tools/regression/usr.bin/xargs/Makefile
+++ b/tools/regression/usr.bin/xargs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/xargs/Makefile,v 1.2 2002/06/24 13:52:28 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/xargs/regress.sh b/tools/regression/usr.bin/xargs/regress.sh
index 7c8db1d2e7d1..220357e89482 100644
--- a/tools/regression/usr.bin/xargs/regress.sh
+++ b/tools/regression/usr.bin/xargs/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/xargs/regress.sh,v 1.6 2004/11/11 19:47:55 nik Exp $
 
 echo 1..5
 
diff --git a/tools/regression/usr.bin/xargs/regress.t b/tools/regression/usr.bin/xargs/regress.t
index a82aacd9886f..664c8ce49fbc 100644
--- a/tools/regression/usr.bin/xargs/regress.t
+++ b/tools/regression/usr.bin/xargs/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/xargs/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/sched/schedgraph.py b/tools/sched/schedgraph.py
index 8f9acf9d1abf..bb02a9f84fe4 100644
--- a/tools/sched/schedgraph.py
+++ b/tools/sched/schedgraph.py
@@ -24,7 +24,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/tools/sched/schedgraph.py,v 1.6 2005/03/14 11:52:24 jeff Exp $
 
 import sys
 import re
diff --git a/tools/test/README b/tools/test/README
index aacc78143657..b469ee636bdc 100644
--- a/tools/test/README
+++ b/tools/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/test/README,v 1.4 2001/10/08 12:28:31 asmodai Exp $
 
 This directory is for test programs.
 
diff --git a/tools/test/devrandom/hammer.random b/tools/test/devrandom/hammer.random
index ea4cb5f64032..0aee741e2c8c 100644
--- a/tools/test/devrandom/hammer.random
+++ b/tools/test/devrandom/hammer.random
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # Try tapping shift/alt/ctrl to get more randomness.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/hammer.random,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 for (;;) {
diff --git a/tools/test/devrandom/hammer.urandom b/tools/test/devrandom/hammer.urandom
index d0b6aa89da58..e6a49b7841b5 100644
--- a/tools/test/devrandom/hammer.urandom
+++ b/tools/test/devrandom/hammer.urandom
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # This also reads /dev/zero to make sure there is no brokenness there.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/hammer.urandom,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 open(ZERO, "/dev/zero") || die "Cannot open /dev/zero - $!\n";
diff --git a/tools/test/devrandom/stat.16bit b/tools/test/devrandom/stat.16bit
index 32a6a9caf550..5b1fb5d1079f 100644
--- a/tools/test/devrandom/stat.16bit
+++ b/tools/test/devrandom/stat.16bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and go to the movies while
 # it runs. This program is a CPU Hog!
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/stat.16bit,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 for ($i = 0; $i < (1024*64); $i++) {
diff --git a/tools/test/devrandom/stat.8bit b/tools/test/devrandom/stat.8bit
index 03fdbdd5b39d..de28beb7c117 100644
--- a/tools/test/devrandom/stat.8bit
+++ b/tools/test/devrandom/stat.8bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and make a cup of coffee while
 # it runs. This program is a CPU Hog!
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/stat.8bit,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 for ($i = 0; $i < (1024*32); $i++) {
diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile
index 7d6067087b6b..d1233f2f1145 100644
--- a/tools/test/malloc/Makefile
+++ b/tools/test/malloc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/malloc/Makefile,v 1.5 2004/12/21 08:47:26 ru Exp $
 PROG=	malloc
 SRCS=	main.c
 .PATH:	${.CURDIR}/../../../lib/libc/stdlib
diff --git a/tools/test/malloc/main.c b/tools/test/malloc/main.c
index 2a0502928c06..dcb200ab9f06 100644
--- a/tools/test/malloc/main.c
+++ b/tools/test/malloc/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/test/malloc/main.c,v 1.2 2002/01/02 06:42:34 kbyanc Exp $ */
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tools/test/posixshm/README b/tools/test/posixshm/README
index 514e18b893a7..767449546f7c 100644
--- a/tools/test/posixshm/README
+++ b/tools/test/posixshm/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/test/posixshm/README,v 1.1 2000/04/22 15:29:21 wollman Exp $
 
 This is a simple program to test/demonstrate the POSIX Shared Memory
 Objects feature set.  `make shm_test' to build.
diff --git a/tools/test/posixshm/shm_test.c b/tools/test/posixshm/shm_test.c
index 6cee558bb362..8cdb516372be 100644
--- a/tools/test/posixshm/shm_test.c
+++ b/tools/test/posixshm/shm_test.c
@@ -1,7 +1,7 @@
 /*
  * Test the POSIX shared-memory API.
  * Dedicated to tyhe public domain by Garrett A. Wollman, 2000.
- * $FreeBSD$
+ * $FreeBSD: src/tools/test/posixshm/shm_test.c,v 1.1 2000/04/22 15:29:21 wollman Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile
index f0110edf1292..92b02fa02041 100644
--- a/tools/test/ppsapi/Makefile
+++ b/tools/test/ppsapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/ppsapi/Makefile,v 1.4 2004/12/21 08:47:26 ru Exp $
 
 PROG=	ppsapitest
 NO_MAN=
diff --git a/tools/test/ppsapi/README b/tools/test/ppsapi/README
index ad8dacf31b57..95787a375cad 100644
--- a/tools/test/ppsapi/README
+++ b/tools/test/ppsapi/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/ppsapi/README,v 1.2 2004/11/19 17:30:48 obrien Exp $
 
 This is a small test program which I have had around since we wrote
 the RFC 2783 API.
diff --git a/tools/test/ppsapi/ppsapitest.c b/tools/test/ppsapi/ppsapitest.c
index 78e73825e16c..8d255879b77d 100644
--- a/tools/test/ppsapi/ppsapitest.c
+++ b/tools/test/ppsapi/ppsapitest.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/test/ppsapi/ppsapitest.c,v 1.2 2004/03/10 20:30:19 phk Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/tools/tools/README b/tools/tools/README
index 6063179a1fa9..cbe6367c8324 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/README,v 1.40 2005/06/06 00:18:17 sobomax Exp $
 
 This directory is for tools.
 
diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile
index d245d47a6729..87c46976b7ba 100644
--- a/tools/tools/aac/Makefile
+++ b/tools/tools/aac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/aac/Makefile,v 1.4 2004/12/21 08:47:26 ru Exp $
 
 PROG=	aac_checkq
 NO_MAN=
diff --git a/tools/tools/aac/aac_checkq.c b/tools/tools/aac/aac_checkq.c
index 9fb79be0f54b..f8737d4ef97f 100644
--- a/tools/tools/aac/aac_checkq.c
+++ b/tools/tools/aac/aac_checkq.c
@@ -30,7 +30,7 @@
 #include <sys/ioctl.h>
 #include "/sys/dev/aac/aac_ioctl.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/aac/aac_checkq.c,v 1.1 2004/02/07 03:51:20 scottl Exp $");
 
 /*
  * Simple program to print out the queue stats on the given queue index.
diff --git a/tools/tools/ath/80211debug.c b/tools/tools/ath/80211debug.c
index 1c65eaa59edb..5ad104dd6555 100644
--- a/tools/tools/ath/80211debug.c
+++ b/tools/tools/ath/80211debug.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/80211debug.c,v 1.1.2.1 2005/08/07 02:23:32 sam Exp $
  */
 
 /*
diff --git a/tools/tools/ath/80211stats.c b/tools/tools/ath/80211stats.c
index 86ab8e13d0c0..f34359071c79 100644
--- a/tools/tools/ath/80211stats.c
+++ b/tools/tools/ath/80211stats.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/80211stats.c,v 1.5 2005/04/13 01:44:59 mdodd Exp $
  */
 
 /*
diff --git a/tools/tools/ath/80211watch.c b/tools/tools/ath/80211watch.c
index c169f996c6e4..5d2b1abef401 100644
--- a/tools/tools/ath/80211watch.c
+++ b/tools/tools/ath/80211watch.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/80211watch.c,v 1.3 2005/03/30 19:28:00 sam Exp $
  */
 
 /*
diff --git a/tools/tools/ath/Makefile b/tools/tools/ath/Makefile
index 899ef47f227b..9679af54b799 100644
--- a/tools/tools/ath/Makefile
+++ b/tools/tools/ath/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/ath/Makefile,v 1.5 2004/12/08 17:42:53 sam Exp $
 #
 # Copyright (c) 2002, 2003	Sam Leffler, Errno Consulting
 # All rights reserved.
diff --git a/tools/tools/ath/athdebug.c b/tools/tools/ath/athdebug.c
index 06591cda7459..05b9ea90b376 100644
--- a/tools/tools/ath/athdebug.c
+++ b/tools/tools/ath/athdebug.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athdebug.c,v 1.1 2004/12/08 17:42:53 sam Exp $
  */
 
 /*
diff --git a/tools/tools/ath/athstats.c b/tools/tools/ath/athstats.c
index 36289635d470..bec31079fa3a 100644
--- a/tools/tools/ath/athstats.c
+++ b/tools/tools/ath/athstats.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.6 2005/03/30 20:21:44 sam Exp $
  */
 
 /*
diff --git a/tools/tools/backout_commit/backout_commit.rb b/tools/tools/backout_commit/backout_commit.rb
index 264c271b60bf..9d9b3a579335 100644
--- a/tools/tools/backout_commit/backout_commit.rb
+++ b/tools/tools/backout_commit/backout_commit.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -w
 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/backout_commit/backout_commit.rb,v 1.1 2003/01/31 22:08:14 seanc Exp $
 
 # Please note, that this utility must be kept in sync with
 # CVSROOT/log_accum.pl.  If someone has a different output from their
diff --git a/tools/tools/commitsdb/make_commit_db b/tools/tools/commitsdb/make_commit_db
index d33d47806fcf..24020aa79486 100644
--- a/tools/tools/commitsdb/make_commit_db
+++ b/tools/tools/commitsdb/make_commit_db
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/commitsdb/make_commit_db,v 1.2 2002/10/17 16:29:26 joe Exp $
 
 # This script walks the tree from the current directory
 # and spits out a database generated by md5'ing the cvs log
diff --git a/tools/tools/commitsdb/query_commit_db b/tools/tools/commitsdb/query_commit_db
index e855efb06766..b33f0d0edf8c 100644
--- a/tools/tools/commitsdb/query_commit_db
+++ b/tools/tools/commitsdb/query_commit_db
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/commitsdb/query_commit_db,v 1.3 2002/04/01 17:51:27 joe Exp $
 
 # This script takes a filename and revision number as arguments
 # and spits out a list of other files and their revisions that share
diff --git a/tools/tools/crypto/Makefile b/tools/tools/crypto/Makefile
index 922b0dcb777e..aa4ef5785dab 100644
--- a/tools/tools/crypto/Makefile
+++ b/tools/tools/crypto/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/crypto/Makefile,v 1.8 2004/09/07 18:35:00 sam Exp $
 #
 # Copyright (c) 2002, 2003	Sam Leffler, Errno Consulting
 # All rights reserved.
diff --git a/tools/tools/crypto/README b/tools/tools/crypto/README
index 16b6bdb0d8ca..cf33e8613b63 100644
--- a/tools/tools/crypto/README
+++ b/tools/tools/crypto/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/crypto/README,v 1.1 2002/12/14 06:23:58 sam Exp $
 
 The cryptotest program repeatedly encrypts and decrypts a buffer
 with the built-in iv and key, using hardware crypto.  At the end,
diff --git a/tools/tools/crypto/cryptokeytest.c b/tools/tools/crypto/cryptokeytest.c
index a031faf3c014..83a3e531ece8 100644
--- a/tools/tools/crypto/cryptokeytest.c
+++ b/tools/tools/crypto/cryptokeytest.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/tools/crypto/cryptokeytest.c,v 1.1 2003/01/06 22:11:56 sam Exp $ */
 /*
  * The big num stuff is a bit broken at the moment and I've not yet fixed it.
  * The symtom is that odd size big nums will fail.  Test code below (it only
diff --git a/tools/tools/crypto/cryptostats.c b/tools/tools/crypto/cryptostats.c
index 83b8a67ac7c2..3eac0e6e0ae2 100644
--- a/tools/tools/crypto/cryptostats.c
+++ b/tools/tools/crypto/cryptostats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/cryptostats.c,v 1.2 2003/03/19 01:53:55 sam Exp $
  */
 
 /*
diff --git a/tools/tools/crypto/cryptotest.c b/tools/tools/crypto/cryptotest.c
index 2b9540bef159..409032e08fe2 100644
--- a/tools/tools/crypto/cryptotest.c
+++ b/tools/tools/crypto/cryptotest.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/cryptotest.c,v 1.7 2005/01/18 07:42:17 phk Exp $
  */
 
 /*
diff --git a/tools/tools/crypto/hifnstats.c b/tools/tools/crypto/hifnstats.c
index 1f40cd55ac0b..e85cb38d281e 100644
--- a/tools/tools/crypto/hifnstats.c
+++ b/tools/tools/crypto/hifnstats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/hifnstats.c,v 1.1 2003/03/19 01:53:55 sam Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/crypto/ipsecstats.c b/tools/tools/crypto/ipsecstats.c
index 48931f6a7891..42a9893ec794 100644
--- a/tools/tools/crypto/ipsecstats.c
+++ b/tools/tools/crypto/ipsecstats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/ipsecstats.c,v 1.1 2003/03/19 01:53:55 sam Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/crypto/safestats.c b/tools/tools/crypto/safestats.c
index ea7601a8e070..03e9f0551f57 100644
--- a/tools/tools/crypto/safestats.c
+++ b/tools/tools/crypto/safestats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/safestats.c,v 1.1 2003/07/21 21:58:04 sam Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/crypto/ubsecstats.c b/tools/tools/crypto/ubsecstats.c
index ebf7c526acba..10c71be73542 100644
--- a/tools/tools/crypto/ubsecstats.c
+++ b/tools/tools/crypto/ubsecstats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/ubsecstats.c,v 1.3 2003/03/24 17:36:50 sam Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/epfe/epfe.pl b/tools/tools/epfe/epfe.pl
index 0aea2c247a64..6f21f58fb5f1 100644
--- a/tools/tools/epfe/epfe.pl
+++ b/tools/tools/epfe/epfe.pl
@@ -7,7 +7,7 @@
 #	$ cd /usr/share/examples/printing
 #	$ epfe < ../../doc/handbook/printing.sgml
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/epfe/epfe.pl,v 1.4 1999/08/28 00:54:26 peter Exp $
 
 $in = 0; @a = ();
 sub Print { s/\&amp\;/&/g; push(@a,$_); }
diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile
index b70e2c695435..92503c9bc3b2 100644
--- a/tools/tools/find-sb/Makefile
+++ b/tools/tools/find-sb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/find-sb/Makefile,v 1.2 2004/12/21 08:47:27 ru Exp $
 PROG=	find-sb
 NO_MAN=
 
diff --git a/tools/tools/find-sb/README b/tools/tools/find-sb/README
index fae701c816c3..bdada71d55da 100644
--- a/tools/tools/find-sb/README
+++ b/tools/tools/find-sb/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/find-sb/README,v 1.1 2002/10/04 03:06:16 wollman Exp $
 
 find-sb is a program which scans the input file you specify (normally a
 raw disk slice) for filesystems.  It's not very smart, nor particularly
diff --git a/tools/tools/find-sb/find-sb.c b/tools/tools/find-sb/find-sb.c
index 72a5546c8258..a4499fe44072 100644
--- a/tools/tools/find-sb/find-sb.c
+++ b/tools/tools/find-sb/find-sb.c
@@ -2,7 +2,7 @@
  * This program, created 2002-10-03 by Garrett A. Wollman
  * <wollman@FreeBSD.org>, is in the public domain.  Use at your own risk.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/find-sb/find-sb.c,v 1.1 2002/10/04 03:06:16 wollman Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/tools/gdb_regofs/Makefile b/tools/tools/gdb_regofs/Makefile
index 5f5a7e36b0d9..10e4f9c12c51 100644
--- a/tools/tools/gdb_regofs/Makefile
+++ b/tools/tools/gdb_regofs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/gdb_regofs/Makefile,v 1.3 2004/12/21 08:47:27 ru Exp $
 PROG=gdb_regofs
 SRCS=${MACHINE_ARCH}.c
 NO_MAN=
diff --git a/tools/tools/gdb_regofs/ia64.c b/tools/tools/gdb_regofs/ia64.c
index 59e0055253b6..c42d9ebdb4f3 100644
--- a/tools/tools/gdb_regofs/ia64.c
+++ b/tools/tools/gdb_regofs/ia64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/gdb_regofs/ia64.c,v 1.1 2004/03/28 18:01:15 marcel Exp $");
 
 #include <stddef.h>
 #include <machine/reg.h>
diff --git a/tools/tools/genericize/Makefile b/tools/tools/genericize/Makefile
index 5df77b99f910..a42d867f8188 100644
--- a/tools/tools/genericize/Makefile
+++ b/tools/tools/genericize/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/genericize/Makefile,v 1.2 2004/11/07 11:09:44 des Exp $
 
 SCRIPTS=	genericize.pl
 BINDIR?=	/usr/local/bin
diff --git a/tools/tools/genericize/genericize.pl b/tools/tools/genericize/genericize.pl
index c9446bb82a76..5465e8288665 100755..100644
--- a/tools/tools/genericize/genericize.pl
+++ b/tools/tools/genericize/genericize.pl
@@ -26,7 +26,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/tools/tools/genericize/genericize.pl,v 1.5 2004/09/20 15:22:57 des Exp $
 #
 
 use strict;
diff --git a/tools/tools/hcomp/Makefile b/tools/tools/hcomp/Makefile
index 06029b7a90d0..3db193aee09c 100644
--- a/tools/tools/hcomp/Makefile
+++ b/tools/tools/hcomp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/hcomp/Makefile,v 1.1 2003/08/04 13:10:01 des Exp $
 
 BINDIR		?= ${HOME}/bin
 BINOWN		?= ${USER}
diff --git a/tools/tools/hcomp/hcomp.pl b/tools/tools/hcomp/hcomp.pl
index 9c48bba123c0..6164026b2980 100644
--- a/tools/tools/hcomp/hcomp.pl
+++ b/tools/tools/hcomp/hcomp.pl
@@ -26,7 +26,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/tools/tools/hcomp/hcomp.pl,v 1.1 2003/08/04 13:10:01 des Exp $
 #
 
 use strict;
diff --git a/tools/tools/html-mv/html-mv b/tools/tools/html-mv/html-mv
index 29ea1f2db81d..fd2ea5fc83d7 100644
--- a/tools/tools/html-mv/html-mv
+++ b/tools/tools/html-mv/html-mv
@@ -17,7 +17,7 @@
 # FAQ_Can_FreeBSD_handle_multiport_serial_cards_sharing_irqs_.html
 # [...]
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/html-mv/html-mv,v 1.2 1999/08/28 00:54:26 peter Exp $
 
 case $# in 0)
 	echo "usage `basename $0` file"
diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile
index 440c39c693f1..9b1267c6c453 100644
--- a/tools/tools/ifinfo/Makefile
+++ b/tools/tools/ifinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ifinfo/Makefile,v 1.5 2004/12/21 08:47:27 ru Exp $
 
 PROG=	ifinfo
 SRCS=	ifinfo.c rfc1650.c
diff --git a/tools/tools/ifinfo/ifinfo.c b/tools/tools/ifinfo/ifinfo.c
index 54ca16426430..ee9b60abb989 100644
--- a/tools/tools/ifinfo/ifinfo.c
+++ b/tools/tools/ifinfo/ifinfo.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ifinfo/ifinfo.c,v 1.7 2001/10/17 04:12:28 fenner Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>		/* for PF_LINK */
diff --git a/tools/tools/ifinfo/ifinfo.h b/tools/tools/ifinfo/ifinfo.h
index c05a8b82eca5..a00414d4083a 100644
--- a/tools/tools/ifinfo/ifinfo.h
+++ b/tools/tools/ifinfo/ifinfo.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ifinfo/ifinfo.h,v 1.4 1999/08/28 00:54:29 peter Exp $
  */
 #ifndef	ifinfo_h
 #define	ifinfo_h	1
diff --git a/tools/tools/kdrv/KernelDriver b/tools/tools/kdrv/KernelDriver
index 60f89d82bf39..d7c7adb34655 100755
--- a/tools/tools/kdrv/KernelDriver
+++ b/tools/tools/kdrv/KernelDriver
@@ -73,7 +73,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kdrv/KernelDriver,v 1.5 2001/02/18 10:43:27 asmodai Exp $
 #
 ################################################################################
 
diff --git a/tools/tools/kdrv/sample.drvinfo b/tools/tools/kdrv/sample.drvinfo
index 4941b07082c4..9dd50c1a6eea 100644
--- a/tools/tools/kdrv/sample.drvinfo
+++ b/tools/tools/kdrv/sample.drvinfo
@@ -2,7 +2,7 @@
 # Sample driver information file for KernelDriver.  See the top of
 # the KernelDriver script for a more exact definition of the syntax.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kdrv/sample.drvinfo,v 1.5 2002/08/11 13:05:28 schweikh Exp $
 
 # Device driver name
 #
diff --git a/tools/tools/kernelcruft/kernelcruft.sh b/tools/tools/kernelcruft/kernelcruft.sh
index 87288c54bd21..d9aafb04f27c 100644
--- a/tools/tools/kernelcruft/kernelcruft.sh
+++ b/tools/tools/kernelcruft/kernelcruft.sh
@@ -4,7 +4,7 @@
 #
 # Try to find *.c files in /sys which are orphaned
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kernelcruft/kernelcruft.sh,v 1.1 2001/11/05 22:06:09 phk Exp $
 
 cd /sys/conf
 cat files* | sed '
diff --git a/tools/tools/kerninclude/kerninclude.sh b/tools/tools/kerninclude/kerninclude.sh
index 1efe4c278fc2..80e0e7dfba70 100644
--- a/tools/tools/kerninclude/kerninclude.sh
+++ b/tools/tools/kerninclude/kerninclude.sh
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kerninclude/kerninclude.sh,v 1.7 2001/04/23 17:31:16 phk Exp $
 #
 # This script tries to find #include statements which are not needed in
 # the FreeBSD kernel tree.
diff --git a/tools/tools/kernxref/kernxref.sh b/tools/tools/kernxref/kernxref.sh
index ded6d415715d..8e76639193df 100644
--- a/tools/tools/kernxref/kernxref.sh
+++ b/tools/tools/kernxref/kernxref.sh
@@ -9,7 +9,7 @@
 #
 # Sort options by "Matthew Emmerton" <matt@gsicomp.on.ca>
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kernxref/kernxref.sh,v 1.20 2005/02/10 12:47:55 phk Exp $
 #
 # This shell script will make a cross reference of the symbols of a kernel.
 #
diff --git a/tools/tools/kttcp/Makefile b/tools/tools/kttcp/Makefile
index 2f2feb3709bb..b9cab907dea6 100644
--- a/tools/tools/kttcp/Makefile
+++ b/tools/tools/kttcp/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/kttcp/Makefile,v 1.2 2003/11/13 21:24:09 sam Exp $
 
 SHELL=	/bin/sh
 
diff --git a/tools/tools/kttcp/README b/tools/tools/kttcp/README
index f78c8d66b07a..1a9f4435d472 100644
--- a/tools/tools/kttcp/README
+++ b/tools/tools/kttcp/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/kttcp/README,v 1.1 2003/11/13 00:30:27 sam Exp $
 
 This is a port of Jason Thorpe's kttcp tool for testing network
 performance for in-kernel applications (like NFS).  The tool consists
diff --git a/tools/tools/kttcp/kttcp.c b/tools/tools/kttcp/kttcp.c
index 44c6613fa90b..223b98334c19 100644
--- a/tools/tools/kttcp/kttcp.c
+++ b/tools/tools/kttcp/kttcp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/tools/tools/kttcp/kttcp.c,v 1.3 2004/12/13 20:40:15 gallatin Exp $	*/
 /*	$NetBSD: kttcp.c,v 1.5 2002/07/11 23:32:35 simonb Exp $	*/
 
 /*
diff --git a/tools/tools/kttcp/sys/Makefile b/tools/tools/kttcp/sys/Makefile
index d7815306b4ab..5ae9d331d63e 100644
--- a/tools/tools/kttcp/sys/Makefile
+++ b/tools/tools/kttcp/sys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kttcp/sys/Makefile,v 1.1 2003/11/13 00:30:27 sam Exp $
 
 KMOD	= kttcp
 SRCS	= kttcp.c
diff --git a/tools/tools/kttcp/sys/kttcp.c b/tools/tools/kttcp/sys/kttcp.c
index 09739600feaf..3faa4425e7ec 100644
--- a/tools/tools/kttcp/sys/kttcp.c
+++ b/tools/tools/kttcp/sys/kttcp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/tools/tools/kttcp/sys/kttcp.c,v 1.4 2004/12/13 20:40:16 gallatin Exp $	*/
 /*	$NetBSD: kttcp.c,v 1.3 2002/07/03 19:36:52 thorpej Exp $	*/
 
 /*
diff --git a/tools/tools/kttcp/sys/kttcpio.h b/tools/tools/kttcp/sys/kttcpio.h
index 1375f6ef6c9d..25fc401d3a22 100644
--- a/tools/tools/kttcp/sys/kttcpio.h
+++ b/tools/tools/kttcp/sys/kttcpio.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/tools/tools/kttcp/sys/kttcpio.h,v 1.1 2003/11/13 00:30:27 sam Exp $	*/
 /*	$NetBSD$	*/
 
 /*
diff --git a/tools/tools/mfc/Makefile b/tools/tools/mfc/Makefile
index a46dbaaad48f..398b7c16dec7 100644
--- a/tools/tools/mfc/Makefile
+++ b/tools/tools/mfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfc/Makefile,v 1.1 2004/09/24 15:24:12 des Exp $
 
 BINDIR?=	${HOME}/bin
 BINOWN?=	`id -u`
diff --git a/tools/tools/mfc/mfc.awk b/tools/tools/mfc/mfc.awk
index f82c5c2ca2b2..1e9131a5c0bb 100644
--- a/tools/tools/mfc/mfc.awk
+++ b/tools/tools/mfc/mfc.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfc/mfc.awk,v 1.1 2004/09/24 20:06:49 jmg Exp $
 #
 
 BEGIN {
diff --git a/tools/tools/mfc/mfc.sh b/tools/tools/mfc/mfc.sh
index cf7d663e23da..88cc9dc85c0a 100644
--- a/tools/tools/mfc/mfc.sh
+++ b/tools/tools/mfc/mfc.sh
@@ -2,7 +2,7 @@
 #
 # Merge an entire directory from HEAD to a given branch
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfc/mfc.sh,v 1.1 2004/09/24 15:24:12 des Exp $
 #
 
 if [ $# -eq 1 -a -f CVS/Tag ] ; then
diff --git a/tools/tools/mid/mid-build b/tools/tools/mid/mid-build
index 0a2d4480a5a8..9df99f8b7f64 100755
--- a/tools/tools/mid/mid-build
+++ b/tools/tools/mid/mid-build
@@ -4,7 +4,7 @@
 #
 # create a Message-ID, In-Reply-To look(1) index database
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mid/mid-build,v 1.2 2002/12/30 21:18:11 schweikh Exp $
 
 
 TMPDIR=/var/tmp; export TMPDIR
diff --git a/tools/tools/mid/mid-index b/tools/tools/mid/mid-index
index a5ec10b78f3b..6afa74bbf4c8 100755
--- a/tools/tools/mid/mid-index
+++ b/tools/tools/mid/mid-index
@@ -2,7 +2,7 @@
 #
 # create message-id / in-reply-to database
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mid/mid-index,v 1.2 1999/08/28 00:54:31 peter Exp $
 
 sub usage { die "usage: mid-index name < filelist"; }
 
diff --git a/tools/tools/ministat/Makefile b/tools/tools/ministat/Makefile
index d1a10a3201ee..3c4a3ce5aa53 100644
--- a/tools/tools/ministat/Makefile
+++ b/tools/tools/ministat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ministat/Makefile,v 1.5.2.1 2005/08/16 22:48:12 phk Exp $
 PROG=	ministat
 NO_MAN=
 DPADD=	${LIBM}
diff --git a/tools/tools/ministat/README b/tools/tools/ministat/README
index cc5fe27df73e..29b174f5408e 100644
--- a/tools/tools/ministat/README
+++ b/tools/tools/ministat/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/ministat/README,v 1.1 2003/08/13 07:21:54 phk Exp $
 
 A small tool to do the statistics legwork on benchmarks etc.
 
diff --git a/tools/tools/ministat/chameleon b/tools/tools/ministat/chameleon
index c554c998c152..294464aa2fbd 100644
--- a/tools/tools/ministat/chameleon
+++ b/tools/tools/ministat/chameleon
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ministat/chameleon,v 1.1 2003/08/13 07:21:54 phk Exp $
 150
 400
 720	
diff --git a/tools/tools/ministat/iguana b/tools/tools/ministat/iguana
index d6996c125802..967f58323a70 100644
--- a/tools/tools/ministat/iguana
+++ b/tools/tools/ministat/iguana
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ministat/iguana,v 1.1 2003/08/13 07:21:54 phk Exp $
 50
 200
 150
diff --git a/tools/tools/ministat/ministat.c b/tools/tools/ministat/ministat.c
index cbada0152ac0..9442cabf832b 100644
--- a/tools/tools/ministat/ministat.c
+++ b/tools/tools/ministat/ministat.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/ministat/ministat.c,v 1.5.2.1 2005/08/16 22:48:12 phk Exp $");
 
 #include <stdio.h>
 #include <math.h>
diff --git a/tools/tools/mtxstat/mtxratio.sh b/tools/tools/mtxstat/mtxratio.sh
index 02a66a94a246..453d0bc1d026 100644
--- a/tools/tools/mtxstat/mtxratio.sh
+++ b/tools/tools/mtxstat/mtxratio.sh
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mtxstat/mtxratio.sh,v 1.1 2004/07/27 00:36:53 jmg Exp $
 sysctl debug.mutex.prof.stats | awk '$1 ~ /[0-9]+/ { if ($3 != 0) { hld_prc = $5 / $3 * 100; lck_prc = $6 / $3 * 100 } else { hld_prc = 0; lck_prc = 0 } print $1 " " $2 " " $3 " " $4 " " $5 " " hld_prc " " $6 " " lck_prc " " substr($0, index($0, $7)); next } { print }'
diff --git a/tools/tools/mtxstat/mtxstat.pl b/tools/tools/mtxstat/mtxstat.pl
index cfa7edd7bf0e..f33190b838ae 100644
--- a/tools/tools/mtxstat/mtxstat.pl
+++ b/tools/tools/mtxstat/mtxstat.pl
@@ -26,7 +26,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/tools/tools/mtxstat/mtxstat.pl,v 1.2 2003/09/19 21:52:29 sam Exp $
 #
 
 use strict;
diff --git a/tools/tools/nanobsd/Files/root/change_password b/tools/tools/nanobsd/Files/root/change_password
index daf4c8ca0e83..0e4bd91b5e54 100644
--- a/tools/tools/nanobsd/Files/root/change_password
+++ b/tools/tools/nanobsd/Files/root/change_password
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/change_password,v 1.1.4.2 2005/09/26 15:00:49 phk Exp $
 #
 
 set -e
diff --git a/tools/tools/nanobsd/Files/root/save_sshkeys b/tools/tools/nanobsd/Files/root/save_sshkeys
index 03fccf4ac0a2..faff37c9b564 100644
--- a/tools/tools/nanobsd/Files/root/save_sshkeys
+++ b/tools/tools/nanobsd/Files/root/save_sshkeys
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/save_sshkeys,v 1.1.4.2 2005/09/26 15:00:49 phk Exp $
 #
 
 set -e
diff --git a/tools/tools/nanobsd/Files/root/updatep1 b/tools/tools/nanobsd/Files/root/updatep1
index 6e094fa2fbbf..c51ebbd014f2 100644
--- a/tools/tools/nanobsd/Files/root/updatep1
+++ b/tools/tools/nanobsd/Files/root/updatep1
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/updatep1,v 1.1.4.1 2005/09/26 15:00:49 phk Exp $
 #
 # Script to update partition 1 on a NanoBSD system.
 #
diff --git a/tools/tools/nanobsd/Files/root/updatep2 b/tools/tools/nanobsd/Files/root/updatep2
index b9067eb7b7c0..b678982b3725 100644
--- a/tools/tools/nanobsd/Files/root/updatep2
+++ b/tools/tools/nanobsd/Files/root/updatep2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/updatep2,v 1.1.4.1 2005/09/26 15:00:49 phk Exp $
 #
 # Script to update partition 2 on a NanoBSD system.
 #
diff --git a/tools/tools/nanobsd/FlashDevice.sub b/tools/tools/nanobsd/FlashDevice.sub
index 3948a4ceb76a..57404d4e1f09 100644
--- a/tools/tools/nanobsd/FlashDevice.sub
+++ b/tools/tools/nanobsd/FlashDevice.sub
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/FlashDevice.sub,v 1.1.2.1 2005/10/04 13:56:35 phk Exp $
 #
 # Convenience function for commonly used Flash devices.
 #
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 5555fa176930..0476465297f5 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.7.2.3.2.1 2005/10/17 07:58:05 phk Exp $
 #
 
 set -e
diff --git a/tools/tools/netrate/Makefile b/tools/tools/netrate/Makefile
index 8fbd75e21976..ea3ecd30a5b1 100644
--- a/tools/tools/netrate/Makefile
+++ b/tools/tools/netrate/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/Makefile,v 1.3 2005/02/12 20:04:23 rwatson Exp $
 #
 
 SUBDIR=	netreceive netsend netblast
diff --git a/tools/tools/netrate/Makefile.inc b/tools/tools/netrate/Makefile.inc
index 3b1228c2879a..2332953c56ae 100644
--- a/tools/tools/netrate/Makefile.inc
+++ b/tools/tools/netrate/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/Makefile.inc,v 1.1 2004/12/21 12:14:33 keramida Exp $
 
 WARNS?= 5
 WFORMAT?= 2
diff --git a/tools/tools/netrate/README b/tools/tools/netrate/README
index ff249621c5d0..bd7ce6b1a384 100644
--- a/tools/tools/netrate/README
+++ b/tools/tools/netrate/README
@@ -54,4 +54,4 @@ license:
  * SUCH DAMAGE.
  */
 
-$FreeBSD$
+$FreeBSD: src/tools/tools/netrate/README,v 1.1 2004/09/10 19:09:50 rwatson Exp $
diff --git a/tools/tools/netrate/netblast/Makefile b/tools/tools/netrate/netblast/Makefile
index 7e51860e5c51..ec13be64aea2 100644
--- a/tools/tools/netrate/netblast/Makefile
+++ b/tools/tools/netrate/netblast/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/netblast/Makefile,v 1.3 2004/12/21 08:47:27 ru Exp $
 #
 
 PROG=	netblast
diff --git a/tools/tools/netrate/netblast/netblast.c b/tools/tools/netrate/netblast/netblast.c
index 7608da7660e8..a542932a01ed 100644
--- a/tools/tools/netrate/netblast/netblast.c
+++ b/tools/tools/netrate/netblast/netblast.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/netblast/netblast.c,v 1.2 2005/02/12 20:03:30 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/netreceive/Makefile b/tools/tools/netrate/netreceive/Makefile
index ef2b09bf8ff5..5eeaed658160 100644
--- a/tools/tools/netrate/netreceive/Makefile
+++ b/tools/tools/netrate/netreceive/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/netreceive/Makefile,v 1.3 2004/12/21 08:47:28 ru Exp $
 #
 
 PROG=	netreceive
diff --git a/tools/tools/netrate/netreceive/netreceive.c b/tools/tools/netrate/netreceive/netreceive.c
index 4a3a6f6c3ae8..6a5b9d75f7cc 100644
--- a/tools/tools/netrate/netreceive/netreceive.c
+++ b/tools/tools/netrate/netreceive/netreceive.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/netreceive/netreceive.c,v 1.2 2004/09/21 03:10:28 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/netsend/Makefile b/tools/tools/netrate/netsend/Makefile
index 2b11958898a1..125d81545f8a 100644
--- a/tools/tools/netrate/netsend/Makefile
+++ b/tools/tools/netrate/netsend/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/netsend/Makefile,v 1.4 2004/12/21 08:47:28 ru Exp $
 #
 
 CFLAGS+=	-Wall
diff --git a/tools/tools/netrate/netsend/netsend.c b/tools/tools/netrate/netsend/netsend.c
index a354fef8ce08..a04c06ad5157 100644
--- a/tools/tools/netrate/netsend/netsend.c
+++ b/tools/tools/netrate/netsend/netsend.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/netsend/netsend.c,v 1.8 2005/04/21 19:28:22 mux Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/pciid/mk_pci_vendors.pl b/tools/tools/pciid/mk_pci_vendors.pl
index aa1974caa74b..bdf1702b83d6 100644
--- a/tools/tools/pciid/mk_pci_vendors.pl
+++ b/tools/tools/pciid/mk_pci_vendors.pl
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/pciid/mk_pci_vendors.pl,v 1.5 2004/06/28 11:46:48 mux Exp $
 #
 # usage: mk_pci_vendors [-lq] [-p pcidevs.txt] [-v vendors.txt]
 #
diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile
index 18e6bb84ef4a..99971a322fd2 100644
--- a/tools/tools/pirtool/Makefile
+++ b/tools/tools/pirtool/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/pirtool/Makefile,v 1.5 2005/01/21 18:12:46 bms Exp $
 
 PROG=   pirtool
 SRCS=   pirtool.c
diff --git a/tools/tools/pirtool/pirtable.h b/tools/tools/pirtool/pirtable.h
index cce6902c3ceb..d0c99df4c042 100644
--- a/tools/tools/pirtool/pirtable.h
+++ b/tools/tools/pirtool/pirtable.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/pirtool/pirtable.h,v 1.2 2005/01/21 17:05:33 bms Exp $
  */
 
 /*
diff --git a/tools/tools/pirtool/pirtool.c b/tools/tools/pirtool/pirtool.c
index 5e13b50e82e9..ec88457cdc4a 100644
--- a/tools/tools/pirtool/pirtool.c
+++ b/tools/tools/pirtool/pirtool.c
@@ -31,7 +31,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/pirtool/pirtool.c,v 1.3 2005/01/21 17:11:38 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/tools/tools/portsinfo/portsinfo.sh b/tools/tools/portsinfo/portsinfo.sh
index f3dcf5039b92..08d36617f446 100644
--- a/tools/tools/portsinfo/portsinfo.sh
+++ b/tools/tools/portsinfo/portsinfo.sh
@@ -3,7 +3,7 @@
 #
 # portsinfo - Generate list of new ports for last two weeks.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/portsinfo/portsinfo.sh,v 1.5 1999/08/28 00:54:32 peter Exp $
 
 PATH=/bin:/usr/bin:/usr/local/bin:$PATH; export PATH
 
diff --git a/tools/tools/prstats/prstats.pl b/tools/tools/prstats/prstats.pl
index bb437a6bbc0b..edc42aced9aa 100644
--- a/tools/tools/prstats/prstats.pl
+++ b/tools/tools/prstats/prstats.pl
@@ -26,7 +26,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/tools/tools/prstats/prstats.pl,v 1.4 2002/04/15 06:36:22 des Exp $
 #
 
 use strict;
diff --git a/tools/tools/recoverdisk/Makefile b/tools/tools/recoverdisk/Makefile
index e86fbb2b96a9..f3045c9f4e3a 100644
--- a/tools/tools/recoverdisk/Makefile
+++ b/tools/tools/recoverdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/recoverdisk/Makefile,v 1.3 2004/12/21 08:47:28 ru Exp $
 
 PROG=	recoverdisk
 
diff --git a/tools/tools/recoverdisk/README b/tools/tools/recoverdisk/README
index 8766f415c3e5..e4b95b86db5e 100644
--- a/tools/tools/recoverdisk/README
+++ b/tools/tools/recoverdisk/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/recoverdisk/README,v 1.2 2005/02/07 11:26:53 obrien Exp $
 
 This is a small tool which will read an entire disk(partition) using
 1M blocks and optionally write the read data to a file or disk.
diff --git a/tools/tools/recoverdisk/recoverdisk.c b/tools/tools/recoverdisk/recoverdisk.c
index 89c2f49b3bf6..754ebe0b5674 100644
--- a/tools/tools/recoverdisk/recoverdisk.c
+++ b/tools/tools/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/tools/tools/recoverdisk/recoverdisk.c,v 1.4 2004/10/23 15:58:50 des Exp $
  */
 #include <stdio.h>
 #include <stdint.h>
diff --git a/tools/tools/release/chk_dokern.sh_and_drivers.conf b/tools/tools/release/chk_dokern.sh_and_drivers.conf
index a47c700e152b..47a8a4a36eaf 100644
--- a/tools/tools/release/chk_dokern.sh_and_drivers.conf
+++ b/tools/tools/release/chk_dokern.sh_and_drivers.conf
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/release/chk_dokern.sh_and_drivers.conf,v 1.2 2003/11/28 08:58:44 ru Exp $
 
 echo Checking */drivers.conf ...
 for f in */drivers.conf; do
diff --git a/tools/tools/scsi-defects/scsi-defects.pl b/tools/tools/scsi-defects/scsi-defects.pl
index 0827182d6e5f..88ba13d360c3 100755
--- a/tools/tools/scsi-defects/scsi-defects.pl
+++ b/tools/tools/scsi-defects/scsi-defects.pl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/scsi-defects/scsi-defects.pl,v 1.3 1999/08/28 00:54:32 peter Exp $
 #
 
 #
diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile
index 684477bd3d79..22f29f453b14 100644
--- a/tools/tools/syscall_timing/Makefile
+++ b/tools/tools/syscall_timing/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/syscall_timing/Makefile,v 1.3 2004/12/21 08:47:29 ru Exp $
 #
 
 PROG=	syscall_timing
diff --git a/tools/tools/syscall_timing/syscall_timing.c b/tools/tools/syscall_timing/syscall_timing.c
index 3e4ca8dceca9..415faaa8ee1f 100644
--- a/tools/tools/syscall_timing/syscall_timing.c
+++ b/tools/tools/syscall_timing/syscall_timing.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/syscall_timing/syscall_timing.c,v 1.2 2005/04/10 02:06:49 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/sysdoc/Makefile b/tools/tools/sysdoc/Makefile
index f3704dab9eb7..156ffb7c4225 100644
--- a/tools/tools/sysdoc/Makefile
+++ b/tools/tools/sysdoc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/Makefile,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 
 MAINTAINER=	trhodes@FreeBSD.org
 
diff --git a/tools/tools/sysdoc/sysctl.sh b/tools/tools/sysdoc/sysctl.sh
index 8dcaf62f3576..aa1abf07584e 100644
--- a/tools/tools/sysdoc/sysctl.sh
+++ b/tools/tools/sysdoc/sysctl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/sysctl.sh,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 #
 # For each sysctl, repeat:
 #	if it has a short description
diff --git a/tools/tools/sysdoc/sysdoc.sh b/tools/tools/sysdoc/sysdoc.sh
index c428174c8c36..66873c784187 100644
--- a/tools/tools/sysdoc/sysdoc.sh
+++ b/tools/tools/sysdoc/sysdoc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/sysdoc.sh,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 #
 #################################################################
 # Missing Features:
diff --git a/tools/tools/sysdoc/tunables.mdoc b/tools/tools/sysdoc/tunables.mdoc
index 429e9dc78884..f8cb3bc3a679 100644
--- a/tools/tools/sysdoc/tunables.mdoc
+++ b/tools/tools/sysdoc/tunables.mdoc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/tunables.mdoc,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 ---
 debug.disablecwd
 bool
diff --git a/tools/tools/tinderbox/Makefile b/tools/tools/tinderbox/Makefile
index a20a32c19169..8060e7e405ea 100644
--- a/tools/tools/tinderbox/Makefile
+++ b/tools/tools/tinderbox/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/Makefile,v 1.9 2003/08/01 07:24:30 des Exp $
 
 BINDIR		?= ${HOME}/bin
 BINOWN		?= ${USER}
diff --git a/tools/tools/tinderbox/etc/Makefile b/tools/tools/tinderbox/etc/Makefile
index 8942bccd4338..3634830e98fd 100644
--- a/tools/tools/tinderbox/etc/Makefile
+++ b/tools/tools/tinderbox/etc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/Makefile,v 1.9 2004/08/19 07:28:30 des Exp $
 
 ETCFILES	 =
 ETCFILES	+= default.rc
diff --git a/tools/tools/tinderbox/etc/current.rc b/tools/tools/tinderbox/etc/current.rc
index 70ec128e4490..faa8da92cdcb 100644
--- a/tools/tools/tinderbox/etc/current.rc
+++ b/tools/tools/tinderbox/etc/current.rc
@@ -1,7 +1,7 @@
 #
 # CURRENT tinderbox setup
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/current.rc,v 1.8 2004/03/16 00:24:54 des Exp $
 #
 
 branches	= CURRENT
diff --git a/tools/tools/tinderbox/etc/default.rc b/tools/tools/tinderbox/etc/default.rc
index 836cae5c1a88..a1e984038b15 100644
--- a/tools/tools/tinderbox/etc/default.rc
+++ b/tools/tools/tinderbox/etc/default.rc
@@ -1,7 +1,7 @@
 #
 # Tinderbox defaults
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/default.rc,v 1.9 2005/04/30 18:26:05 des Exp $
 #
 
 comment		= %%branch%% tinderbox
diff --git a/tools/tools/tinderbox/etc/releng_4.rc b/tools/tools/tinderbox/etc/releng_4.rc
index 0f0ef20a7042..7e8170e8aa80 100644
--- a/tools/tools/tinderbox/etc/releng_4.rc
+++ b/tools/tools/tinderbox/etc/releng_4.rc
@@ -1,7 +1,7 @@
 #
 # RELENG_4 tinderbox setup
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/releng_4.rc,v 1.10 2005/02/06 13:56:12 des Exp $
 #
 
 branches	= RELENG_4_8, RELENG_4_10, RELENG_4_11
diff --git a/tools/tools/tinderbox/etc/releng_5.rc b/tools/tools/tinderbox/etc/releng_5.rc
index 3f5a4d527b51..ed41eed80eeb 100644
--- a/tools/tools/tinderbox/etc/releng_5.rc
+++ b/tools/tools/tinderbox/etc/releng_5.rc
@@ -1,7 +1,7 @@
 #
 # RELENG_5 tinderbox setup
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/releng_5.rc,v 1.8 2004/11/11 18:37:39 des Exp $
 #
 
 branches	= RELENG_5
diff --git a/tools/tools/tinderbox/etc/stable.rc b/tools/tools/tinderbox/etc/stable.rc
index 17a009a33ca2..dfd529cf4708 100644
--- a/tools/tools/tinderbox/etc/stable.rc
+++ b/tools/tools/tinderbox/etc/stable.rc
@@ -1,7 +1,7 @@
 #
 # STABLE tinderbox setup
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/stable.rc,v 1.3 2004/02/14 09:52:22 des Exp $
 #
 
 branches	= RELENG_4
diff --git a/tools/tools/tinderbox/etc/update_current.rc b/tools/tools/tinderbox/etc/update_current.rc
index e8a1fa0ecfc5..87e82a1c2307 100644
--- a/tools/tools/tinderbox/etc/update_current.rc
+++ b/tools/tools/tinderbox/etc/update_current.rc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/update_current.rc,v 1.1 2004/06/14 11:36:00 des Exp $
 branches	= CURRENT
 platforms	= alpha, amd64, i386/i386, i386/pc98, ia64, powerpc, sparc64
 targets		= update
diff --git a/tools/tools/tinderbox/etc/update_releng_4.rc b/tools/tools/tinderbox/etc/update_releng_4.rc
index 748702582c4f..a61666df8fba 100644
--- a/tools/tools/tinderbox/etc/update_releng_4.rc
+++ b/tools/tools/tinderbox/etc/update_releng_4.rc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/update_releng_4.rc,v 1.2 2005/02/06 13:56:12 des Exp $
 branches	= RELENG_4_8, RELENG_4_10, RELENG_4_11
 platforms	= alpha, i386/i386, i386/pc98
 targets		= update
diff --git a/tools/tools/tinderbox/etc/update_releng_5.rc b/tools/tools/tinderbox/etc/update_releng_5.rc
index a2a05760c40c..7fff21a9cfb0 100644
--- a/tools/tools/tinderbox/etc/update_releng_5.rc
+++ b/tools/tools/tinderbox/etc/update_releng_5.rc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/update_releng_5.rc,v 1.2 2004/11/11 18:37:39 des Exp $
 branches	= RELENG_5
 platforms	= alpha, amd64, i386/i386, i386/pc98, ia64, sparc64
 targets		= update
diff --git a/tools/tools/tinderbox/etc/update_stable.rc b/tools/tools/tinderbox/etc/update_stable.rc
index 6c865eb19327..92c6230e02ba 100644
--- a/tools/tools/tinderbox/etc/update_stable.rc
+++ b/tools/tools/tinderbox/etc/update_stable.rc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/etc/update_stable.rc,v 1.1 2004/06/14 11:36:00 des Exp $
 branches	= RELENG_4
 platforms	= alpha, i386/i386, i386/pc98
 targets		= update
diff --git a/tools/tools/tinderbox/powerpc.diff b/tools/tools/tinderbox/powerpc.diff
index ce27e71f0897..96a554c23ab3 100644
--- a/tools/tools/tinderbox/powerpc.diff
+++ b/tools/tools/tinderbox/powerpc.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/tinderbox/powerpc.diff,v 1.3 2003/09/09 07:01:13 des Exp $
 
 Index: contrib/gcc/config/rs6000/freebsd.h
 ===================================================================
diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 3c218af3ee00..ba7669a975fa 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/tools/tinderbox/tbmaster.1,v 1.18 2005/03/03 07:20:57 des Exp $
 .\"
 .Dd August 18, 2004
 .Dt TBMASTER 1
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 3917b3b9308f..74c8f37c62a8 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -26,7 +26,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/tools/tools/tinderbox/tbmaster.pl,v 1.53 2005/03/03 07:18:01 des Exp $
 #
 
 use 5.006_001;
diff --git a/tools/tools/tinderbox/tinderbox.1 b/tools/tools/tinderbox/tinderbox.1
index ea1f193e7f03..861904872c1a 100644
--- a/tools/tools/tinderbox/tinderbox.1
+++ b/tools/tools/tinderbox/tinderbox.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/tools/tinderbox/tinderbox.1,v 1.12 2004/06/21 14:49:22 des Exp $
 .\"
 .Dd June 21, 2004
 .Dt TINDERBOX 1
diff --git a/tools/tools/tinderbox/tinderbox.pl b/tools/tools/tinderbox/tinderbox.pl
index 4d84ed4c40ee..9411447760c5 100644
--- a/tools/tools/tinderbox/tinderbox.pl
+++ b/tools/tools/tinderbox/tinderbox.pl
@@ -26,7 +26,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/tools/tools/tinderbox/tinderbox.pl,v 1.42 2005/04/30 18:22:12 des Exp $
 #
 
 use 5.006_001;
diff --git a/tools/tools/tinderbox/www/Makefile b/tools/tools/tinderbox/www/Makefile
index acb4c877c430..de00616a2816 100644
--- a/tools/tools/tinderbox/www/Makefile
+++ b/tools/tools/tinderbox/www/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinderbox/www/Makefile,v 1.6 2004/01/25 19:11:43 des Exp $
 
 CGI		 = index.cgi
 DATA		 = tb.css
diff --git a/tools/tools/tinderbox/www/index.cgi b/tools/tools/tinderbox/www/index.cgi
index 543e9b8235a5..9f2d2190e08b 100644
--- a/tools/tools/tinderbox/www/index.cgi
+++ b/tools/tools/tinderbox/www/index.cgi
@@ -26,7 +26,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/tools/tools/tinderbox/www/index.cgi,v 1.25 2005/02/07 07:55:00 des Exp $
 #
 
 use 5.006_001;
diff --git a/tools/tools/tinderbox/www/tb.css b/tools/tools/tinderbox/www/tb.css
index ae433365b16a..9415386f075d 100644
--- a/tools/tools/tinderbox/www/tb.css
+++ b/tools/tools/tinderbox/www/tb.css
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/tinderbox/www/tb.css,v 1.5 2003/11/12 08:30:51 des Exp $
  */
 
 BODY, H1, H2, H3, H4, H5, H6, LI {
diff --git a/tools/tools/upgrade/getosreldate.sh b/tools/tools/upgrade/getosreldate.sh
index 3c9564851e16..e17e956db0fc 100755
--- a/tools/tools/upgrade/getosreldate.sh
+++ b/tools/tools/upgrade/getosreldate.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/upgrade/getosreldate.sh,v 1.2 1999/08/28 00:54:34 peter Exp $
 
 RELDATE=`sysctl -n kern.osreldate 2>/dev/null`
 if [ "x$RELDATE" = x ]; then
diff --git a/tools/tools/upgrade/move_aout_libs.sh b/tools/tools/upgrade/move_aout_libs.sh
index e5252000dc25..18c0110a1143 100755
--- a/tools/tools/upgrade/move_aout_libs.sh
+++ b/tools/tools/upgrade/move_aout_libs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/upgrade/move_aout_libs.sh,v 1.7 2002/10/01 13:29:45 ru Exp $
 # 
 # Search for a.out libraries and move them to an aout subdirectory of
 # the elf library directory.
diff --git a/tools/tools/usb/print-usb-if-vids.sh b/tools/tools/usb/print-usb-if-vids.sh
index ffe86934bdc0..b9116ec384a2 100644
--- a/tools/tools/usb/print-usb-if-vids.sh
+++ b/tools/tools/usb/print-usb-if-vids.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/usb/print-usb-if-vids.sh,v 1.1 2004/04/18 05:37:34 obrien Exp $
 
 
 fetch -o /tmp/usb.if http://www.usb.org/app/pub/dump/comp_dump/
diff --git a/tools/tools/vop_table/vop_table.pl b/tools/tools/vop_table/vop_table.pl
index 5ac979d7e1ed..6c1cfdaf30b1 100644
--- a/tools/tools/vop_table/vop_table.pl
+++ b/tools/tools/vop_table/vop_table.pl
@@ -7,7 +7,7 @@
 # (c) 2004 Andrew R. Reiter <arr@watson.org>
 # All Rights Reserved.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/vop_table/vop_table.pl,v 1.1 2005/01/05 06:53:03 arr Exp $
 
 # XXX todo: Make $src_dir modificationable
 
diff --git a/tools/tools/vop_table/vop_table.tcl b/tools/tools/vop_table/vop_table.tcl
index 1b76d18bae0d..ebc3eeb394e5 100644
--- a/tools/tools/vop_table/vop_table.tcl
+++ b/tools/tools/vop_table/vop_table.tcl
@@ -1,5 +1,5 @@
 #!/usr/local/bin/tclsh8.3
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/vop_table/vop_table.tcl,v 1.5 2003/01/15 19:19:28 phk Exp $
 
 set fo [open _.html w]
 
diff --git a/tools/tools/whereintheworld/Makefile b/tools/tools/whereintheworld/Makefile
index 876a318c3f44..0ff712faf8c4 100644
--- a/tools/tools/whereintheworld/Makefile
+++ b/tools/tools/whereintheworld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/whereintheworld/Makefile,v 1.1 2003/01/09 12:23:29 des Exp $
 
 SCRIPTS=	whereintheworld.pl
 
diff --git a/tools/tools/whereintheworld/whereintheworld.pl b/tools/tools/whereintheworld/whereintheworld.pl
index 6a8e21e0c4a9..9860156b259a 100644
--- a/tools/tools/whereintheworld/whereintheworld.pl
+++ b/tools/tools/whereintheworld/whereintheworld.pl
@@ -7,7 +7,7 @@
 # Dag-Erling Smørgrav <des@freebsd.org> 09 January 2003
 #
 # $Id: whereintheworld,v 1.3 2000/01/28 00:42:32 fenner Exp $
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/whereintheworld/whereintheworld.pl,v 1.5 2003/02/15 14:30:51 des Exp $
 #
 
 use strict;
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 8f4953dac4a7..582113988e50 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/Makefile,v 1.279.2.1 2005/08/15 18:34:20 cperciva Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc
index 2ee98c34aab5..f5da842c7f62 100644
--- a/usr.bin/Makefile.inc
+++ b/usr.bin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/Makefile.inc,v 1.3 2002/02/06 18:13:12 markm Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/usr.bin/alias/Makefile b/usr.bin/alias/Makefile
index 53df717f66cf..5d82678321aa 100644
--- a/usr.bin/alias/Makefile
+++ b/usr.bin/alias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/alias/Makefile,v 1.4 2004/12/21 08:46:55 ru Exp $
 
 SCRIPTS=generic.sh
 SCRIPTSNAME=alias
diff --git a/usr.bin/alias/generic.sh b/usr.bin/alias/generic.sh
index 33a39ad97831..ebc2b8550fbf 100644
--- a/usr.bin/alias/generic.sh
+++ b/usr.bin/alias/generic.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/alias/generic.sh,v 1.1 2002/07/16 22:16:03 wollman Exp $
 # This file is in the public domain.
 ${0##*/} ${1+"$@"}
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile
index 0355588b3c39..5fd09ea2024a 100644
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/apply/Makefile,v 1.8 2002/07/14 18:22:12 alfred Exp $
 
 PROG=	apply
 WARNS?=	4
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 3babbffae869..91155039a172 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apply.1	8.2 (Berkeley) 4/4/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/apply/apply.1,v 1.16 2005/01/18 13:43:46 ru Exp $
 .\"
 .Dd July 17, 2004
 .Dt APPLY 1
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 25ba374d97e9..97f3db97b021 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/apply/apply.c,v 1.24 2003/06/09 19:21:35 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.bin/asa/Makefile b/usr.bin/asa/Makefile
index c2a221ae027b..6bc0ccca3ee8 100644
--- a/usr.bin/asa/Makefile
+++ b/usr.bin/asa/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/03/25 18:04:51 glass Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/asa/Makefile,v 1.1 2002/05/15 02:40:57 tjr Exp $
 
 PROG=	asa
 
diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index 5f5c236a67e8..1e8d6916e38e 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/asa/asa.1,v 1.4 2005/01/17 07:44:11 ru Exp $
 .\"
 .Dd May 9, 2002
 .Dt ASA 1
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 692b83757d4f..65fa675ff174 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -36,7 +36,7 @@
 __RCSID("$NetBSD: asa.c,v 1.11 1997/09/20 14:55:00 lukem Exp $");
 #endif
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/asa/asa.c,v 1.6 2005/05/21 09:55:04 ru Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 47d2574e7f5c..ddf7026a0612 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/at/Makefile,v 1.15 2002/02/08 22:31:35 markm Exp $
 
 .include "${.CURDIR}/Makefile.inc"
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 3eb3e740f7e4..3d9eb361c8f5 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/at.c,v 1.29 2002/07/22 11:32:16 robert Exp $");
 
 #define _USE_BSD 1
 
diff --git a/usr.bin/at/at.h b/usr.bin/at/at.h
index 3d72bbbdbbd4..ff8008d58dca 100644
--- a/usr.bin/at/at.h
+++ b/usr.bin/at/at.h
@@ -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/usr.bin/at/at.h,v 1.5 2001/07/24 14:15:51 obrien Exp $
  */
 
 extern int fcreated;
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index bca1051793f5..e166d377b2b9 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/at/at.man,v 1.35 2005/01/18 13:43:46 ru Exp $
 .Dd January 13, 2002
 .Dt "AT" 1
 .Os
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index ef5265b4c1d2..76831a8a8ebb 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/panic.c,v 1.17 2002/05/16 00:47:14 tjr Exp $");
 
 /* System Headers */
 
diff --git a/usr.bin/at/panic.h b/usr.bin/at/panic.h
index 832de83a7d98..d656d6185b9d 100644
--- a/usr.bin/at/panic.h
+++ b/usr.bin/at/panic.h
@@ -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/usr.bin/at/panic.h,v 1.6 2002/01/13 20:21:08 mike Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 4590ad120448..7f1e93f2630d 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/parsetime.c,v 1.25 2001/12/10 21:13:01 dwmalone Exp $");
 
 /* System Headers */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 91176b471249..872ce44dbae7 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/perm.c,v 1.13 2001/12/10 21:13:01 dwmalone Exp $");
 
 /* System Headers */
 
diff --git a/usr.bin/at/perm.h b/usr.bin/at/perm.h
index b55b5fb786a7..92d0e31f10d7 100644
--- a/usr.bin/at/perm.h
+++ b/usr.bin/at/perm.h
@@ -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/usr.bin/at/perm.h,v 1.4 2001/12/02 12:26:18 markm Exp $
  */
 
 int check_permission(void);
diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h
index 50dd6b108af4..cb5adf670575 100644
--- a/usr.bin/at/privs.h
+++ b/usr.bin/at/privs.h
@@ -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/usr.bin/at/privs.h,v 1.8 2001/09/04 16:15:51 ru Exp $
  */
 
 #ifndef _PRIVS_H
diff --git a/usr.bin/atm/Makefile b/usr.bin/atm/Makefile
index 9ed46ef7a16d..5f7daefc539a 100644
--- a/usr.bin/atm/Makefile
+++ b/usr.bin/atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/atm/Makefile,v 1.1 2003/10/29 10:30:53 harti Exp $
 
 SUBDIR=	sscop
 
diff --git a/usr.bin/atm/Makefile.inc b/usr.bin/atm/Makefile.inc
index 265f86d1ed55..e971f6f5e318 100644
--- a/usr.bin/atm/Makefile.inc
+++ b/usr.bin/atm/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/atm/Makefile.inc,v 1.1 2003/10/29 10:30:53 harti Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile
index 16703bb35bd6..d8786f61804d 100644
--- a/usr.bin/atm/sscop/Makefile
+++ b/usr.bin/atm/sscop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/atm/sscop/Makefile,v 1.3 2004/09/24 22:10:34 trhodes Exp $
 
 CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop
 
diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index 87eaa4166b86..6783511763a5 100644
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/awk/Makefile,v 1.12 2005/05/17 14:54:33 ru Exp $
 
 AWKSRC=	${.CURDIR}/../../contrib/one-true-awk
 .PATH: ${AWKSRC}
diff --git a/usr.bin/awk/b.c.diff b/usr.bin/awk/b.c.diff
index 2f6b2225c9ec..cba82e4b390a 100644
--- a/usr.bin/awk/b.c.diff
+++ b/usr.bin/awk/b.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/b.c.diff,v 1.1 2005/05/17 14:54:33 ru Exp $
 
 Index: b.c
 ===================================================================
diff --git a/usr.bin/awk/main.c.diff b/usr.bin/awk/main.c.diff
index a9d23260cf8b..29282ae4800f 100644
--- a/usr.bin/awk/main.c.diff
+++ b/usr.bin/awk/main.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/main.c.diff,v 1.1 2005/05/17 14:54:33 ru Exp $
 
 Index: main.c
 ===================================================================
diff --git a/usr.bin/awk/run.c.diff b/usr.bin/awk/run.c.diff
index d4912507ee5c..722c71c544cb 100644
--- a/usr.bin/awk/run.c.diff
+++ b/usr.bin/awk/run.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/run.c.diff,v 1.1 2005/05/17 14:54:33 ru Exp $
 
 Index: run.c
 ===================================================================
diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile
index 67d4ba7fecd1..d5bb0e2b1f05 100644
--- a/usr.bin/banner/Makefile
+++ b/usr.bin/banner/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/banner/Makefile,v 1.8 2002/02/08 22:31:35 markm Exp $
 
 PROG=	banner
 MAN=	banner.6
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index febfa3d32652..b5e8cf57c512 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/banner/banner.6,v 1.9 2005/01/25 22:24:04 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Dt BANNER 6
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 99914e047de0..3ff939ca1e48 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)banner.c	8.4 (Berkeley) 4/29/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/banner/banner.c,v 1.15 2002/03/22 01:19:22 imp Exp $");
 
 /*
  * banner - prints large signs
diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile
index d647395c83d9..78bae81fcdb6 100644
--- a/usr.bin/basename/Makefile
+++ b/usr.bin/basename/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/basename/Makefile,v 1.4 2002/02/08 22:31:35 markm Exp $
 
 PROG=	basename
 MLINKS=	basename.1 dirname.1
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index b4fa8997190e..fb23a821ac8c 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/basename/basename.1,v 1.16 2005/01/18 13:43:47 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index d94ee67a3a1d..3078949096e0 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/basename/basename.c,v 1.15 2004/07/15 06:15:10 tjr Exp $");
 
 #include <err.h>
 #include <libgen.h>
diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile
index 15109434e5af..8592fbf8ebb5 100644
--- a/usr.bin/biff/Makefile
+++ b/usr.bin/biff/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/biff/Makefile,v 1.4 2002/02/08 22:31:35 markm Exp $
 
 PROG=	biff
 
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 9f71fd6018fd..81cea8bcfced 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/biff/biff.1,v 1.20 2005/01/17 07:44:11 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index c04c8d39f9fa..b12d1597ae45 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)biff.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/biff/biff.c,v 1.18 2002/07/24 18:54:59 robert Exp $");
 
 #include <sys/stat.h>
 
diff --git a/usr.bin/bluetooth/Makefile b/usr.bin/bluetooth/Makefile
index 9ef16cc8aae6..3cd0778944ca 100644
--- a/usr.bin/bluetooth/Makefile
+++ b/usr.bin/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/Makefile,v 1.3 2003/10/12 22:04:21 emax Exp $
 
 SUBDIR=	\
 	bthost \
diff --git a/usr.bin/bluetooth/Makefile.inc b/usr.bin/bluetooth/Makefile.inc
index c0e05cfa1da6..eb32d7b65ad8 100644
--- a/usr.bin/bluetooth/Makefile.inc
+++ b/usr.bin/bluetooth/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/Makefile.inc,v 1.1 2003/10/12 22:04:21 emax Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 
diff --git a/usr.bin/bluetooth/bthost/Makefile b/usr.bin/bluetooth/bthost/Makefile
index fe2c47959353..b618fc7e3bdf 100644
--- a/usr.bin/bluetooth/bthost/Makefile
+++ b/usr.bin/bluetooth/bthost/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.4 2003/08/14 20:07:13 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/bthost/Makefile,v 1.2 2005/01/28 16:08:06 ru Exp $
 
 PROG=		bthost
 WARNS?=		2
diff --git a/usr.bin/bluetooth/bthost/bthost.1 b/usr.bin/bluetooth/bthost/bthost.1
index e4a4abc45ecb..b7476a069872 100644
--- a/usr.bin/bluetooth/bthost/bthost.1
+++ b/usr.bin/bluetooth/bthost/bthost.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bthost.1,v 1.7 2003/05/21 22:19:00 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bluetooth/bthost/bthost.1,v 1.3 2005/01/17 07:44:12 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt BTHOST 1
diff --git a/usr.bin/bluetooth/bthost/bthost.c b/usr.bin/bluetooth/bthost/bthost.c
index 2dd56359fbaf..74738dab43d6 100644
--- a/usr.bin/bluetooth/bthost/bthost.c
+++ b/usr.bin/bluetooth/bthost/bthost.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthost.c,v 1.5 2003/05/21 20:30:01 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/bthost/bthost.c,v 1.1 2003/10/12 22:04:21 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.bin/bluetooth/btsockstat/Makefile b/usr.bin/bluetooth/btsockstat/Makefile
index cdec9f7013c6..258ea8500c8f 100644
--- a/usr.bin/bluetooth/btsockstat/Makefile
+++ b/usr.bin/bluetooth/btsockstat/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:07:14 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/btsockstat/Makefile,v 1.4 2005/01/28 16:08:07 ru Exp $
 
 PROG=		btsockstat
 WARNS?=		2
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.1 b/usr.bin/bluetooth/btsockstat/btsockstat.1
index ad5063da32c7..8dc91a8bef67 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.1
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: btsockstat.1,v 1.6 2003/05/21 00:09:45 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bluetooth/btsockstat/btsockstat.1,v 1.8 2005/01/18 13:43:47 ru Exp $
 .\"
 .Dd October 12, 2003
 .Dt BTSOCKSTAT 1
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.c b/usr.bin/bluetooth/btsockstat/btsockstat.c
index c7f333c60eb6..5c1e261a809b 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.c
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: btsockstat.c,v 1.8 2003/05/21 22:40:25 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/btsockstat/btsockstat.c,v 1.5 2004/04/09 23:01:41 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/Makefile b/usr.bin/bluetooth/rfcomm_sppd/Makefile
index 9018f6e88de6..7904cc2a1008 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/Makefile
+++ b/usr.bin/bluetooth/rfcomm_sppd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/09/07 18:15:55 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/Makefile,v 1.3 2005/01/28 16:08:07 ru Exp $
 
 PROG=		rfcomm_sppd
 SRCS=		rfcomm_sppd.c rfcomm_sdp.c
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
index 587307153333..51a4f60df70a 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_sdp.c,v 1.1 2003/09/07 18:15:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c,v 1.2 2004/04/09 23:26:16 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
index 21c921c31369..98ba5342b890 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: rfcomm_sppd.1,v 1.3 2003/09/07 18:15:55 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1,v 1.7 2005/01/18 13:43:47 ru Exp $
 .\"
 .Dd April 26, 2003
 .Dt RFCOMM_SPPD 1
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
index 40ad502ff6b6..3ba474f99177 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_sppd.c,v 1.4 2003/09/07 18:15:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c,v 1.6 2004/09/30 21:05:17 emax Exp $
  */
 
 #include <sys/stat.h>
diff --git a/usr.bin/brandelf/Makefile b/usr.bin/brandelf/Makefile
index 2c4859fcd959..6fc3996d8fc5 100644
--- a/usr.bin/brandelf/Makefile
+++ b/usr.bin/brandelf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/brandelf/Makefile,v 1.7 2003/06/14 19:32:51 obrien Exp $
 
 PROG=	brandelf
 
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 2fc14516d8f7..f37d74c0146d 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/brandelf/brandelf.1,v 1.16 2005/01/18 13:43:47 ru Exp $
 .\"
 .Dd February 6, 1997
 .Dt BRANDELF 1
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 9cd391eb5ee2..25c1344239db 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/brandelf/brandelf.c,v 1.25 2005/05/21 09:55:04 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/elf_common.h>
diff --git a/usr.bin/bsdiff/Makefile b/usr.bin/bsdiff/Makefile
index 8a8bc3120b58..32cc98fcd033 100644
--- a/usr.bin/bsdiff/Makefile
+++ b/usr.bin/bsdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/Makefile,v 1.1.2.1 2005/08/15 18:34:21 cperciva Exp $
 
 SUBDIR=	bsdiff bspatch
 
diff --git a/usr.bin/bsdiff/Makefile.inc b/usr.bin/bsdiff/Makefile.inc
index 198d906713fd..f81e7f9ff948 100644
--- a/usr.bin/bsdiff/Makefile.inc
+++ b/usr.bin/bsdiff/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/Makefile.inc,v 1.2.2.1 2005/08/15 18:34:21 cperciva Exp $
 
 WARNS?=	6
 
diff --git a/usr.bin/bsdiff/bsdiff/Makefile b/usr.bin/bsdiff/bsdiff/Makefile
index 0e8498f2be73..a535837347ca 100644
--- a/usr.bin/bsdiff/bsdiff/Makefile
+++ b/usr.bin/bsdiff/bsdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/bsdiff/Makefile,v 1.1.2.1 2005/08/15 18:34:21 cperciva Exp $
 
 PROG=	bsdiff
 
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.1 b/usr.bin/bsdiff/bsdiff/bsdiff.1
index 304285ec297c..7f6a189ab7d1 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.1
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.1
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.1,v 1.1.2.1 2005/08/15 18:34:21 cperciva Exp $
 .\"
 .Dd May 18, 2003
 .Dt BSDIFF 1
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index df9a0580831e..ee49bebce581 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c,v 1.1.2.1 2005/08/15 18:34:21 cperciva Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/bsdiff/bspatch/Makefile b/usr.bin/bsdiff/bspatch/Makefile
index c0ed5219167f..16e001c4da7f 100644
--- a/usr.bin/bsdiff/bspatch/Makefile
+++ b/usr.bin/bsdiff/bspatch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/bspatch/Makefile,v 1.1.2.1 2005/08/15 18:34:21 cperciva Exp $
 
 PROG=	bspatch
 
diff --git a/usr.bin/bsdiff/bspatch/bspatch.1 b/usr.bin/bsdiff/bspatch/bspatch.1
index a428b84cf8a1..f6c824846779 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.1
+++ b/usr.bin/bsdiff/bspatch/bspatch.1
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.1,v 1.1.2.1 2005/08/15 18:34:21 cperciva Exp $
 .\"
 .Dd May 18, 2003
 .Dt BSPATCH 1
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index bf6baa91d18d..f939b3e88ef2 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1.2.1 2005/08/15 18:34:21 cperciva Exp $");
 
 #include <bzlib.h>
 #include <stdlib.h>
diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile
index 93f2d0b8c34b..9c7a6ac2af30 100644
--- a/usr.bin/bzip2/Makefile
+++ b/usr.bin/bzip2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bzip2/Makefile,v 1.8 2005/01/28 16:08:07 ru Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/usr.bin/bzip2/doc/Makefile b/usr.bin/bzip2/doc/Makefile
index 8d416402412d..2b158825a19c 100644
--- a/usr.bin/bzip2/doc/Makefile
+++ b/usr.bin/bzip2/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bzip2/doc/Makefile,v 1.3 2005/05/31 22:16:49 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/bzip2
 
diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile
index 7f61946c8db1..c284138497a2 100644
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bzip2recover/Makefile,v 1.3 2004/12/21 08:47:29 ru Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile
index 1d9551cc38b6..a71aebdf04c5 100644
--- a/usr.bin/c89/Makefile
+++ b/usr.bin/c89/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/c89/Makefile,v 1.7 2005/01/28 16:08:07 ru Exp $
 
 PROG=	c89
 
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 7d1a9d1b1687..f07ebcd8b7c2 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -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/usr.bin/c89/c89.1,v 1.10 2005/05/21 09:55:04 ru Exp $
 .\" "
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index a1dc9b2a6238..00a99890e40d 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/c89/c89.c,v 1.5 2005/05/21 09:55:04 ru Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/c99/Makefile b/usr.bin/c99/Makefile
index 580065ff15c6..99921ef4ab78 100644
--- a/usr.bin/c99/Makefile
+++ b/usr.bin/c99/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/c99/Makefile,v 1.1 2002/10/07 09:37:55 tjr Exp $
 
 PROG=	c99
 
diff --git a/usr.bin/c99/c99.1 b/usr.bin/c99/c99.1
index 615d27703e6b..74433b934288 100644
--- a/usr.bin/c99/c99.1
+++ b/usr.bin/c99/c99.1
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" FreeBSD: src/usr.bin/c89/c89.1,v 1.4.2.4 2001/08/02 01:11:13 obrien Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/c99/c99.1,v 1.4 2005/05/21 09:55:05 ru Exp $
 .\"
 .Dd October 7, 2002
 .Os
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index 553099f65cc1..80203c6ae0c8 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/c99/c99.c,v 1.4 2005/05/21 09:55:05 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 06eea06820f6..b2e84551ad78 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/calendar/Makefile,v 1.30 2004/08/16 09:31:09 dwmalone Exp $
 
 PROG=	calendar
 SRCS=   calendar.c io.c day.c ostern.c paskha.c
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 404f44c4adec..1d82f715edcc 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/calendar/calendar.1,v 1.38 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd June 13, 2002
 .Dt CALENDAR 1
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index aae5f2a70848..7a150b6c401a 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/calendar.c,v 1.18 2002/08/14 11:28:07 ru Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index fdda4b59a7cc..4c94500cec7c 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendar.h,v 1.10 2004/05/28 17:41:36 stefanf Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 0e6d710bd8d3..2432d7bd62e6 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.all,v 1.9 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.australia b/usr.bin/calendar/calendars/calendar.australia
index 72d086c79edc..4b0ebed91dee 100644
--- a/usr.bin/calendar/calendars/calendar.australia
+++ b/usr.bin/calendar/calendars/calendar.australia
@@ -1,7 +1,7 @@
 /*
  * Australian holidays
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.australia,v 1.6 2004/11/21 23:05:06 grog Exp $
  */
 
 #ifndef _calendar_australia_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 6ba59db4181d..c15ae13314d2 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.birthday,v 1.31.2.1 2005/08/19 03:23:07 murray Exp $
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index affe3f8144b3..5b728c250490 100644
--- a/usr.bin/calendar/calendars/calendar.christian
+++ b/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.christian,v 1.9 2003/10/09 04:02:24 grog Exp $
  */
 
 #ifndef _calendar_christian_
diff --git a/usr.bin/calendar/calendars/calendar.computer b/usr.bin/calendar/calendars/calendar.computer
index b153349a049d..a57ff0737966 100644
--- a/usr.bin/calendar/calendars/calendar.computer
+++ b/usr.bin/calendar/calendars/calendar.computer
@@ -1,7 +1,7 @@
 /*
  * Computer
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.computer,v 1.10 2003/06/23 00:16:00 grog Exp $
  */
 
 #ifndef _calendar_computer_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index 443122744d3f..61d74937863e 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
 /*
  * Croatian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.croatian,v 1.5 2001/06/11 04:24:43 ache Exp $
  */
 
 #ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd
index ab99d68f7626..7da3b2cdc8d5 100644
--- a/usr.bin/calendar/calendars/calendar.freebsd
+++ b/usr.bin/calendar/calendars/calendar.freebsd
@@ -1,7 +1,7 @@
 /*
  * FreeBSD
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.165.2.1 2005/07/15 14:46:00 garga Exp $
  */
 
 #ifndef _calendar_freebsd_
diff --git a/usr.bin/calendar/calendars/calendar.french b/usr.bin/calendar/calendars/calendar.french
index 18b4d8ae8a94..a9af6f16607f 100644
--- a/usr.bin/calendar/calendars/calendar.french
+++ b/usr.bin/calendar/calendars/calendar.french
@@ -1,7 +1,7 @@
 /*
  * French calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.french,v 1.2 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _calendar_french_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index 635aef1d5735..d84e2604fd5e 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
 /*
  * German calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.german,v 1.6 2001/06/11 04:24:43 ache Exp $
  */
 
 #ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index d36d285e494d..040c24802190 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
 /*
  * History
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.history,v 1.31.10.1 2005/08/19 03:23:07 murray Exp $
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 3ffde89de148..0ff62308a82d 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.holiday,v 1.28.8.1 2005/08/19 03:23:07 murray Exp $
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.hungarian b/usr.bin/calendar/calendars/calendar.hungarian
index 1b29dfaf2f46..0fd3dd41e7d3 100644
--- a/usr.bin/calendar/calendars/calendar.hungarian
+++ b/usr.bin/calendar/calendars/calendar.hungarian
@@ -1,7 +1,7 @@
 /*
  * Hungarian calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.hungarian,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _calendar_hungarian_
diff --git a/usr.bin/calendar/calendars/calendar.judaic b/usr.bin/calendar/calendars/calendar.judaic
index 395f56e319e8..3d6f4ebd7c00 100644
--- a/usr.bin/calendar/calendars/calendar.judaic
+++ b/usr.bin/calendar/calendars/calendar.judaic
@@ -1,7 +1,7 @@
 /*
  * Judaic Calendar. Maintained by Josef Grosch <jgrosch@mooseriver.com>.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.judaic,v 1.12 2003/03/05 21:13:28 dwmalone Exp $
  *
  */
 
diff --git a/usr.bin/calendar/calendars/calendar.lotr b/usr.bin/calendar/calendars/calendar.lotr
index 2450e363400b..e4d3e26d91c7 100644
--- a/usr.bin/calendar/calendars/calendar.lotr
+++ b/usr.bin/calendar/calendars/calendar.lotr
@@ -1,7 +1,7 @@
 /*
  * Lord Of The Rings
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.lotr,v 1.2 2003/10/09 00:31:48 grog Exp $
  */
 
 #ifndef _calendar_lotr_
diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music
index 1807c8f9e502..49775443d70e 100644
--- a/usr.bin/calendar/calendars/calendar.music
+++ b/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.music,v 1.17 2004/12/16 00:26:53 grog Exp $
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.newzealand b/usr.bin/calendar/calendars/calendar.newzealand
index be069df8dfea..3437c8300a25 100644
--- a/usr.bin/calendar/calendars/calendar.newzealand
+++ b/usr.bin/calendar/calendars/calendar.newzealand
@@ -1,7 +1,7 @@
 /*
  * New Zealand holidays
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.newzealand,v 1.2 2005/01/01 18:58:28 ceri Exp $
  */
 
 #ifndef _calendar_newzealand_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index 07018766a832..489d21fa444f 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
 /*
  * Russian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.russian,v 1.5 2000/05/04 11:35:27 phantom Exp $
  */
 
 #ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.southafrica b/usr.bin/calendar/calendars/calendar.southafrica
index ae683b0bd358..5ff50136a322 100644
--- a/usr.bin/calendar/calendars/calendar.southafrica
+++ b/usr.bin/calendar/calendars/calendar.southafrica
@@ -5,7 +5,7 @@
  * be an unnamed public holiday in addition to the named holiday the day
  * before. This file format is not complex enough to reflect this, but
  * if it ever is, the change should be made.
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.southafrica,v 1.1 2002/11/19 00:29:36 grog Exp $
  */
 
 #ifndef _calendar_southafrica_
diff --git a/usr.bin/calendar/calendars/calendar.usholiday b/usr.bin/calendar/calendars/calendar.usholiday
index d96189cdd703..f8e8ef703bc6 100644
--- a/usr.bin/calendar/calendars/calendar.usholiday
+++ b/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.usholiday,v 1.8 2003/04/16 02:18:30 grog Exp $
  */
 
 #ifndef _calendar_usholiday_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 2b65f1af748f..7f6b8734d682 100644
--- a/usr.bin/calendar/calendars/calendar.world
+++ b/usr.bin/calendar/calendars/calendar.world
@@ -1,7 +1,7 @@
 /*
  * World wide calendar files, except national calendars
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.world,v 1.5 2003/02/15 10:57:20 seanc Exp $
  */
 
 #ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag b/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag
index 751c001982ca..ddac0f6e1b65 100644
--- a/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag,v 1.1 2004/05/23 13:22:01 josef Exp $
  */
 
 #ifndef _de_AT_ISO8859_15_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
index f2a33cc563b2..1274934a85dd 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all,v 1.6 2001/06/11 03:06:13 ache Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
index 14ae4872abce..5b4610a12a69 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag,v 1.9 2003/10/09 04:05:04 grog Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
index 84663904ddbc..18b78f41345f 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte,v 1.12 2003/10/15 08:18:59 tg Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
index 02640b115bfb..eba0fe33838c 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche,v 1.7 2001/06/11 03:06:13 ache Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
index bfa33e66168e..db1f6bd78002 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur,v 1.8 2003/10/06 01:17:42 grog Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
index d75b97c3c249..b4727f9cc41f 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik,v 1.12 2004/12/16 00:29:35 grog Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
index 2c7639217df5..444d05ba1935 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft,v 1.9 2003/10/15 08:18:59 tg Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
index 785512e543d3..9a706c022b00 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * Calendrier français
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_all_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
index d492ed7cdbcf..e5703b7dadfe 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
@@ -1,7 +1,7 @@
 /*
  * Fêtes à souhaiter
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_fetes_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
index 18b4d8ae8a94..823aef4c3481 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
@@ -1,7 +1,7 @@
 /*
  * French calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _calendar_french_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
index d2b3742f37c0..dcac87c54ef6 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
@@ -1,7 +1,7 @@
 /*
  * Jours fériés
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_jferies_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
index 5a9f0eaf13aa..40c6414198a7 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
@@ -1,7 +1,7 @@
 /*
  * Proverbes liés au calendrier
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_proverbes_
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
index 326571a2ae37..835ed470d3d5 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all,v 1.5 2001/06/11 03:08:46 ache Exp $
  */
 
 #ifndef _hr_HR_ISO8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
index 71e212889d94..5322ccf8089c 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici,v 1.7 2001/06/11 03:08:46 ache Exp $
  */
 
 #ifndef _hr_HR_ISO8859_2_praznici
diff --git a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all
index 5084dc7295b6..5165ab309ce1 100644
--- a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  * Magyar kalendárium
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _hu_HU_ISO8859_2_all_
diff --git a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok
index f85c0840d910..14f7c57d2fb1 100644
--- a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok
+++ b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok
@@ -1,7 +1,7 @@
 /*
  * Névnapok
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _hu_HU_ISO8859_2_nevnapok_
diff --git a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek
index dab8ead76abf..41e619f314cd 100644
--- a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek
+++ b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek
@@ -1,7 +1,7 @@
 /*
  * Ünnepnapok
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _hu_HU_ISO8859_2_unnepek_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
index b2de01ee8e58..fe1ad0bdc6ed 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all,v 1.6 2003/12/15 11:51:26 maxim Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
index 66b81e64ebe6..b5ea8ed19a94 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÏÓÓÉÊÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common,v 1.13 2003/12/26 13:04:13 maxim Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday
index eae8dac9451a..6d25e473bcc3 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * òÏÓÓÉÊÓËÉÅ ÐÒÁÚÄÎÉËÉ (ÎÅÒÁÂÏÞÉÅ "ËÒÁÓÎÙÅ" ÄÎÉ)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday,v 1.2 2003/12/26 13:04:13 maxim Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_holiday_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military
index 1b4e9c8880f8..f3a6f33ffb5d 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military
@@ -1,7 +1,7 @@
 /*
  * äÎÉ ×ÏÉÎÓËÏÊ ÓÌÁ×Ù òÏÓÓÉÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military,v 1.2 2003/12/26 13:04:13 maxim Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_military_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
index 4db9563703d2..ceea6041a5b8 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk,v 1.6 2000/05/04 11:31:15 phantom Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
index ac38458d4a68..da2d0a700b48 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox,v 1.5 2000/05/04 11:31:16 phantom Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
index 2fb6bc072692..7ac2bac5802b 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan,v 1.7 2003/12/31 18:01:31 ache Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index cbc196655eab..0a5d9c6f8491 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/day.c,v 1.21 2004/12/06 15:38:24 bland Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index df19e8ce3d33..b55f45aeae83 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/io.c,v 1.19 2002/07/28 13:46:09 jmallett Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index f000f7d5311b..663c322ba7e4 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/ostern.c,v 1.11 2001/12/10 21:13:03 dwmalone Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index 3999d31c92bb..fdad57d835d4 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/paskha.c,v 1.7 2001/12/10 21:13:03 dwmalone Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index cacbd2587acd..85913f584100 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/pathnames.h,v 1.4 2001/01/13 01:33:59 ache Exp $
  */
 
 #include <paths.h>
diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile
index 408790c6c025..4c3a59b626fb 100644
--- a/usr.bin/cap_mkdb/Makefile
+++ b/usr.bin/cap_mkdb/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cap_mkdb/Makefile,v 1.4 2002/02/08 22:31:36 markm Exp $
 
 PROG=	cap_mkdb
 
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 2ac09e35bc84..404fc8b7cede 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cap_mkdb.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.1,v 1.15 2005/02/22 23:29:53 ru Exp $
 .\"
 .Dd February 22, 2005
 .Dt CAP_MKDB 1
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 32413c88b4b6..60f9b37c9a1c 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)cap_mkdb.c	8.2 (Berkeley) 4/27/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.c,v 1.14 2005/02/22 23:29:53 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/catman/Makefile b/usr.bin/catman/Makefile
index d80a5fd8ae49..fc63007e9219 100644
--- a/usr.bin/catman/Makefile
+++ b/usr.bin/catman/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/catman/Makefile,v 1.2 2004/12/22 15:25:51 ru Exp $
 
 PROG=	catman
 WARNS?=	6
diff --git a/usr.bin/catman/catman.1 b/usr.bin/catman/catman.1
index 8fc77803a772..0da6b067e716 100644
--- a/usr.bin/catman/catman.1
+++ b/usr.bin/catman/catman.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/catman/catman.1,v 1.5 2005/01/17 07:44:13 ru Exp $
 .\"
 .Dd December 22, 2004
 .Dt CATMAN 1
diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c
index 6fcd9758d33a..d643f0c02fe8 100644
--- a/usr.bin/catman/catman.c
+++ b/usr.bin/catman/catman.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/catman/catman.c,v 1.13 2005/05/21 09:55:05 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 8aa23eb0daf2..fe7c36af98ee 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chat/Makefile,v 1.13 2003/10/31 06:22:03 kientzle Exp $
 
 # I once used this extensively, but no longer have a modem.  Feel free
 # to ask me questions about it, but I disclaim ownership now.  -Peter
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index ecc733d1ce7b..42f466c0234b 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chat/chat.8,v 1.20 2002/12/30 21:18:11 schweikh Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index c0afeaf53689..d74b00850f74 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chat/chat.c,v 1.21 2003/10/31 06:22:03 kientzle Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/checknr/Makefile b/usr.bin/checknr/Makefile
index 8a47b5956bef..5d349f5b8b9f 100644
--- a/usr.bin/checknr/Makefile
+++ b/usr.bin/checknr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/checknr/Makefile,v 1.3 2002/02/27 15:49:07 dwmalone Exp $
 
 PROG=	checknr
 
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 713c88cd26ee..51a9414de08f 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)checknr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/checknr/checknr.1,v 1.12 2005/01/25 22:27:00 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Dt CHECKNR 1
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index 742c74e5de60..ae1f847cf67a 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)checknr.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/checknr/checknr.c,v 1.9 2004/07/15 04:42:47 tjr Exp $");
 
 /*
  * checknr: check an nroff/troff input file for matching macro calls.
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index f3f5bd69dfcf..a2c0fb478f9f 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chkey/Makefile,v 1.10 2004/11/13 20:40:30 bz Exp $
 
 .PATH: ${.CURDIR}/../newkey
 
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index a4467c89449c..6ef107742e31 100644
--- a/usr.bin/chkey/chkey.1
+++ b/usr.bin/chkey/chkey.1
@@ -1,6 +1,6 @@
 .\" @(#)chkey.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chkey/chkey.1,v 1.7 2002/04/19 23:24:07 charnier Exp $
 .\"
 .Dd July 5, 1989
 .Dt CHKEY 1
diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c
index db0b743fd583..44eb825ed955 100644
--- a/usr.bin/chkey/chkey.c
+++ b/usr.bin/chkey/chkey.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chkey/chkey.c,v 1.5 2002/08/27 19:06:44 charnier Exp $");
 
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 3ffb0ef76597..1e773ab1fa5a 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chpass/Makefile,v 1.30 2004/12/29 08:13:20 ache Exp $
 
 .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen
 
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 24b17597bad6..464d5e0c0f87 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.38.2.1 2005/09/24 01:59:39 keramida Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index ad6b9850370d..5d84c0272c1b 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)chpass.c	8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/chpass.c,v 1.27 2004/01/18 21:46:39 charnier Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index ed1a58649d59..1d852d4bff87 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)chpass.h	8.4 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/chpass/chpass.h,v 1.7 2004/01/18 21:46:39 charnier Exp $
  */
 
 struct passwd;
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index ce82f8ee4644..42fcdcf1a73f 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)edit.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/edit.c,v 1.23 2003/04/09 18:18:42 des Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index eac5561a8dc2..c6e140e2bc4d 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)field.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/field.c,v 1.9 2004/01/18 21:46:39 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index 19f1a99062d8..81511ee2c5f0 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)table.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/table.c,v 1.10 2003/05/03 19:44:45 obrien Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index 07d96e227a96..c97f0b4cd7a9 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)util.c	8.4 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/util.c,v 1.13 2004/01/18 21:46:39 charnier Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile
index 828900ac0273..01440d0bc695 100644
--- a/usr.bin/cksum/Makefile
+++ b/usr.bin/cksum/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/28/95
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cksum/Makefile,v 1.5 2002/02/08 22:31:36 markm Exp $
 
 PROG=	cksum
 SRCS=	cksum.c crc.c print.c sum1.c sum2.c crc32.c
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index d4a0ee7d3ed2..b4161fee89d0 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cksum.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cksum/cksum.1,v 1.19 2005/01/17 07:44:13 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index b6462d49fafb..b698cdc49bb3 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/cksum.c,v 1.17 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index d1f42f2f628c..92693e8014d6 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/crc.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
index cadbc17b69bb..fa8f900ece61 100644
--- a/usr.bin/cksum/crc32.c
+++ b/usr.bin/cksum/crc32.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/crc32.c,v 1.9 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index f2d75def1eab..e9b594adf262 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/cksum/extern.h,v 1.6 2003/03/13 23:32:28 robert Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 1cc27646f21c..4d732d9acee7 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/print.c,v 1.7 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index 406b40e2832f..f3c05ce02ef9 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sum1.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/sum1.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index c179c6289a2f..83ca362d3ae0 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)sum2.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/sum2.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile
index d93f54bc0fd5..02f99d540b34 100644
--- a/usr.bin/cmp/Makefile
+++ b/usr.bin/cmp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6.14.1 2005/09/17 11:33:41 brian Exp $
 
 PROG=	cmp
 SRCS=	cmp.c link.c misc.c regular.c special.c
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 22ed9324eb87..09789063076e 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cmp/cmp.1,v 1.12.12.1 2005/09/17 11:33:41 brian Exp $
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 304aa7de4613..704a3c9247ae 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)cmp.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/cmp.c,v 1.16.14.1 2005/09/17 11:33:41 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index 1dd1c820e2fb..028aeaf1f885 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/cmp/extern.h,v 1.4.14.1 2005/09/17 11:33:41 brian Exp $
  *
  */
 
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index fe45def9fb57..c2edf9ec298c 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/link.c,v 1.1.2.1 2005/09/17 11:33:41 brian Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 53c6a9bf6dd3..7fc0470b5258 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/misc.c,v 1.7 2002/07/28 15:13:17 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 7a27f5e470c4..963cc9b9e7f2 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)regular.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/regular.c,v 1.18 2003/02/26 06:44:46 das Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index bbe3cb10fa81..ab21146505bd 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/special.c,v 1.10 2003/06/19 07:24:26 murray Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile
index 8e3a95948f3f..e1a26f1e2aaa 100644
--- a/usr.bin/col/Makefile
+++ b/usr.bin/col/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/col/Makefile,v 1.4 2002/02/08 22:31:36 markm Exp $
 
 PROG=	col
 
diff --git a/usr.bin/col/README b/usr.bin/col/README
index 116a044a38f4..89e4ce4c7236 100644
--- a/usr.bin/col/README
+++ b/usr.bin/col/README
@@ -1,6 +1,6 @@
 #	@(#)README	8.1 (Berkeley) 6/6/93
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/col/README,v 1.2 2001/06/17 04:24:16 mikeh Exp $
 
 col - filter out reverse line feeds.
 
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 3197c02d5a43..2bac8b8cddc1 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/col/col.1,v 1.19 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd August 4, 2004
 .Dt COL 1
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 7dcebff7deac..758cbecd1022 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/col/col.c,v 1.19 2004/07/29 07:28:26 tjr Exp $");
 
 #include <err.h>
 #include <locale.h>
diff --git a/usr.bin/colcrt/Makefile b/usr.bin/colcrt/Makefile
index 87d96cabffa1..7d2b7be0af40 100644
--- a/usr.bin/colcrt/Makefile
+++ b/usr.bin/colcrt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colcrt/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	colcrt
 
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index a4a727e8940b..d5bbbf459106 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colcrt.1	8.1 (Berkeley) 6/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colcrt/colcrt.1,v 1.16 2005/02/13 22:25:21 ru Exp $
 .\"
 .Dd July 31, 2004
 .Dt COLCRT 1
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index 2ba4f39bbdae..2e5570b216e2 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colcrt/colcrt.c,v 1.18 2004/07/31 06:22:57 tjr Exp $");
 
 #include <err.h>
 #include <locale.h>
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index 6cb213f48898..b3af0663795f 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/Makefile,v 1.21 2002/02/08 23:07:34 markm Exp $
 
 PROG=	colldef
 SRCS=	parse.y scan.l y.tab.h
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index fafa74db460d..000fb2f60566 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colldef/colldef.1,v 1.23 2005/01/18 13:43:48 ru Exp $
 .\"
 .Dd January 27, 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/common.h b/usr.bin/colldef/common.h
index 316490d4eb8d..46ec06668544 100644
--- a/usr.bin/colldef/common.h
+++ b/usr.bin/colldef/common.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/colldef/common.h,v 1.2 2001/11/28 09:50:24 ache Exp $
  */
 
 #define CHARMAP_SYMBOL_LEN 64
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index 375aed8ac3e0..3bedd7394a93 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colldef/parse.y,v 1.34 2005/05/21 09:55:05 ru Exp $");
 
 #include <arpa/inet.h>
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index aeeff1406832..96a7ef372636 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colldef/scan.l,v 1.19 2002/08/23 04:18:26 ache Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile
index 12585762f626..d616bd3a20bb 100644
--- a/usr.bin/colrm/Makefile
+++ b/usr.bin/colrm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colrm/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	colrm
 
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index ceb04558e6dc..f97a8c4bb9e1 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colrm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colrm/colrm.1,v 1.11 2005/01/17 07:44:14 ru Exp $
 .\"
 .Dd August 4, 2004
 .Dt COLRM 1
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 52dda90086dd..34440736f52f 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colrm/colrm.c,v 1.12 2004/07/29 09:09:22 tjr Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile
index 771723ef31f5..ed0fa5e7304d 100644
--- a/usr.bin/column/Makefile
+++ b/usr.bin/column/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/column/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	column
 
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 5c5a100fe3b1..717c593a3702 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)column.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/column/column.1,v 1.14 2005/01/18 13:43:48 ru Exp $
 .\"
 .Dd July 29, 2004
 .Os
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 4ac5b244b830..f91c5554676c 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/column/column.c,v 1.14 2005/01/25 01:35:02 jmallett Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 13da76fa2ef6..1c9b5a399de2 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/comm/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	comm
 
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 2402ab5a1ceb..45a726d80ba2 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)comm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/comm/comm.1,v 1.14 2005/01/25 22:28:34 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 0e7e029ce782..06cf4a4e430e 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -47,7 +47,7 @@ static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/comm/comm.c,v 1.21 2004/07/02 22:48:29 tjr Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index a84460a92220..471e92a39898 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/compile_et/Makefile,v 1.11 1999/09/04 09:52:32 markm Exp $
 
 PROG=	compile_et
 SRCS=	compile_et.c parse.y lex.l getarg.c
diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile
index 45c0814add3f..ec45aa5f933a 100644
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/17/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/compress/Makefile,v 1.8 2004/09/10 21:34:46 trhodes Exp $
 
 PROG=	compress
 SRCS=	compress.c zopen.c
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 91be154eadd9..1b1dcd2d9420 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)compress.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/compress/compress.1,v 1.20.2.1 2005/09/17 17:12:18 garys Exp $
 .\"
 .Dd May 17, 2002
 .Dt COMPRESS 1
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 584f283ffb88..3931ee57c92e 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/compress/compress.c,v 1.21 2003/06/14 13:41:31 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/compress/doc/NOTES b/usr.bin/compress/doc/NOTES
index d400c9b485ca..aec6b750e594 100644
--- a/usr.bin/compress/doc/NOTES
+++ b/usr.bin/compress/doc/NOTES
@@ -1,5 +1,5 @@
 
-  $FreeBSD$
+  $FreeBSD: src/usr.bin/compress/doc/NOTES,v 1.2 2002/10/16 12:42:15 charnier Exp $
 
 From: James A. Woods <jaw@eos.arc.nasa.gov>
 
diff --git a/usr.bin/compress/doc/README b/usr.bin/compress/doc/README
index 2b5f6ba98b23..0828cdfb3a91 100644
--- a/usr.bin/compress/doc/README
+++ b/usr.bin/compress/doc/README
@@ -1,6 +1,6 @@
 
 	@(#)README	8.1 (Berkeley) 6/9/93
-  $FreeBSD$
+  $FreeBSD: src/usr.bin/compress/doc/README,v 1.3 2002/12/30 21:18:11 schweikh Exp $
 
 Compress version 4.0 improvements over 3.0:
 	o compress() speedup (10-50%) by changing division hash to xor
diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log
index 57e0337eef7d..76e82ad9ecee 100644
--- a/usr.bin/compress/doc/revision.log
+++ b/usr.bin/compress/doc/revision.log
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.4 2001/08/13 14:06:30 ru Exp $ */
 
 /*
  * $Header: compress.c,v 4.0 85/07/30 12:50:00 joe Release $
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index a1ffbf75d20d..730a1200df7a 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)zopen.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/compress/zopen.3,v 1.8 2001/10/01 15:01:57 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt ZOPEN 3
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index f0ec8871cd81..12d6da903a2a 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)zopen.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/compress/zopen.c,v 1.12 2005/05/18 05:24:08 kan Exp $");
 
 /*-
  * fcompress.c - File compression ala IEEE Computer, June 1984.
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index a27a4f9b98aa..8ad5691ff608 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/compress/zopen.h,v 1.5 2002/03/22 01:19:31 imp Exp $
  */
 
 #ifndef _ZOPEN_H_
diff --git a/usr.bin/csplit/Makefile b/usr.bin/csplit/Makefile
index 3f370c7c4ad3..671233575011 100644
--- a/usr.bin/csplit/Makefile
+++ b/usr.bin/csplit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/csplit/Makefile,v 1.1 2002/05/02 07:54:04 tjr Exp $
 
 PROG=	csplit
 
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index 8582887113fd..98b834f9772c 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/csplit/csplit.1,v 1.11 2005/01/25 22:29:51 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Dt CSPLIT 1
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index 2dff81fa8a45..9d2b4e5bc84c 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.9 2004/03/22 11:15:03 tjr Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index c13e835da3c5..a5a5a092ea67 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile
index dc639af6e2e8..7c5b1147e555 100644
--- a/usr.bin/ctags/Makefile
+++ b/usr.bin/ctags/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ctags/Makefile,v 1.5 2002/02/08 22:31:37 markm Exp $
 
 PROG=	ctags
 SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index d1f0d5a61632..eaf038c70332 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctags.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ctags/ctags.1,v 1.17 2005/01/17 07:44:16 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt CTAGS 1
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 2d9e3f36ed01..ac76510e4e94 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/ctags.c,v 1.19 2004/05/07 19:44:40 cjc Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index ce4484f2f6bc..6ae0cdd0a029 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ctags.h	8.3 (Berkeley) 4/2/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ctags/ctags.h,v 1.7 2002/03/22 01:19:31 imp Exp $
  *
  */
 
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index ef6c45fee258..c5016c2d2a61 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.12 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 3ac47df76ee5..1416e7596570 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/lisp.c,v 1.7 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index a31ff931f7f2..ae44d2c14ae0 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/print.c,v 1.9 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 6c42f32c79a8..c2c8a8ffad51 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index e0e0daba6687..eb40786ebbf5 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/yacc.c,v 1.9 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile
index 5be029a3d9d1..b0ea0f6e28f2 100644
--- a/usr.bin/cut/Makefile
+++ b/usr.bin/cut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cut/Makefile,v 1.5 2002/02/08 22:31:38 markm Exp $
 
 PROG=	cut
 
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 13056a2dc3d9..c22c70a4d9e9 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cut/cut.1,v 1.31 2005/01/18 13:43:48 ru Exp $
 .\"
 .Dd June 28, 2004
 .Dt CUT 1
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index a370e600ef0a..fd64dabc4bbe 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)cut.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cut/cut.c,v 1.30 2004/11/05 10:45:23 tjr Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 0f19499f7249..5c1ed5ccdfb0 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dig/Makefile,v 1.11.2.1 2005/07/30 07:56:26 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index 770389799411..f06791277318 100644
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dirname/Makefile,v 1.6 2004/12/21 08:47:29 ru Exp $
 
 PROG=	dirname
 NO_MAN=
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 3018f2f6f00c..55ae5d2f97ab 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)dirname.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/dirname/dirname.c,v 1.12 2005/05/21 09:55:05 ru Exp $");
 
 #include <err.h>
 #include <libgen.h>
diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index 12e80b9da3d1..98c73ca7077d 100644
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/du/Makefile,v 1.9 2004/05/24 22:22:29 pjd Exp $
 
 PROG=	du
 WARNS?=	6
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 81e7d4945036..e83c55a40deb 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/du/du.1,v 1.30 2005/05/21 09:55:05 ru Exp $
 .\"
 .Dd June 2, 2004
 .Dt DU 1
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 8af4c460bad4..b7a6f17ee5ab 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)du.c	8.5 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/du/du.c,v 1.38 2005/04/09 14:31:40 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/ee/FREEBSD-upgrade b/usr.bin/ee/FREEBSD-upgrade
index 3bca6abb4b8c..bebbc60cf753 100644
--- a/usr.bin/ee/FREEBSD-upgrade
+++ b/usr.bin/ee/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/ee/FREEBSD-upgrade,v 1.2 2001/06/11 03:45:25 ache Exp $
 
 Hugh F. Mahon's EasyEditor
 	originals can be found at: 	http://mahon.cwx.net/
diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile
index 8fdc4996fa82..02f6ff5490ba 100644
--- a/usr.bin/ee/Makefile
+++ b/usr.bin/ee/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ee/Makefile,v 1.24 2002/07/02 12:37:09 ru Exp $
 
 CFLAGS+= -DCAP -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
 	 -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -DSLCT_HDR
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 4da47bc52812..199cfc622fd8 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.18.2.1 2005/07/17 15:03:35 brueffer Exp $
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index 0284b7f662de..ad37b4955d73 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ee/ee.c,v 1.32 2004/11/05 10:18:05 fjoe Exp $");
 
 char *ee_copyright_message = 
 "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996 Hugh Mahon ";
diff --git a/usr.bin/ee/new_curse.c b/usr.bin/ee/new_curse.c
index 22e1a847f6e0..5693628dd41e 100644
--- a/usr.bin/ee/new_curse.c
+++ b/usr.bin/ee/new_curse.c
@@ -45,7 +45,7 @@ char *copyright_message[] = { "Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993,
 				"All rights are reserved."};
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ee/new_curse.c,v 1.9 2002/06/30 05:21:17 obrien Exp $");
 
 #include "new_curse.h"
 #include <signal.h>
diff --git a/usr.bin/ee/new_curse.h b/usr.bin/ee/new_curse.h
index bbef58572a7b..a55ba80e68e4 100644
--- a/usr.bin/ee/new_curse.h
+++ b/usr.bin/ee/new_curse.h
@@ -37,7 +37,7 @@
  |	Copyright (c) 1986, 1987, 1988, 1991, 1995 Hugh Mahon
  |	All are rights reserved.
  |
- | $FreeBSD$
+ | $FreeBSD: src/usr.bin/ee/new_curse.h,v 1.3 2001/03/27 13:51:17 sobomax Exp $
  |
  */
 
diff --git a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
index 80a99616df6e..083beab3cf45 100644
--- a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg,v 1.9 2001/03/28 21:33:30 joerg Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
index ccefcc4b3e62..eee79bab9bb0 100644
--- a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
+++ b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/en_US.US-ASCII/ee.msg,v 1.7 2001/03/27 13:51:18 sobomax Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
index e93ff22dfa59..b3082d477751 100644
--- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg,v 1.10 2001/03/27 13:53:08 sobomax Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
index 3176f7995993..0e09299f7c24 100644
--- a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
+++ b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg,v 1.6 2005/02/27 19:42:48 phantom Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
index 99aa34392ac8..2d5d46fcccec 100644
--- a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
+++ b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
@@ -5,7 +5,7 @@ $ Based on uk_UA.KOI8-U translation by Olexander Kunytsa <kunia@istc.kiev.ua>
 $
 $ For ee patchlevel 3
 $
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg,v 1.1 2001/04/19 10:32:25 ache Exp $
 $
 $
 $set 1
diff --git a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
index 1556d916742e..761e07de7cff 100644
--- a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
+++ b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg,v 1.1 2001/03/28 16:51:02 sobomax Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/elf2aout/Makefile b/usr.bin/elf2aout/Makefile
index 92bb65980d06..4a65b55138d1 100644
--- a/usr.bin/elf2aout/Makefile
+++ b/usr.bin/elf2aout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/elf2aout/Makefile,v 1.9 2004/12/21 08:47:29 ru Exp $
 
 PROG=	elf2aout
 NO_MAN=
diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index 3abf8188fcaf..45c152e7e57f 100644
--- a/usr.bin/elf2aout/elf2aout.c
+++ b/usr.bin/elf2aout/elf2aout.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/elf2aout/elf2aout.c,v 1.9 2003/03/29 03:03:42 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/elf64.h>
diff --git a/usr.bin/elfdump/Makefile b/usr.bin/elfdump/Makefile
index 95ce514b3ace..dd2e9e38303f 100644
--- a/usr.bin/elfdump/Makefile
+++ b/usr.bin/elfdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/elfdump/Makefile,v 1.4 2003/02/03 01:59:27 obrien Exp $
 
 PROG=	elfdump
 WARNS?=	5
diff --git a/usr.bin/elfdump/elfdump.1 b/usr.bin/elfdump/elfdump.1
index 1902e41820c8..d2fc5574c600 100644
--- a/usr.bin/elfdump/elfdump.1
+++ b/usr.bin/elfdump/elfdump.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/elfdump/elfdump.1,v 1.6 2005/01/18 13:43:48 ru Exp $
 .\"
 .Dd January 15, 2003
 .Dt ELFDUMP 1
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index e9fcb21ae465..791d6617372f 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/elfdump/elfdump.c,v 1.12 2004/03/02 14:06:27 jake Exp $");
 
 #include <sys/types.h>
 #include <sys/elf32.h>
diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile
index 32a670b07eca..6e5ad7b3a6df 100644
--- a/usr.bin/enigma/Makefile
+++ b/usr.bin/enigma/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/enigma/Makefile,v 1.9 2004/02/05 22:44:24 ru Exp $
 
 PROG=	enigma
 
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index a66ad0a9a8af..1a1214a7e55e 100644
--- a/usr.bin/enigma/enigma.1
+++ b/usr.bin/enigma/enigma.1
@@ -4,7 +4,7 @@
 .\" Since enigma itself is distributed in the Public Domain, this file
 .\" is also.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/enigma/enigma.1,v 1.11.2.1 2005/07/17 15:03:35 brueffer Exp $
 .\" "
 .Dd May 14, 2004
 .Os
diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c
index 25bb4568a20b..3f2d980ae609 100644
--- a/usr.bin/enigma/enigma.c
+++ b/usr.bin/enigma/enigma.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/enigma/enigma.c,v 1.8 2003/10/09 10:00:53 tjr Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile
index bc1eea49153a..867cf948c0ca 100644
--- a/usr.bin/env/Makefile
+++ b/usr.bin/env/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/env/Makefile,v 1.6 2005/06/20 03:43:25 gad Exp $
 
 PROG=	env
 SRCS=	env.c envopts.c
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index a1696d3c2cf7..667c20058115 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -33,7 +33,7 @@
 .\"
 .\" From @(#)printenv.1	8.1 (Berkeley) 6/6/93
 .\" From FreeBSD: src/usr.bin/printenv/printenv.1,v 1.17 2002/11/26 17:33:35 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/env/env.1,v 1.9 2005/06/22 19:04:07 ru Exp $
 .\"
 .Dd June 20, 2005
 .Dt ENV 1
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 815976fe5f7a..b11de5271d2a 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)env.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/env/env.c,v 1.16 2005/06/21 19:38:26 gad Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/env/envopts.c b/usr.bin/env/envopts.c
index f8214305cc60..d3dadeed4e80 100644
--- a/usr.bin/env/envopts.c
+++ b/usr.bin/env/envopts.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/env/envopts.c,v 1.2.2.1 2005/07/25 18:09:09 gad Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/usr.bin/env/envopts.h b/usr.bin/env/envopts.h
index 1f15c6917a80..5e30ac1e2cd4 100644
--- a/usr.bin/env/envopts.h
+++ b/usr.bin/env/envopts.h
@@ -27,7 +27,7 @@
  * are those of the authors and should not be interpreted as representing
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/env/envopts.h,v 1.1 2005/06/20 03:43:25 gad Exp $
  */
 
 void		 search_paths(char *path, char **argv);
diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile
index c6b339c69fc2..6093c6b5b6cc 100644
--- a/usr.bin/expand/Makefile
+++ b/usr.bin/expand/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/expand/Makefile,v 1.4 2002/02/08 22:31:38 markm Exp $
 
 PROG=	expand
 MLINKS=	expand.1 unexpand.1
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 263017cc26d3..c38ef3c227f1 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)expand.1	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/expand/expand.1,v 1.14 2005/01/17 07:44:17 ru Exp $
 .\"
 .Dd April 21, 2002
 .Dt EXPAND 1
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 6c99db806856..3ba16b833283 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/expand/expand.c,v 1.15 2004/06/24 13:42:26 tjr Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile
index ffae97dc061f..3dd55e90c0cf 100644
--- a/usr.bin/false/Makefile
+++ b/usr.bin/false/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/false/Makefile,v 1.3 2002/02/08 22:31:38 markm Exp $
 
 PROG=	false
 
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 415ec580a375..24a8ab2812bf 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)false.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/false/false.1,v 1.11 2001/11/22 11:05:31 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt FALSE 1
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index 27b2c258cfff..7a5155755ebd 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)false.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/false/false.c,v 1.5 2003/02/19 00:10:28 peter Exp $");
 
 int
 main(void)
diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile
index 68115a7fdcb4..8ae6a091e639 100644
--- a/usr.bin/fetch/Makefile
+++ b/usr.bin/fetch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fetch/Makefile,v 1.17 2004/12/21 10:16:02 ru Exp $
 
 PROG=		fetch
 CSTD?=		c99
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 5a629304b06c..34b7ec1ae74a 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.66 2005/02/13 22:25:21 ru Exp $
 .\"
 .Dd March 11, 2003
 .Dt FETCH 1
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index 2834e0b5902c..3584461136d5 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fetch/fetch.c,v 1.75 2004/11/18 12:01:30 cperciva Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 0aec031c98cc..f2f1c8c3a26d 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Makefile,v 1.30 2004/11/19 04:04:14 obrien Exp $
 # Makefile for file(1) cmd.
 # Copyright (c) David E. O'Brien, 2000-2004
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
diff --git a/usr.bin/file/config.h b/usr.bin/file/config.h
index 1863903ff588..0ff0d7b8da2c 100644
--- a/usr.bin/file/config.h
+++ b/usr.bin/file/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/file/config.h,v 1.9 2004/12/28 04:35:00 obrien Exp $ */
 
 #include <osreldate.h>
 
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 789122678188..6c641bee17cb 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file/file.1,v 1.36 2005/02/13 23:45:50 ru Exp $
 .\" $Id: file.man,v 1.54 2003/10/27 18:09:08 christos Exp $
 .Dd October 27, 2003
 .Dt FILE 1 "Copyright but distributable"
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 9d5bd04486c2..8e31aa21eab4 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file/magic.5,v 1.23 2004/12/28 12:29:06 ru Exp $
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index c3c6ddc7612d..602ce7461c02 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file2c/Makefile,v 1.8 2005/05/15 06:26:59 marcel Exp $
 
 PROG=	file2c
 WARNS?=	6
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 80bbb2eea606..bba060ecb5c3 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file2c/file2c.1,v 1.11.2.1 2005/08/18 15:01:24 keramida Exp $
 .\"
 .Dd May 14, 2005
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 8e16bbb8b383..9ad90622130d 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/file2c/file2c.c,v 1.9 2005/05/15 06:26:59 marcel Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index b20dc0346f55..33038fe23f66 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/find/Makefile,v 1.18 2005/01/25 14:07:25 ssouhlal Exp $
 
 PROG=	find
 SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c \
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index 2ee85102688b..5af20fec3c1f 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/16/94
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/find/extern.h,v 1.22 2004/07/29 03:29:44 tjr Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index bf654137f24e..325eff8e53fd 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/find/find.1,v 1.73 2005/06/14 11:50:51 ru Exp $
 .\"
 .Dd April 2, 2005
 .Dt FIND 1
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 0486e8b096b5..562dfc372558 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)find.c	8.5 (Berkeley) 8/5/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/find.c,v 1.17 2004/05/28 17:17:15 eik Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index 59c70b66640f..745d116f345b 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)find.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/find/find.h,v 1.17 2004/05/28 17:17:15 eik Exp $
  */
 
 #include <regex.h>
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index beeebef05cee..b93c7d53e75e 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -41,7 +41,7 @@ static const char sccsid[] = "@(#)function.c	8.10 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.53 2005/01/25 14:07:25 ssouhlal Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y
index b4b15c444e57..eba2f9a2aded 100644
--- a/usr.bin/find/getdate.y
+++ b/usr.bin/find/getdate.y
@@ -13,7 +13,7 @@
 /* SUPPRESS 288 on yyerrlab *//* Label unused */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/getdate.y,v 1.3 2003/06/14 13:00:21 markm Exp $");
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 88e45938cc6d..b5ca8ae56c07 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ls.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/ls.c,v 1.17 2004/01/20 09:27:03 des Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 643f1f8cbf3a..b1f22332658a 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/main.c,v 1.15 2003/06/14 13:00:21 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 15329064cf44..a8274130c29f 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)misc.c	8.2 (Berkeley) 4/1/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/misc.c,v 1.8 2005/04/02 07:44:12 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index c774efa0dc89..f04d12adaffd 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)operator.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/operator.c,v 1.14 2003/06/14 13:00:21 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 718c2cdc3a9e..9013cb88c05f 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/option.c,v 1.23 2004/07/29 03:29:44 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/finger/Makefile b/usr.bin/finger/Makefile
index 983392b7a1e0..aea815eef043 100644
--- a/usr.bin/finger/Makefile
+++ b/usr.bin/finger/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/finger/Makefile,v 1.5 2002/02/08 22:31:39 markm Exp $
 
 PROG=	finger
 SRCS=	finger.c lprint.c net.c sprint.c util.c
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 38552094ac7b..019a089fb3b4 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/extern.h,v 1.9 2004/03/14 06:43:34 jmallett Exp $
  */
 
 #ifndef	_EXTERN_H_
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 1ef35d6e4d81..9d5a9ed4a489 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/finger/finger.1,v 1.30 2004/07/17 04:04:30 tjr Exp $
 .\"
 .Dd July 17, 2004
 .Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index bcba85f714d2..6b220986ffc0 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/finger.c,v 1.35 2005/05/21 09:55:05 ru Exp $");
 
 /*
  * Finger prints out information about users.  It is not portable since
diff --git a/usr.bin/finger/finger.conf.5 b/usr.bin/finger/finger.conf.5
index 54f5eecd7c54..83ebc5be8e0b 100644
--- a/usr.bin/finger/finger.conf.5
+++ b/usr.bin/finger/finger.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/usr.bin/finger/finger.conf.5,v 1.6 2005/02/09 18:04:22 ru Exp $
 .\"
 .Dd August 16, 2000
 .Dt FINGER.CONF 5
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 6b18146d4b50..bf56cd66ba13 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)finger.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/finger.h,v 1.5 2004/03/14 06:43:34 jmallett Exp $
  */
 
 #ifndef	_FINGER_H_
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 848bbeeeb324..695701763bce 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/lprint.c,v 1.25 2004/03/14 06:43:34 jmallett Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 2bd35ad00ac2..16572b2c638f 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/net.c,v 1.23 2004/05/16 22:08:15 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/pathnames.h b/usr.bin/finger/pathnames.h
index 7c9ad19abcb6..160252d41183 100644
--- a/usr.bin/finger/pathnames.h
+++ b/usr.bin/finger/pathnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/pathnames.h,v 1.5 2001/07/30 16:50:47 yar Exp $
  */
 
 #ifndef PATHNAMES_H
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 51a19190b01f..3dcd69c69488 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/sprint.c,v 1.22 2003/04/02 20:22:29 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 3ac5a068331c..324ea4848f53 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/util.c,v 1.21 2003/04/02 20:22:29 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/fmt/Makefile b/usr.bin/fmt/Makefile
index b15d254d3936..b8b70b3237f4 100644
--- a/usr.bin/fmt/Makefile
+++ b/usr.bin/fmt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fmt/Makefile,v 1.8 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	fmt
 
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 162bcab0f9d2..6480c82efe97 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fmt/fmt.1,v 1.14 2004/08/02 11:12:13 tjr Exp $
 .\"
 .\" Modified by Gareth McCaughan to describe the new version of `fmt'
 .\" rather than the old one.
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 33f92b1b82d5..853695fca4e9 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -173,7 +173,7 @@ static const char copyright[] =
   "Copyright (c) 1997 Gareth McCaughan. All rights reserved.\n";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fmt/fmt.c,v 1.22 2004/08/02 11:10:20 tjr Exp $");
 
 #include <err.h>
 #include <locale.h>
diff --git a/usr.bin/fold/Makefile b/usr.bin/fold/Makefile
index d73d0a7cee43..df1973522674 100644
--- a/usr.bin/fold/Makefile
+++ b/usr.bin/fold/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fold/Makefile,v 1.3 2002/02/08 22:31:39 markm Exp $
 
 PROG=	fold
 
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 3928b88adf52..b9f206d1b903 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fold.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fold/fold.1,v 1.12 2004/08/02 11:15:01 tjr Exp $
 .\"
 .Dd August 2, 2004
 .Dt FOLD 1
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 59d8fc59adfd..c0a92b9ce5a6 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fold/fold.c,v 1.13 2004/06/24 15:12:29 tjr Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile
index 57b966353fdc..63315d51cee0 100644
--- a/usr.bin/from/Makefile
+++ b/usr.bin/from/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/from/Makefile,v 1.3 2002/02/08 22:31:39 markm Exp $
 
 PROG=	from
 
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 2052623a6933..17ecf6913f5b 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)from.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/from/from.1,v 1.15 2005/05/21 09:55:06 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 84d0c52b23a3..51f3222f2532 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/from/from.c,v 1.14 2002/09/04 23:29:00 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 8ca57b992bc8..eee3ce513b23 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fstat/Makefile,v 1.9 2004/10/21 12:09:45 phk Exp $
 
 PROG=	fstat
 SRCS=	cd9660.c fstat.c msdosfs.c
diff --git a/usr.bin/fstat/cd9660.c b/usr.bin/fstat/cd9660.c
index 1c26e8d854a8..a86964eec454 100644
--- a/usr.bin/fstat/cd9660.c
+++ b/usr.bin/fstat/cd9660.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fstat/cd9660.c,v 1.6 2005/03/16 10:24:16 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 91bf4d27530d..5b025af511c0 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstat.1	8.3 (Berkeley) 2/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fstat/fstat.1,v 1.26 2005/02/13 22:25:22 ru Exp $
 .\"
 .Dd March 27, 2002
 .Dt FSTAT 1
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 9c247977215e..d6fd9c26d936 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fstat/fstat.c,v 1.60.2.1 2005/08/06 22:26:51 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index dda8bbf7906b..66f47260f74a 100644
--- a/usr.bin/fstat/fstat.h
+++ b/usr.bin/fstat/fstat.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fstat/fstat.h,v 1.6 2004/06/29 21:28:09 dwmalone Exp $
  */
 
 #ifndef	__FSTAT_H__
diff --git a/usr.bin/fstat/msdosfs.c b/usr.bin/fstat/msdosfs.c
index 5bae63e4b5eb..720a6ebf71a1 100644
--- a/usr.bin/fstat/msdosfs.c
+++ b/usr.bin/fstat/msdosfs.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fstat/msdosfs.c,v 1.9 2004/06/29 21:28:09 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile
index 42aa6ddec665..f71790f4f8b8 100644
--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fsync/Makefile,v 1.5 2005/01/25 14:12:01 ssouhlal Exp $
 
 PROG=	fsync
 
diff --git a/usr.bin/fsync/fsync.1 b/usr.bin/fsync/fsync.1
index 0cc41d3ceb05..ee77227d356a 100644
--- a/usr.bin/fsync/fsync.1
+++ b/usr.bin/fsync/fsync.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fsync/fsync.1,v 1.7 2005/01/26 06:42:45 ssouhlal Exp $
 .\"
 .Dd January 25, 2005
 .Dt FSYNC 1
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 78aeb21baa21..82ccf71d1c60 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -27,7 +27,7 @@
 #ifndef lint
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fsync/fsync.c,v 1.7 2005/01/26 15:17:25 delphij Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 25d30d476e99..844548b52148 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ftp/Makefile,v 1.17 2004/02/05 22:44:24 ru Exp $
 #	$NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
diff --git a/usr.bin/ftp/config.h b/usr.bin/ftp/config.h
index 77dff70747ce..26dbd6c21712 100644
--- a/usr.bin/ftp/config.h
+++ b/usr.bin/ftp/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/ftp/config.h,v 1.3 2002/06/15 09:42:17 mikeh Exp $ */
 
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile
index 5ab51cf5c7eb..472a7d052d50 100644
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gcore/Makefile,v 1.9 2004/11/27 06:46:48 das Exp $
 
 PROG=	gcore
 SRCS=	elfcore.c gcore.c
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index 4a920eb0246f..8ffd7f28f023 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gcore/elfcore.c,v 1.17 2004/07/12 20:19:40 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/procfs.h>
diff --git a/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h
index 1bd70954794f..64b2ebe3b936 100644
--- a/usr.bin/gcore/extern.h
+++ b/usr.bin/gcore/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gcore/extern.h,v 1.4 2002/09/13 16:33:35 peter Exp $
  */
 
 struct dumpers {
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index 981e0be3b346..dfe6d821c9f7 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gcore/gcore.1,v 1.15 2004/07/03 00:24:40 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 7005e834ff91..b7846d291535 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gcore/gcore.c,v 1.31 2004/02/15 22:48:25 dwmalone Exp $");
 
 /*
  * Originally written by Eric Cooper in Fall 1981.
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index a6c9991bb5b9..d59655138438 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gencat/Makefile,v 1.9 2005/06/30 11:56:31 johan Exp $
 
 PROG=	gencat
 WARNS?=	6
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index eed676428487..b4d5f03bab24 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -24,7 +24,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/usr.bin/gencat/gencat.1,v 1.12 2005/01/17 07:44:17 ru Exp $
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index 306f48d3d7bd..c419f2d92c62 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -72,7 +72,7 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gencat/gencat.c,v 1.12 2005/02/27 19:37:51 ru Exp $");
 
 #define _NLS_PRIVATE
 
diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile
index eaaf628aad37..8b035ab4392b 100644
--- a/usr.bin/getconf/Makefile
+++ b/usr.bin/getconf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getconf/Makefile,v 1.4 2002/11/25 09:00:05 ru Exp $
 
 PROG=	getconf
 
diff --git a/usr.bin/getconf/confstr.gperf b/usr.bin/getconf/confstr.gperf
index c629987e5caf..929a8fd1350a 100644
--- a/usr.bin/getconf/confstr.gperf
+++ b/usr.bin/getconf/confstr.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/confstr.gperf,v 1.5 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/fake-gperf.awk b/usr.bin/getconf/fake-gperf.awk
index 96fcd3c9977c..b3107fe40e02 100644
--- a/usr.bin/getconf/fake-gperf.awk
+++ b/usr.bin/getconf/fake-gperf.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getconf/fake-gperf.awk,v 1.3 2003/08/22 17:32:07 markm Exp $
 BEGIN {
   state = 0;
   struct_seen = "";
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index c3baed94b1fa..35e4d7e680c2 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/getconf/getconf.1,v 1.14 2005/01/18 13:43:49 ru Exp $
 .\"
 .Dd September 18, 2002
 .Dt GETCONF 1
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 0ba45a0e3ce3..2dcb8250b5fb 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/getconf/getconf.c,v 1.9 2003/08/22 17:32:07 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/getconf/getconf.h b/usr.bin/getconf/getconf.h
index 266a0ff3b051..3f7e412f9dc7 100644
--- a/usr.bin/getconf/getconf.h
+++ b/usr.bin/getconf/getconf.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/getconf.h,v 1.4 2002/10/27 04:14:08 wollman Exp $
  */
 
 #ifdef STABLE
diff --git a/usr.bin/getconf/limits.gperf b/usr.bin/getconf/limits.gperf
index 68e0d65e78ff..ceb93db33471 100644
--- a/usr.bin/getconf/limits.gperf
+++ b/usr.bin/getconf/limits.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/limits.gperf,v 1.2 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/pathconf.gperf b/usr.bin/getconf/pathconf.gperf
index e8b83659d80f..00a934592a17 100644
--- a/usr.bin/getconf/pathconf.gperf
+++ b/usr.bin/getconf/pathconf.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/pathconf.gperf,v 1.4 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/progenv.gperf b/usr.bin/getconf/progenv.gperf
index 40ce16a16069..13656e33aa79 100644
--- a/usr.bin/getconf/progenv.gperf
+++ b/usr.bin/getconf/progenv.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/progenv.gperf,v 1.3 2005/02/18 21:53:05 wollman Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/sysconf.gperf b/usr.bin/getconf/sysconf.gperf
index ae88464a0b74..945f7ab47284 100644
--- a/usr.bin/getconf/sysconf.gperf
+++ b/usr.bin/getconf/sysconf.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/sysconf.gperf,v 1.5 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index 01dfa87e2935..7a633ee477eb 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getopt/Makefile,v 1.5 2002/02/08 22:31:40 markm Exp $
 #
 
 PROG = getopt
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 771a2e73645f..53bc1ea46fc7 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/getopt/getopt.1,v 1.23 2005/02/13 22:25:22 ru Exp $
 .\"
 .Dd April 3, 1999
 .Dt GETOPT 1
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index 33637604f26f..a897b4105e7d 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/getopt/getopt.c,v 1.10 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile
index a24d9cda6c81..9fa5a90f7449 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/29/93
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/gprof/Makefile,v 1.8 2004/06/20 11:05:25 stefanf Exp $
 
 PROG=	gprof
 SRCS=	gprof.c aout.c arcs.c dfn.c elf.c lookup.c hertz.c \
diff --git a/usr.bin/gprof/alpha.h b/usr.bin/gprof/alpha.h
index 823d6562d105..bf7c5771255c 100644
--- a/usr.bin/gprof/alpha.h
+++ b/usr.bin/gprof/alpha.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/alpha.h,v 1.2 2002/02/21 07:12:57 bde Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/amd64.h b/usr.bin/gprof/amd64.h
index 823d6562d105..c869875864a8 100644
--- a/usr.bin/gprof/amd64.h
+++ b/usr.bin/gprof/amd64.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/amd64.h,v 1.2 2002/02/21 07:12:57 bde Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/aout.c b/usr.bin/gprof/aout.c
index 2ccf818f42e0..6afa3c48f7eb 100644
--- a/usr.bin/gprof/aout.c
+++ b/usr.bin/gprof/aout.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/aout.c,v 1.7 2004/06/20 11:05:25 stefanf Exp $");
 
 #include <netinet/in.h>
 
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 3be00dffbc6a..10d87a7e706a 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/arcs.c,v 1.12 2004/06/20 11:05:25 stefanf Exp $");
 
 #include <err.h>
 #include "gprof.h"
diff --git a/usr.bin/gprof/arm.h b/usr.bin/gprof/arm.h
index 823d6562d105..c7d626d0a22f 100644
--- a/usr.bin/gprof/arm.h
+++ b/usr.bin/gprof/arm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/arm.h,v 1.1 2004/05/14 13:44:04 cognet Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index 0e23a87a22bf..6658432ceb66 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)dfn.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/dfn.c,v 1.5 2002/10/16 13:50:09 charnier Exp $");
 
 #include <err.h>
 #include "gprof.h"
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index b0af431dc5a1..26d5428e8030 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/elf.c,v 1.5 2002/10/16 13:50:09 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 035e14674b3a..03d9aa765abd 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gprof.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gprof/gprof.1,v 1.28 2005/02/13 22:25:22 ru Exp $
 .\"
 .Dd June 20, 2004
 .Dt GPROF 1
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index cfb9fab2cc9b..9b7dab1f572e 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/gprof.c,v 1.24 2004/07/11 17:37:33 stefanf Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index aba2dea0018b..c76d6c97ea5b 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gprof.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/gprof.h,v 1.24 2004/10/03 18:22:35 stefanf Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index cf8a3ae68523..2ef289b487a9 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)hertz.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/hertz.c,v 1.3 2004/10/03 18:22:35 stefanf Exp $");
 
 #include <sys/time.h>
 
diff --git a/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index 823d6562d105..a6e9bb73aff1 100644
--- a/usr.bin/gprof/i386.h
+++ b/usr.bin/gprof/i386.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/i386.h,v 1.2 2002/02/21 07:12:57 bde Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/ia64.h b/usr.bin/gprof/ia64.h
index 823d6562d105..4fe478b8965f 100644
--- a/usr.bin/gprof/ia64.h
+++ b/usr.bin/gprof/ia64.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/ia64.h,v 1.2 2002/02/21 07:12:57 bde Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/kernel.c b/usr.bin/gprof/kernel.c
index dc456f5f97a9..cfc0870c3b94 100644
--- a/usr.bin/gprof/kernel.c
+++ b/usr.bin/gprof/kernel.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/kernel.c,v 1.5 2004/10/05 23:50:10 green Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index f51da9829f74..4716453f1b54 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/lookup.c,v 1.5 2002/10/16 13:50:09 charnier Exp $");
 
 #include "gprof.h"
 
diff --git a/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index 0dcd78c6af47..7a9d8ff9211c 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- *  $FreeBSD$
+ *  $FreeBSD: src/usr.bin/gprof/pathnames.h,v 1.2 2002/10/16 13:50:09 charnier Exp $
  */
 
 #define	_PATH_FLAT_BLURB	"/usr/share/misc/gprof.flat"
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 4ca539588c73..24e723b8d714 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/printgprof.c,v 1.12 2004/05/24 12:44:00 stefanf Exp $");
 
 #include <err.h>
 #include <string.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index ed68bcc0d313..1ec8cdb74875 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)printlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/printlist.c,v 1.6 2004/05/24 12:44:00 stefanf Exp $");
 
 #include <err.h>
 #include <string.h>
diff --git a/usr.bin/gprof/sparc64.h b/usr.bin/gprof/sparc64.h
index 823d6562d105..a4b64254fe13 100644
--- a/usr.bin/gprof/sparc64.h
+++ b/usr.bin/gprof/sparc64.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/sparc64.h,v 1.1 2002/03/10 01:25:47 jake Exp $
  */
 
     /*
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 81346182e650..f0021c9e7275 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)head.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/head/head.1,v 1.13 2005/01/17 07:44:18 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt HEAD 1
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index eb20446ec636..fa39b9c85612 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/head/head.c,v 1.18 2002/07/23 14:39:20 jmallett Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hesinfo/Makefile b/usr.bin/hesinfo/Makefile
index 870db2887d7b..c4c46764ffc0 100644
--- a/usr.bin/hesinfo/Makefile
+++ b/usr.bin/hesinfo/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/hesinfo/Makefile,v 1.3 2002/02/08 22:31:40 markm Exp $
 
 PROG=	hesinfo
 
diff --git a/usr.bin/hesinfo/hesinfo.1 b/usr.bin/hesinfo/hesinfo.1
index 7ab2d35d4a30..004b4070290a 100644
--- a/usr.bin/hesinfo/hesinfo.1
+++ b/usr.bin/hesinfo/hesinfo.1
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hesinfo/hesinfo.1,v 1.6 2005/02/09 18:04:22 ru Exp $
 .\"
 .Dd October 27, 1996
 .Dt HESINFO 1
diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c
index fa81864a5d00..503d46c46f86 100644
--- a/usr.bin/hesinfo/hesinfo.c
+++ b/usr.bin/hesinfo/hesinfo.c
@@ -19,7 +19,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hesinfo/hesinfo.c,v 1.7 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile
index 3252fc9af147..22e1b59f64ce 100644
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/hexdump/Makefile,v 1.9 2004/07/22 13:14:42 johan Exp $
 
 PROG=	hexdump
 SRCS=	conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 9668780677b0..d01b97ad066d 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -35,7 +35,7 @@
 static const char sccsid[] = "@(#)conv.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/conv.c,v 1.8 2004/07/16 11:07:07 johan Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index db04c49aade5..6cf3aa80d8e8 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/display.c,v 1.22 2004/08/04 02:47:32 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 4d8c2daefecc..cbf17d6033d4 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hexdump.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hexdump/hexdump.1,v 1.22 2005/01/17 07:44:18 ru Exp $
 .\"
 .Dd July 10, 2004
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 2ed7c4b9df49..78df723fa436 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/hexdump.c,v 1.7 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <locale.h>
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 9a1198f45cf5..a98428786986 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hexdump.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/hexdump/hexdump.h,v 1.9 2004/07/11 01:11:12 tjr Exp $
  */
 
 #include <wchar.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 4d21611f6a3f..a510db35e9ae 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)hexsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/hexsyntax.c,v 1.12 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 647fca030bd0..059b6b04eb26 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)od.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.19 2005/01/17 07:44:18 ru Exp $
 .\"
 .Dd July 11, 2004
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index e0f9283bbc22..c144d2fe5528 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.17 2004/07/22 13:14:42 johan Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 1231a1519ea5..0fd67ff955c5 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/parse.c,v 1.13 2004/07/22 13:14:42 johan Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index 998a496c7b37..791cd44cf71e 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/host/Makefile,v 1.11.2.1 2005/07/30 07:56:26 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 715456839582..44ec4ec05a30 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/id/Makefile,v 1.11 2004/05/19 21:06:36 dwmalone Exp $
 
 PROG=	id
 WARNS?=	6
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index 0654f41f3fc9..331eeb0c8e4b 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)groups.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/groups.1,v 1.9 2005/01/17 07:44:18 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 14b990d58428..6aebf365fd15 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/id.1,v 1.15 2005/04/29 08:37:52 robert Exp $
 .\"
 .Dd May 3, 2004
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 20a348e81767..df9da51fd543 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/id/id.c,v 1.26 2005/04/29 10:11:18 robert Exp $");
 
 #include <sys/param.h>
 #include <sys/mac.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 958570df5fcc..568fbaf147c1 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)whoami.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/whoami.1,v 1.9 2005/01/17 07:44:19 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt WHOAMI 1
diff --git a/usr.bin/indent/README b/usr.bin/indent/README
index 03d5d3d8d39e..a796b4614647 100644
--- a/usr.bin/indent/README
+++ b/usr.bin/indent/README
@@ -1,5 +1,5 @@
 
-  $FreeBSD$
+  $FreeBSD: src/usr.bin/indent/README,v 1.2 2002/10/16 13:58:39 charnier Exp $
 
 This is the C indenter, it originally came from the University of Illinois
 via some distribution tape for PDP-11 Unix.  It has subsequently been
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index f139de588404..cc6deea06a10 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/args.c,v 1.15 2004/09/19 20:34:30 das Exp $");
 
 /*
  * Argument scanning and profile reading code.  Default parameters are set
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index f04e13d5f426..a4ee47cde667 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)indent.1	8.1 (Berkeley) 7/1/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/indent/indent.1,v 1.26.2.1 2005/08/18 15:01:24 keramida Exp $
 .\"
 .Dd June 29, 2004
 .Dt INDENT 1
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index f91043f7d3b1..911080d67658 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/indent.c,v 1.23 2004/06/27 10:58:37 schweikh Exp $");
 
 #include <sys/param.h>
 #include <err.h>
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index 4c52bf8370e4..ac40f01b0484 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -25,7 +25,7 @@
  */
 
 #if 0
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/indent.h,v 1.2 2002/03/30 17:10:20 dwmalone Exp $");
 #endif
 
 void	addkey(char *, int);
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index e1ff294e2576..008bf2b41a9f 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)indent_codes.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/indent/indent_codes.h,v 1.2 2000/12/09 09:52:51 obrien Exp $
  */
 
 #define newline		1
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index 010b3a3d6794..781718de9ae4 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)indent_globs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/indent/indent_globs.h,v 1.10 2004/06/27 10:58:37 schweikh Exp $
  */
 
 #define BACKSLASH '\\'
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 45eb6c2d5f3b..f818aed47f63 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/io.c,v 1.14 2004/06/27 10:58:37 schweikh Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 3d30bb337ce5..0c6437076d6a 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)lexi.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/lexi.c,v 1.18 2004/02/09 15:27:02 bde Exp $");
 
 /*
  * Here we have the token scanner for indent.  It scans off one token and puts
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 65d9a6bb8c47..7720ff147acf 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/parse.c,v 1.10 2003/06/15 09:28:17 charnier Exp $");
 
 #include <stdio.h>
 #include "indent_globs.h"
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 9524bf404f19..ad7fe2e7f607 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)pr_comment.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/pr_comment.c,v 1.8 2003/06/15 09:28:17 charnier Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 9c0e45c0702c..c369399219c5 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcrm/Makefile,v 1.6 2002/02/08 22:31:40 markm Exp $
 
 PROG=	ipcrm
 
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index b7e7c841da20..6b3193dd9517 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.13 2004/07/02 22:22:25 ru Exp $
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 8c039aefd01e..8f93b483bccd 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ipcrm/ipcrm.c,v 1.11 2002/09/04 23:29:02 dwmalone Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index af767776af9a..9024c6ac35e3 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcs/Makefile,v 1.7 2004/02/05 22:44:24 ru Exp $
 
 PROG=	ipcs
 DPADD=	${LIBKVM}
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 7d231342d68b..0e94097bc4c8 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.21 2005/01/18 13:43:49 ru Exp $
 .\"
 .Dd March 24, 2004
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 5a1dbb02d67b..773d9974b633 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ipcs/ipcs.c,v 1.27 2005/05/24 23:42:09 csjp Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index b42ea5abcac8..509f77814b0f 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)join.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/join/join.1,v 1.20 2005/02/13 22:25:23 ru Exp $
 .\"
 .Dd July 5, 2004
 .Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 097ecbe743f9..52ffac2bfdbc 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/join/join.c,v 1.20 2004/08/26 06:28:05 maxim Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index 662600eef0a8..7804b92f282a 100644
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/jot/Makefile,v 1.4 2002/02/08 22:31:40 markm Exp $
 
 PROG=	jot
 
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index e3c3fcf47957..7a8e3bd1975a 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)jot.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/jot/jot.1,v 1.17 2005/01/18 13:43:50 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index f3f74235a966..b4db20f74e24 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)jot.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/jot/jot.c,v 1.26 2004/07/16 05:10:46 tjr Exp $");
 
 /*
  * jot - print sequential or random data
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 060081c2899e..88e596245243 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/kdump/Makefile,v 1.11 2002/07/23 09:15:45 ru Exp $
 
 .PATH: ${.CURDIR}/../ktrace
 
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 802f7cc2a594..a3bec0010488 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/kdump/kdump.1,v 1.12 2005/01/28 12:17:33 gnn Exp $
 .\"
 .Dd January 28, 2005
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 8b122ab3577b..f148f6a5ff7a 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)kdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.26 2004/09/19 14:54:35 ru Exp $");
 
 #define _KERNEL
 extern int errno;
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index cbe751503009..92f1fd3ef6f1 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,6 +1,6 @@
 set -e
 
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/kdump/mkioctls,v 1.37 2004/06/16 23:39:33 mlaier Exp $
 
 if [ "x$1" = "x-s" ]; then
 	use_switch=1
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index bf279eb25b22..776568cb44ab 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogin/Makefile,v 1.3 1999/08/28 01:02:27 peter Exp $
 
 PROG=	keylogin
 
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index 8a3927dfb65a..5d55b2443c0a 100644
--- a/usr.bin/keylogin/keylogin.1
+++ b/usr.bin/keylogin/keylogin.1
@@ -1,6 +1,6 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.8 2004/07/03 00:24:41 ru Exp $
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
diff --git a/usr.bin/keylogin/keylogin.c b/usr.bin/keylogin/keylogin.c
index 8e10d957b3ef..484efb40f8f4 100644
--- a/usr.bin/keylogin/keylogin.c
+++ b/usr.bin/keylogin/keylogin.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)keylogin.c 1.4 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/keylogin/keylogin.c,v 1.4 2002/06/30 05:25:01 obrien Exp $");
 
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index 1f5feec6e9d0..07a67120a520 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogout/Makefile,v 1.4 2004/02/04 11:59:07 ru Exp $
 
 PROG=	keylogout
 
diff --git a/usr.bin/keylogout/keylogout.1 b/usr.bin/keylogout/keylogout.1
index 6d643c90d1ad..485e12079024 100644
--- a/usr.bin/keylogout/keylogout.1
+++ b/usr.bin/keylogout/keylogout.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keylogout/keylogout.1,v 1.5 2002/04/20 12:14:57 charnier Exp $
 .\" @(#)keylogout.1 1.4 91/03/11 TIRPC 1.0; from 1.3 89/07/26 SMI;
 .Dd April 15, 1989
 .Dt KEYLOGOUT 1
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index e4fcf21adbeb..a7169ce48261 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/keylogout/keylogout.c,v 1.5 2002/06/30 05:25:01 obrien Exp $");
 
 /*
  * unset the secret key on local machine
diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile
index ff772a800aec..584e6d82b29e 100644
--- a/usr.bin/killall/Makefile
+++ b/usr.bin/killall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/killall/Makefile,v 1.4 2000/08/28 22:09:38 peter Exp $
 
 PROG=	killall
 
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index bfac13f7e7e1..bcf23a37bd89 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -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/usr.bin/killall/killall.1,v 1.34 2005/01/17 07:44:20 ru Exp $
 .\"
 .Dd January 26, 2004
 .Os
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index 10537e624c1a..e0e996424b88 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/killall/killall.c,v 1.31 2004/07/29 18:36:35 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/jail.h>
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index c00bb7510459..542046efc5a0 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ktrace/Makefile,v 1.6 1999/08/28 01:02:32 peter Exp $
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index fd2d3902df02..9e5d84bd71fe 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ktrace/ktrace.1,v 1.17 2005/01/18 13:43:50 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 4b8379614e64..13c78fb7d9ff 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ktrace.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ktrace/ktrace.c,v 1.20 2003/02/05 14:25:43 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index 058fbd7e01ba..c699fffa3f26 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ktrace/ktrace.h,v 1.4 2002/04/28 13:00:16 markm Exp $
  */
 
 #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 01d7b43a3fcb..950962a5f3df 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ktrace/subr.c,v 1.13 2004/11/27 06:51:38 das Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/ktrdump/Makefile b/usr.bin/ktrdump/Makefile
index 6b5ff127165f..caacccb32294 100644
--- a/usr.bin/ktrdump/Makefile
+++ b/usr.bin/ktrdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ktrdump/Makefile,v 1.3 2002/06/06 11:27:03 ru Exp $
 
 PROG=	ktrdump
 DPADD=	${LIBKVM}
diff --git a/usr.bin/ktrdump/ktrdump.8 b/usr.bin/ktrdump/ktrdump.8
index 1e0e8c94208e..41fbb2182735 100644
--- a/usr.bin/ktrdump/ktrdump.8
+++ b/usr.bin/ktrdump/ktrdump.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ktrdump/ktrdump.8,v 1.8 2005/06/14 11:50:52 ru Exp $
 .\"
 .Dd March 8, 2005
 .Dt KTRDUMP 8
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index 33b846ede1d4..83ed8f53a313 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ktrdump/ktrdump.c,v 1.11 2005/06/05 23:49:35 csjp Exp $");
 
 #include <sys/types.h>
 #include <sys/ktr.h>
diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile
index 08b73286dfc4..062e4817e5b8 100644
--- a/usr.bin/lam/Makefile
+++ b/usr.bin/lam/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lam/Makefile,v 1.3 2002/02/08 22:31:41 markm Exp $
 
 PROG=	lam
 
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 2d248f61aed4..9986577373be 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lam.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lam/lam.1,v 1.13 2004/08/12 11:34:34 tjr Exp $
 .\"
 .Dd August 12, 2004
 .Dt LAM 1
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 40cd9453610f..f82ea026aa76 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lam/lam.c,v 1.13 2004/07/19 12:57:24 tjr Exp $");
 
 /*
  *	lam - laminate files
diff --git a/usr.bin/last/Makefile b/usr.bin/last/Makefile
index f7e88115e9b1..0cfb97b6f8ef 100644
--- a/usr.bin/last/Makefile
+++ b/usr.bin/last/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/last/Makefile,v 1.3 2002/02/08 22:31:41 markm Exp $
 
 PROG=	last
 
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index f838c4aab8a2..5ad73f9e6863 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/last/last.1,v 1.18 2005/02/13 22:25:23 ru Exp $
 .\"
 .Dd July 27, 2003
 .Dt LAST 1
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index d9877b423bb8..2de02d64a046 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)last.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/last/last.c,v 1.34 2004/08/08 18:59:19 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile
index 13f0fe6df654..f28033a7fbe0 100644
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lastcomm/Makefile,v 1.3 2002/02/08 22:31:41 markm Exp $
 
 PROG=	lastcomm
 
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index a1f86f40cdbf..f780d691f700 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)lastcomm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lastcomm/lastcomm.1,v 1.13 2004/07/26 19:59:29 charnier Exp $
 .\"
 .Dd September 18, 1996
 .Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 6672e8f27f98..735578cc6454 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)lastcomm.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lastcomm/lastcomm.c,v 1.20 2005/05/21 09:55:06 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index bb04f4550e32..5e3200690d93 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.13 2004/06/29 21:13:15 dwmalone Exp $
 
 PROG=		ldd
 SRCS=		ldd.c
diff --git a/usr.bin/ldd/extern.h b/usr.bin/ldd/extern.h
index 4df6759b971d..936f52b2be23 100644
--- a/usr.bin/ldd/extern.h
+++ b/usr.bin/ldd/extern.h
@@ -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/usr.bin/ldd/extern.h,v 1.1 2002/04/28 12:55:35 markm Exp $
  */
 
 extern void	dump_file(const char *);
diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1
index 0446aa260d7a..a7e5159d5434 100644
--- a/usr.bin/ldd/ldd.1
+++ b/usr.bin/ldd/ldd.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.23 2002/12/30 21:18:11 schweikh Exp $
 .\"
 .Dd October 22, 1993
 .Dt LDD 1
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 8e5e5d2f2bcf..6880f3690406 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ldd/ldd.c,v 1.33 2002/10/19 10:18:29 sobomax Exp $");
 
 #include <sys/wait.h>
 
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index e6de90fcae38..c1288f99a664 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ldd/sods.c,v 1.17 2004/06/29 21:13:15 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index 859c11cbf845..801501f3e135 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/leave/Makefile,v 1.5 2002/02/08 22:31:41 markm Exp $
 
 PROG=	leave
 
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 6c33367b85ab..ada7c3f5f533 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)leave.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/leave/leave.1,v 1.10 2002/12/23 16:04:51 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt LEAVE 1
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 89c3f5285716..c1db13606cb0 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/leave/leave.c,v 1.12 2002/09/04 23:29:03 dwmalone Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
index 663ee26a6cca..311cb2f50152 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/Makefile,v 1.10 2005/05/17 11:41:01 ru Exp $
 
 PROG=	less
 SRCS=	main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c \
diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common
index fcc6ccfa1ce3..8aea191fded1 100644
--- a/usr.bin/less/Makefile.common
+++ b/usr.bin/less/Makefile.common
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/Makefile.common,v 1.4 2003/06/06 13:46:55 kuriyama Exp $
 
 LSDIR=	${.CURDIR}/../../contrib/less
 .PATH:	${LSDIR}
diff --git a/usr.bin/less/defines.h b/usr.bin/less/defines.h
index f173474067ce..00aa35857b64 100644
--- a/usr.bin/less/defines.h
+++ b/usr.bin/less/defines.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/less/defines.h,v 1.5 2004/04/17 07:48:21 tjr Exp $ */
 /* defines.h.  Generated by configure.  */
 /* defines.h.in.  Generated from configure.ac by autoheader.  */
 
diff --git a/usr.bin/less/lesspipe.sh b/usr.bin/less/lesspipe.sh
index 5fbf62330087..001517e43f38 100644
--- a/usr.bin/less/lesspipe.sh
+++ b/usr.bin/less/lesspipe.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # ex:ts=8
 
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/lesspipe.sh,v 1.2 2005/05/17 11:08:11 des Exp $
 
 case "$1" in
 	*.Z)
diff --git a/usr.bin/less/zless.sh b/usr.bin/less/zless.sh
index b947b819f2c0..08ae72897942 100644
--- a/usr.bin/less/zless.sh
+++ b/usr.bin/less/zless.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/zless.sh,v 1.1 2005/05/17 11:14:11 des Exp $
 #
 
 export LESSOPEN="|/usr/bin/lesspipe.sh %s"
diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile
index 0688e8352615..80958ce6239e 100644
--- a/usr.bin/lessecho/Makefile
+++ b/usr.bin/lessecho/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lessecho/Makefile,v 1.3 2004/12/21 08:47:29 ru Exp $
 
 PROG=	lessecho
 SRCS=	lessecho.c version.c
diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile
index b10bf6d5fa2b..5d7878ce16af 100644
--- a/usr.bin/lesskey/Makefile
+++ b/usr.bin/lesskey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lesskey/Makefile,v 1.3 2001/03/27 10:51:48 ru Exp $
 
 PROG=	lesskey
 SRCS=	lesskey.c version.c
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index 12e8ec32f61f..1b076c98eda8 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,5 +1,5 @@
 // $Header: /home/daffy/u0/vern/flex/RCS/FlexLexer.h,v 1.19 96/05/25 20:43:02 vern Exp $
-// $FreeBSD$
+// $FreeBSD: src/usr.bin/lex/FlexLexer.h,v 1.4 2004/03/11 10:43:35 josef Exp $
 
 // FlexLexer.h -- define interfaces for lexical analyzer classes generated
 //		  by flex
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 6d0ea5b44ec2..20c68474f7db 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/Makefile,v 1.20 2004/07/30 00:08:15 kan Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
index 025a914407ec..da07f39ecccb 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/ccl.c,v 2.9 93/09/16 20:32:14 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/ccl.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/config.h b/usr.bin/lex/config.h
index 2e0b5b43747b..f321b12333d7 100644
--- a/usr.bin/lex/config.h
+++ b/usr.bin/lex/config.h
@@ -1,5 +1,5 @@
 /* config.h.  Generated automatically by configure.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/config.h,v 1.3 1999/08/28 05:08:16 peter Exp $ */
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 0853466f9ac2..1f056284d949 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/dfa.c,v 2.26 95/04/20 13:53:14 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/dfa.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index d647142f4054..60ef676f0fa5 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/ecs.c,v 2.9 93/12/07 10:18:20 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/ecs.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 602095095fb2..066f9ab13e34 100644
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -2,7 +2,7 @@
 
 /* Scanner skeleton version:
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.8 2004/01/06 19:03:44 nectar Exp $
  */
 
 #if defined(__FreeBSD__)
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index 03651ea965b8..a1e4f0dceb4b 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -27,7 +27,7 @@
  */
 
 /* @(#) $Header: /home/daffy/u0/vern/flex/RCS/flexdef.h,v 2.53 95/04/20 11:17:36 vern Exp $ (LBL) */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/flexdef.h,v 1.6 2003/01/01 18:49:00 schweikh Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index 7ccf4da84a80..cb02ea4e9562 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/gen.c,v 2.56 96/05/25 20:43:38 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/gen.c,v 1.7 2004/01/06 18:54:55 nectar Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index a7316ba92037..35398d5860aa 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -5,7 +5,7 @@
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/initscan.c,v 1.9 2002/08/25 13:22:44 charnier Exp $");
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
@@ -1276,7 +1276,7 @@ char *yytext;
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lex/initscan.c,v 1.9 2002/08/25 13:22:44 charnier Exp $";
 #endif /* not lint */
 
 #include "flexdef.h"
diff --git a/usr.bin/lex/lex.1 b/usr.bin/lex/lex.1
index b41de37986a2..fecf68ce6d94 100644
--- a/usr.bin/lex/lex.1
+++ b/usr.bin/lex/lex.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lex/lex.1,v 1.18 2004/07/07 21:27:44 keramida Exp $
 .\"
 .TH FLEX 1 "April 1995" "Version 2.5"
 .SH NAME
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 51d71b6402d9..82a603cf60ce 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/lib/Makefile,v 1.9 2004/12/21 09:33:47 ru Exp $
 
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
diff --git a/usr.bin/lex/lib/libmain.c b/usr.bin/lex/lib/libmain.c
index 426eb98985d4..2927e16ccf75 100644
--- a/usr.bin/lex/lib/libmain.c
+++ b/usr.bin/lex/lib/libmain.c
@@ -1,7 +1,7 @@
 /* libmain - flex run-time support library "main" function */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/libmain.c,v 1.4 95/09/27 12:47:55 vern Exp $
- * $FreeBSD$ */
+ * $FreeBSD: src/usr.bin/lex/lib/libmain.c,v 1.3 1999/10/27 07:56:49 obrien Exp $ */
 
 extern int yylex();
 
diff --git a/usr.bin/lex/lib/libyywrap.c b/usr.bin/lex/lib/libyywrap.c
index 75c669c6ae94..f249e9d54006 100644
--- a/usr.bin/lex/lib/libyywrap.c
+++ b/usr.bin/lex/lib/libyywrap.c
@@ -1,7 +1,7 @@
 /* libyywrap - flex run-time support library "yywrap" function */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/libyywrap.c,v 1.1 93/10/02 15:23:09 vern Exp $
- * $FreeBSD$ */
+ * $FreeBSD: src/usr.bin/lex/lib/libyywrap.c,v 1.4 1999/10/27 07:56:49 obrien Exp $ */
 
 int yywrap()
 	{
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index f6adaa7c41c1..f1f68774da10 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -34,7 +34,7 @@ char copyright[] =
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/main.c,v 2.64 96/05/25 20:42:42 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/main.c,v 1.8 2002/06/30 05:25:04 obrien Exp $");
 
 
 #include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index 3eda5793650c..a9dec4caf83a 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/misc.c,v 2.47 95/04/28 11:39:39 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/misc.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index 4b81284ff2ec..1be59e5c0156 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/nfa.c,v 2.17 95/03/04 16:11:42 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/nfa.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index dc71379b3ee2..71c54154cdac 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -34,7 +34,7 @@
  */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/parse.y,v 2.28 95/04/21 11:51:51 vern Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/parse.y,v 1.3 1999/10/27 07:56:46 obrien Exp $ */
 
 
 /* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index cee8a16d2def..6ad866977542 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -28,7 +28,7 @@
  */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/scan.l,v 2.56 95/04/24 12:17:19 vern Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/scan.l,v 1.5 1999/10/27 07:56:46 obrien Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index 077015b78578..8cecdedfc712 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/sym.c,v 2.19 95/03/04 16:11:04 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/sym.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index 89973f08ba87..32a3cfa9e608 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/tblcmp.c,v 2.11 94/11/05 17:08:28 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/tblcmp.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/version.h b/usr.bin/lex/version.h
index 5dbdf94b6765..a9f3056abef7 100644
--- a/usr.bin/lex/version.h
+++ b/usr.bin/lex/version.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/version.h,v 1.3 1999/10/27 07:47:42 obrien Exp $ */
 
 #define FLEX_VERSION "2.5.4"
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index e90c5d4fee0a..99e06f9b88f2 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/yylex.c,v 2.13 95/03/04 16:10:41 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/yylex.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include <ctype.h>
 #include "flexdef.h"
diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile
index 5999cdbe060c..7caaac36f07c 100644
--- a/usr.bin/limits/Makefile
+++ b/usr.bin/limits/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/limits/Makefile,v 1.5 2004/11/08 18:08:16 des Exp $
 
 PROG=	limits
 DPADD=	${LIBUTIL}
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 62efb85fe57a..95bcb6dcf240 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/limits/limits.1,v 1.29 2005/01/17 07:44:20 ru Exp $
 .\"
 .Dd September 18, 2002
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index e976f369e2ca..01c6d9706da8 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/limits/limits.c,v 1.14 2004/12/19 13:29:25 cperciva Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/locale/Makefile b/usr.bin/locale/Makefile
index d7f67e1aca81..aead6830b40f 100644
--- a/usr.bin/locale/Makefile
+++ b/usr.bin/locale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locale/Makefile,v 1.4 2003/06/25 23:05:11 phantom Exp $
 
 PROG = locale
 CFLAGS += -I${.CURDIR}/../../lib/libc/locale
diff --git a/usr.bin/locale/locale.1 b/usr.bin/locale/locale.1
index f9cfc343d4bf..d1440988d109 100644
--- a/usr.bin/locale/locale.1
+++ b/usr.bin/locale/locale.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/locale/locale.1,v 1.7 2005/01/18 20:54:50 ru Exp $
 .\"
 .Dd June 20, 2003
 .Dt LOCALE 1
diff --git a/usr.bin/locale/locale.c b/usr.bin/locale/locale.c
index a4b6b4001839..d0e826dc9fbe 100644
--- a/usr.bin/locale/locale.c
+++ b/usr.bin/locale/locale.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locale/locale.c,v 1.15 2004/08/02 12:50:12 tjr Exp $
  */
 
 /*
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 1d495e420ece..362195e082e8 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile,v 1.6 1999/08/28 01:02:52 peter Exp $
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index 48174083d848..5b2166eae5bf 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile.inc,v 1.4 1999/08/28 01:02:52 peter Exp $
 
 LIBEXECDIR?=	/usr/libexec
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index eb39dd16b51d..ac544d449d5d 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/bigram/Makefile,v 1.6 2004/12/21 08:47:30 ru Exp $
 
 PROG=	locate.bigram
 NO_MAN=
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 208824f22d2c..a4ad2b1e8650 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/bigram/locate.bigram.c,v 1.12 2005/02/09 09:13:36 stefanf Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 20eef8c49212..4de4b8ab6d29 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/code/Makefile,v 1.6 2004/12/21 08:47:30 ru Exp $
 
 PROG=	locate.code
 CFLAGS+=-I${.CURDIR}/../locate 
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 6290c67201ef..9f7850e16028 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/code/locate.code.c,v 1.13 2002/03/22 01:22:47 imp Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 9a618da4e8fa..96320a1d3422 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/Makefile,v 1.15 2002/07/29 09:40:15 ru Exp $
 
 PROG=	locate
 SRCS=	util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 156f21a725d2..a236332a8d0d 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -30,7 +30,7 @@
 #
 # Sequence of databases is important.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/concatdb.sh,v 1.10 2000/01/12 08:01:00 kris Exp $
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index 8e29355857b9..b76bb0854ae7 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/fastfind.c,v 1.13 2001/01/06 18:17:06 wosch Exp $
  */
 
 
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 27b750e08d90..f1c60b5127e0 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.30 2005/02/13 22:25:23 ru Exp $
 .\"
 .Dd July 23, 2004
 .Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 928359951f8d..1689a9fef1ea 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/locate/locate/locate.c,v 1.15 2002/03/22 01:22:48 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 24df8d4002be..100139de8fdc 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locate.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/locate.h,v 1.7 1999/08/28 01:02:59 peter Exp $
  */
 
 /* Symbolic constants shared by locate.c and code.c */
diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc
index dee3a07d1158..cc938de1c09b 100644
--- a/usr.bin/locate/locate/locate.rc
+++ b/usr.bin/locate/locate/locate.rc
@@ -1,7 +1,7 @@
 #
 # /etc/locate.rc -  command script for updatedb(8)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/locate.rc,v 1.8.34.1 2005/08/25 19:06:11 cperciva Exp $
 
 #
 # All commented values are the defaults
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index 2e2248f535f1..12db435d434a 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.12 2005/01/18 13:43:50 ru Exp $
 .\"
 .Dd February 11, 1996
 .Dt LOCATE.UPDATEDB 8
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 39d15d7c13cf..7231ebae97ac 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -28,7 +28,7 @@
 # 
 # usage: mklocatedb [-presort] < filelist > database
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/mklocatedb.sh,v 1.13 2002/07/22 05:35:59 tjr Exp $
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 45de7e685fc4..ec19f9f1c2d6 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -26,7 +26,7 @@
 #
 # updatedb - update locate database for local mounted filesystems
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.18.14.1 2005/08/25 19:06:11 cperciva Exp $
 
 if [ "$(id -u)" = "0" ]; then
 	echo ">>> WARNING" 1>&2
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 944ca88e7038..0a94c9c28702 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/util.c,v 1.10 2002/06/24 12:40:11 naddy Exp $
  */
 
 
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index dc09a87b1b9c..6c3c968e51be 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lock/Makefile,v 1.9 2002/02/08 22:31:41 markm Exp $
 
 PROG=	lock
 BINOWN=	root
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 7c9c65025cf2..ccd0dee77c2a 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lock.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lock/lock.1,v 1.12 2005/02/13 22:25:23 ru Exp $
 .\"
 .Dd July 10, 2002
 .Dt LOCK 1
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 3b19e35bbe1c..23c5717ce8e5 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)lock.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lock/lock.c,v 1.18 2004/01/22 04:24:15 cperciva Exp $");
 
 /*
  * Lock a terminal up until the given key is entered or the given
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 7baff7cd7738..5c90e1f02dde 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lockf/Makefile,v 1.6 2002/02/08 22:31:41 markm Exp $
 
 PROG=	lockf
 
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index c6e6e6687e52..f00e8ebf9c6b 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lockf/lockf.1,v 1.16.2.1 2005/08/18 15:01:24 keramida Exp $
 .\"
 .Dd July 7, 1998
 .Os
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 6995d0abfba4..52bc95036131 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lockf/lockf.c,v 1.11 2004/07/15 04:51:21 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
index 48c52513500d..ad40c192c6a8 100644
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/logger/Makefile,v 1.3 2001/09/05 20:10:59 dd Exp $
 
 PROG=	logger
 CFLAGS+=-DINET6
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index cc952ea11b21..2edc2cb7f930 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logger/logger.1,v 1.16 2005/01/17 07:44:21 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOGGER 1
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 45665068b1ab..1eec2d13b055 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/logger/logger.c,v 1.14 2005/05/29 16:04:46 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 9ddda3633819..4a405f71d409 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # 	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/login/Makefile,v 1.48 2004/11/03 18:01:19 ru Exp $
 
 PROG=	login
 SRCS=	login.c login_fbtab.c
diff --git a/usr.bin/login/README b/usr.bin/login/README
index bc228f766aa6..d3798a8b38d0 100644
--- a/usr.bin/login/README
+++ b/usr.bin/login/README
@@ -8,4 +8,4 @@ The following defines can be used:
 
 -Guido
 
-$FreeBSD$
+$FreeBSD: src/usr.bin/login/README,v 1.4 2001/08/30 11:27:36 markm Exp $
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index ec924ca31d73..dbc11db2f124 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/login/login.1,v 1.28 2004/10/16 00:13:38 brueffer Exp $
 .\"
 .Dd October 16, 2004
 .Dt LOGIN 1
diff --git a/usr.bin/login/login.access.5 b/usr.bin/login/login.access.5
index 2f2d8f25e40f..b376554f4220 100644
--- a/usr.bin/login/login.access.5
+++ b/usr.bin/login/login.access.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/login/login.access.5,v 1.14 2004/07/02 22:22:27 ru Exp $
 .\"
 .Dd April 30, 1994
 .Dt LOGIN.ACCESS 5
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 68693f82e21c..19b18f6797b2 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/login/login.c,v 1.99 2005/06/01 12:23:06 maxim Exp $");
 
 /*
  * login [ name ]
diff --git a/usr.bin/login/login.h b/usr.bin/login/login.h
index 6be2539c7bb6..f39583dbe9f7 100644
--- a/usr.bin/login/login.h
+++ b/usr.bin/login/login.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/login/login.h,v 1.4 2002/03/22 01:22:49 imp Exp $
  */
 
 void	login_fbtab(char *, uid_t, gid_t);
diff --git a/usr.bin/login/login_access.c b/usr.bin/login/login_access.c
index f6f5745d3351..d404bda02f91 100644
--- a/usr.bin/login/login_access.c
+++ b/usr.bin/login/login_access.c
@@ -15,7 +15,7 @@ static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/login/login_access.c,v 1.10 2002/03/22 01:22:49 imp Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index c0a4290a4677..6813ffc19309 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/login/login_fbtab.c,v 1.16 2002/03/22 01:22:49 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 333c2ca280fa..076d1ea38c86 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/9/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/login/pathnames.h,v 1.5 2001/08/30 11:27:36 markm Exp $
  */
 
 #include <paths.h>
diff --git a/usr.bin/logins/Makefile b/usr.bin/logins/Makefile
index 42840fb28b9c..2065dd242b0b 100644
--- a/usr.bin/logins/Makefile
+++ b/usr.bin/logins/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/logins/Makefile,v 1.1 2004/03/06 21:57:29 des Exp $
 
 PROG=	logins
 WARNS?=	6
diff --git a/usr.bin/logins/logins.1 b/usr.bin/logins/logins.1
index fcd12b309b0d..c62d5e144f8b 100644
--- a/usr.bin/logins/logins.1
+++ b/usr.bin/logins/logins.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logins/logins.1,v 1.2 2004/03/06 23:36:41 des Exp $
 .\"
 .Dd March 6, 2004
 .Dt LOGINS 1
diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c
index abf342e63219..bde8beb2c1d9 100644
--- a/usr.bin/logins/logins.c
+++ b/usr.bin/logins/logins.c
@@ -25,11 +25,11 @@
  * (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/usr.bin/logins/logins.c,v 1.1 2004/03/06 21:57:29 des Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/logins/logins.c,v 1.1 2004/03/06 21:57:29 des Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile
index 4e910ce73297..bfe5682e54f1 100644
--- a/usr.bin/logname/Makefile
+++ b/usr.bin/logname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/logname/Makefile,v 1.5 2005/01/25 14:22:20 ssouhlal Exp $
 
 PROG=	logname
 WARNS?= 6
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 99ebee510b33..93af410eb67e 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logname/logname.1,v 1.9 2005/01/17 07:44:21 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 8f98b8a6dd5e..24b704747a10 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)logname.c	8.2 (Berkeley) 4/3/94";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/logname/logname.c,v 1.8 2005/01/25 14:22:20 ssouhlal Exp $");
 
 #include <err.h>
 #include <unistd.h>
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index ecc19a62cd24..fb8bc8515b43 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)look.1	8.1 (Berkeley) 6/14/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/look/look.1,v 1.17 2005/01/17 07:44:22 ru Exp $
 .\"
 .Dd July 17, 2004
 .Dt LOOK 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 68d6755f64b2..610e0bf40c40 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/look/look.c,v 1.17 2004/07/19 11:12:02 tjr Exp $");
 
 /*
  * look -- find lines in a sorted list.
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index 61996824ef93..e0eea4a1841e 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lorder/Makefile,v 1.8 2001/04/07 11:21:22 ru Exp $
 
 SCRIPTS=lorder.sh
 MAN=	lorder.1
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index 6cced8f8de2c..11640dd5344f 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lorder.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lorder/lorder.1,v 1.7 2004/07/03 00:24:42 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt LORDER 1
diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh
index c908f761a595..5576bae34570 100644
--- a/usr.bin/lorder/lorder.sh
+++ b/usr.bin/lorder/lorder.sh
@@ -33,7 +33,7 @@
 #
 #	@(#)lorder.sh	8.1 (Berkeley) 6/6/93
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lorder/lorder.sh,v 1.6 2003/06/01 22:37:38 tjr Exp $
 #
 
 # only one argument is a special case, just output the name twice
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index 0c33583257cf..9e7f1916c8c6 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lsvfs/Makefile,v 1.8 2002/08/10 20:19:03 mux Exp $
 
 PROG=	lsvfs
 WARNS?=	6
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index ed4b44eb2b89..c4b259d76332 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.13 2005/01/24 20:06:16 charnier Exp $
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index 1e486d7ca462..ddbc6768939c 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.17 2002/08/11 02:07:43 mux Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 702b3f3d2444..44b68d5778f9 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.10 2002/04/26 13:13:41 espie Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/m4/Makefile,v 1.7 2005/01/28 16:08:07 ru Exp $
 
 # -DEXTENDED 
 # 	if you want the paste & spaste macros.
diff --git a/usr.bin/m4/TEST/math.m4 b/usr.bin/m4/TEST/math.m4
index 0262af66e253..b51f6ed9c5e0 100644
--- a/usr.bin/m4/TEST/math.m4
+++ b/usr.bin/m4/TEST/math.m4
@@ -1,4 +1,4 @@
-dnl $FreeBSD$
+dnl $FreeBSD: src/usr.bin/m4/TEST/math.m4,v 1.1 2004/05/01 03:27:05 smkelly Exp $
 dnl A regression test for m4 C operators		(ksb,petef)
 dnl If you think you have a short-circuiting m4, run us m4 -DSHORCIRCUIT=yes
 dnl
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 060ce03661d5..7988957c35e3 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: eval.c,v 1.44 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/eval.c,v 1.22 2004/08/16 14:18:21 tjr Exp $");
 
 /*
  * eval.c
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 2c0284b1a784..969f99d7a4ea 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: expr.c,v 1.14 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/expr.c,v 1.14 2004/05/01 03:59:43 smkelly Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index e96870b58555..cefa6ecac892 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/extern.h,v 1.12 2004/08/16 14:18:22 tjr Exp $
  */
 
 /* eval.c */
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index 8940bb820f77..a1b1be626e5f 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/gnum4.c,v 1.9 2004/05/18 15:53:58 stefanf Exp $");
 
 /*
  * functions needed to support gnu-m4 extensions, including a fake freezing
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index bafaa2ad5a43..805b51f8504f 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)look.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/look.c,v 1.7 2002/07/15 02:15:12 jmallett Exp $");
 
 /*
  * look.c
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 0c492a98ca3c..fc233cc16d35 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"	@(#) $OpenBSD: m4.1,v 1.24 2002/04/18 18:57:23 espie Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/m4/m4.1,v 1.27 2005/01/17 07:44:22 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 847a37288e0c..bf4b95af20ec 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.53 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/main.c,v 1.26 2004/08/16 14:18:22 tjr Exp $");
 
 /*
  * main.c
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index e3e48e272001..47ab5fbf9610 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mdef.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/mdef.h,v 1.10 2002/07/15 02:15:12 jmallett Exp $
  */
 
 #define MACRTYPE        1
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index b5632e820fef..7718796b116b 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.27 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/misc.c,v 1.15 2002/07/15 02:15:12 jmallett Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 94e8164f07ab..a8a30e0ce650 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/pathnames.h,v 1.4 2002/05/02 05:25:23 jmallett Exp $
  */
 
 /*
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 34939854b97f..5cd8db0fe302 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdd.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/stdd.h,v 1.4 2002/07/15 02:15:12 jmallett Exp $
  */
 
 /*
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index a42aea044271..26140bf7269a 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/trace.c,v 1.7 2002/07/15 02:15:12 jmallett Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 491d06f97c50..69090591de82 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/25/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mail/Makefile,v 1.11 2002/07/29 09:40:16 ru Exp $
 
 PROG=	mail
 SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
diff --git a/usr.bin/mail/USD.doc/mail0.nr b/usr.bin/mail/USD.doc/mail0.nr
index e569a5fbe72f..26b4761c1b6d 100644
--- a/usr.bin/mail/USD.doc/mail0.nr
+++ b/usr.bin/mail/USD.doc/mail0.nr
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mail0.nr	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mail/USD.doc/mail0.nr,v 1.1.1.1.46.1 2005/08/19 02:53:00 cperciva Exp $
 .\"
 .eh 'USD:7-%''Mail Reference Manual'
 .oh 'Mail Reference Manual''USD:7-%'
diff --git a/usr.bin/mail/USD.doc/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index 10e707cc3c0c..011630308e7f 100644
--- a/usr.bin/mail/USD.doc/mail5.nr
+++ b/usr.bin/mail/USD.doc/mail5.nr
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail5.nr	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mail/USD.doc/mail5.nr,v 1.4 2000/11/29 10:56:59 ru Exp $
 .\"
 .bp
 .sh 1 "Additional features"
diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c
index fa820b4a94bd..d0c6a83bd569 100644
--- a/usr.bin/mail/aux.c
+++ b/usr.bin/mail/aux.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)aux.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/aux.c,v 1.13 2002/08/25 13:22:47 charnier Exp $");
 
 #include <sys/time.h>
 
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 5ec6d7a69e7a..5eb8f097a2c7 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmd1.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmd1.c,v 1.7 2002/06/30 05:25:05 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 15cf04a47b82..507c29a8964e 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmd2.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <sys/wait.h>
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index c9b7c6ae57aa..2a0a4d8fc533 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmd3.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmd3.c,v 1.10 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index b350ccef746e..adf21f0b3948 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmdtab.c,v 1.6 2002/06/30 05:25:06 obrien Exp $");
 
 #include "def.h"
 #include "extern.h"
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 6a0926336c14..3badff9f2539 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/collect.c,v 1.12 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index 3ef4ed0866d1..8b7f8270588b 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -32,7 +32,7 @@
  *
  *	@(#)def.h	8.4 (Berkeley) 4/20/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/def.h,v 1.8 2001/12/18 20:52:09 mikeh Exp $
  */
 
 /*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index d50c43a73b5f..0acda60bc2ed 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)edit.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/edit.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <fcntl.h>
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index 7f02a88c2f7f..74bb78f92cf5 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/extern.h,v 1.9 2004/02/29 20:44:44 mikeh Exp $
  */
 
 struct name *cat(struct name *, struct name *);
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index b00f48593ede..a5fe4c1c0523 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)fio.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/fio.c,v 1.12 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <sys/file.h>
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index 58519852aa93..6f65772e6304 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)getname.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/getname.c,v 1.4 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <pwd.h>
diff --git a/usr.bin/mail/glob.h b/usr.bin/mail/glob.h
index 5f1812a5af62..796231d64768 100644
--- a/usr.bin/mail/glob.h
+++ b/usr.bin/mail/glob.h
@@ -32,7 +32,7 @@
  *
  *	@(#)glob.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/glob.h,v 1.2 2001/03/25 04:57:04 mikeh Exp $
  */
 
 /*
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index 90db9621075b..40e8eda6d944 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/head.c,v 1.8 2003/01/09 05:08:37 mikeh Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 7eb11231334e..e204e45649f9 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/lex.c,v 1.16 2004/03/06 13:27:59 mikeh Exp $");
 
 #include "rcv.h"
 #include <errno.h>
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index abff92a928c9..c55849beeee8 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)list.c	8.4 (Berkeley) 5/1/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/list.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <ctype.h>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index bf2873bbb0e2..df5b991c4ec8 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.8 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.45 2004/05/19 09:51:31 ru Exp $
 .\"
 .Dd February 29, 2004
 .Dt MAIL 1
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 4a00177dc033..bbe2e68011a2 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/main.c,v 1.14 2004/02/29 20:44:44 mikeh Exp $");
 
 #include "rcv.h"
 #include <fcntl.h>
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index fc0acdc851ea..a03fe58417de 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/names.c,v 1.9 2004/02/29 20:44:44 mikeh Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/pathnames.h b/usr.bin/mail/pathnames.h
index 57a2a0c00595..f34827589a46 100644
--- a/usr.bin/mail/pathnames.h
+++ b/usr.bin/mail/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/pathnames.h,v 1.4 2001/05/27 20:26:22 mikeh Exp $
  */
 
 #define	_PATH_EX	"/usr/bin/ex"
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index b6dc30a39ac5..42aaa5ce7707 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/popen.c,v 1.7 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <sys/wait.h>
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index 4507c59e23b6..e7d7ece4611d 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)quit.c	8.2 (Berkeley) 4/28/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/quit.c,v 1.7 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <fcntl.h>
diff --git a/usr.bin/mail/rcv.h b/usr.bin/mail/rcv.h
index 44bb25ef3694..37303b8287b8 100644
--- a/usr.bin/mail/rcv.h
+++ b/usr.bin/mail/rcv.h
@@ -32,7 +32,7 @@
  *
  *	@(#)rcv.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/rcv.h,v 1.2 2001/03/25 04:57:04 mikeh Exp $
  */
 
 /*
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 35b4c729522a..a71d28e37193 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)send.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/send.c,v 1.14 2004/02/29 20:44:44 mikeh Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index d3a816fb081d..766311e5f0bd 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)strings.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/strings.c,v 1.5 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 0d7424e94daf..38d44126970e 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)temp.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/temp.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index 6948d042488d..4bafd7511062 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tty.c	8.2 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/tty.c,v 1.6 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 34f9d800aad7..a6bad0bb1632 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)v7.local.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/v7.local.c,v 1.5 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index ab171c159e1e..5bc00497bf8f 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/vars.c,v 1.4 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index e41c25c08681..3aa98d28e0f5 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)version.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/version.c,v 1.4 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Just keep track of the date/sid of this version of Mail.
diff --git a/usr.bin/make/GNode.h b/usr.bin/make/GNode.h
index 382da550d200..e7feb1874353 100644
--- a/usr.bin/make/GNode.h
+++ b/usr.bin/make/GNode.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/GNode.h,v 1.4 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef GNode_h_39503bf2
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index ba0d20e86d01..ca874cc5eddc 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 #	$Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/Makefile,v 1.61 2005/05/25 08:46:31 harti Exp $
 
 PROG=	make
 CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/make/Makefile.dist b/usr.bin/make/Makefile.dist
index 0a485e1db01f..5b85088e9c79 100644
--- a/usr.bin/make/Makefile.dist
+++ b/usr.bin/make/Makefile.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/Makefile.dist,v 1.4 2005/05/24 13:19:40 harti Exp $
 # a very simple makefile...
 pmake:
 	@echo 'make started.'
diff --git a/usr.bin/make/PSD.doc/stubs b/usr.bin/make/PSD.doc/stubs
index 39d8defe2e14..156d34e0e3bb 100644
--- a/usr.bin/make/PSD.doc/stubs
+++ b/usr.bin/make/PSD.doc/stubs
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/stubs,v 1.1 2000/11/24 10:05:30 ru Exp $
 .\"
 .de Ix
 ..
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index 320d5dfc3c4b..0701bde18127 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.13 2002/10/29 14:56:09 ru Exp $
 .\"
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 2b81c7f5993f..2287f2d0bedd 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/arch.c,v 1.66 2005/05/24 15:58:34 harti Exp $");
 
 /*-
  * arch.c --
diff --git a/usr.bin/make/arch.h b/usr.bin/make/arch.h
index 3c28b2fcdb98..61f67baa3423 100644
--- a/usr.bin/make/arch.h
+++ b/usr.bin/make/arch.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/arch.h,v 1.5 2005/05/18 06:50:38 harti Exp $
  */
 
 #ifndef arch_h_488adf7a
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 6453abf5f8fa..f8a356f78ddf 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/buf.c,v 1.36 2005/05/13 08:53:00 harti Exp $");
 
 /*
  * buf.c
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 106f34884897..81d7fd82fff1 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/buf.h,v 1.27 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef buf_h_a61a6812
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 6e7a09451778..ede5656e506f 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/cond.c,v 1.54 2005/05/25 16:06:14 harti Exp $");
 
 /*
  * Functions to handle conditionals in a makefile.
diff --git a/usr.bin/make/cond.h b/usr.bin/make/cond.h
index 9a8dbdcc0cbe..c4510c1a0ddc 100644
--- a/usr.bin/make/cond.h
+++ b/usr.bin/make/cond.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/cond.h,v 1.3 2005/04/11 07:20:09 harti Exp $
  */
 
 #ifndef cond_h_6e96ad7c
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 06b0f8e91a02..32d0baa992f4 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/config.h,v 1.16 2005/02/01 10:50:35 harti Exp $
  */
 
 #ifndef config_h_efe0765e
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index c66b2bf4bc97..2aabd93ab595 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/dir.c,v 1.52 2005/03/23 12:56:15 harti Exp $");
 
 /*-
  * dir.c --
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 03481b869790..a5ed061790f3 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/dir.h,v 1.21 2005/03/23 12:56:15 harti Exp $
  */
 
 #ifndef dir_h_6002e3b8
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 15372b648e95..387c3ef1df8a 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/for.c,v 1.43 2005/05/10 12:02:15 harti Exp $");
 
 /*-
  * for.c --
diff --git a/usr.bin/make/for.h b/usr.bin/make/for.h
index 0e43c4a4194c..674c307fcfe5 100644
--- a/usr.bin/make/for.h
+++ b/usr.bin/make/for.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/for.h,v 1.3 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef for_h_9d770f33
diff --git a/usr.bin/make/globals.h b/usr.bin/make/globals.h
index 4982a9f817f9..7454c4ebf513 100644
--- a/usr.bin/make/globals.h
+++ b/usr.bin/make/globals.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/globals.h,v 1.10 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef globals_h_1c1edb96
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index b5ea6bcb8aeb..b5a75a108c9b 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/hash.c,v 1.25 2005/05/13 08:53:00 harti Exp $");
 
 /* hash.c --
  *
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 80dd74ddb19e..30d548a937cd 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hash.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash.h,v 1.20 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef hash_h_f6312f46
diff --git a/usr.bin/make/hash_tables.c b/usr.bin/make/hash_tables.c
index 54363266fede..49934e5c8c04 100644
--- a/usr.bin/make/hash_tables.c
+++ b/usr.bin/make/hash_tables.c
@@ -1,6 +1,6 @@
 /*
  * DO NOT EDIT
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash_tables.c,v 1.2 2005/05/06 18:30:05 harti Exp $
  * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.100 2005/04/29 15:15:28 harti Exp 
  * DO NOT EDIT
  */
diff --git a/usr.bin/make/hash_tables.h b/usr.bin/make/hash_tables.h
index 8fa43a5808da..7d50d1915a09 100644
--- a/usr.bin/make/hash_tables.h
+++ b/usr.bin/make/hash_tables.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash_tables.h,v 1.1 2005/04/29 15:15:28 harti Exp $
  */
 #ifndef hash_tables_h_
 #define hash_tables_h_
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 629460a532f4..9b38d302b2ba 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/job.c,v 1.122.2.1 2005/07/20 19:05:23 harti Exp $");
 
 #ifndef OLD_JOKE
 #define	OLD_JOKE 0
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 1ef4b669084a..b607874847e8 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)job.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/job.h,v 1.45 2005/05/24 15:30:03 harti Exp $
  */
 
 #ifndef job_h_4678dfd1
diff --git a/usr.bin/make/lst.c b/usr.bin/make/lst.c
index a5b7f06c5254..f35f160b8ab5 100644
--- a/usr.bin/make/lst.c
+++ b/usr.bin/make/lst.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.c,v 1.7 2005/05/18 06:50:39 harti Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 497d59c59780..0a7083fa4196 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lst.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.h,v 1.37 2005/05/18 06:50:39 harti Exp $
  */
 
 #ifndef lst_h_38f3ead1
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index aeed7345190c..67ce4f63e0d7 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -46,7 +46,7 @@ static char copyright[] =
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/main.c,v 1.155 2005/05/24 16:05:51 harti Exp $");
 
 /*
  * main.c
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 29f74ac7c790..5cdfb1d32b85 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)make.1	8.8 (Berkeley) 6/13/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/make.1,v 1.89.2.1 2005/08/18 15:01:24 keramida Exp $
 .\"
 .Dd March 30, 2005
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 9a39a9ebf667..d2698fe91f02 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/make.c,v 1.38 2005/05/24 16:05:51 harti Exp $");
 
 /*
  * make.c
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index e8d56608d07c..518224b95126 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)make.h	8.3 (Berkeley) 6/13/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/make.h,v 1.34 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef make_h_a91074b9
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 4d6610313d07..0f8da6303bbc 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.108 2005/05/24 15:30:03 harti Exp $");
 
 /*-
  * parse.c --
diff --git a/usr.bin/make/parse.h b/usr.bin/make/parse.h
index 6ee15f963def..c957979e1aed 100644
--- a/usr.bin/make/parse.h
+++ b/usr.bin/make/parse.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/parse.h,v 1.6 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef parse_h_470eeb9a
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 5fb4ceb8400b..51ac851db38b 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/pathnames.h,v 1.14 2005/03/11 13:02:38 harti Exp $
  */
 
 #ifndef pathnames_h_235b888a
diff --git a/usr.bin/make/proc.c b/usr.bin/make/proc.c
index 711f605a4846..986a08803715 100644
--- a/usr.bin/make/proc.c
+++ b/usr.bin/make/proc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/proc.c,v 1.1 2005/05/24 15:41:34 harti Exp $");
 
 #include <unistd.h>
 #include <errno.h>
diff --git a/usr.bin/make/proc.h b/usr.bin/make/proc.h
index a4ce6d31f37a..2919debcff55 100644
--- a/usr.bin/make/proc.h
+++ b/usr.bin/make/proc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/proc.h,v 1.1 2005/05/24 15:41:34 harti Exp $
  */
 
 #ifndef proc_h_458845848
diff --git a/usr.bin/make/shell.c b/usr.bin/make/shell.c
index c1f82d1cb05f..07a1ca635a5e 100644
--- a/usr.bin/make/shell.c
+++ b/usr.bin/make/shell.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/shell.c,v 1.1 2005/05/24 15:30:03 harti Exp $");
 
 #include <sys/queue.h>
 #include <stdio.h>
diff --git a/usr.bin/make/shell.h b/usr.bin/make/shell.h
index a3170583bdc2..c61c69347aa8 100644
--- a/usr.bin/make/shell.h
+++ b/usr.bin/make/shell.h
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/shell.h,v 1.1 2005/05/24 15:30:03 harti Exp $
  */
 
 #ifndef shell_h_6002e3b8
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 288df8c11dd9..bce4a1b0906c 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/str.c,v 1.45 2005/05/23 13:27:52 harti Exp $");
 
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/usr.bin/make/str.h b/usr.bin/make/str.h
index e8cf10cc648d..f4d63f3bf250 100644
--- a/usr.bin/make/str.h
+++ b/usr.bin/make/str.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/str.h,v 1.6 2005/05/23 13:27:52 harti Exp $
  */
 
 #ifndef str_h_44db59e6
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 7aa96f62a1c4..bfe8b3727d02 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/suff.c,v 1.64 2005/05/24 15:58:35 harti Exp $");
 
 /*-
  * suff.c --
diff --git a/usr.bin/make/suff.h b/usr.bin/make/suff.h
index 9982ab46321c..145b92160f6f 100644
--- a/usr.bin/make/suff.h
+++ b/usr.bin/make/suff.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/suff.h,v 1.3 2005/03/23 12:56:15 harti Exp $
  */
 
 #ifndef suff_h_2d5a821c
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index fab3189e8330..d5957c617a2e 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/targ.c,v 1.41 2005/05/13 13:47:41 harti Exp $");
 
 /*
  * Functions for maintaining the Lst allTargets. Target nodes are
diff --git a/usr.bin/make/targ.h b/usr.bin/make/targ.h
index 38828334e92a..a5ad59b1b125 100644
--- a/usr.bin/make/targ.h
+++ b/usr.bin/make/targ.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/targ.h,v 1.2 2005/02/04 07:51:00 harti Exp $
  */
 
 #ifndef targ_h_6ded1830
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 3a27b0a4110a..2ca65911d29d 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/util.c,v 1.19 2005/05/13 13:47:41 harti Exp $");
 
 /*-
  * util.c --
diff --git a/usr.bin/make/util.h b/usr.bin/make/util.h
index 9a1dedf6c7d5..4e0c21568950 100644
--- a/usr.bin/make/util.h
+++ b/usr.bin/make/util.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/util.h,v 1.10 2005/05/18 06:50:39 harti Exp $
  */
 
 #ifndef util_h_b7020fdb
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 9844e1650050..7725c8837e01 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/var.c,v 1.159 2005/05/24 16:05:51 harti Exp $");
 
 /**
  * var.c --
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 618cf7af8462..159bb11ec636 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/var.h,v 1.29 2005/05/24 16:05:51 harti Exp $
  */
 
 #ifndef var_h_9cccafce
diff --git a/usr.bin/makewhatis/Makefile b/usr.bin/makewhatis/Makefile
index 4da90ef0f73f..e28374f2aeec 100644
--- a/usr.bin/makewhatis/Makefile
+++ b/usr.bin/makewhatis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/makewhatis/Makefile,v 1.3 2002/11/18 10:11:22 ru Exp $
 
 PROG=		makewhatis
 DPADD=		${LIBZ}
diff --git a/usr.bin/makewhatis/makewhatis.1 b/usr.bin/makewhatis/makewhatis.1
index 4e20cebf8d93..d24883ddd7d3 100644
--- a/usr.bin/makewhatis/makewhatis.1
+++ b/usr.bin/makewhatis/makewhatis.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/makewhatis/makewhatis.1,v 1.4 2005/01/17 07:44:22 ru Exp $
 .\"
 .Dd May 12, 2002
 .Dt MAKEWHATIS 1
diff --git a/usr.bin/makewhatis/makewhatis.c b/usr.bin/makewhatis/makewhatis.c
index 30f2da8d0ba7..0b480539108a 100644
--- a/usr.bin/makewhatis/makewhatis.c
+++ b/usr.bin/makewhatis/makewhatis.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/makewhatis/makewhatis.c,v 1.9 2002/09/04 23:29:04 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/makewhatis/makewhatis.local.8 b/usr.bin/makewhatis/makewhatis.local.8
index dfe252fdd961..65d4e8e2bf91 100644
--- a/usr.bin/makewhatis/makewhatis.local.8
+++ b/usr.bin/makewhatis/makewhatis.local.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/makewhatis/makewhatis.local.8,v 1.15 2004/07/02 22:22:28 ru Exp $
 .Dd April 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os
diff --git a/usr.bin/makewhatis/makewhatis.local.sh b/usr.bin/makewhatis/makewhatis.local.sh
index 8be25300b75d..b0bb2081468b 100644
--- a/usr.bin/makewhatis/makewhatis.local.sh
+++ b/usr.bin/makewhatis/makewhatis.local.sh
@@ -33,7 +33,7 @@
 #
 # PS: this wrapper works also for catman(1)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/makewhatis/makewhatis.local.sh,v 1.7 1999/08/27 23:36:10 peter Exp $
 
 PATH=/bin:/usr/bin:$PATH; export PATH
 opt= dirs= localdirs=
diff --git a/usr.bin/mesg/Makefile b/usr.bin/mesg/Makefile
index 47f5a85fccfe..52da7f0075cd 100644
--- a/usr.bin/mesg/Makefile
+++ b/usr.bin/mesg/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mesg/Makefile,v 1.3 2002/02/08 22:31:42 markm Exp $
 
 PROG=	mesg
 
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index b596f75cf7d2..2132892e48bc 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mesg.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mesg/mesg.1,v 1.13 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd May 5, 2002
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 270c1c546b5c..8ac81a76e25b 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)mesg.c	8.2 (Berkeley) 1/21/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mesg/mesg.c,v 1.9 2005/05/21 09:55:06 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index 226ba7617985..3df33e1e4935 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/minigzip/Makefile,v 1.4 2004/02/05 22:44:25 ru Exp $
 
 PROG=	minigzip
 LDADD=	-lz
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index ddd2b957a6b1..04cd7dd2e7e2 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/minigzip/minigzip.1,v 1.10 2004/07/02 22:22:28 ru Exp $
 .\"
 .Dd October 3, 2002
 .Dt MINIGZIP 1
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index 463466ca840a..f57a148d6b8f 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkdep/Makefile,v 1.9 2001/04/07 11:21:23 ru Exp $
 
 SCRIPTS=	mkdep.gcc.sh
 MAN=		mkdep.1
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index 5d86209a03af..436889a95267 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdep.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkdep/mkdep.1,v 1.16 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt MKDEP 1
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ec00dcfbdf92..9d983ac4128f 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkdep/mkdep.gcc.sh,v 1.18 1999/08/28 01:04:04 peter Exp $
 
 D=.depend			# default dependency file is .depend
 append=0
diff --git a/usr.bin/mkfifo/Makefile b/usr.bin/mkfifo/Makefile
index bab308b133f6..b2b673f162ee 100644
--- a/usr.bin/mkfifo/Makefile
+++ b/usr.bin/mkfifo/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkfifo/Makefile,v 1.4 2005/01/17 13:47:05 delphij Exp $
 
 PROG=	mkfifo
 WARNS?=	6
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 3fd31765c478..e1ab48398446 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.14 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 7e147b6b1497..ec4c47e14acb 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mkfifo.c	8.2 (Berkeley) 1/5/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mkfifo/mkfifo.c,v 1.10 2005/01/17 13:47:05 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 9873d4e32fc3..11a71fa1bc7a 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mklocale/Makefile,v 1.29 2005/05/16 09:32:41 ru Exp $
 
 PROG=	mklocale
 WARNS?=	6
diff --git a/usr.bin/mklocale/extern.h b/usr.bin/mklocale/extern.h
index a52c6b5b9015..f2037dd2c6eb 100644
--- a/usr.bin/mklocale/extern.h
+++ b/usr.bin/mklocale/extern.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mklocale/extern.h,v 1.1 2002/04/28 12:34:54 markm Exp $
  */
 
 int yylex(void);
diff --git a/usr.bin/mklocale/ldef.h b/usr.bin/mklocale/ldef.h
index f35506b3483b..d1aaaa2a41c2 100644
--- a/usr.bin/mklocale/ldef.h
+++ b/usr.bin/mklocale/ldef.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ldef.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/mklocale/ldef.h,v 1.4 2005/02/26 21:47:54 ru Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index eeed535db2c6..157004109f71 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)lex.l	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.9 2005/02/26 21:47:54 ru Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 249249c485a2..7b74ecd10ae9 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.27 2005/01/21 10:36:11 ru Exp $
 .\"
 .Dd October 17, 2004
 .Dt MKLOCALE 1
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index a41d02ed3d1a..340cb0a20264 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)yacc.y	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.25 2005/05/16 09:32:41 ru Exp $");
 
 #include <arpa/inet.h>
 
diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile
index 805c013d4a97..b0c432f5a315 100644
--- a/usr.bin/mkstr/Makefile
+++ b/usr.bin/mkstr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkstr/Makefile,v 1.4 2002/02/08 22:31:42 markm Exp $
 
 PROG=	mkstr
 
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 1b83cc0ebf5d..98e0209e994a 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.12 2003/08/22 17:55:56 dds Exp $
 .\"
 .Dd November 1, 2002
 .Dt MKSTR 1
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index ce61c9d7ff9b..e7957ce8fa8e 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mkstr/mkstr.c,v 1.11 2004/03/14 05:51:20 bde Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile
index 76ebee6f360b..bdb07a32ac84 100644
--- a/usr.bin/mktemp/Makefile
+++ b/usr.bin/mktemp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mktemp/Makefile,v 1.3 2002/02/08 22:31:42 markm Exp $
 
 PROG=	mktemp
 
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index e923f9be0936..6562ddcc1438 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.19 2005/01/17 07:44:24 ru Exp $
 .\"
 .Dd November 20, 1996
 .Dt MKTEMP 1
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index b58ac4b9d055..132e27b57dcf 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$FreeBSD: src/usr.bin/mktemp/mktemp.c,v 1.5 2002/03/22 01:33:17 imp Exp $";
 #endif /* not lint */
 
 static void usage(void);
diff --git a/usr.bin/mkuzip/Makefile b/usr.bin/mkuzip/Makefile
index 11ed0831f14c..1350711d19aa 100644
--- a/usr.bin/mkuzip/Makefile
+++ b/usr.bin/mkuzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkuzip/Makefile,v 1.4 2005/05/02 17:38:49 sobomax Exp $
 
 PROG=	mkuzip
 MAN=	mkuzip.8
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index 35bd2e808da7..6e31070c6c3b 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.       Maxim Sobolev
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkuzip/mkuzip.8,v 1.5 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd September 10, 2004
 .Dt MKUZIP 8
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index 2f770ffec37b..62fc4207950b 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.       Maxim Sobolev
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mkuzip/mkuzip.c,v 1.4 2005/05/11 17:02:38 fjoe Exp $
  *
  */
 
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 9f59c6a598cc..f2ecf4c4ac50 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/msgs/Makefile,v 1.9 2005/01/17 17:45:38 delphij Exp $
 
 PROG=	msgs
 WARNS?=	6
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 147f8c9e4232..65b7aa72b84b 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/msgs/msgs.1,v 1.19 2004/07/03 00:24:42 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 23f224047b1f..a5b7ec5ff954 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/msgs/msgs.c,v 1.27 2005/01/17 17:45:38 delphij Exp $");
 
 /*
  * msgs - a user bulletin board program
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index 25b4af5b897f..e9fb2b619633 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mt/Makefile,v 1.4 2001/05/18 13:41:31 ru Exp $
 
 PROG=	mt
 
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index e061704b5e19..6cfc0ab30508 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.42 2005/04/03 05:19:45 imp Exp $
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 95ef836c6cad..4d52acbc5b8b 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mt/mt.c,v 1.36 2004/04/09 17:30:26 mux Exp $");
 
 /*
  * mt --
diff --git a/usr.bin/nc/Makefile b/usr.bin/nc/Makefile
index a4400bcddc90..e7715dfae498 100644
--- a/usr.bin/nc/Makefile
+++ b/usr.bin/nc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nc/Makefile,v 1.3 2005/02/07 08:44:34 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/netcat
 
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 4ec897371b2b..5a90348b9e5c 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncal/Makefile,v 1.8 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	ncal
 
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 61c44e04c3e7..0bf69edc15d1 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncal/ncal.1,v 1.18 2005/01/11 10:32:51 ru Exp $
 .\"
 .Dd November 23, 2004
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 7e0d5eed09cc..ba865e7b740a 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ncal/ncal.c,v 1.19 2004/11/23 22:57:17 wollman Exp $";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/ncplist/Makefile b/usr.bin/ncplist/Makefile
index 8e6d18991a4f..b7ae2f59b27f 100644
--- a/usr.bin/ncplist/Makefile
+++ b/usr.bin/ncplist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncplist/Makefile,v 1.2 1999/10/31 08:58:29 bp Exp $
 
 PROG=	ncplist
 
diff --git a/usr.bin/ncplist/ncplist.1 b/usr.bin/ncplist/ncplist.1
index 0f37429fe53f..dd8a5000d1e1 100644
--- a/usr.bin/ncplist/ncplist.1
+++ b/usr.bin/ncplist/ncplist.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.9 2001/04/18 15:51:52 ru Exp $
 .Dd June 24, 1999
 .Dt NCPLIST 1
 .Os
diff --git a/usr.bin/ncplist/ncplist.c b/usr.bin/ncplist/ncplist.c
index e91f2312e4ad..1ff338363eb1 100644
--- a/usr.bin/ncplist/ncplist.c
+++ b/usr.bin/ncplist/ncplist.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.2 2002/04/28 12:21:31 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/ncplogin/Makefile b/usr.bin/ncplogin/Makefile
index 8795f29f3ad1..6e08d251e1cd 100644
--- a/usr.bin/ncplogin/Makefile
+++ b/usr.bin/ncplogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncplogin/Makefile,v 1.5 2002/02/08 22:31:42 markm Exp $
 
 PROG=	ncplogin
 MAN=	ncplogin.1 ncplogout.1
diff --git a/usr.bin/ncplogin/ncplogin.1 b/usr.bin/ncplogin/ncplogin.1
index f44852687c2a..bc850b3667f0 100644
--- a/usr.bin/ncplogin/ncplogin.1
+++ b/usr.bin/ncplogin/ncplogin.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.12 2002/04/20 12:16:11 charnier Exp $
 .Dd September 15, 1999
 .Dt NCPLOGIN 1
 .Os
diff --git a/usr.bin/ncplogin/ncplogin.c b/usr.bin/ncplogin/ncplogin.c
index 7bc2f66267ad..0f08b61c3d73 100644
--- a/usr.bin/ncplogin/ncplogin.c
+++ b/usr.bin/ncplogin/ncplogin.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.4 2002/09/04 23:29:04 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
diff --git a/usr.bin/ncplogin/ncplogout.1 b/usr.bin/ncplogin/ncplogout.1
index c228de79d22e..55fe4c017175 100644
--- a/usr.bin/ncplogin/ncplogout.1
+++ b/usr.bin/ncplogin/ncplogout.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.10 2004/07/02 22:22:29 ru Exp $
 .Dd September 15, 1999
 .Dt NCPLOGOUT 1
 .Os
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index 483e8ef2b502..2f1ff9663749 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.26.2.1 2005/07/28 19:54:55 rwatson Exp $
 
 PROG=	netstat
 SRCS=	if.c inet.c inet6.c main.c mbuf.c mcast.c mroute.c ipx.c route.c \
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 517325c7a645..423319e462a8 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/atalk.c,v 1.24 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index d70517d483e2..fc6c17dd7a54 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/if.c,v 1.58.8.3 2005/09/29 13:19:10 glebius Exp $");
 
 #include <sys/types.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 671010e68bdc..de2050cae8a3 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/inet.c,v 1.70 2005/04/12 08:47:04 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 984f525dd536..ddf42856bd2e 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)inet6.c	8.4 (Berkeley) 4/20/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/inet6.c,v 1.25 2004/07/28 16:03:12 stefanf Exp $");
 
 #ifdef INET6
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index c99d27a2e988..629d341aeda2 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -70,7 +70,7 @@ static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/ipsec.c,v 1.12 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 04ba023ee399..00954c705844 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/ipx.c,v 1.23 2005/01/02 19:26:06 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index fc80620c64f3..54fee59fc1b8 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/main.c,v 1.72.2.2 2005/08/19 15:08:43 glebius Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 9bb403822d6d..619dbde7e5d8 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mbuf.c,v 1.42.8.1 2005/07/28 19:54:55 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/usr.bin/netstat/mcast.c b/usr.bin/netstat/mcast.c
index 2b2a5cd1bb70..ceab444aa662 100644
--- a/usr.bin/netstat/mcast.c
+++ b/usr.bin/netstat/mcast.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mcast.c,v 1.2 2004/07/26 20:18:11 charnier Exp $");
 
 /*
  * Print the system's current multicast group memberships.
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index e81ca2bd3821..3de3ab4ee769 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mroute.c,v 1.22 2004/07/26 20:18:11 charnier Exp $");
 
 /*
  * Print multicast routing structures and statistics.
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index bc06a3d6c30d..ba0db9e72d2c 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mroute6.c,v 1.15 2004/07/26 20:18:11 charnier Exp $");
 
 #ifdef INET6
 #include <sys/param.h>
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index e156989155c5..6566da1ec763 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/netgraph.c,v 1.10 2004/07/26 20:18:11 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 8019fb04eb36..4ec107683a74 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.50.8.2 2005/08/28 09:03:45 yar Exp $
 .\"
 .Dd August 19, 2005
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 5bc3a60f310a..4a07164fac53 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netstat.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/netstat/netstat.h,v 1.41.2.2 2005/08/19 15:08:43 glebius Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 0eb1e9223f57..d24fef90a48f 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -38,7 +38,7 @@ static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/route.c,v 1.76 2005/05/13 16:31:10 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index d9256115382a..7fb84ea8ef69 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/unix.c,v 1.18 2004/07/26 20:18:11 charnier Exp $");
 
 /*
  * Display protocol blocks in the unix domain.
diff --git a/usr.bin/newgrp/Makefile b/usr.bin/newgrp/Makefile
index 8195348bf3f8..30d8fa4f4d6c 100644
--- a/usr.bin/newgrp/Makefile
+++ b/usr.bin/newgrp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newgrp/Makefile,v 1.3 2004/11/03 18:01:20 ru Exp $
 
 PROG=	newgrp
 DPADD=	${LIBCRYPT} ${LIBUTIL}
diff --git a/usr.bin/newgrp/newgrp.1 b/usr.bin/newgrp/newgrp.1
index 44ab9fd56583..af36e190ad85 100644
--- a/usr.bin/newgrp/newgrp.1
+++ b/usr.bin/newgrp/newgrp.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/newgrp/newgrp.1,v 1.3 2005/01/17 07:44:25 ru Exp $
 .\"
 .Dd May 23, 2002
 .Dt NEWGRP 1
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index 62d552fa05d3..aa2ff9147312 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newgrp/newgrp.c,v 1.2 2003/10/30 15:14:34 harti Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index 670aa3c01d6f..b5feb95b4bb8 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newkey/Makefile,v 1.13 2004/11/13 20:40:30 bz Exp $
 
 PROG=	newkey
 SRCS=	newkey.c generic.c update.c
diff --git a/usr.bin/newkey/extern.h b/usr.bin/newkey/extern.h
index 7a5fb422d4f0..333b613b58eb 100644
--- a/usr.bin/newkey/extern.h
+++ b/usr.bin/newkey/extern.h
@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/newkey/extern.h,v 1.4 2005/02/07 21:40:24 stefanf Exp $
  */
 
 #ifdef YP
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 3572df92f727..9d0b993a71e3 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newkey/generic.c,v 1.7 2002/04/28 12:09:33 markm Exp $");
 
 #include <sys/file.h>
 
diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8
index 09b00e9f47d3..2ae1e90ef57c 100644
--- a/usr.bin/newkey/newkey.8
+++ b/usr.bin/newkey/newkey.8
@@ -1,5 +1,5 @@
 .\" @(#)newkey.8 1.3 91/03/11 TIRPC 1.0; from 1.12 90/02/03 SMI;
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/newkey/newkey.8,v 1.7 2002/07/14 15:09:10 charnier Exp $
 .Dd October 12, 1987
 .Dt NEWKEY 8
 .Os
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index 22d34e7a5e59..7925f8a8024f 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
  * Administrative tool to add a new user to the publickey database
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newkey/newkey.c,v 1.8 2005/05/21 09:55:06 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 533568fe836d..451e2847833e 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -42,7 +42,7 @@ static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
  * Administrative tool to add a new user to the publickey database
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newkey/update.c,v 1.10 2005/02/07 21:42:16 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile
index ce4c7c6136fb..b6aa7473a57f 100644
--- a/usr.bin/nfsstat/Makefile
+++ b/usr.bin/nfsstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nfsstat/Makefile,v 1.3 2001/12/10 21:13:06 dwmalone Exp $
 
 PROG=	nfsstat
 CFLAGS+=-DNFS
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index b5f56ff447d4..8795ac28a7f9 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nfsstat/nfsstat.1,v 1.13 2004/07/02 22:22:29 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index dda4bbbaa96d..d1ed9c3396af 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)nfsstat.c	8.2 (Berkeley) 3/31/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nfsstat/nfsstat.c,v 1.21 2004/07/11 17:37:33 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile
index 0d2733a6d10e..be49265a996b 100644
--- a/usr.bin/nice/Makefile
+++ b/usr.bin/nice/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nice/Makefile,v 1.4 2002/02/08 22:31:43 markm Exp $
 
 PROG=	nice
 
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index eb804bd7d3c7..b8e2dc2b1320 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nice.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nice/nice.1,v 1.26 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 1aed481f71cb..551b6930aa1c 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)nice.c	8.2 (Berkeley) 4/16/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/nice/nice.c,v 1.12 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/nl/Makefile b/usr.bin/nl/Makefile
index 9b1f292dfbee..f83d4af1ab86 100644
--- a/usr.bin/nl/Makefile
+++ b/usr.bin/nl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nl/Makefile,v 1.1 2001/05/04 17:25:23 brian Exp $
 
 PROG=	nl
 
diff --git a/usr.bin/nl/nl.1 b/usr.bin/nl/nl.1
index 610ec939aad6..c778b626239c 100644
--- a/usr.bin/nl/nl.1
+++ b/usr.bin/nl/nl.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nl/nl.1,v 1.16 2005/01/25 22:32:48 tjr Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index f557185003d1..2c1ee7913842 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -39,7 +39,7 @@
 __COPYRIGHT(
 "@(#) Copyright (c) 1999\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/nl/nl.c,v 1.10 2005/04/09 14:31:41 stefanf Exp $");
 #endif    
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile
index cd635cefa526..8e6290f0e967 100644
--- a/usr.bin/nohup/Makefile
+++ b/usr.bin/nohup/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nohup/Makefile,v 1.5 2002/07/14 18:19:26 alfred Exp $
 
 PROG=	nohup
 WARNS?=	4
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index bf74dd65bf39..34f19e6c76f2 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nohup.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nohup/nohup.1,v 1.13 2005/01/17 07:44:27 ru Exp $
 .\"
 .Dd July 19, 2001
 .Dt NOHUP 1
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 06f22445771d..c1f4d17b2214 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)nohup.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/nohup/nohup.c,v 1.10 2003/05/03 19:44:46 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/nslookup/Makefile b/usr.bin/nslookup/Makefile
index c8a2dda6ca8d..4c825f8d9ee2 100644
--- a/usr.bin/nslookup/Makefile
+++ b/usr.bin/nslookup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nslookup/Makefile,v 1.4.2.1 2005/07/30 07:56:27 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/nsupdate/Makefile b/usr.bin/nsupdate/Makefile
index 3bc6506df99a..e28f78463955 100644
--- a/usr.bin/nsupdate/Makefile
+++ b/usr.bin/nsupdate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nsupdate/Makefile,v 1.4.2.1 2005/07/30 07:56:27 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index 714cb48240c7..f96d055d34ae 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/objformat/Makefile,v 1.18 2002/09/17 01:49:00 peter Exp $
 
 PROG=		objformat
 
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index bdaa8266709a..37835aa2f5ce 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -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/usr.bin/objformat/objformat.1,v 1.10 2002/11/26 17:34:25 ru Exp $
 .\"
 .Dd September 17, 2002
 .Os
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index f2e9595ddba8..9089d2fe40f8 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/objformat/objformat.c,v 1.9 2002/09/17 01:49:00 peter Exp $
  */
 
 #include <unistd.h>
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 0375111dbfba..7925fa9e60ed 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opieinfo/Makefile,v 1.11 2004/11/03 18:01:20 ru Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index 215c86b4511e..00fbb7c6d10a 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiekey/Makefile,v 1.11 2002/01/03 21:20:29 ache Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index 0d75a2113dc1..782af6dcf775 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiepasswd/Makefile,v 1.10 2004/11/03 18:01:20 ru Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index 6ca205d32252..31978c82c8c2 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/3/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pagesize/Makefile,v 1.7 2001/04/07 11:21:23 ru Exp $
 
 SCRIPTS=pagesize.sh
 MAN=	pagesize.1
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index e4287e18cb0e..bf987d03be97 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pagesize.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pagesize/pagesize.1,v 1.7 2002/04/20 12:16:17 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt PAGESIZE 1
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index fd5477b3222b..8c46ee0f6f99 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pagesize.sh	8.1 (Berkeley) 4/3/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pagesize/pagesize.sh,v 1.5 1999/08/28 01:04:48 peter Exp $
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index ef68ba6e7b4f..f7bd252a9361 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/passwd/Makefile,v 1.46 2004/12/29 08:16:39 ache Exp $
 
 PROG	 = passwd
 BINOWN	 = root
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 3c6e2aaa447d..69cf94ff6908 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.30.2.1 2005/09/24 01:59:39 keramida Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index d35458c956a1..487309e79901 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/passwd/passwd.c,v 1.23 2003/04/18 21:27:09 nectar Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 6b8ed0de12bd..f5a4aa6c409d 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)paste.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/paste/paste.1,v 1.19 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd June 25, 2004
 .Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 683b12001eb7..ff598b0db9be 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)paste.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/paste/paste.c,v 1.14 2004/06/25 01:48:43 tjr Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/pathchk/Makefile b/usr.bin/pathchk/Makefile
index b5bea85270aa..73ab3e915e3b 100644
--- a/usr.bin/pathchk/Makefile
+++ b/usr.bin/pathchk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pathchk/Makefile,v 1.1 2002/05/22 10:30:16 tjr Exp $
 
 PROG=	pathchk
 
diff --git a/usr.bin/pathchk/pathchk.1 b/usr.bin/pathchk/pathchk.1
index e8639559cf47..c03522ef31ee 100644
--- a/usr.bin/pathchk/pathchk.1
+++ b/usr.bin/pathchk/pathchk.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pathchk/pathchk.1,v 1.5 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd May 21, 2002
 .Dt PATHCHK 1
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index dd9768a497e0..2d5dcdc21de2 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pathchk/pathchk.c,v 1.5 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/pkill/Makefile b/usr.bin/pkill/Makefile
index 632d6f42cf6e..3853a38f13b3 100644
--- a/usr.bin/pkill/Makefile
+++ b/usr.bin/pkill/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pkill/Makefile,v 1.5 2004/11/13 17:12:22 ru Exp $
 
 PROG=	pkill
 WARNS?=	5
diff --git a/usr.bin/pkill/pkill.1 b/usr.bin/pkill/pkill.1
index 143bbc47b3d8..89d717e00b00 100644
--- a/usr.bin/pkill/pkill.1
+++ b/usr.bin/pkill/pkill.1
@@ -1,6 +1,6 @@
 .\"	$NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pkill/pkill.1,v 1.16 2005/06/14 11:50:52 ru Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c
index 68798f129475..934a25a84aba 100644
--- a/usr.bin/pkill/pkill.c
+++ b/usr.bin/pkill/pkill.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pkill/pkill.c,v 1.26 2005/03/20 11:47:44 pjd Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 277459ee47a7..46257f47932c 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)egetopt.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pr/egetopt.c,v 1.3 2002/06/23 20:42:30 charnier Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index da552c03e8e8..d3a999bfb14a 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/extern.h,v 1.3 2002/09/04 23:29:05 dwmalone Exp $
  */
 
 extern int eoptind;
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 035958e26bf5..629512861d08 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pr/pr.1,v 1.22 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt PR 1
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 947404217bdc..907c6a160ef7 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)pr.c	8.2 (Berkeley) 4/16/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pr/pr.c,v 1.18 2004/07/26 20:24:59 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index a4346c788dcc..d93fe8c422f8 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)pr.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/pr.h,v 1.4 2001/03/21 14:32:02 ache Exp $
  */
 
 /*
diff --git a/usr.bin/printenv/Makefile b/usr.bin/printenv/Makefile
index bcb5952eb9ee..f6e4b181e4a9 100644
--- a/usr.bin/printenv/Makefile
+++ b/usr.bin/printenv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/printenv/Makefile,v 1.5 2003/06/01 06:29:47 tjr Exp $
 
 PROG=	printenv
 
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index c30d81cd948f..15f7e853f2f3 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/printenv/printenv.1,v 1.19 2005/01/17 07:44:28 ru Exp $
 .\"
 .Dd May 12, 2003
 .Dt PRINTENV 1
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 8ad23c7454da..fbda2718a881 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)printenv.c	8.2 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/printenv/printenv.c,v 1.6 2002/09/04 23:29:05 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile
index 78cdd0d13019..7809e8beead2 100644
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/printf/Makefile,v 1.5 2005/04/14 08:43:36 stefanf Exp $
 
 PROG=	printf
 WARNS?=	6
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 4a30851de01e..2754fb7f6c72 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printf.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/printf/printf.1,v 1.34 2005/06/14 11:50:52 ru Exp $
 .\"
 .Dd April 14, 2005
 .Dt PRINTF 1
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index b527c42a0e7d..e9e0da517c99 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -44,7 +44,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)printf.c	8.1 (Berkeley) 7/20/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/printf/printf.c,v 1.36 2005/05/21 09:55:07 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile
index 666a3baeaa3a..3c4eba13151c 100644
--- a/usr.bin/quota/Makefile
+++ b/usr.bin/quota/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/quota/Makefile,v 1.5 2003/06/15 06:46:24 rwatson Exp $
 
 PROG=	quota
 BINOWN=	root
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index cf16941eb0ce..1896299e7d2e 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/quota/quota.1,v 1.16 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd August 8, 2002
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 2b0dd4925d29..2585300cb045 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -48,7 +48,7 @@ static const char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";
  * Disk quota reporting program.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.24 2005/03/13 17:58:31 ceri Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile
index d5471379fe1e..b32dcebacc16 100644
--- a/usr.bin/renice/Makefile
+++ b/usr.bin/renice/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/renice/Makefile,v 1.5 2002/02/08 22:31:43 markm Exp $
 
 PROG=	renice
 MAN=	renice.8
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 4420d8efa758..d42123879b3c 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)renice.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/renice/renice.8,v 1.16 2003/02/26 20:27:24 charnier Exp $
 .\"
 .Dd June 9, 1993
 .Dt RENICE 8
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 21bb4c2c9805..528176a2d1ad 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/renice/renice.c,v 1.18 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile
index 27137ffb4d15..6275448f3e0e 100644
--- a/usr.bin/rev/Makefile
+++ b/usr.bin/rev/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rev/Makefile,v 1.4 2002/02/08 22:31:43 markm Exp $
 
 PROG=	rev
 
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index 68b00bf89c53..a1e9eb53eff7 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rev.1	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rev/rev.1,v 1.6 2001/02/13 09:55:09 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt REV 1
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 67080fbb0845..2022b2ba6870 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rev/rev.c,v 1.8 2004/12/15 06:24:57 ssouhlal Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 195bffbb0b15..857d41013b05 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rlogin/Makefile,v 1.28 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	rlogin
 
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 9a29f6614708..3a6ae5593f57 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rlogin/rlogin.1,v 1.27 2005/01/21 11:09:40 ru Exp $
 .\"
 .Dd September 26, 2003
 .Dt RLOGIN 1
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index ab99b777c362..3cf5611a1191 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rlogin/rlogin.c,v 1.38 2005/01/21 11:09:40 ru Exp $");
 
 /*
  * rlogin - remote login
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index d01e863af93f..7198a304805d 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rpcgen/Makefile,v 1.7 2002/07/14 17:55:35 alfred Exp $
 
 PROG=	rpcgen
 SRCS=	rpc_main.c  rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 1e328761ebc3..52f4d876baf3 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_clntout.c,v 1.9 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index f1b288ac9908..d5d0428722e4 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_cout.c,v 1.11 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_cout.c, XDR routine outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index fb25e524c719..1f0e72dde8bf 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_hout.c,v 1.10 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_hout.c, Header file outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 7d54d239feb9..9fae0de5ba2b 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_main.c,v 1.25 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_main.c, Top level of the RPC protocol compiler.
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index a87e8a91a170..abced8622177 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_parse.c,v 1.11 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_parse.c, Parser for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h
index 4f3547bc5f80..3bd8438354fd 100644
--- a/usr.bin/rpcgen/rpc_parse.h
+++ b/usr.bin/rpcgen/rpc_parse.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/rpcgen/rpc_parse.h,v 1.5 2002/07/21 12:55:04 charnier Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index b960cd681c14..3104bb73d7f5 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -30,7 +30,7 @@
 /* #pragma ident	"@(#)rpc_sample.c	1.9	94/04/25 SMI" */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_sample.c,v 1.6 2002/07/21 12:55:04 charnier Exp $");
 
 /*
  * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index bea0773a261c..ac6ccf86d058 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_scan.c,v 1.9 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_scan.c, Scanner for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h
index 1b887b091f53..8202920ad73b 100644
--- a/usr.bin/rpcgen/rpc_scan.h
+++ b/usr.bin/rpcgen/rpc_scan.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/rpcgen/rpc_scan.h,v 1.5 2002/07/21 12:55:04 charnier Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 2450142ff595..1a982793f2a8 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_svcout.c,v 1.16 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index aaa71c912dd6..69b2a7425b70 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_tblout.c,v 1.9 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 0d3fdaf70cb9..645eaf9309f4 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_util.c,v 1.9 2005/05/31 20:00:29 stefanf Exp $");
 
 /*
  * rpc_util.c, Utility routines for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 73438272a38e..900c1d995fae 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/rpcgen/rpc_util.h,v 1.6 2002/07/21 12:55:04 charnier Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 0c7139b82d4f..23a6fc01be5a 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,5 +1,5 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.22 2005/01/15 11:20:51 ru Exp $
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
 .\"
 .Dd March 28, 1993
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index e7283a4f5356..426e9d9aa32e 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rpcinfo/Makefile,v 1.6 2001/03/27 10:52:08 ru Exp $
 
 PROG=	rpcinfo
 SRCS=	rpcinfo.c rpc_generic.c
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index f4c7fc79868c..940da8c0e97c 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" Copyright 1991 Sun Microsystems, Inc.
 .\" $NetBSD: rpcinfo.8,v 1.6 2000/06/02 23:19:38 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rpcinfo/rpcinfo.8,v 1.9 2002/10/16 15:38:28 charnier Exp $
 .Dd August 18, 1992
 .Dt RPCINFO 8
 .Os
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index a2e662961ada..d7c8025722f6 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rpcinfo.c 1.16 89/04/05 Copyr 1986 Sun Micro";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcinfo/rpcinfo.c,v 1.17 2004/03/11 10:22:25 bde Exp $");
 
 /*
  * rpcinfo: ping a particular rpc program
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index af056a93c4a9..5e27815af8b5 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rs.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rs/rs.1,v 1.11 2004/07/30 00:10:52 tjr Exp $
 .\"
 .Dd July 30, 2004
 .Dt RS 1
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index df01c57d1b63..60be8c4324ef 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -48,7 +48,7 @@ static const char sccsid[] = "@(#)rs.c	8.1 (Berkeley) 6/6/93";
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rs/rs.c,v 1.13 2005/04/28 12:37:15 robert Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index cf052f71efa7..35a1e1f393f7 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rsh/Makefile,v 1.24 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	rsh
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index ee5d0dd193ff..380489bdcc8c 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rsh/rsh.1,v 1.20.2.1 2005/07/17 15:03:35 brueffer Exp $
 .\"
 .Dd October 16, 2002
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index a3668300f387..465b264a31b4 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "From: @(#)rsh.c	8.3 (Berkeley) 4/6/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rsh/rsh.c,v 1.35 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 6d329774b711..9059f0e5e99a 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rup/Makefile,v 1.5 2001/03/27 10:52:09 ru Exp $
 
 PROG=	rup
 
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 76be6fcea5b6..0fae9658ea62 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rup/rup.1,v 1.19 2004/07/04 20:55:49 ru Exp $
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 26037a61bfec..85b504b7e93f 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rup/rup.c,v 1.18 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 3d0938140daf..6b50cfcc53f9 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ruptime.1	8.2 (Berkeley) 4/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.17 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd March 1, 2003
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 045a1257f787..f30b611b9ba3 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -42,7 +42,7 @@ static const char sccsid[] = "@(#)ruptime.c	8.2 (Berkeley) 4/5/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ruptime/ruptime.c,v 1.17 2005/05/21 09:55:08 ru Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 21d0ce24a706..b37c8d0b3305 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rusers/Makefile,v 1.6 2004/05/19 21:34:52 dwmalone Exp $
 
 PROG = rusers
 WARNS?=	6
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index f528bb87e4e4..d08b73686bae 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rusers/rusers.1,v 1.18 2004/07/04 20:55:50 ru Exp $
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 705c887e8d7d..91fe63bdd86a 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rusers/rusers.c,v 1.17 2005/05/21 09:55:08 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 4e448dbd2ca7..0ca9e4fc40b0 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rwall/Makefile,v 1.6 2004/02/04 11:59:07 ru Exp $
 
 PROG = rwall
 
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 2de83d4c2711..e08884699791 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rwall/rwall.1,v 1.15 2004/07/04 20:55:50 ru Exp $
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 042b72f71355..5aac7f537766 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -43,7 +43,7 @@ static const char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rwall/rwall.c,v 1.14 2005/05/21 09:55:08 ru Exp $");
 
 /*
  * This program is not related to David Wall, whose Stanford Ph.D. thesis
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index 684e508146d0..ef56e7b648ee 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwho.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rwho/rwho.1,v 1.10.2.1 2005/08/15 06:07:23 ssouhlal Exp $
 .\"
 .Dd June 6, 1993
 .Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index be82ad36d4dc..50a17d21d623 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rwho/rwho.c,v 1.18 2002/07/01 16:40:33 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile
index 50ba12e696af..1d53d1aa789b 100644
--- a/usr.bin/script/Makefile
+++ b/usr.bin/script/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/script/Makefile,v 1.4 2001/12/12 23:23:52 markm Exp $
 
 PROG=	script
 LDADD=	-lutil
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 1c93b3e48a15..8c0dae925069 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/script/script.1,v 1.21 2004/07/03 00:24:43 ru Exp $
 .\"
 .Dd January 22, 2004
 .Dt SCRIPT 1
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index ad706dcdd350..1c2a383316ed 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/script/script.c,v 1.24 2004/02/15 17:30:13 cperciva Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index 9d9886f3688c..a411bd79f0e5 100644
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sed/Makefile,v 1.5 2002/06/17 08:21:53 sobomax Exp $
 
 PROG=	sed
 SRCS=	compile.c main.c misc.c process.c
diff --git a/usr.bin/sed/TEST/hanoi.sed b/usr.bin/sed/TEST/hanoi.sed
index 6a45deaa94c7..0a724b8feefb 100644
--- a/usr.bin/sed/TEST/hanoi.sed
+++ b/usr.bin/sed/TEST/hanoi.sed
@@ -1,7 +1,7 @@
 # Towers of Hanoi in sed.
 #
 #	@(#)hanoi.sed	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sed/TEST/hanoi.sed,v 1.3 2002/07/04 05:16:19 tjr Exp $
 #
 #
 # Ex:
diff --git a/usr.bin/sed/TEST/math.sed b/usr.bin/sed/TEST/math.sed
index cdd18d6d532b..c3ecc64434e1 100644
--- a/usr.bin/sed/TEST/math.sed
+++ b/usr.bin/sed/TEST/math.sed
@@ -1,6 +1,6 @@
 # This is ksb's infamous sed calculator.		(ksb@sa.fedex.com)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sed/TEST/math.sed,v 1.2 2004/05/01 02:15:58 smkelly Exp $
 #
 # $Id: math.sed,v 2.5 1998/08/02 13:23:34 ksb Exp ksb $
 # expr ::= (expr) | expr! |
diff --git a/usr.bin/sed/TEST/sed.test b/usr.bin/sed/TEST/sed.test
index 801e392561b3..8017a6183ad5 100644
--- a/usr.bin/sed/TEST/sed.test
+++ b/usr.bin/sed/TEST/sed.test
@@ -30,7 +30,7 @@
 #
 #	@(#)sed.test	8.1 (Berkeley) 6/6/93
 #
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/sed/TEST/sed.test,v 1.4 2004/08/09 15:29:41 dds Exp $
 #
 
 # sed Regression Tests
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 14ef81b681ee..85471d36d0a2 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/compile.c,v 1.27.2.1 2005/10/04 15:26:10 dds Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)compile.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index 495fb07a1b30..187ceb77d3ac 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/sed/defs.h,v 1.5 2004/08/09 15:29:41 dds Exp $
  */
 
 /*
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index 9d4b5bdb0cfe..dcbe081e622d 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/sed/extern.h,v 1.13 2004/08/09 15:29:41 dds Exp $
  */
 
 extern struct s_command *prog;
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 5703d2052542..77efcc658695 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/main.c,v 1.36 2005/05/10 13:40:50 glebius Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index f3b513784a6e..2a3789221df3 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/misc.c,v 1.10 2004/08/09 15:29:41 dds Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index ffdb629f9e6a..f36ae6f04e15 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/process.c,v 1.39 2005/04/09 14:31:41 stefanf Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)process.c	8.6 (Berkeley) 4/20/94";
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index f6a86d520d35..e4dac8a93e50 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/sed/sed.1,v 1.43 2005/06/14 11:50:52 ru Exp $
 .\"
 .Dd May 10, 2005
 .Dt SED 1
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 9970eb5c3cef..fcd79990d17e 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/shar/Makefile,v 1.7 2001/04/07 11:21:24 ru Exp $
 
 SCRIPTS=shar.sh
 MAN=	shar.1
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 1143f9cd3b7b..88dd16f2fe0b 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/shar/shar.1,v 1.11 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile
index 59199098dda6..444408ca3de3 100644
--- a/usr.bin/showmount/Makefile
+++ b/usr.bin/showmount/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/showmount/Makefile,v 1.4 2001/03/27 10:52:12 ru Exp $
 
 PROG=	showmount
 MAN=	showmount.8
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index fe53d88dc822..8c7ad4d6fd06 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/showmount/showmount.8,v 1.18 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index b9ea200692f4..c4814a2f7001 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)showmount.c	8.3 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/showmount/showmount.c,v 1.16 2005/05/21 09:55:08 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/smbutil/Makefile b/usr.bin/smbutil/Makefile
index 13b5078e0411..8e8721d3debd 100644
--- a/usr.bin/smbutil/Makefile
+++ b/usr.bin/smbutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/smbutil/Makefile,v 1.2 2005/05/04 15:05:46 takawata Exp $
 
 PROG=	smbutil
 SRCS=	smbutil.c dumptree.c login.c lookup.c view.c print.c
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index 55e702577e6c..37419d59f4a2 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sockstat/Makefile,v 1.7 2005/01/28 16:08:08 ru Exp $
 
 PROG=		sockstat
 WARNS?=		4
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 9d3a83e373a2..49d52c93b5c7 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -25,7 +25,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/usr.bin/sockstat/sockstat.1,v 1.20 2005/01/11 10:32:52 ru Exp $
 .\"
 .Dd August 25, 2004
 .Dt SOCKSTAT 1
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index 3aa3e0d3f858..7f1af0c93b07 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.13 2005/06/10 06:36:03 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile
index d176fdd7d457..0fbeb420e207 100644
--- a/usr.bin/split/Makefile
+++ b/usr.bin/split/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/split/Makefile,v 1.4 2001/12/12 23:09:07 markm Exp $
 
 PROG=	split
 
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 70ed146cc5a1..cafb03961f61 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/split/split.1,v 1.15 2005/01/17 07:44:29 ru Exp $
 .\"
 .Dd July 12, 2004
 .Dt SPLIT 1
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index ca3847c5c965..c2ad82dfa978 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/split/split.c,v 1.15 2004/07/11 14:44:23 tjr Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile
index 808c41e9b0cb..428cea6676af 100644
--- a/usr.bin/stat/Makefile
+++ b/usr.bin/stat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/stat/Makefile,v 1.4 2005/01/28 16:08:08 ru Exp $
 
 PROG=	stat
 WARNS?=	2
diff --git a/usr.bin/stat/stat.1 b/usr.bin/stat/stat.1
index d7ebb01c3997..a3d80f87e40c 100644
--- a/usr.bin/stat/stat.1
+++ b/usr.bin/stat/stat.1
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.8 2005/06/14 11:50:53 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt STAT 1
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index b67627e94716..b9eaf9f8ff4b 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -41,7 +41,7 @@ __RCSID("$NetBSD: stat.c,v 1.13 2003/07/25 03:21:17 atatat Exp $");
 #endif
 #endif
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/stat/stat.c,v 1.6 2003/10/06 01:55:17 dougb Exp $");
 
 #if HAVE_CONFIG_H
 #include "config.h" 
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 109b55153d65..7308fa8d6715 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/su/Makefile,v 1.40 2004/11/03 18:01:21 ru Exp $
 
 PROG=	su
 
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index e44d639b1e00..7a9d35546a57 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/su/su.1,v 1.36 2005/01/18 13:43:53 ru Exp $
 .\"
 .Dd October 3, 2004
 .Dt SU 1
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index f6e0c86c387b..a95faf982208 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -74,7 +74,7 @@ static char sccsid[] = "@(#)su.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/su/su.c,v 1.76 2005/01/17 19:57:59 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 3cd09f4b50a4..02e9e5a9461d 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/systat/Makefile,v 1.15 2004/02/04 10:20:43 ru Exp $
 
 PROG=	systat
 SRCS=	cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index b15286b580c5..50575dd19538 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/cmds.c,v 1.5 2003/01/04 21:58:25 phk Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 6b4f77ee7cf1..c0b827030b11 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/cmdtab.c,v 1.9 2003/08/01 20:28:20 dwmalone Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/convtbl.c b/usr.bin/systat/convtbl.c
index 56436132fbe4..d4a75a7291c0 100644
--- a/usr.bin/systat/convtbl.c
+++ b/usr.bin/systat/convtbl.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/convtbl.c,v 1.3 2004/07/04 16:11:03 stefanf Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/systat/convtbl.h b/usr.bin/systat/convtbl.h
index 8d5ffeeef260..239dd565da55 100644
--- a/usr.bin/systat/convtbl.h
+++ b/usr.bin/systat/convtbl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/convtbl.h,v 1.2 2004/03/09 11:57:27 dwmalone Exp $
  */
 
 #ifndef _CONVTBL_H_
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index d37cf2d5ad98..a9ba440fdf57 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -60,7 +60,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/devs.c,v 1.9 2003/10/20 20:13:50 phk Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)disks.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index 921700846b23..314ffe3a8010 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/devs.h,v 1.4 2001/12/12 00:13:37 markm Exp $
  */
 
 int dsinit(int, struct statinfo *, struct statinfo *, struct statinfo *);
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 84af89ca55f0..2cf4afbafd10 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/extern.h,v 1.14 2004/03/09 11:57:27 dwmalone Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 1a22bbeb171f..94752bd73b8f 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/fetch.c,v 1.5 2001/12/12 00:13:37 markm Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)fetch.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 487a3ba40f7d..3c6b8db6aa9d 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/icmp.c,v 1.3 2001/12/12 00:13:37 markm Exp $");
 
 #ifdef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index c02819ffdd6d..640590f0e89e 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/icmp6.c,v 1.1 2003/08/01 20:28:20 dwmalone Exp $");
 
 #ifdef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ifcmds.c b/usr.bin/systat/ifcmds.c
index 68c377e476ad..ad4c546d69ea 100644
--- a/usr.bin/systat/ifcmds.c
+++ b/usr.bin/systat/ifcmds.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/ifcmds.c,v 1.2 2004/03/09 11:57:27 dwmalone Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/systat/ifstat.c b/usr.bin/systat/ifstat.c
index 26c81ce1413a..f086a53a36d1 100644
--- a/usr.bin/systat/ifstat.c
+++ b/usr.bin/systat/ifstat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/ifstat.c,v 1.2 2004/03/09 11:57:27 dwmalone Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 0702ea140b50..61bd5c258bf0 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -60,7 +60,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/iostat.c,v 1.21 2003/11/01 02:06:02 tjr Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index 1462ab102147..a94f69cb84a8 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/ip.c,v 1.5 2001/12/12 00:13:37 markm Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index a88c5b48c2e6..931e5d297170 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/ip6.c,v 1.1 2003/08/01 20:28:20 dwmalone Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index b563266be97f..96bc702cd27e 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/keyboard.c,v 1.2 2001/12/12 00:13:37 markm Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)keyboard.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 833a1884889f..a26e67e6f9c9 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/main.c,v 1.18 2004/03/09 11:57:28 dwmalone Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 5e55bc9319b0..f8a78d44305a 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/mbufs.c,v 1.18 2005/04/09 14:31:41 stefanf Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 5f64e3ec237f..53bbb4cd0119 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -58,7 +58,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/mode.c,v 1.3 2001/12/12 00:13:37 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/systat/mode.h b/usr.bin/systat/mode.h
index 9fc0feae96d5..cb6d40cc8474 100644
--- a/usr.bin/systat/mode.h
+++ b/usr.bin/systat/mode.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/mode.h,v 1.3 2001/12/12 00:13:37 markm Exp $
  */
 
 /*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index c78f6feac7d7..e7d7e9aae2d2 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/netcmds.c,v 1.12 2002/03/22 01:42:31 imp Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 735cce316865..29dfc607f060 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/netstat.c,v 1.23 2005/02/19 16:54:26 ume Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 3bc38938e270..c3b68cb41d21 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.20 2005/05/02 10:50:10 delphij Exp $");
 
 /*
  * Pigs display from Bill Reeves at Lucasfilm
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index eca672654ea9..3a3c7e45eaa3 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/swap.c,v 1.21 2002/12/30 18:14:43 mike Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 8d372b67dd11..65f29aa6dcf3 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.44.2.1 2005/08/18 15:01:25 keramida Exp $
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index f37a04ceec5c..96d067293fe3 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)systat.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/systat.h,v 1.6 2001/12/12 00:13:37 markm Exp $
  */
 
 #include <curses.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 40311d6face2..baeed87441e9 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -41,7 +41,7 @@ static const char rcsid[] =
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/tcp.c,v 1.9 2004/02/25 13:26:53 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index bced789e4451..6de9e54407b8 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/vmstat.c,v 1.60 2005/02/21 14:35:00 ps Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile
index 4b5d40e0d302..f35ca4d0057a 100644
--- a/usr.bin/tabs/Makefile
+++ b/usr.bin/tabs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tabs/Makefile,v 1.1 2002/05/21 02:33:25 tjr Exp $
 
 PROG=	tabs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/tabs/tabs.1 b/usr.bin/tabs/tabs.1
index 9075de5fa7ff..b2f852337189 100644
--- a/usr.bin/tabs/tabs.1
+++ b/usr.bin/tabs/tabs.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tabs/tabs.1,v 1.7 2005/01/17 07:44:29 ru Exp $
 .\"
 .Dd May 20, 2002
 .Dt TABS 1
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index d03a7413d175..48a610516d4d 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tabs/tabs.c,v 1.3 2002/06/08 11:33:22 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/tty.h>
diff --git a/usr.bin/tail/Makefile b/usr.bin/tail/Makefile
index c8166936983d..c11dc8cae8fd 100644
--- a/usr.bin/tail/Makefile
+++ b/usr.bin/tail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tail/Makefile,v 1.4 2005/01/10 20:22:37 dwmalone Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	tail
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index 9c45a1b53490..324af7d6e7e5 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tail/extern.h,v 1.9 2004/11/04 19:18:19 paul Exp $
  */
 
 #define	WR(p, size) do { \
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index e8f3aaff2ada..e68f427d803b 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/forward.c,v 1.38.2.1 2005/10/09 03:51:55 delphij Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)forward.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index 584e3d103eab..0bb8ecabf946 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/misc.c,v 1.9 2005/01/10 20:19:46 dwmalone Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index ff66f78cf37e..9686248edb93 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/read.c,v 1.11 2004/11/03 15:23:11 paul Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index f0a52aa8bcc5..981dec692a93 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/reverse.c,v 1.19 2005/03/20 22:08:52 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 9b8cabe8534e..d8717ba061a8 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tail.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tail/tail.1,v 1.12 2005/01/17 07:44:30 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TAIL 1
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 9162d1712ba7..f36f2e35f209 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/tail.c,v 1.21 2005/06/01 20:34:06 eivind Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 94795d775bb3..1011a82966f4 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/talk/Makefile,v 1.10 2002/02/08 23:07:35 markm Exp $
 
 PROG=	talk
 SRCS=	ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 717ffb36a540..b1de3d2da546 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/ctl.c,v 1.10 2005/02/09 09:13:36 stefanf Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 0871febe7361..06c32b0c0dfa 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/ctl_transact.c,v 1.7 2002/02/18 20:35:26 mike Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 24851e45fab1..a495aa4709e2 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/display.c,v 1.11 2003/07/04 20:44:25 luigi Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index f212a209a015..b54ed3ba769e 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/get_addrs.c,v 1.5 2001/12/11 23:51:14 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index d7cca18ec0dc..7e646ff23a29 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/get_iface.c,v 1.10 2005/03/11 14:17:12 stefanf Exp $");
 
 /*
  * From:
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index ad6b8235eec1..0f23d35e90b7 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/get_names.c,v 1.9 2004/06/14 22:34:13 bms Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index f391b76a5e0b..ce24553aef84 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/init_disp.c,v 1.14 2004/04/19 21:37:28 cognet Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index a6e98e8900db..4d73e78a5ff0 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/invite.c,v 1.9 2003/01/01 18:49:00 schweikh Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index bcbf53580d06..f9b306d921c9 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/io.c,v 1.16 2004/05/10 15:52:16 cognet Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 1ff1477b22ff..f251661e8b1b 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/look_up.c,v 1.8 2005/02/09 09:13:36 stefanf Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index e4a097739671..6936efaa285f 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/msgs.c,v 1.6 2001/12/11 23:51:14 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 775b6d1437ce..4a41c4b368ac 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/talk/talk.1,v 1.20 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt TALK 1
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 8e3f540055bb..b58839c30a92 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/talk.c,v 1.11 2002/08/19 03:07:56 jmallett Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 2a81a53bca9b..7f3bcf4c9ec9 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)talk.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/talk/talk.h,v 1.5 2004/04/19 21:37:29 cognet Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tar/COPYING b/usr.bin/tar/COPYING
index c7024826841e..555a2818b258 100644
--- a/usr.bin/tar/COPYING
+++ b/usr.bin/tar/COPYING
@@ -25,4 +25,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/usr.bin/tar/COPYING,v 1.1 2004/08/07 03:24:48 kientzle Exp $
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 128f2c2c8a71..5721fa1f53fa 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/Makefile,v 1.24 2005/05/08 06:25:15 kientzle Exp $
 
 #
 # Use "make distfile" to build a tar.gz file suitable for distribution,
diff --git a/usr.bin/tar/Makefile.am b/usr.bin/tar/Makefile.am
index ce565c04bd62..4b6fbbe2a5eb 100644
--- a/usr.bin/tar/Makefile.am
+++ b/usr.bin/tar/Makefile.am
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/Makefile.am,v 1.3 2005/04/24 05:53:37 kientzle Exp $
 
 # Process this file with automake to create Makefile.in
 
diff --git a/usr.bin/tar/bsdtar.1 b/usr.bin/tar/bsdtar.1
index b73999eb83e1..e31d3030647f 100644
--- a/usr.bin/tar/bsdtar.1
+++ b/usr.bin/tar/bsdtar.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tar/bsdtar.1,v 1.29 2005/06/27 07:37:01 ru Exp $
 .\"
 .Dd April 13, 2004
 .Dt BSDTAR 1
diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c
index 59d3aced1049..462d0673ba54 100644
--- a/usr.bin/tar/bsdtar.c
+++ b/usr.bin/tar/bsdtar.c
@@ -25,7 +25,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.63.2.1 2005/09/20 07:48:00 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/tar/bsdtar.h b/usr.bin/tar/bsdtar.h
index 5c37a7150ec3..c687063c4512 100644
--- a/usr.bin/tar/bsdtar.h
+++ b/usr.bin/tar/bsdtar.h
@@ -26,7 +26,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/usr.bin/tar/bsdtar.h,v 1.23 2005/04/17 17:20:54 kientzle Exp $
  */
 
 #include <archive.h>
diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h
index d4eca6fcdd85..fb2e5ad5780a 100644
--- a/usr.bin/tar/bsdtar_platform.h
+++ b/usr.bin/tar/bsdtar_platform.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/usr.bin/tar/bsdtar_platform.h,v 1.15 2005/04/17 19:43:37 kientzle Exp $
  */
 
 /*
diff --git a/usr.bin/tar/configure.ac.in b/usr.bin/tar/configure.ac.in
index 249fa7b44079..269e6ab4b7ae 100644
--- a/usr.bin/tar/configure.ac.in
+++ b/usr.bin/tar/configure.ac.in
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/configure.ac.in,v 1.9 2005/04/23 18:41:28 kientzle Exp $
 
 # Process this file with autoconf to produce a configure script.
 AC_INIT(bsdtar, @VERSION@, kientzle@freebsd.org)
diff --git a/usr.bin/tar/getdate.y b/usr.bin/tar/getdate.y
index cc838c1b4c03..a40fac548f8d 100644
--- a/usr.bin/tar/getdate.y
+++ b/usr.bin/tar/getdate.y
@@ -24,7 +24,7 @@
 /* SUPPRESS 288 on yyerrlab *//* Label unused */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/getdate.y,v 1.4 2005/04/23 18:38:32 kientzle Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr.bin/tar/matching.c b/usr.bin/tar/matching.c
index 0aaff9265536..1f2cb893270d 100644
--- a/usr.bin/tar/matching.c
+++ b/usr.bin/tar/matching.c
@@ -25,7 +25,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/matching.c,v 1.9 2005/03/14 00:30:35 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.bin/tar/read.c b/usr.bin/tar/read.c
index dc9540905497..43c68da3f663 100644
--- a/usr.bin/tar/read.c
+++ b/usr.bin/tar/read.c
@@ -25,7 +25,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.23 2005/04/17 17:20:54 kientzle Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/tar/tree.c b/usr.bin/tar/tree.c
index 4528eea3c15b..2844e21baec2 100644
--- a/usr.bin/tar/tree.c
+++ b/usr.bin/tar/tree.c
@@ -44,7 +44,7 @@
  * regular dir or via fchdir(2) for a symlink).
  */
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/tree.c,v 1.2 2005/05/08 06:25:15 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/usr.bin/tar/tree.h b/usr.bin/tar/tree.h
index 06eab8ea08f1..06b15fe540a4 100644
--- a/usr.bin/tar/tree.h
+++ b/usr.bin/tar/tree.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/usr.bin/tar/tree.h,v 1.2 2005/05/08 06:25:15 kientzle Exp $
  */
 
 /*-
diff --git a/usr.bin/tar/util.c b/usr.bin/tar/util.c
index 69cc67117c5b..feb058f9427d 100644
--- a/usr.bin/tar/util.c
+++ b/usr.bin/tar/util.c
@@ -25,7 +25,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.13 2005/04/17 19:46:50 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>  /* Linux doesn't define mode_t, etc. in sys/stat.h. */
diff --git a/usr.bin/tar/write.c b/usr.bin/tar/write.c
index 39743276e9c7..07ad7a2b72ff 100644
--- a/usr.bin/tar/write.c
+++ b/usr.bin/tar/write.c
@@ -25,7 +25,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.41 2005/05/08 06:25:15 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/usr.bin/tcopy/Makefile b/usr.bin/tcopy/Makefile
index 1bae0b229420..2cc2841ef5ee 100644
--- a/usr.bin/tcopy/Makefile
+++ b/usr.bin/tcopy/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tcopy/Makefile,v 1.3 2002/02/08 23:07:35 markm Exp $
 
 PROG=	tcopy
 
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 498e12d427e1..9aaef944cb8e 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tcopy.1	8.2 (Berkeley) 4/17/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tcopy/tcopy.1,v 1.17 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd April 17, 1994
 .Dt TCOPY 1
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 540ac06af738..7b0b77cba5dc 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tcopy/tcopy.c,v 1.13 2002/03/25 05:23:45 mike Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile
index 920dd6605917..c546408ed574 100644
--- a/usr.bin/tee/Makefile
+++ b/usr.bin/tee/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tee/Makefile,v 1.4 2001/12/12 00:06:51 markm Exp $
 
 PROG=	tee
 
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index 0f492c0981af..657c109497fe 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tee.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tee/tee.1,v 1.7 2005/01/17 07:44:30 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TEE 1
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 123a2de69ab5..a9741998a3d2 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tee.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tee/tee.c,v 1.10 2002/09/04 23:29:07 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index e364934b0635..83cd94b2a3a4 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/telnet/Makefile,v 1.28 2005/06/10 06:12:51 des Exp $
 
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/telnet
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index a51afed99745..6a05f0f5b1b1 100644
--- a/usr.bin/tftp/Makefile
+++ b/usr.bin/tftp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tftp/Makefile,v 1.5 2002/02/08 23:07:35 markm Exp $
 
 PROG=	tftp
 SRCS=	main.c tftp.c tftpsubs.c
diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h
index 3956aca95ecc..fdf3d312e3d4 100644
--- a/usr.bin/tftp/extern.h
+++ b/usr.bin/tftp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tftp/extern.h,v 1.3 2002/03/22 01:42:33 imp Exp $
  */
 
 void	recvfile(int, char *, char *);
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 08a7f1355dcd..1265aa06bcc1 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tftp/main.c,v 1.21 2003/10/12 00:27:55 tjr Exp $");
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
 
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 04daa87aacef..75f2f6a2beb9 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tftp/tftp.1,v 1.19 2005/01/18 13:43:53 ru Exp $
 .\"
 .Dd October 1, 2003
 .Dt TFTP 1
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index bac262f9ad7d..f5fc14bf32b0 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tftp/tftp.c,v 1.11 2002/05/12 01:47:50 bsd Exp $");
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
 
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index a7911cf70a89..7e0655bc5885 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tftp/tftpsubs.c,v 1.6 2005/02/14 17:42:58 stefanf Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tftp/tftpsubs.h b/usr.bin/tftp/tftpsubs.h
index 0c3b42ea991a..d3eafd9ade8d 100644
--- a/usr.bin/tftp/tftpsubs.h
+++ b/usr.bin/tftp/tftpsubs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tftpsubs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tftp/tftpsubs.h,v 1.2 2002/03/22 01:42:34 imp Exp $
  */
 
 /*
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 199b2a85e84b..0f6abd95e2c5 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/time/time.1,v 1.24 2005/01/17 07:44:31 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TIME 1
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 53f96368cba5..f180d0504e5f 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/time/time.c,v 1.27 2005/05/21 09:55:08 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile
index 532431d13cae..ee82e8bf7fcb 100644
--- a/usr.bin/tip/Makefile
+++ b/usr.bin/tip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/Makefile,v 1.6 2001/12/20 14:25:46 markm Exp $
 
 SUBDIR=tip
 
diff --git a/usr.bin/tip/Makefile.inc b/usr.bin/tip/Makefile.inc
index 265f86d1ed55..651f84c309c4 100644
--- a/usr.bin/tip/Makefile.inc
+++ b/usr.bin/tip/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/Makefile.inc,v 1.4 2001/12/20 14:25:46 markm Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.bin/tip/README b/usr.bin/tip/README
index fb9af1574119..ca3a3caa972c 100644
--- a/usr.bin/tip/README
+++ b/usr.bin/tip/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/README,v 1.3 2001/12/20 14:25:46 markm Exp $
 
 Tip can be configured in a number of ways:
 
diff --git a/usr.bin/tip/TODO b/usr.bin/tip/TODO
index 6aace387e541..559aefee8d03 100644
--- a/usr.bin/tip/TODO
+++ b/usr.bin/tip/TODO
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/TODO,v 1.3 2001/12/20 14:25:46 markm Exp $
 
 1. Rethink protection glitches on REMOTE & PHONES
    files (setuid/setgid??).
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 2794ba7105a9..62af65a01763 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/biz22.c,v 1.2 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index 44b8a62e74c8..10927bf0edd4 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/biz31.c,v 1.2 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index 598dbab86021..bcac4bd16be5 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/courier.c,v 1.6 2003/04/06 08:30:25 imp Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index 7d1127149133..1f6ebdff2394 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/df.c,v 1.3 2003/04/06 08:30:25 imp Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index ea78cce4aad9..2b04ba7f9e2c 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/dn11.c,v 1.3 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index 7784f2936835..20b603a9e492 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/hayes.c,v 1.4 2003/04/06 08:30:25 imp Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index ec9c3d4f9f81..a4f2c41c2e85 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/t3000.c,v 1.5 2003/04/06 08:30:25 imp Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index df850a5364b3..81e7bd76a014 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/v3451.c,v 1.2 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 5a6268e7aef4..dc8a6632ebbe 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/v831.c,v 1.3 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index c3b87ae98a07..385b056ae3ba 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/ventel.c,v 1.4 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/Makefile b/usr.bin/tip/tip/Makefile
index 232a79a7136e..670be9b5b7d5 100644
--- a/usr.bin/tip/tip/Makefile
+++ b/usr.bin/tip/tip/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.9 2001/09/23 06:15:30 pvalchev Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/tip/Makefile,v 1.18 2002/07/12 14:49:25 ru Exp $
 #
 # Files are:
 #	/etc/remote		remote host description file
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 88d88b96fc6e..e7cb9a4f7494 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/acu.c,v 1.7 2002/03/22 01:42:35 imp Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 33601c2fcc98..fbca29228ee0 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/acutab.c,v 1.5 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 5bfd65f34d8c..021674f5feae 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmds.c,v 1.16 2003/04/06 08:30:25 imp Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index 272d70a320a0..18107c39c54a 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmdtab.c,v 1.5 2003/04/06 08:30:25 imp Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index b2d7e86605fe..91a04d5daab5 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.5 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 7396466e446e..afa72c488c06 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/hunt.c,v 1.6 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index 2385810d98c2..8dc2ccf11a59 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/log.c,v 1.5 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index bfdb17d8ca1a..dbd816749460 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/partab.c,v 1.4 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/pathnames.h b/usr.bin/tip/tip/pathnames.h
index c885ea73a7d6..80729b16573d 100644
--- a/usr.bin/tip/tip/pathnames.h
+++ b/usr.bin/tip/tip/pathnames.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: pathnames.h,v 1.2 1996/06/26 05:40:45 deraadt Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.bin/tip/tip/pathnames.h,v 1.5 2001/12/20 14:25:46 markm Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 1a5d560e9421..f18fc8f07a89 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/remote.c,v 1.5 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 static char copyright[] =
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 4ec0826f6bcb..94202e5b808b 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.22.10.1 2005/07/17 15:03:35 brueffer Exp $
 .\"
 .Dd September 9, 2001
 .Dt TIP 1
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index d1ea1ae10ca9..c1c48a607965 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.16 2003/04/06 08:30:25 imp Exp $");
 
 #ifndef lint
 static char copyright[] =
diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h
index f240f156434e..ce655721315f 100644
--- a/usr.bin/tip/tip/tip.h
+++ b/usr.bin/tip/tip/tip.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: tip.h,v 1.11 2001/09/09 19:30:49 millert Exp $	*/
 /*	$NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.bin/tip/tip/tip.h,v 1.10 2004/05/06 13:25:09 stefanf Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index e8e380e400bb..7974944024c0 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/tipout.c,v 1.10 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index 84312884e400..9493851cefd8 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/uucplock.c,v 1.6 2001/12/20 14:25:46 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 4554c5a2dae8..47f2b3a48150 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/value.c,v 1.9 2004/05/06 13:25:09 stefanf Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index 9e2d7f669f2c..808412592470 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/vars.c,v 1.6 2004/03/14 05:55:16 bde Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile
index 08343da66f8b..ea0f1ad4ed29 100644
--- a/usr.bin/top/Makefile
+++ b/usr.bin/top/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/top/Makefile,v 1.10 2002/02/08 23:07:35 markm Exp $
 PROG=	top
 
 TOPDIR=	${.CURDIR}/../../contrib/top
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 789b9874f2f3..86898091a14d 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -20,7 +20,7 @@
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *          Thomas Moestl <tmoestl@gmx.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/top/machine.c,v 1.74 2005/05/18 13:42:51 keramida Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/top/top.local.1 b/usr.bin/top/top.local.1
index 75489b7c8291..7839ead5fc98 100644
--- a/usr.bin/top/top.local.1
+++ b/usr.bin/top/top.local.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$ 
+.\" $FreeBSD: src/usr.bin/top/top.local.1,v 1.3 2003/07/17 23:56:39 julian Exp $ 
 .SH "FreeBSD NOTES"
 
 .SH DISPLAY OF THREADS
diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile
index e44f4f2cfdcc..6ff2e0241396 100644
--- a/usr.bin/touch/Makefile
+++ b/usr.bin/touch/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/touch/Makefile,v 1.3 2001/12/11 23:38:24 markm Exp $
 
 PROG=	touch
 
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index 8c7ab8b3b9f5..bdb54f70a20e 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/touch/touch.1,v 1.14 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt TOUCH 1
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 30d22ed35b99..1d45fc002941 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/touch/touch.c,v 1.20 2002/09/04 23:29:07 dwmalone Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 143dc651e135..fe8a25990b83 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tput/Makefile,v 1.4 2001/04/07 11:21:25 ru Exp $
 
 PROG=	tput
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 33950a766bf5..4003c7f455f0 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tput/tput.1,v 1.17 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd June 15, 2002
 .Dt TPUT 1
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index a74e36af8d34..65b37dd49f2f 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tput/tput.c,v 1.15 2002/09/04 23:29:07 dwmalone Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile
index 00bdd8d5bb7a..f240ad15c6ac 100644
--- a/usr.bin/tr/Makefile
+++ b/usr.bin/tr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tr/Makefile,v 1.2 2004/07/09 02:08:07 tjr Exp $
 
 PROG=	tr
 SRCS=	cmap.c cset.c str.c tr.c
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index 811040c25e76..1edd9d257b8c 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/cmap.c,v 1.2 2004/07/14 08:36:09 tjr Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/usr.bin/tr/cmap.h b/usr.bin/tr/cmap.h
index 9a81e134678f..38e3d0e275e8 100644
--- a/usr.bin/tr/cmap.h
+++ b/usr.bin/tr/cmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tr/cmap.h,v 1.1 2004/07/09 02:08:07 tjr Exp $
  */
 
 #ifndef CMAP_H
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index 1b4212949b6c..6e7c21734b18 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/cset.c,v 1.3 2004/07/14 08:33:14 tjr Exp $");
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/usr.bin/tr/cset.h b/usr.bin/tr/cset.h
index ab3eabd3e439..ae62d1dfa898 100644
--- a/usr.bin/tr/cset.h
+++ b/usr.bin/tr/cset.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tr/cset.h,v 1.2 2004/07/14 08:35:11 tjr Exp $
  */
 
 #ifndef CSET_H
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index 2fdbdf33438c..adc9ec3c0c20 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tr/extern.h,v 1.9 2004/07/09 02:08:07 tjr Exp $
  */
 
 #include <limits.h>
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index c023fea66a24..535211ceb993 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/str.c,v 1.24 2004/11/14 05:15:25 jkh Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 9c36c91702c8..1dae885fa53c 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tr/tr.1,v 1.33 2005/02/13 23:45:51 ru Exp $
 .\"
 .Dd July 23, 2004
 .Dt TR 1
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 61195ff4dbb0..fbfb8320f9d0 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/tr.c,v 1.24 2005/04/09 14:31:41 stefanf Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile
index 028a6ca75c9f..eb1ce72f39c8 100644
--- a/usr.bin/true/Makefile
+++ b/usr.bin/true/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/true/Makefile,v 1.4 2001/12/12 00:06:51 markm Exp $
 
 PROG=	true
 
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index 58d3a0236878..251d6235dc02 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)true.1	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/true/true.1,v 1.12 2002/04/20 12:17:23 charnier Exp $
 .\"
 .Dd June 9, 1993
 .Dt TRUE 1
diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c
index 8e2f2554396a..5d7a1fb45eca 100644
--- a/usr.bin/true/true.c
+++ b/usr.bin/true/true.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/true/true.c,v 1.6 2003/02/19 00:18:13 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile
index 4752c5cb64e2..1325fe2b62aa 100644
--- a/usr.bin/truncate/Makefile
+++ b/usr.bin/truncate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/truncate/Makefile,v 1.3 2001/12/12 00:06:52 markm Exp $
 
 PROG=		truncate
 
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index c79e64a92a70..32c7f473c9a3 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/truncate/truncate.1,v 1.12 2005/01/17 07:44:32 ru Exp $
 .\"
 .Dd July 4, 2000
 .Dt TRUNCATE 1
diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c
index 364f40026add..9e5a39052bc0 100644
--- a/usr.bin/truncate/truncate.c
+++ b/usr.bin/truncate/truncate.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$FreeBSD$";
+    "$FreeBSD: src/usr.bin/truncate/truncate.c,v 1.9 2005/05/21 09:55:08 ru Exp $";
 #endif
 
 #include <sys/stat.h>
diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index 3fcc219ceb38..f3745afcf6a8 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/truss/Makefile,v 1.21 2004/10/24 15:33:00 ru Exp $
 
 WARNS?=	2
 NO_WERROR=
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 5e7fa9910230..f63b4518fdb7 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/alpha-fbsd.c,v 1.18 2004/07/17 19:48:49 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/amd64-fbsd.c b/usr.bin/truss/amd64-fbsd.c
index 7fb5d2617ed2..7de10584988a 100644
--- a/usr.bin/truss/amd64-fbsd.c
+++ b/usr.bin/truss/amd64-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/amd64-fbsd.c,v 1.3 2004/07/17 19:48:49 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/extern.h b/usr.bin/truss/extern.h
index e13f80bc9a81..ba1781c555ac 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/extern.h,v 1.10 2005/03/27 12:53:25 alfred Exp $
  */
 
 extern int setup_and_wait(char **);
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 45da1cdf3dd4..847a66fd8244 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-fbsd.c,v 1.23 2004/08/08 23:29:36 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 01703b5b17e2..20e5732f09f8 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-linux.c,v 1.23 2004/07/17 19:48:49 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/ia64-fbsd.c b/usr.bin/truss/ia64-fbsd.c
index 7ca6d7fa7336..f30546168fb7 100644
--- a/usr.bin/truss/ia64-fbsd.c
+++ b/usr.bin/truss/ia64-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/ia64-fbsd.c,v 1.7 2004/07/17 19:48:49 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 9d289a7a0a72..b6aaff0f465b 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/truss/main.c,v 1.40 2005/03/27 12:53:25 alfred Exp $");
 
 /*
  * The main module for truss.  Suprisingly simple, but, then, the other
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index c48370caa5bd..5896e564a644 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/truss/setup.c,v 1.21 2005/03/27 12:53:25 alfred Exp $");
 
 /*
  * Various setup functions for truss.  Not the cleanest-written code,
diff --git a/usr.bin/truss/sparc64-fbsd.c b/usr.bin/truss/sparc64-fbsd.c
index 375e1fa4e884..137b58b25862 100644
--- a/usr.bin/truss/sparc64-fbsd.c
+++ b/usr.bin/truss/sparc64-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/sparc64-fbsd.c,v 1.7 2004/07/17 19:48:49 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index 838dfe270fd8..22c5bbd67a1f 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -27,7 +27,7 @@
  * IN (meaning that the data is passed *into* the system call).
  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/syscall.h,v 1.15 2004/07/17 19:48:49 alfred Exp $
  */
 
 enum Argtype { None = 1, Hex, Octal, Int, String, Ptr, Stat, Ioctl, Quad,
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 04886a942e59..96695f60825c 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/syscalls.c,v 1.49 2005/06/14 21:51:08 alfred Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index 6b975ba5c481..e872a7bbf98d 100644
--- a/usr.bin/truss/truss.1
+++ b/usr.bin/truss/truss.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/truss/truss.1,v 1.18.2.1 2005/08/18 15:01:25 keramida Exp $
 .\"
 .Dd September 3, 2004
 .Dt TRUSS 1
diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h
index 00df4d6a3d67..e5bbcb117adf 100644
--- a/usr.bin/truss/truss.h
+++ b/usr.bin/truss/truss.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/truss.h,v 1.5 2002/08/05 12:22:55 mdodd Exp $
  */
 
 #define FOLLOWFORKS        0x00000001
diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h
index f02d0c50bd56..bbbcfbf5f2ae 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/9/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/tset/extern.h,v 1.9 2002/03/22 01:42:37 imp Exp $
  */
 
 #include <termcap.h>
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index d3db6b67e707..b6d1d3d7b01e 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/map.c,v 1.11 2005/05/29 15:44:55 charnier Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 52358e75a14c..212e4f9dab2d 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/misc.c,v 1.5 2001/12/11 23:29:45 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 85965b38b991..d090e1a445c0 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/set.c,v 1.10 2002/03/22 01:42:37 imp Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index 54a349e05f2b..008328cf8614 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/term.c,v 1.6 2002/03/22 01:42:37 imp Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index fd62aabdd1ee..7722fcdffb75 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tset.1	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tset/tset.1,v 1.16 2005/02/13 22:25:25 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt TSET 1
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index dc4c333e2f90..8091c8d414e1 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/tset.c,v 1.19 2002/09/04 23:29:07 dwmalone Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 9d149183e2f2..b0703f892801 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/wrterm.c,v 1.4 2001/12/11 23:29:45 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile
index b0d353e4d8f7..98dce616d753 100644
--- a/usr.bin/tsort/Makefile
+++ b/usr.bin/tsort/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tsort/Makefile,v 1.4 2001/12/12 00:06:52 markm Exp $
 
 PROG=	tsort
 
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 9af1a344f4a6..01a43d43a996 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tsort.1	8.3 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tsort/tsort.1,v 1.12 2004/07/03 01:28:21 tjr Exp $
 .\"
 .Dd July 3, 2004
 .Dt TSORT 1
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index a01a86c3700c..aa79e59e099d 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -45,7 +45,7 @@ static const char sccsid[] = "@(#)tsort.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tsort/tsort.c,v 1.17 2005/05/29 15:47:31 charnier Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile
index 4dcab3343e44..635e7426f0cb 100644
--- a/usr.bin/tty/Makefile
+++ b/usr.bin/tty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tty/Makefile,v 1.4 2001/12/12 00:06:52 markm Exp $
 
 PROG=	tty
 
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 4c91919f0b45..0394e30364f9 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tty.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tty/tty.1,v 1.8 2005/02/13 22:25:25 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 4710e169c1bf..806fe4b797da 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tty/tty.c,v 1.9 2002/05/29 17:12:30 jmallett Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/uac/Makefile b/usr.bin/uac/Makefile
index eb46c1d10402..2a0bb7095a2c 100644
--- a/usr.bin/uac/Makefile
+++ b/usr.bin/uac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uac/Makefile,v 1.1 2000/01/19 09:47:19 obrien Exp $
 
 PROG=	uac
 
diff --git a/usr.bin/uac/uac.1 b/usr.bin/uac/uac.1
index 987cdff81f75..dbc93083e57d 100644
--- a/usr.bin/uac/uac.1
+++ b/usr.bin/uac/uac.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uac/uac.1,v 1.12 2005/01/17 07:44:32 ru Exp $
 .\"
 .Dd January 18, 2000
 .Dt UAC 1
diff --git a/usr.bin/uac/uac.c b/usr.bin/uac/uac.c
index a2cd1b2b876f..f7c87e31e0b1 100644
--- a/usr.bin/uac/uac.c
+++ b/usr.bin/uac/uac.c
@@ -25,7 +25,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/usr.bin/uac/uac.c,v 1.3 2004/01/12 04:05:23 nectar Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile
index 9aaf7754de52..967d2c6fcad8 100644
--- a/usr.bin/ul/Makefile
+++ b/usr.bin/ul/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ul/Makefile,v 1.4 2001/12/11 23:27:23 markm Exp $
 
 PROG=	ul
 
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 242fb7e3ba17..847b958abe62 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ul.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ul/ul.1,v 1.18 2005/05/21 09:55:09 ru Exp $
 .\"
 .Dd August 4, 2004
 .Dt UL 1
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 77559cf254fe..50f55c4345f1 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ul/ul.c,v 1.14 2005/05/21 09:55:09 ru Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 2a28464efa23..edec1419efa4 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uname/uname.1,v 1.18 2005/01/18 13:43:54 ru Exp $
 .\"
 .Dd April 2, 2003
 .Dt UNAME 1
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 81aef452a74e..3495a13e7f0e 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uname/uname.c,v 1.14 2003/07/01 20:15:28 jmallett Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index 14014facb7b0..b1a5311954ea 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unexpand/Makefile,v 1.5 2004/12/21 08:47:30 ru Exp $
 
 PROG=	unexpand
 NO_MAN=
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 10b54eeb26d3..5a56b4096f55 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/unexpand/unexpand.c,v 1.14 2004/06/24 13:48:28 tjr Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile
index b31709aa6e62..8e39926e2ae3 100644
--- a/usr.bin/unifdef/Makefile
+++ b/usr.bin/unifdef/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unifdef/Makefile,v 1.6 2003/06/04 10:01:10 fanf Exp $
 
 PROG=	unifdef
 SCRIPTS=unifdefall.sh
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 02cbfeba8ad5..2c3db5acc189 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)unifdef.1	8.2 (Berkeley) 4/1/94
 .\"	$dotat: things/unifdef.1,v 1.51 2005/03/08 12:39:01 fanf2 Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/unifdef/unifdef.1,v 1.24 2005/05/21 09:55:09 ru Exp $
 .\"
 .Dd September 24, 2002
 .Dt UNIFDEF 1
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index dd2f23e08ff3..fe557a6a2feb 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -46,7 +46,7 @@ __IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.171 2005/03/08 12:38:48 fanf2 Ex
 #endif
 #endif /* not lint */
 #ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/unifdef/unifdef.c,v 1.20 2005/05/21 09:55:09 ru Exp $");
 #endif
 
 /*
diff --git a/usr.bin/unifdef/unifdefall.sh b/usr.bin/unifdef/unifdefall.sh
index bcba08c9712b..be3817d66e41 100644
--- a/usr.bin/unifdef/unifdefall.sh
+++ b/usr.bin/unifdef/unifdefall.sh
@@ -3,7 +3,7 @@
 # remove all the #if's from a source file
 #
 #	$dotat: things/unifdefall.sh,v 1.9 2002/09/24 19:43:57 fanf2 Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unifdef/unifdefall.sh,v 1.2 2002/09/24 19:50:03 fanf Exp $
 
 set -e
 
diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile
index 2bcf18e53703..e3f296663453 100644
--- a/usr.bin/uniq/Makefile
+++ b/usr.bin/uniq/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uniq/Makefile,v 1.4 2001/12/11 23:27:23 markm Exp $
 
 PROG=	uniq
 
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 79be0a40a5dd..7dd95c5a4eb1 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uniq/uniq.1,v 1.19 2005/01/17 07:44:34 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index a71726cc5fc8..36841135f3e6 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uniq/uniq.c,v 1.26 2004/09/14 12:01:18 tjr Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index cb783ab95bb2..4ae052bb58f0 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/Makefile,v 1.8 2001/12/17 16:02:15 ru Exp $
 
 PROG=	units
 FILES=	units.lib
diff --git a/usr.bin/units/README b/usr.bin/units/README
index 974cbe9fee3f..a4106cdf4a00 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/README,v 1.4 1999/08/28 01:07:09 peter Exp $
 
 This is a program which I wrote as a clone of the UNIX 'units'
 command.  I threw it together in a couple days, but it seems to work,
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
index 227dd00b4922..1f65bd8f6d7c 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/units/pathnames.h,v 1.4 1999/08/28 01:07:09 peter Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 96b84d6efa30..5836544d7505 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/units/units.1,v 1.18 2005/02/13 22:25:25 ru Exp $
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 9ca5cda7f814..879860ce9a71 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,7 +17,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/units/units.c,v 1.10 2002/07/28 16:23:28 dwmalone Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index bd4502bf9823..e859c9b60ab1 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $FreeBSD$
+/ $FreeBSD: src/usr.bin/units/units.lib,v 1.16 2004/05/30 16:09:12 dwmalone Exp $
 
 / primitive units
 
diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile
index 27fea4bad2a3..ad73b3643cbd 100644
--- a/usr.bin/unvis/Makefile
+++ b/usr.bin/unvis/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unvis/Makefile,v 1.4 2001/12/11 23:27:23 markm Exp $
 
 PROG=	unvis
 
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index 658bfa323f00..21e3485da625 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unvis.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/unvis/unvis.1,v 1.7 2002/04/20 12:17:45 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt UNVIS 1
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 395c9adaefb0..8e33d1f2f05d 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unvis/unvis.c,v 1.9 2002/09/04 23:29:08 dwmalone Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/usbhidaction/Makefile b/usr.bin/usbhidaction/Makefile
index 6c2f7a6b8496..fb3b4a67bcb1 100644
--- a/usr.bin/usbhidaction/Makefile
+++ b/usr.bin/usbhidaction/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/usbhidaction/Makefile,v 1.3 2005/01/28 16:08:08 ru Exp $
 #	$NetBSD: Makefile,v 1.4 2002/02/02 16:54:26 veego Exp $
 
 PROG=	usbhidaction
diff --git a/usr.bin/usbhidaction/usbhidaction.1 b/usr.bin/usbhidaction/usbhidaction.1
index 4c0f6a36574e..4b89833b7c4b 100644
--- a/usr.bin/usbhidaction/usbhidaction.1
+++ b/usr.bin/usbhidaction/usbhidaction.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/usbhidaction/usbhidaction.1,v 1.3 2003/05/30 21:27:29 ru Exp $
 .\" $NetBSD: usbhidaction.1,v 1.8 2003/02/25 10:35:59 wiz Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index e1f67b00b4db..57c0ce658c6d 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -1,5 +1,5 @@
 /*      $NetBSD: usbhidaction.c,v 1.8 2002/06/11 06:06:21 itojun Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.bin/usbhidaction/usbhidaction.c,v 1.4 2004/03/09 11:35:43 dwmalone Exp $ */
 
 /*
  * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
diff --git a/usr.bin/usbhidctl/Makefile b/usr.bin/usbhidctl/Makefile
index 3738b506cea2..45d05dc0b53f 100644
--- a/usr.bin/usbhidctl/Makefile
+++ b/usr.bin/usbhidctl/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.4 1999/05/11 21:02:25 augustss Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/usbhidctl/Makefile,v 1.4 2002/04/15 09:33:34 ru Exp $
 
 PROG=	usbhidctl
 SRCS=	usbhid.c
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index a6c3351e5fac..1ed0a15df37c 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.bin/usbhidctl/usbhid.c,v 1.9 2003/05/26 04:58:26 mdodd Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.bin/usbhidctl/usbhidctl.1 b/usr.bin/usbhidctl/usbhidctl.1
index beb6fa3c0b3b..f9fca51d3fe1 100644
--- a/usr.bin/usbhidctl/usbhidctl.1
+++ b/usr.bin/usbhidctl/usbhidctl.1
@@ -1,5 +1,5 @@
 .\" $NetBSD: usbhidctl.1,v 1.8 1999/05/11 21:03:58 augustss Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/usbhidctl/usbhidctl.1,v 1.5 2005/01/18 13:43:55 ru Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index 3d6524bc7a29..2ce34fbc9cf6 100644
--- a/usr.bin/users/Makefile
+++ b/usr.bin/users/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/users/Makefile,v 1.3 2001/12/11 23:27:23 markm Exp $
 
 PROG=	users
 
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index c3454c6784d0..5d3c5c85d525 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)users.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/users/users.1,v 1.7 2002/04/20 12:17:49 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt USERS 1
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index c90bfbdc149d..476c954be77a 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/users/users.c,v 1.8 2002/09/04 23:29:09 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 37005f3ded52..690a5947aab2 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uudecode/Makefile,v 1.8 2004/12/21 08:47:30 ru Exp $
 
 PROG=	uudecode
 WARNS?=	4
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 093af7d2d474..8066adcf5896 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.49 2003/05/03 19:44:46 obrien Exp $");
 
 /*
  * uudecode [file ...]
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index c795753a10bc..c1cf2b517809 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uuencode/Makefile,v 1.8 2002/05/19 20:39:42 jmallett Exp $
 
 PROG=	uuencode
 WARNS?=	4
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 7d6118847183..dda45bdd96e8 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.27.2.1 2005/07/17 15:03:36 brueffer Exp $
 .\"
 .Dd January 27, 2002
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index e4d83b446b16..cb4fbfe08729 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uuencode/uuencode.c,v 1.18 2004/01/22 07:23:35 grehan Exp $");
 
 /*
  * uuencode [input] output
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index 34879d1f68cb..9c9a0e895d4f 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uuencode.format.5	8.2 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.format.5,v 1.12 2001/10/09 11:05:27 ru Exp $
 .\"
 .Dd January 12, 1994
 .Dt UUENCODE 5
diff --git a/usr.bin/uuidgen/Makefile b/usr.bin/uuidgen/Makefile
index 370241d3ebdd..ae90a25a49d4 100644
--- a/usr.bin/uuidgen/Makefile
+++ b/usr.bin/uuidgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.2 2003/12/07 21:34:56 mux Exp $
 
 PROG=	uuidgen
 WARNS?=	6
diff --git a/usr.bin/uuidgen/uuidgen.1 b/usr.bin/uuidgen/uuidgen.1
index 58dff699cecb..7fe509b38a62 100644
--- a/usr.bin/uuidgen/uuidgen.1
+++ b/usr.bin/uuidgen/uuidgen.1
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuidgen/uuidgen.1,v 1.6.2.1 2005/09/24 01:59:39 keramida Exp $
 .\"
 .Dd September 7, 2005
 .Dt UUIDGEN 1
diff --git a/usr.bin/uuidgen/uuidgen.c b/usr.bin/uuidgen/uuidgen.c
index d5dac4bcacfb..d2aeb70c3b3e 100644
--- a/usr.bin/uuidgen/uuidgen.c
+++ b/usr.bin/uuidgen/uuidgen.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uuidgen/uuidgen.c,v 1.3 2003/03/15 02:27:10 marcel Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index 63ba3abec817..1b2e01bf568e 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vacation/Makefile,v 1.14 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/vacation
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 1a64c1c9f01f..872505313b2c 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vgrind/Makefile,v 1.14 2005/02/22 23:29:54 ru Exp $
 
 PROG=	vfontedpr
 SRCS=	regexp.c vfontedpr.c
diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile
index 8712ebb60585..413f55adce91 100644
--- a/usr.bin/vgrind/RETEST/Makefile
+++ b/usr.bin/vgrind/RETEST/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vgrind/RETEST/Makefile,v 1.3 2004/12/21 08:47:30 ru Exp $
 
 PROG=	retest
 SRCS=	regexp.c retest.c
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index e1c1c5011ff2..6f3cd25d6d73 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/vgrind/extern.h,v 1.4 2002/03/22 01:42:41 imp Exp $
  */
 
 typedef int boolean;
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 199f3c6c119d..2e887d72ce4f 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vgrind/regexp.c,v 1.7 2002/03/22 01:42:41 imp Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vgrind/tmac.vgrind b/usr.bin/vgrind/tmac.vgrind
index 7e2d4646b7c1..bcde248eba58 100644
--- a/usr.bin/vgrind/tmac.vgrind
+++ b/usr.bin/vgrind/tmac.vgrind
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vgrind/tmac.vgrind,v 1.2 2000/11/29 10:32:51 ru Exp $
 .am vS
 ..
 .am vE
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index d1bb4d98ea15..078c697f1c44 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vgrind/vfontedpr.c,v 1.15 2003/10/26 05:03:11 peter Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index d738d6ef7703..dcb156183bb9 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrind.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vgrind/vgrind.1,v 1.14 2005/01/18 13:43:55 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt VGRIND 1
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index bfc2f1bae559..88a9404f74c9 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -33,7 +33,7 @@
 #
 #       @(#)vgrind.sh	8.1 (Berkeley) 6/6/93
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vgrind/vgrind.sh,v 1.4 2003/05/31 21:02:50 schweikh Exp $
 #
 
 voptions=""
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 88189406764d..09d071554fde 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrindefs.5	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vgrind/vgrindefs.5,v 1.12 2005/01/18 13:43:55 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt VGRINDEFS 5
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index c3d771174a2a..848cb93c5561 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vgrind/vgrindefs.c,v 1.3 2001/12/11 23:10:26 markm Exp $");
 
 #define	BUFSIZ	1024
 #define MAXHOP	32	/* max number of tc= indirections */
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 7276b7b35bb8..ee3cf4325fbd 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vi/Makefile,v 1.43 2004/10/18 17:16:01 ru Exp $
 #
 
 SRCDIR=		${.CURDIR}/../../contrib/nvi
diff --git a/usr.bin/vi/config.h b/usr.bin/vi/config.h
index a8bee6775f81..3b104d1991e4 100644
--- a/usr.bin/vi/config.h
+++ b/usr.bin/vi/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/vi/config.h,v 1.3 2000/04/16 17:34:33 jlemon Exp $ */
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff --git a/usr.bin/vi/pathnames.h b/usr.bin/vi/pathnames.h
index 72c8bb3daa45..202186dcd07f 100644
--- a/usr.bin/vi/pathnames.h
+++ b/usr.bin/vi/pathnames.h
@@ -1,5 +1,5 @@
 /* @(#)pathnames.h.in	8.4 (Berkeley) 6/26/96 */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/vi/pathnames.h,v 1.3 2003/05/05 22:49:23 obrien Exp $ */
 
 /* Read standard system paths first. */
 #include <paths.h>
diff --git a/usr.bin/vi/port.h b/usr.bin/vi/port.h
index bdd5faf2cf58..1be5b78b46dc 100644
--- a/usr.bin/vi/port.h
+++ b/usr.bin/vi/port.h
@@ -1,6 +1,6 @@
 /* @(#)port.h.in	8.13 (Berkeley) 6/12/96 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/vi/port.h,v 1.2 2002/03/22 01:42:41 imp Exp $ */
 
 /*
  * Declare the basic types, if they aren't already declared.  Named and
diff --git a/usr.bin/vis/extern.h b/usr.bin/vis/extern.h
index 5ae1d1a9eca6..bc7de9bc3676 100644
--- a/usr.bin/vis/extern.h
+++ b/usr.bin/vis/extern.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/vis/extern.h,v 1.2 2002/03/22 01:42:42 imp Exp $
  */
 
 extern int foldit(char *, int, int);
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 6ad82c2dc2f4..70cba4a08a13 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vis/foldit.c,v 1.6 2001/12/11 23:02:44 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index 5c2bf1066eb1..093e3820d541 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vis.1	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vis/vis.1,v 1.12 2005/02/13 22:25:25 ru Exp $
 .\"
 .Dd June 25, 2004
 .Dt VIS 1
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 8a76d24f7d35..b6b685b22be2 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vis/vis.c,v 1.10 2002/09/04 23:29:09 dwmalone Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile
index 21795e9ac09f..a143b7fc5d27 100644
--- a/usr.bin/vmstat/Makefile
+++ b/usr.bin/vmstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vmstat/Makefile,v 1.11.8.1 2005/08/19 00:07:06 rwatson Exp $
 
 PROG=	vmstat
 MAN=	vmstat.8
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 4f8efb1d8c42..51ca29833ffe 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.32 2005/05/26 17:54:15 keramida Exp $
 .\"
 .Dd December 10, 2003
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 6e3aaaae605f..3a7e1e4941c2 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.86.2.1 2005/08/19 00:07:06 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
index 1515a875ae7e..dc1e89dc53a4 100644
--- a/usr.bin/w/Makefile
+++ b/usr.bin/w/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/w/Makefile,v 1.8 2001/07/26 19:20:13 brian Exp $
 
 PROG=	w
 SRCS=	fmt.c pr_time.c proc_compare.c w.c
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 070d055b0616..b7861865c13d 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/w/extern.h,v 1.5 2002/03/22 01:42:43 imp Exp $
  */
 
 
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 5ac060de4bcc..01cba3fa8434 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/w/pr_time.c,v 1.19 2002/06/07 01:41:54 jmallett Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 8e807d161df2..dfe818466a7e 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)proc_compare.c	8.2 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/w/proc_compare.c,v 1.9 2004/04/14 09:34:17 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index cc11c7110ce3..c7b6c6a509e2 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uptime.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/w/uptime.1,v 1.8 2002/05/09 11:47:40 joe Exp $
 .\"
 .Dd April 18, 1994
 .Dt UPTIME 1
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index e8dbbf4b560b..842a6813468c 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/w/w.1,v 1.20 2005/02/13 22:25:25 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 72559ba9b71f..f7d3d9ee4f34 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/w/w.c,v 1.58 2005/06/04 23:40:09 gad Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 131cf2c403cd..83bfa408da16 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/wall/ttymsg.c,v 1.11 2002/10/11 14:58:34 mike Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
diff --git a/usr.bin/wall/ttymsg.h b/usr.bin/wall/ttymsg.h
index 31312aa94f55..625c22d55b13 100644
--- a/usr.bin/wall/ttymsg.h
+++ b/usr.bin/wall/ttymsg.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/wall/ttymsg.h,v 1.1 2001/09/09 14:23:31 dd Exp $ */
 
 const char	*ttymsg(struct iovec *, int, const char *, int);
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 36151253d1c5..7c92e630d4cf 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wall.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/wall/wall.1,v 1.11 2004/07/17 04:15:27 tjr Exp $
 .\"
 .Dd July 17, 2004
 .Dt WALL 1
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 35d6463cdd91..b1278b98feb4 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/wall/wall.c,v 1.23 2003/02/21 08:46:44 tjr Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile
index edce9c1412c8..34407b7da7ca 100644
--- a/usr.bin/wc/Makefile
+++ b/usr.bin/wc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/wc/Makefile,v 1.2 2004/12/27 22:27:56 josef Exp $
 
 PROG=	wc
 WARNS?=	6
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index b95ad6aca025..d0902e9eeda8 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/wc/wc.1,v 1.23 2005/02/26 04:14:20 trhodes Exp $
 .\"
 .Dd February 23, 2005
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 090ff7766a25..d1d88f1a4e12 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)wc.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/wc/wc.c,v 1.21 2004/12/27 22:27:56 josef Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 8114290f968d..50d07394a17a 100644
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/what/Makefile,v 1.3 2001/12/11 22:25:43 markm Exp $
 
 PROG=	what
 
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index d57ef8b9462a..365b2ac38323 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)what.1	8.1 (Berkeley) 6/6/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/what/what.1,v 1.19 2005/06/14 11:50:53 ru Exp $
 .\"
 .Dd May 12, 2005
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 8e994e9a650f..49d1e9af60ce 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/what/what.c,v 1.11 2005/05/12 18:57:37 jmallett Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile
index d48b30d11782..99f6e32ebfbc 100644
--- a/usr.bin/whereis/Makefile
+++ b/usr.bin/whereis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whereis/Makefile,v 1.8 2005/01/28 16:08:08 ru Exp $
 
 PROG=	whereis
 WARNS?=	5
diff --git a/usr.bin/whereis/pathnames.h b/usr.bin/whereis/pathnames.h
index 09084aefa83f..65f4f4c97da0 100644
--- a/usr.bin/whereis/pathnames.h
+++ b/usr.bin/whereis/pathnames.h
@@ -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/usr.bin/whereis/pathnames.h,v 1.4 2002/08/22 01:50:51 johan Exp $
  */
 
 /* Where to look for libexec and games */
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index c5378b9f2b91..bedbcf8ac1fd 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)whereis.1	8.2 (Berkeley) 12/30/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/whereis/whereis.1,v 1.22 2004/07/02 22:22:34 ru Exp $
 .\"
 .Dd August 22, 2002
 .Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 70feb8a3eaaa..394cb901d48d 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -32,7 +32,7 @@
 
 #include <sys/types.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/whereis/whereis.c,v 1.15 2005/04/09 14:31:41 stefanf Exp $");
 
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index fdc121bb9820..2cda86415881 100644
--- a/usr.bin/which/Makefile
+++ b/usr.bin/which/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/which/Makefile,v 1.6 2000/08/29 23:30:52 green Exp $
 
 PROG=	which
 
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index c00a14ab9fd1..f889e0980141 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/which/which.1,v 1.25 2005/02/10 16:04:22 ru Exp $
 .\"
 .Dd June 21, 2002
 .Dt WHICH 1
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c
index 3b8224da43d6..e8ecea297b97 100644
--- a/usr.bin/which/which.c
+++ b/usr.bin/which/which.c
@@ -26,7 +26,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/which/which.c,v 1.6 2005/02/10 16:04:22 ru Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index e36b07cde550..bcae0d2183e7 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)who.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/who/who.1,v 1.17 2005/01/17 07:44:35 ru Exp $
 .\"
 .Dd May 8, 2002
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 27b68960c2bc..5e7523396e7d 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.21 2005/05/29 15:52:48 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile
index e6f82fd8f276..4d3f45058cce 100644
--- a/usr.bin/whois/Makefile
+++ b/usr.bin/whois/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whois/Makefile,v 1.7 2003/06/12 02:46:47 mike Exp $
 
 PROG=	whois
 
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 33486dce45c6..d69d4937caf9 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.34 2004/12/11 13:14:54 ceri Exp $
 .\"
 .Dd December 11, 2004
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index c5bf9f4c9c1b..81065b32c6cf 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/whois/whois.c,v 1.43 2005/05/29 15:49:53 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 8d0daa4d8ad8..ab90044c1763 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/window/Makefile,v 1.11 2002/02/08 23:07:36 markm Exp $
 
 PROG=	window
 SRCS=	char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
diff --git a/usr.bin/window/alias.h b/usr.bin/window/alias.h
index 8b6aba37b7c5..0058b13f83ee 100644
--- a/usr.bin/window/alias.h
+++ b/usr.bin/window/alias.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/alias.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #define alias var
diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index cd9a6ebc8907..3763ff7ab001 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/char.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "char.h"
diff --git a/usr.bin/window/char.h b/usr.bin/window/char.h
index c4b957c6f84e..cfc9a14145f8 100644
--- a/usr.bin/window/char.h
+++ b/usr.bin/window/char.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/char.h,v 1.4 2000/10/26 10:07:19 obrien Exp $
  */
 
 /*
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index 698930ea4451..3447cf561820 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index 049171d3bbd5..14026ec708aa 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd1.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "@(#)$FreeBSD$";
+  "@(#)$FreeBSD: src/usr.bin/window/cmd1.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index 9633b7386de7..188fb2d63a75 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd2.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index 27a3173bd018..362dbf7f84df 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd3.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd3.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd4.c b/usr.bin/window/cmd4.c
index 82ed1bd7d5e6..1a724f7951de 100644
--- a/usr.bin/window/cmd4.c
+++ b/usr.bin/window/cmd4.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd4.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd4.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index 60b0244d8622..e3e4aba9708b 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd5.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd5.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index 63689aa77c36..034ffec57c16 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd6.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd6.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index 1039f2617464..8a11cea449d9 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd7.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd7.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index 6294b936f498..7b79c07f6197 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)compress.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/compress.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index 78cf892743c4..7daf47fb4a57 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)context.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/context.c,v 1.4 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include "value.h"
diff --git a/usr.bin/window/context.h b/usr.bin/window/context.h
index df82b2707aed..87e7c5f5c1da 100644
--- a/usr.bin/window/context.h
+++ b/usr.bin/window/context.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)context.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/context.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/window/defs.h b/usr.bin/window/defs.h
index 6601e5d95500..4f1155aa1a8d 100644
--- a/usr.bin/window/defs.h
+++ b/usr.bin/window/defs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/defs.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #include "ww.h"
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index 7e759c14d047..cd3762f27c38 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)error.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/error.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index 85a54899b625..77c7c213c7fa 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)lcmd.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/lcmd.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/lcmd.h b/usr.bin/window/lcmd.h
index 6c58e2d54719..c78c72612f52 100644
--- a/usr.bin/window/lcmd.h
+++ b/usr.bin/window/lcmd.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lcmd.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/lcmd.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #define LCMD_NARG 20			/* maximum number of arguments */
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 1e072d6323b2..4dcaf07ad66e 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)lcmd1.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/lcmd1.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index a9972a9dfc96..347f868e7a9e 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lcmd2.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/window/lcmd2.c,v 1.5 2004/04/04 19:11:01 charnier Exp $");
 
 #include "defs.h"
 #include <string.h> /* System string definitions. */
diff --git a/usr.bin/window/local.h b/usr.bin/window/local.h
index 685e320dc9f2..fec9b6d7e3ce 100644
--- a/usr.bin/window/local.h
+++ b/usr.bin/window/local.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/local.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 /*
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 844ca7609d78..ea272ce881c3 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -43,7 +43,7 @@ char copyright[] =
 #ifndef lint
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/2/94";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/main.c,v 1.8 2003/09/17 03:58:52 marcel Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index 70d41dd79ad8..3c282a645461 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)mloop.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/mloop.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/window/mystring.h b/usr.bin/window/mystring.h
index 3d14ae681cc0..5a678e4eaa7a 100644
--- a/usr.bin/window/mystring.h
+++ b/usr.bin/window/mystring.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/mystring.h,v 1.2 2000/10/26 10:00:52 obrien Exp $
  */
 
 #define STR_DEBUG
diff --git a/usr.bin/window/parser.h b/usr.bin/window/parser.h
index 30a45037c483..0846fd9c3310 100644
--- a/usr.bin/window/parser.h
+++ b/usr.bin/window/parser.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/parser.h,v 1.2 2000/10/26 10:00:52 obrien Exp $
  */
 
 #include "value.h"
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index ac9f9d358fb5..1a6fdcbb4705 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser1.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser1.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index 75552de9d015..6a3ac96fa938 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser2.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser2.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index bd36d41a4713..4f29c7dac2ee 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser3.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser3.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index 338bdfb98121..de5ebbe8392f 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser4.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser4.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index ddc81366c5c8..61f48e0d805d 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser5.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser5.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index 785d0a343fa4..d47236923246 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)scanner.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/scanner.c,v 1.5 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index 557c0beb878c..224762b02f90 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/startup.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 57b5fa101b8a..21c27eb1964f 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)string.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/string.c,v 1.5 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include <string.h> /* System string definitions. */
diff --git a/usr.bin/window/token.h b/usr.bin/window/token.h
index 5e3f72c0ac1e..25c715021d34 100644
--- a/usr.bin/window/token.h
+++ b/usr.bin/window/token.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)token.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/token.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #define token		(cx.x_token)
diff --git a/usr.bin/window/tt.h b/usr.bin/window/tt.h
index 53fe7b3efa4a..a088819612e2 100644
--- a/usr.bin/window/tt.h
+++ b/usr.bin/window/tt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tt.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/tt.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 /*
diff --git a/usr.bin/window/ttf100.c b/usr.bin/window/ttf100.c
index 53f177b002cb..7bac2b157ebe 100644
--- a/usr.bin/window/ttf100.c
+++ b/usr.bin/window/ttf100.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttf100.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttf100.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index ba84e849694e..9f68c6f52a26 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttgeneric.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttgeneric.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index e1dab1ecaa2f..a1654de0418b 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tth19.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tth19.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index 54229b5ad334..58a28096c244 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tth29.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tth29.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 17b5961168df..4cb574f9735f 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttinit.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttinit.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index 1be0fa056fd1..ba8fbfd4916c 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttoutput.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttoutput.c,v 1.5 2001/07/26 11:02:37 sheldonh Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index 5cc82e641ff7..b9a1e2eba9cf 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tttermcap.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tttermcap.c,v 1.4 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include "tt.h"
diff --git a/usr.bin/window/tttvi925.c b/usr.bin/window/tttvi925.c
index 86e0d5ae4f38..fc90c18a856c 100644
--- a/usr.bin/window/tttvi925.c
+++ b/usr.bin/window/tttvi925.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tttvi925.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tttvi925.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttwyse60.c b/usr.bin/window/ttwyse60.c
index 5e023bac263d..5e8af0adf8f4 100644
--- a/usr.bin/window/ttwyse60.c
+++ b/usr.bin/window/ttwyse60.c
@@ -44,7 +44,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttwyse60.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttwyse60.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttwyse75.c b/usr.bin/window/ttwyse75.c
index 37e0194b56f0..d393cda7ab8a 100644
--- a/usr.bin/window/ttwyse75.c
+++ b/usr.bin/window/ttwyse75.c
@@ -44,7 +44,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttwyse75.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttwyse75.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index 2fd6fb97d84b..4a0c112d9b8d 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttzapple.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttzapple.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttzentec.c b/usr.bin/window/ttzentec.c
index 0e80711a3460..e4075b216b43 100644
--- a/usr.bin/window/ttzentec.c
+++ b/usr.bin/window/ttzentec.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttzentec.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttzentec.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/value.h b/usr.bin/window/value.h
index b55e210b6ba5..f9c15088c310 100644
--- a/usr.bin/window/value.h
+++ b/usr.bin/window/value.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)value.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/value.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 struct value {
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index 8ef317591ac7..bea3d8de795f 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)var.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/var.c,v 1.5 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include "value.h"
diff --git a/usr.bin/window/var.h b/usr.bin/window/var.h
index 645d2da4b10d..b8bb4ddcc551 100644
--- a/usr.bin/window/var.h
+++ b/usr.bin/window/var.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/var.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 struct var {
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index c5f0e451725c..2d696b706e0b 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/win.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 307ae2e92592..4dcc2e74beee 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)window.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/window/window.1,v 1.17 2005/02/13 22:25:26 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt WINDOW 1
diff --git a/usr.bin/window/ww.h b/usr.bin/window/ww.h
index d843ef382536..5effa15181f7 100644
--- a/usr.bin/window/ww.h
+++ b/usr.bin/window/ww.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ww.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/ww.h,v 1.4 2000/10/16 08:28:50 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index 0a78f0605fae..44657d9f2542 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwadd.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwadd.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index e02d4e5fa75e..92ad0b1fb46a 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwalloc.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwalloc.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index 2d63b173982d..ac5b7c0f241a 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwbox.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwbox.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index 3ff46ece4059..7f3243e761fc 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwchild.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwchild.c,v 1.5 2002/06/03 23:13:11 mike Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index ea58edcaa47f..ea8cbd39d147 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwclose.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwclose.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index bc0055eda7f5..53bd715e50a7 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwclreol.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwclreol.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index 1b8452bf1d1b..d69350e131ae 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwclreos.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwclreos.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index 5b804c2a2517..1be6d354b301 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwcursor.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwcursor.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdata.c b/usr.bin/window/wwdata.c
index 54062c20e45f..5653077df1b0 100644
--- a/usr.bin/window/wwdata.c
+++ b/usr.bin/window/wwdata.c
@@ -37,5 +37,5 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdata.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdata.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index ba25cb00d3e9..cdacee2ec00f 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdelchar.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdelchar.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index ef2912b16995..5fb6fadba457 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdelete.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdelete.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index dbeb12cd1dd9..2d81b495110c 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdelline.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdelline.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index 7988492de4a2..2251214758e1 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdump.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdump.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index e8d62ab857b0..83a4cc7d852a 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwend.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwend.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index f60f7fa0a436..8cc4d74a0afa 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwenviron.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwenviron.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwerror.c b/usr.bin/window/wwerror.c
index 9282b87bcf7e..fd44b239b7c1 100644
--- a/usr.bin/window/wwerror.c
+++ b/usr.bin/window/wwerror.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwerror.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwerror.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index 414cc4bec8a4..9b2761838e42 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwflush.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwflush.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index 5cdd7779c5a0..3da79a389e8a 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwframe.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwframe.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index c0a14ea8fffb..6b5079b0e988 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwgets.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwgets.c,v 1.5 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 480367292081..cb3490475fe8 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwinit.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwinit.c,v 1.13 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index a9a8c277eece..7bd5e11901b4 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwinschar.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwinschar.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index 60e8b054d720..a82f0f4addda 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwinsline.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwinsline.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index 7803557c16b6..3daa5248eb39 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwiomux.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwiomux.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 50ecf8579161..df9774c8c28d 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwlabel.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwlabel.c,v 1.5 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index 945dca4e037d..91c6537c3cf5 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwmisc.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwmisc.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index 5db6caecf4ec..06b6cf290387 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwmove.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwmove.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index c6f906d8b752..57546d506a83 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwopen.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwopen.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index 1c74981aa775..1cd1fc4d7edd 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwprintf.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwprintf.c,v 1.4 2003/04/15 18:59:22 kan Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index d26280baf4c0..c28b33f56c32 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwpty.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwpty.c,v 1.5 2001/09/28 22:46:13 billf Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwputc.c b/usr.bin/window/wwputc.c
index 8d0780e443d4..5bf7a3f7b626 100644
--- a/usr.bin/window/wwputc.c
+++ b/usr.bin/window/wwputc.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwputc.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwputc.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index dbc2960c00c9..4100c8e68bac 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwputs.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwputs.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index 66ac69c50962..0146a32d6448 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwredraw.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwredraw.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index bdc2f7092ebc..b6a9982fe6e2 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwredrawwin.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwredrawwin.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index 3332273be459..8d2a7cf5027b 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwrint.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwrint.c,v 1.4 2001/07/26 11:02:37 sheldonh Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index d0641a1e69c7..d28d9d1dffbe 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwscroll.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwscroll.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index 443d1f31c5a6..afca0467aeda 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwsize.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwsize.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index 477f920a286c..4e7dfd39622c 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwspawn.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwspawn.c,v 1.6 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwsuspend.c b/usr.bin/window/wwsuspend.c
index ad3db5aa1106..a8075581b145 100644
--- a/usr.bin/window/wwsuspend.c
+++ b/usr.bin/window/wwsuspend.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwsuspend.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwsuspend.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index 0be6590aeaff..d4acb260d44e 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwterminfo.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwterminfo.c,v 1.6 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #ifdef TERMINFO
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index 94de13cfbc1c..beb8318aecdb 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwtty.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwtty.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index 7fd6507046cc..9d2c18ec718d 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwunframe.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwunframe.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index 3c1ade7263e0..b948edcc6f69 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwupdate.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwupdate.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 29b3b73fb54b..be6f97b4f232 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwwrite.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwwrite.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index 82dcb33bd17f..a86a6def2ae6 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)xx.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/xx.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/xx.h b/usr.bin/window/xx.h
index e49b85ededbb..560a4edc60ed 100644
--- a/usr.bin/window/xx.h
+++ b/usr.bin/window/xx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xx.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/xx.h,v 1.2 2000/10/26 10:07:20 obrien Exp $
  */
 
 struct xx {
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index a6f9bed48931..6da49beecd93 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)xxflush.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/xxflush.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index e7b24a14d8ab..2854a585563a 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/write/write.1,v 1.14 2005/05/21 09:55:09 ru Exp $
 .\"
 .Dd July 17, 2004
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index b0e0a1f91b8d..41c82e089c7c 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)write.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/write/write.c,v 1.18 2005/01/05 11:52:40 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index 16162a1641e9..b3f046f3ffb6 100644
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xargs/Makefile,v 1.6 2003/03/28 16:24:11 mux Exp $
 
 PROG=	xargs
 SRCS=	xargs.c strnsubst.c
diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c
index 82868ffc3d82..4b3f9b64d74e 100644
--- a/usr.bin/xargs/strnsubst.c
+++ b/usr.bin/xargs/strnsubst.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xargs/strnsubst.c,v 1.7 2004/10/18 15:40:47 cperciva Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index e96f9d8c81e6..12be87b606a3 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)xargs.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.34 2005/05/21 09:55:09 ru Exp $
 .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $
 .\"
 .Dd August 2, 2004
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index c75f18d2da55..c5b39af79892 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.57 2005/02/27 02:01:31 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 594f1dcfbf79..17edf5a77cf0 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xinstall/Makefile,v 1.23 2005/01/25 14:34:57 ssouhlal Exp $
 
 PROG=		xinstall
 PROGNAME=	install
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 9e2c2cbd6979..f4298dcb695e 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xinstall/install.1,v 1.32.2.1 2005/08/18 15:01:25 keramida Exp $
 .\"
 .Dd May 7, 2001
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 58cdcca9fde8..1ea5987c0445 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.66 2005/01/25 14:34:57 ssouhlal Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/usr.bin/xlint/Makefile b/usr.bin/xlint/Makefile
index 68264f4a7f75..ed1a4cf8c98a 100644
--- a/usr.bin/xlint/Makefile
+++ b/usr.bin/xlint/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:23:45 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/Makefile,v 1.14 2003/06/15 13:03:37 markm Exp $
 
 .if ${LINT} == "lint"
 _llib=	llib
diff --git a/usr.bin/xlint/Makefile.inc b/usr.bin/xlint/Makefile.inc
index 0c1b97a5cdfa..af488a49429f 100644
--- a/usr.bin/xlint/Makefile.inc
+++ b/usr.bin/xlint/Makefile.inc
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.inc,v 1.8 2002/02/04 00:18:32 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/Makefile.inc,v 1.5 2004/02/23 20:21:21 johan Exp $
 
 WARNS?=		0
 
diff --git a/usr.bin/xlint/arch/ia64/targparam.h b/usr.bin/xlint/arch/ia64/targparam.h
index 7ec1038156f7..be01ed4673f4 100644
--- a/usr.bin/xlint/arch/ia64/targparam.h
+++ b/usr.bin/xlint/arch/ia64/targparam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/xlint/arch/ia64/targparam.h,v 1.2 2003/11/03 05:09:57 marcel Exp $ */
 /*	$NetBSD: targparam.h,v 1.1 2002/01/18 20:39:18 thorpej Exp $	*/
 
 /*
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index b7f78c5afb26..4c6cbb0d5660 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/lint1/Makefile,v 1.17 2004/02/05 22:44:25 ru Exp $
 
 PROG=	lint1
 SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
diff --git a/usr.bin/xlint/lint1/cgram.y b/usr.bin/xlint/lint1/cgram.y
index 8791a2d3b8ed..98fb2f447035 100644
--- a/usr.bin/xlint/lint1/cgram.y
+++ b/usr.bin/xlint/lint1/cgram.y
@@ -37,7 +37,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: cgram.y,v 1.23 2002/01/31 19:36:53 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/cgram.y,v 1.8 2003/06/07 18:12:30 obrien Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c
index 69c7cda53775..46ade01bfd4f 100644
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: decl.c,v 1.29 2002/01/18 21:01:39 thorpej Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/decl.c,v 1.12 2003/01/01 18:13:44 schweikh Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/usr.bin/xlint/lint1/emit.c b/usr.bin/xlint/lint1/emit.c
index 3e2bfc6c88eb..05ad337be554 100644
--- a/usr.bin/xlint/lint1/emit.c
+++ b/usr.bin/xlint/lint1/emit.c
@@ -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/usr.bin/xlint/lint1/emit.c,v 1.2 2002/03/22 01:42:44 imp Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/xlint/lint1/emit1.c b/usr.bin/xlint/lint1/emit1.c
index e62549c63c05..5c0f5c60bee3 100644
--- a/usr.bin/xlint/lint1/emit1.c
+++ b/usr.bin/xlint/lint1/emit1.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: emit1.c,v 1.11 2002/01/31 19:36:54 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/emit1.c,v 1.2 2002/12/30 21:18:13 schweikh Exp $");
 
 #include <ctype.h>
 
diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c
index 5c56638d0637..694864a4891c 100644
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: err.c,v 1.17 2002/01/31 19:36:54 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/err.c,v 1.9 2002/07/19 16:38:20 markm Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c
index 68ade02e4752..2c8e41c108f4 100644
--- a/usr.bin/xlint/lint1/func.c
+++ b/usr.bin/xlint/lint1/func.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: func.c,v 1.16 2002/01/03 04:25:15 thorpej Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/func.c,v 1.9 2002/03/03 15:12:19 markm Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c
index cf4cbddfa98f..7cdb45430d5a 100644
--- a/usr.bin/xlint/lint1/init.c
+++ b/usr.bin/xlint/lint1/init.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: init.c,v 1.9 2001/09/18 18:15:54 wiz Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/init.c,v 1.2 2002/12/30 21:18:13 schweikh Exp $");
 
 #include <stdlib.h>
 
diff --git a/usr.bin/xlint/lint1/lint1.h b/usr.bin/xlint/lint1/lint1.h
index 4594f185dd26..45975e9a0c45 100644
--- a/usr.bin/xlint/lint1/lint1.h
+++ b/usr.bin/xlint/lint1/lint1.h
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/lint1.h,v 1.2 2003/01/01 18:13:44 schweikh Exp $");
 
 #include "lint.h"
 #include "op.h"
diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c
index 80d548264c9b..2076c1e636ad 100644
--- a/usr.bin/xlint/lint1/main1.c
+++ b/usr.bin/xlint/lint1/main1.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: main1.c,v 1.11 2002/01/29 02:43:38 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/main1.c,v 1.3 2002/04/22 13:44:42 des Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/usr.bin/xlint/lint1/makeman b/usr.bin/xlint/lint1/makeman
index 9c2584640d87..cf6dc8364983 100644
--- a/usr.bin/xlint/lint1/makeman
+++ b/usr.bin/xlint/lint1/makeman
@@ -73,7 +73,7 @@ cat << \__EOF
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xlint/lint1/makeman,v 1.3 2002/12/11 17:13:09 ru Exp $
 .\"
 .Dd July 5, 2000
 .Dt LINT 7
diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c
index 7a13e7e2afd4..c9722b42acc3 100644
--- a/usr.bin/xlint/lint1/mem1.c
+++ b/usr.bin/xlint/lint1/mem1.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: mem1.c,v 1.7 2002/01/31 19:36:54 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/mem1.c,v 1.9 2002/07/19 16:38:20 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/usr.bin/xlint/lint1/param.h b/usr.bin/xlint/lint1/param.h
index 0f9ca6800416..b381000bf2e2 100644
--- a/usr.bin/xlint/lint1/param.h
+++ b/usr.bin/xlint/lint1/param.h
@@ -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/usr.bin/xlint/lint1/param.h,v 1.9 2004/05/14 13:44:36 cognet Exp $
  */
 
 /*
diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l
index ea5a2c57bdcd..36994942af13 100644
--- a/usr.bin/xlint/lint1/scan.l
+++ b/usr.bin/xlint/lint1/scan.l
@@ -37,7 +37,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: scan.l,v 1.26 2002/01/31 22:30:21 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/scan.l,v 1.12 2003/01/01 18:13:44 schweikh Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index 2a65d80a797d..1226c403da95 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: tree.c,v 1.24 2002/01/31 22:30:20 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/tree.c,v 1.14 2003/01/01 18:13:44 schweikh Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index eaee12413cf2..cc467398bc26 100644
--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:24:39 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/lint2/Makefile,v 1.5 2004/12/21 08:47:30 ru Exp $
 
 .PATH:	${.CURDIR}/../lint1
 
diff --git a/usr.bin/xlint/lint2/main2.c b/usr.bin/xlint/lint2/main2.c
index a05ddf4cb74b..974f83916e47 100644
--- a/usr.bin/xlint/lint2/main2.c
+++ b/usr.bin/xlint/lint2/main2.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: main2.c,v 1.5 2001/11/21 19:14:26 wiz Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/main2.c,v 1.2 2003/01/01 18:13:45 schweikh Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/xlint/lint2/mem2.c b/usr.bin/xlint/lint2/mem2.c
index ebc4d139e092..6e3bcd023ed6 100644
--- a/usr.bin/xlint/lint2/mem2.c
+++ b/usr.bin/xlint/lint2/mem2.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: mem2.c,v 1.6 2002/01/21 19:49:52 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/mem2.c,v 1.7 2002/03/03 15:12:22 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c
index 46958283074e..9840adb2f2e6 100644
--- a/usr.bin/xlint/lint2/read.c
+++ b/usr.bin/xlint/lint2/read.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: read.c,v 1.12 2002/01/21 19:49:52 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/read.c,v 1.9 2003/01/01 18:13:45 schweikh Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/xlint/llib/Makefile b/usr.bin/xlint/llib/Makefile
index 9f1e3c1568ed..e22093e1b507 100644
--- a/usr.bin/xlint/llib/Makefile
+++ b/usr.bin/xlint/llib/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.7 2000/06/14 20:22:19 matt Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/llib/Makefile,v 1.13 2002/03/20 18:25:50 ru Exp $
 
 LIBS=	llib-lposix.ln llib-lstdc.ln
 
diff --git a/usr.bin/xlint/llib/llib-lposix b/usr.bin/xlint/llib/llib-lposix
index b3f9ca93d0d3..6488ad567a4f 100644
--- a/usr.bin/xlint/llib/llib-lposix
+++ b/usr.bin/xlint/llib/llib-lposix
@@ -1,5 +1,5 @@
 /*	$NetBSD: llib-lposix,v 1.2 1995/07/03 21:25:09 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/xlint/llib/llib-lposix,v 1.3 2002/06/21 09:23:12 phk Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
diff --git a/usr.bin/xlint/llib/llib-lstdc b/usr.bin/xlint/llib/llib-lstdc
index 83b44f24f950..a6305ca1f22c 100644
--- a/usr.bin/xlint/llib/llib-lstdc
+++ b/usr.bin/xlint/llib/llib-lstdc
@@ -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/usr.bin/xlint/llib/llib-lstdc,v 1.7 2002/03/03 15:12:43 markm Exp $
  */
 
 /* LINTLIBRARY */
diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile
index 5dfdfb314a71..9cc4a048d7ce 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/xlint/Makefile,v 1.8 2002/03/20 18:25:50 ru Exp $
 
 .PATH:	${.CURDIR}/../lint1
 
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 13ffce10dbc8..3a4cfdfb7698 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -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/usr.bin/xlint/xlint/lint.1,v 1.27 2005/02/13 22:25:26 ru Exp $
 .\"
 .Dd May 24, 2001
 .Dt LINT 1
diff --git a/usr.bin/xlint/xlint/pathnames.h b/usr.bin/xlint/xlint/pathnames.h
index 3f7d210530da..3020935a7853 100644
--- a/usr.bin/xlint/xlint/pathnames.h
+++ b/usr.bin/xlint/xlint/pathnames.h
@@ -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/usr.bin/xlint/xlint/pathnames.h,v 1.6 2002/03/20 18:25:50 ru Exp $
  */
 
 /* directory where lint1 and lint2 reside */
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index 9dc8df612912..da7906b8366a 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: xlint.c,v 1.27 2002/01/31 19:09:33 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/xlint/xlint.c,v 1.26 2003/10/26 03:34:13 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index befdcab380c4..b03e49bb82e3 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)xstr.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xstr/xstr.1,v 1.12 2005/05/21 09:55:09 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt XSTR 1
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 7964dd9897a9..6a5af96a2fe1 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xstr/xstr.c,v 1.10 2005/05/21 10:14:11 ru Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index e8b1024e82bb..39c15d0c1629 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/yacc/Makefile,v 1.13 2002/02/08 23:07:36 markm Exp $
 
 PROG=	yacc
 SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 24b1610cd13b..df5538daf263 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/closure.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index cb8b083bff41..b8588b2e1a51 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	5.6 (Berkeley) 5/24/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/defs.h,v 1.12 2002/06/11 11:27:20 robert Exp $
  */
 
 #include <assert.h>
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 9940dbc050c5..031250371aef 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/error.c,v 1.15 2002/04/09 11:39:05 ru Exp $");
 
 /* routines for printing error messages  */
 
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 95d87de2dc1e..039538bc7bc0 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/lalr.c,v 1.15 2002/06/11 11:27:20 robert Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index cd8d1a1e624e..4a8d2af6f1ae 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/lr0.c,v 1.13 2002/06/11 11:27:20 robert Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 474de0b19157..b486b67b70d9 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/main.c,v 1.22 2004/03/05 02:05:56 wes Exp $");
 
 #include <paths.h>
 #include <signal.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 1dde4dda5b0b..6d009b9f41ae 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/mkpar.c,v 1.19 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index b0b520a7e30d..6b3bf7c99a38 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/output.c,v 1.28 2002/06/11 11:27:20 robert Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 7c1132d494d9..2e42a6bbec91 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/reader.c,v 1.19 2002/08/25 13:23:09 charnier Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index f765c912f5c8..7b5530eeb18e 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $");
 
 #include "defs.h"
 
@@ -65,7 +65,7 @@ const char *banner[] =
     "__unused",
     "#endif",
     "static char const ",
-    "yyrcsid[] = \"$FreeBSD$\";",
+    "yyrcsid[] = \"$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $\";",
     "#endif",
     "#define YYBYACC 1",
     "#define YYMAJOR 1",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index cb7b0bd45cb0..612178012559 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/symtab.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 282eaa3499a9..c7dd4d063db9 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/verbose.c,v 1.13 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 46d934dd758d..5cf57acaebbd 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/warshall.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 
 #include "defs.h"
 
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 56bacbbda7b3..5914f9a93c8d 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yacc.1	5.8 (Berkeley) 5/24/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yacc/yacc.1,v 1.17 2005/01/18 13:43:56 ru Exp $
 .\"	$OpenBSD: yacc.1,v 1.14 2001/05/01 17:58:05 aaron Exp $
 .\"
 .Dd May 24, 1993
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index a4d9a31bd1e8..09cb2ef42ef7 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yyfix.1	5.4 (Berkeley) 3/23/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yacc/yyfix.1,v 1.7 2002/11/26 15:34:18 ru Exp $
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile
index e3e98dac215e..70f6a28469ad 100644
--- a/usr.bin/yes/Makefile
+++ b/usr.bin/yes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/yes/Makefile,v 1.4 2001/12/11 22:56:05 markm Exp $
 
 PROG=	yes
 
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 9b4b37712a6c..03ecf0d8bf2b 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yes.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yes/yes.1,v 1.7 2002/04/20 12:18:22 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt YES 1
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index aae13b9a09b5..edaa9b493c76 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "@(#)yes.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.bin/yes/yes.c,v 1.5 2002/11/09 21:00:39 dwmalone Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index 58ee6907f07f..d596daa96a1a 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypcat/Makefile,v 1.6 2002/02/08 23:07:36 markm Exp $
 
 PROG=	ypcat
 
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 8a2565200354..86a528afa77c 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -26,7 +26,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/usr.bin/ypcat/ypcat.1,v 1.13 2002/04/20 12:18:24 charnier Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPCAT 1
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 55390433597a..fd95452f8cbb 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ypcat/ypcat.c,v 1.9 2005/05/21 09:55:10 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index 22e62996937e..4bdbb64f07be 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypmatch/Makefile,v 1.6 2002/02/08 23:07:37 markm Exp $
 
 PROG=	ypmatch
 
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 5f4a4cab278d..ebbbbf714c10 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -26,7 +26,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/usr.bin/ypmatch/ypmatch.1,v 1.13 2002/04/20 12:18:26 charnier Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPMATCH 1
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index d0904c51de90..e4475aa4c653 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ypmatch/ypmatch.c,v 1.12 2005/05/21 09:55:10 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index f28f864ab097..b6839f121b73 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypwhich/Makefile,v 1.7 2002/02/08 23:07:37 markm Exp $
 
 PROG=	ypwhich
 
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index 25eeb08fb0e3..cf6650228f0e 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ypwhich/ypwhich.1,v 1.9 2004/07/02 22:22:35 ru Exp $
 .\"
 .Dd February 23, 1994
 .Dt YPWHICH 1
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 8bfca24ed132..ce81a0dbb6bd 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ypwhich/ypwhich.c,v 1.16 2004/04/04 19:17:38 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/IPXrouted/IPXrouted.8 b/usr.sbin/IPXrouted/IPXrouted.8
index 6c3bd542e8df..bc08a2c7b71b 100644
--- a/usr.sbin/IPXrouted/IPXrouted.8
+++ b/usr.sbin/IPXrouted/IPXrouted.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.18 2004/07/02 23:12:38 ru Exp $
 .\"
 .Dd October 11, 1995
 .Dt IPXROUTED 8
diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile
index 44605ac04bd9..70d306342b01 100644
--- a/usr.sbin/IPXrouted/Makefile
+++ b/usr.sbin/IPXrouted/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/IPXrouted/Makefile,v 1.9 2004/02/04 10:18:05 ru Exp $
 
 PROG=	IPXrouted
 MAN=	IPXrouted.8
diff --git a/usr.sbin/IPXrouted/af.c b/usr.sbin/IPXrouted/af.c
index ea61762e00ef..035856f31b0f 100644
--- a/usr.sbin/IPXrouted/af.c
+++ b/usr.sbin/IPXrouted/af.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/af.c,v 1.8 2004/08/07 04:19:37 imp Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/af.h b/usr.sbin/IPXrouted/af.h
index 576a6c7adc04..311a0dd9ff16 100644
--- a/usr.sbin/IPXrouted/af.h
+++ b/usr.sbin/IPXrouted/af.h
@@ -36,7 +36,7 @@
  *
  *	@(#)af.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/af.h,v 1.4 1999/08/28 01:15:01 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/defs.h b/usr.sbin/IPXrouted/defs.h
index c2b28a7a0d81..4b607e712c17 100644
--- a/usr.sbin/IPXrouted/defs.h
+++ b/usr.sbin/IPXrouted/defs.h
@@ -34,7 +34,7 @@
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/defs.h,v 1.9 2002/02/18 20:35:26 mike Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/IPXrouted/if.c b/usr.sbin/IPXrouted/if.c
index 2c6e664ad44f..8e44f9d035c0 100644
--- a/usr.sbin/IPXrouted/if.c
+++ b/usr.sbin/IPXrouted/if.c
@@ -34,7 +34,7 @@
  *
  * static char sccsid[] = "@(#)if.c	5.1 (Berkeley) 6/4/85"; (routed/if.c)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/if.c,v 1.6 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/input.c b/usr.sbin/IPXrouted/input.c
index 651a8ae43609..ed0ce9d1c528 100644
--- a/usr.sbin/IPXrouted/input.c
+++ b/usr.sbin/IPXrouted/input.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/input.c,v 1.9 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/interface.h b/usr.sbin/IPXrouted/interface.h
index ed7b9889dcff..a6c56f668dd7 100644
--- a/usr.sbin/IPXrouted/interface.h
+++ b/usr.sbin/IPXrouted/interface.h
@@ -34,7 +34,7 @@
  *
  *	@(#)interface.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/interface.h,v 1.4 1999/08/28 01:15:02 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/main.c b/usr.sbin/IPXrouted/main.c
index 8c841618396a..24bf6d5e8ec2 100644
--- a/usr.sbin/IPXrouted/main.c
+++ b/usr.sbin/IPXrouted/main.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/main.c,v 1.12 2005/05/11 02:45:49 jmallett Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/output.c b/usr.sbin/IPXrouted/output.c
index 78922c9f38d0..1d00a30dc758 100644
--- a/usr.sbin/IPXrouted/output.c
+++ b/usr.sbin/IPXrouted/output.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/output.c,v 1.9 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/protocol.h b/usr.sbin/IPXrouted/protocol.h
index 7fae5363cf02..ae3b2b5b1e75 100644
--- a/usr.sbin/IPXrouted/protocol.h
+++ b/usr.sbin/IPXrouted/protocol.h
@@ -37,7 +37,7 @@
  *
  *	@(#)protocol.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/protocol.h,v 1.5 1999/08/28 01:15:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap.h b/usr.sbin/IPXrouted/sap.h
index b4e9dcb6ef51..639983deef00 100644
--- a/usr.sbin/IPXrouted/sap.h
+++ b/usr.sbin/IPXrouted/sap.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap.h,v 1.7 1999/08/28 01:15:03 peter Exp $
  */
 #ifndef _SAP_H_
 #define _SAP_H_
diff --git a/usr.sbin/IPXrouted/sap_input.c b/usr.sbin/IPXrouted/sap_input.c
index 59281b29cac5..6fa5fa94088f 100644
--- a/usr.sbin/IPXrouted/sap_input.c
+++ b/usr.sbin/IPXrouted/sap_input.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_input.c,v 1.7 1999/08/28 01:15:04 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_output.c b/usr.sbin/IPXrouted/sap_output.c
index d1f1a28d4192..a35463464908 100644
--- a/usr.sbin/IPXrouted/sap_output.c
+++ b/usr.sbin/IPXrouted/sap_output.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_output.c,v 1.10 2002/05/30 21:49:15 wollman Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_tables.c b/usr.sbin/IPXrouted/sap_tables.c
index e1572d181957..a6024c56e643 100644
--- a/usr.sbin/IPXrouted/sap_tables.c
+++ b/usr.sbin/IPXrouted/sap_tables.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_tables.c,v 1.9 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c
index 2b9ccfac3658..e9c01e381bd8 100644
--- a/usr.sbin/IPXrouted/startup.c
+++ b/usr.sbin/IPXrouted/startup.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/startup.c,v 1.11 2004/04/13 11:24:43 luigi Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/table.h b/usr.sbin/IPXrouted/table.h
index 3f9693f187f3..e52fc7e5e9db 100644
--- a/usr.sbin/IPXrouted/table.h
+++ b/usr.sbin/IPXrouted/table.h
@@ -36,7 +36,7 @@
  *
  *	@(#)table.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/table.h,v 1.6 1999/08/28 01:15:05 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/tables.c b/usr.sbin/IPXrouted/tables.c
index fee39217fab7..bd917177ed34 100644
--- a/usr.sbin/IPXrouted/tables.c
+++ b/usr.sbin/IPXrouted/tables.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/tables.c,v 1.8 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/timer.c b/usr.sbin/IPXrouted/timer.c
index 215973094a9a..b5734c961e06 100644
--- a/usr.sbin/IPXrouted/timer.c
+++ b/usr.sbin/IPXrouted/timer.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/timer.c,v 1.6 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/trace.c b/usr.sbin/IPXrouted/trace.c
index 47a576d31471..b88907c99163 100644
--- a/usr.sbin/IPXrouted/trace.c
+++ b/usr.sbin/IPXrouted/trace.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)trace.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/IPXrouted/trace.c,v 1.10 2003/11/15 17:10:56 trhodes Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/IPXrouted/trace.h b/usr.sbin/IPXrouted/trace.h
index c83a9d1b4572..3916ad19e5dd 100644
--- a/usr.sbin/IPXrouted/trace.h
+++ b/usr.sbin/IPXrouted/trace.h
@@ -37,7 +37,7 @@
  *
  *	@(#)trace.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/trace.h,v 1.7 1999/08/28 01:15:07 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index f2cb2fa4dcb7..216bc8350435 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/Makefile,v 1.332.2.1 2005/08/15 20:24:07 cperciva Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	ac \
diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
index 4347591cf563..c2890ac8a384 100644
--- a/usr.sbin/Makefile.inc
+++ b/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/Makefile.inc,v 1.3 2001/03/26 14:39:14 ru Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index c45a0d69ff42..e19362df7a0c 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ac/Makefile,v 1.10 2004/03/08 20:01:34 gad Exp $
 
 PROG=	ac
 MAN=	ac.8
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index efe3e23c92ce..bb9a75810b55 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.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/usr.sbin/ac/ac.8,v 1.21 2005/01/18 20:02:28 ru Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 031099a4b9b8..a3d4f4c6cd22 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ac/ac.c,v 1.29 2004/03/08 20:02:23 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
index 7ea45a7df929..041cb5827457 100644
--- a/usr.sbin/accton/Makefile
+++ b/usr.sbin/accton/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/accton/Makefile,v 1.7 2002/07/11 22:29:11 alfred Exp $
 
 PROG=	accton
 MAN=	accton.8
diff --git a/usr.sbin/accton/accton.8 b/usr.sbin/accton/accton.8
index 73c7d2926113..039b2579d848 100644
--- a/usr.sbin/accton/accton.8
+++ b/usr.sbin/accton/accton.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/accton/accton.8,v 1.13 2004/04/16 09:31:17 brueffer Exp $
 .\"
 .Dd May 21, 1993
 .Dt ACCTON 8
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index c1bb8b6b72c5..1fb83ff46f5a 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)accton.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/accton/accton.c,v 1.8 2004/08/07 04:19:37 imp Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.sbin/acpi/Makefile b/usr.sbin/acpi/Makefile
index 8190bc7c3037..c282fff4f970 100644
--- a/usr.sbin/acpi/Makefile
+++ b/usr.sbin/acpi/Makefile
@@ -1,6 +1,6 @@
 # Makefile for acpi tools
 # $Id: Makefile,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/Makefile,v 1.3 2003/08/08 03:20:59 njl Exp $
 
 SUBDIR= acpiconf acpidb acpidump iasl
 
diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index 2fce9209e18d..520aa219e91a 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -1,5 +1,5 @@
 # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/Makefile.inc,v 1.8 2003/08/07 16:51:50 njl Exp $
 
 ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica
 CFLAGS+= -I${.CURDIR}/../../../sys -I${ACPICA_DIR} -I${ACPICA_DIR}/compiler
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
index bb0df4b406e5..ebbf0b4da6e7 100644
--- a/usr.sbin/acpi/acpiconf/Makefile
+++ b/usr.sbin/acpi/acpiconf/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2000/07/14 18:16:25 iwasaki Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/acpiconf/Makefile,v 1.5 2004/11/13 01:54:22 philip Exp $
 
 PROG=	acpiconf
 MAN=	acpiconf.8
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index 05d3a5de2619..eec3a386918a 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/usr.sbin/acpi/acpiconf/acpiconf.8
@@ -25,7 +25,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/usr.sbin/acpi/acpiconf/acpiconf.8,v 1.15 2005/02/09 18:04:39 ru Exp $
 .\"
 .Dd August 16, 2004
 .Dt ACPICONF 8
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index 3b0686e5ee05..2b0fb72b6290 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: acpiconf.c,v 1.5 2000/08/08 14:12:19 iwasaki Exp $
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpiconf/acpiconf.c,v 1.22.2.1 2005/07/29 16:31:58 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 5541b5611aff..31d924d35f78 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/acpidb/Makefile,v 1.6 2004/11/13 01:34:51 philip Exp $
 
 PROG=	acpidb
 SRCS+=	acpidb.c
diff --git a/usr.sbin/acpi/acpidb/acpidb.8 b/usr.sbin/acpi/acpidb/acpidb.8
index 4ed97a6a399c..afede2c8748c 100644
--- a/usr.sbin/acpi/acpidb/acpidb.8
+++ b/usr.sbin/acpi/acpidb/acpidb.8
@@ -25,7 +25,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/usr.sbin/acpi/acpidb/acpidb.8,v 1.2 2004/06/06 17:49:57 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt ACPIDB 8
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index c53a265ee484..a3e1572a178b 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidb/acpidb.c,v 1.4 2005/01/03 04:14:05 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index 21a4140defcc..0e8e519b4aa7 100644
--- a/usr.sbin/acpi/acpidump/Makefile
+++ b/usr.sbin/acpi/acpidump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/acpidump/Makefile,v 1.7 2003/08/28 03:33:07 njl Exp $
 
 PROG=	acpidump
 MAN=	acpidump.8
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 6241dfdd3f69..042b0da1e404 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.31 2005/02/14 11:21:48 scottl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c
index 550420c677ea..9b80527a9e3f 100644
--- a/usr.sbin/acpi/acpidump/acpi_user.c
+++ b/usr.sbin/acpi/acpidump/acpi_user.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpi_user.c,v 1.12 2004/05/28 07:25:23 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index f2b029145664..5738a63fda5d 100644
--- a/usr.sbin/acpi/acpidump/acpidump.8
+++ b/usr.sbin/acpi/acpidump/acpidump.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.8,v 1.23 2005/02/14 16:32:32 njl Exp $
 .\"
 .Dd February 14, 2005
 .Dt ACPIDUMP 8
diff --git a/usr.sbin/acpi/acpidump/acpidump.c b/usr.sbin/acpi/acpidump/acpidump.c
index 33610386456b..d27f4dbdcc22 100644
--- a/usr.sbin/acpi/acpidump/acpidump.c
+++ b/usr.sbin/acpi/acpidump/acpidump.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.c,v 1.11 2004/10/05 20:45:05 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h
index 231f49358e28..a24cfbf987e7 100644
--- a/usr.sbin/acpi/acpidump/acpidump.h
+++ b/usr.sbin/acpi/acpidump/acpidump.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.h,v 1.21 2005/02/17 21:09:26 scottl Exp $
  */
 
 #ifndef _ACPIDUMP_H_
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index afe0d81cd5ca..21772c529dee 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/iasl/Makefile,v 1.5 2004/01/13 20:53:56 ru Exp $
 
 PROG=	iasl
 SRCS=	aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y \
diff --git a/usr.sbin/acpi/iasl/iasl.8 b/usr.sbin/acpi/iasl/iasl.8
index fa80aa7a84ac..a1c8bea7b671 100644
--- a/usr.sbin/acpi/iasl/iasl.8
+++ b/usr.sbin/acpi/iasl/iasl.8
@@ -25,7 +25,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/usr.sbin/acpi/iasl/iasl.8,v 1.2 2004/06/13 18:03:39 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt IASL 8
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index 0ca2dae1e97b..c22cf3a92192 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/Makefile,v 1.19 2004/03/30 21:50:42 trhodes Exp $
 
 SCRIPTS=adduser.sh rmuser.sh
 MAN=	adduser.conf.5 adduser.8 rmuser.8
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index a87e6af5a85e..c4e8762b4047 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.55 2004/06/06 17:55:55 mtm Exp $
 .\"
 .Dd March 30, 2004
 .Dt ADDUSER 8
diff --git a/usr.sbin/adduser/adduser.conf.5 b/usr.sbin/adduser/adduser.conf.5
index c00666d2ed15..230c8bbb6026 100644
--- a/usr.sbin/adduser/adduser.conf.5
+++ b/usr.sbin/adduser/adduser.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/adduser/adduser.conf.5,v 1.4 2004/06/13 18:03:39 ru Exp $
 .\"
 .Dd March 30, 2004
 .Dt ADDUSER.CONF 5
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index a8622b93881f..c273999a916b 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -24,7 +24,7 @@
 #
 #       Email: Mike Makonnen <mtm@FreeBSD.Org>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/adduser.sh,v 1.26 2005/04/28 12:44:02 robert Exp $
 #
 
 # err msg
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index 913cb5ddf135..1f088af8b0b2 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -24,7 +24,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/usr.sbin/adduser/rmuser.8,v 1.23 2004/06/08 14:52:55 csjp Exp $
 .\"
 .Dd May 10, 2002
 .Dt RMUSER 8
diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh
index a051b640a4bd..c879adfe3d75 100644
--- a/usr.sbin/adduser/rmuser.sh
+++ b/usr.sbin/adduser/rmuser.sh
@@ -24,7 +24,7 @@
 #
 #	Email: Mike Makonnen <mtm@FreeBSD.Org>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/rmuser.sh,v 1.9 2005/05/24 04:50:07 adamw Exp $
 #
 
 ATJOBDIR="/var/at/jobs"
diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile
index 37e42005884c..0e8f3b8c1c3c 100644
--- a/usr.sbin/amd/Makefile
+++ b/usr.sbin/amd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/Makefile,v 1.8 2001/07/20 06:19:36 obrien Exp $
 
 SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd \
 	scripts wire-test
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index 612f9f7aa2d0..c4dab45c8b3b 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/Makefile.inc,v 1.11 2004/11/13 20:40:31 bz Exp $
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 592268801eb6..36e06123198f 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/amd/Makefile,v 1.24 2004/11/13 20:40:31 bz Exp $
 #
 
 .PATH: ${.CURDIR}/../../../contrib/amd/amd
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 74fc7492f524..9dc1b4f79f2b 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/amq/Makefile,v 1.15 2001/07/20 06:19:34 obrien Exp $
 #
 
 .PATH: ${.CURDIR}/../../../contrib/amd/amq
diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile
index e9c77073b290..2432e2208224 100644
--- a/usr.sbin/amd/doc/Makefile
+++ b/usr.sbin/amd/doc/Makefile
@@ -1,6 +1,6 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/doc/Makefile,v 1.11 2001/07/20 06:19:34 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/doc
 
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 7f96a456dfe4..42cccc7f5765 100644
--- a/usr.sbin/amd/fixmount/Makefile
+++ b/usr.sbin/amd/fixmount/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/fixmount/Makefile,v 1.8 2001/07/20 06:19:35 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/fixmount \
        ${.CURDIR}/../../../contrib/amd/conf/checkmount
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 9ae55adfa7ac..24616e8ec9a6 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/fsinfo/Makefile,v 1.13 2001/07/20 06:19:35 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/fsinfo
 
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 5b863dd5adcd..0df0a8e1c522 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/hlfsd/Makefile,v 1.8 2004/02/04 11:59:08 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/hlfsd
 
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index 7fa54aefe69a..45859e1e82db 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/include/Makefile,v 1.9 2004/11/13 20:40:31 bz Exp $
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
diff --git a/usr.sbin/amd/include/aux_conf.h b/usr.sbin/amd/include/aux_conf.h
index 11e0b15280f5..c5ccf5966d6c 100644
--- a/usr.sbin/amd/include/aux_conf.h
+++ b/usr.sbin/amd/include/aux_conf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/amd/include/aux_conf.h,v 1.4 2004/07/06 14:06:58 mbr Exp $ */
 
 /*
  * aux_conf.h:
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index 0ee735608515..f21340dd21b3 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/amd/include/config.h,v 1.30 2004/07/15 13:24:44 mbr Exp $
  *
  * portions derived from
  *      $NetBSD: config.h,v 1.11 1998/08/08 22:33:37 christos Exp $
diff --git a/usr.sbin/amd/include/newvers.sh b/usr.sbin/amd/include/newvers.sh
index 6a35d14b29ba..e10bf2696227 100644
--- a/usr.sbin/amd/include/newvers.sh
+++ b/usr.sbin/amd/include/newvers.sh
@@ -1,5 +1,5 @@
 #	$NetBSD: mkconf,v 1.1.1.1 1997/07/24 21:20:12 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/include/newvers.sh,v 1.9 2005/02/16 21:02:50 ru Exp $
 # mkconf
 # Generate local configuration parameters for amd
 #
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index 7bca934fb6ac..15c8dd1503f8 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/libamu/Makefile,v 1.8 2004/10/24 15:33:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/libamu \
        ${.CURDIR}/../../../contrib/amd/conf/transp \
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index ff792bd570dc..40212b1121dd 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/mk-amd-map/Makefile,v 1.15 2001/07/20 06:19:35 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
 
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index c6bb1cc37a0b..fcd012839062 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/pawd/Makefile,v 1.5 2001/07/20 06:19:36 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/amq
 
diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile
index 822b95144916..d72234aa19d5 100644
--- a/usr.sbin/amd/scripts/Makefile
+++ b/usr.sbin/amd/scripts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/scripts/Makefile,v 1.4 2001/07/20 06:19:36 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/scripts
 
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index a07e6902fe76..647f511a3d84 100644
--- a/usr.sbin/amd/wire-test/Makefile
+++ b/usr.sbin/amd/wire-test/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/wire-test/Makefile,v 1.8 2001/07/20 06:19:36 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/wire-test
 
diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile
index b0f66cd15a86..8ea6acf9a5a2 100644
--- a/usr.sbin/ancontrol/Makefile
+++ b/usr.sbin/ancontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ancontrol/Makefile,v 1.13 2004/07/30 21:43:21 njl Exp $
 
 PROG=	ancontrol
 MAN=	ancontrol.8
diff --git a/usr.sbin/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8
index 5ce4377ab90f..5279f2e9c227 100644
--- a/usr.sbin/ancontrol/ancontrol.8
+++ b/usr.sbin/ancontrol/ancontrol.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.30 2005/02/13 22:25:26 ru Exp $
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 6ff491246c41..899baa3d7fad 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -37,7 +37,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.25 2004/11/03 20:45:52 ceri Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 043c3c763aed..0eb4d0f62edc 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.17 2004/05/27 19:23:27 njl Exp $
 
 PROG=	apm
 MAN=	apm.8
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 1e36f639f509..8693cfb8657d 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -8,7 +8,7 @@
 .\" responsible for the proper functioning of this software, nor does
 .\" the author assume any responsibility for damages incurred with its
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/apm/apm.8,v 1.31 2005/05/30 18:44:43 will Exp $
 .\"
 .\" use.
 .Dd November 1, 1994
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 56432a4ab7a2..eef375a5cc63 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/apm/apm.c,v 1.38 2005/05/30 18:44:43 will Exp $");
 
 #include <sys/file.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 7e81b35dbc77..5387261a8d45 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apmd/Makefile,v 1.8 2004/01/21 13:38:17 ru Exp $
 
 PROG=	apmd
 MAN=	apmd.8
diff --git a/usr.sbin/apmd/README b/usr.sbin/apmd/README
index 59a56e33827d..abaf406d1bb7 100644
--- a/usr.sbin/apmd/README
+++ b/usr.sbin/apmd/README
@@ -210,4 +210,4 @@ Created by: iwasaki@FreeBSD.org
 Edited by: jkh@FreeBSD.org
            nick@foobar.org
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/apmd/README,v 1.2 1999/08/28 01:15:24 peter Exp $
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index f94ea5d89342..a1d248f0918c 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apmd.8	1.1 (FreeBSD) 6/28/99
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.22 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd June 28, 1999
 .Dt APMD 8 i386
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 0b8ef93fb2f3..a304211ab60d 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.8 2005/03/24 01:26:40 mdodd Exp $";
 #endif /* not lint */
 
 #include <assert.h>
diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h
index 1be5afa4bd19..7c819539ec15 100644
--- a/usr.sbin/apmd/apmd.h
+++ b/usr.sbin/apmd/apmd.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmd.h,v 1.4 2002/07/11 18:22:42 alfred Exp $
  */
 
 #define APMD_CONFIGFILE		"/etc/apmd.conf"
diff --git a/usr.sbin/apmd/apmdlex.l b/usr.sbin/apmd/apmdlex.l
index 0e5cff30036e..fc203d1f3293 100644
--- a/usr.sbin/apmd/apmdlex.l
+++ b/usr.sbin/apmd/apmdlex.l
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmdlex.l,v 1.3 2001/05/15 05:13:45 nsayer Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/apmd/apmdparse.y b/usr.sbin/apmd/apmdparse.y
index 597982bd9895..10d99e70580f 100644
--- a/usr.sbin/apmd/apmdparse.y
+++ b/usr.sbin/apmd/apmdparse.y
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmdparse.y,v 1.5 2003/06/16 14:57:07 maxim Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c
index 1562c55f0620..28e61dd2348b 100644
--- a/usr.sbin/apmd/contrib/pccardq.c
+++ b/usr.sbin/apmd/contrib/pccardq.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.5 2001/08/20 15:09:32 brian Exp $ */
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/arlcontrol/Makefile b/usr.sbin/arlcontrol/Makefile
index dc95a93bdd53..d29dc725b46f 100644
--- a/usr.sbin/arlcontrol/Makefile
+++ b/usr.sbin/arlcontrol/Makefile
@@ -1,6 +1,6 @@
 #
 # $RISS: if_arl/arlconfig/Makefile,v 1.5 2003/01/13 08:05:29 frol Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/arlcontrol/Makefile,v 1.3 2005/02/09 10:35:28 stefanf Exp $
 #
 
 PROG=	arlcontrol
diff --git a/usr.sbin/arlcontrol/arlcontrol.8 b/usr.sbin/arlcontrol/arlcontrol.8
index d0e540934f72..f8260783491c 100644
--- a/usr.sbin/arlcontrol/arlcontrol.8
+++ b/usr.sbin/arlcontrol/arlcontrol.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arlcontrol/arlcontrol.8,v 1.11 2005/01/18 20:02:29 ru Exp $
 .\"
 .Dd March 15, 2004
 .Dt ARLCONTROL 8 i386
diff --git a/usr.sbin/arlcontrol/arlcontrol.c b/usr.sbin/arlcontrol/arlcontrol.c
index cc45c37be767..4f522caf5449 100644
--- a/usr.sbin/arlcontrol/arlcontrol.c
+++ b/usr.sbin/arlcontrol/arlcontrol.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/arlcontrol/arlcontrol.c,v 1.4 2005/05/20 12:44:04 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile
index 6ca9dd204ffd..bcd40e933487 100644
--- a/usr.sbin/arp/Makefile
+++ b/usr.sbin/arp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/18/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/arp/Makefile,v 1.12 2004/04/13 11:45:28 luigi Exp $
 
 PROG=	arp
 MAN=	arp.4 arp.8
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index ec513a86384b..364929e3ea42 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arp/arp.4,v 1.18 2004/08/07 04:19:37 imp Exp $
 .\"
 .Dd June 16, 2004
 .Dt ARP 4
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index e84aa812e523..8825a7b620bf 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)arp.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.23 2004/08/07 04:19:37 imp Exp $
 .\"
 .Dd June 6, 1993
 .Dt ARP 8
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index a9f08781ffc5..7bedd72b6d1f 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -42,7 +42,7 @@ static char const sccsid[] = "@(#)from: arp.c	8.2 (Berkeley) 1/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/arp/arp.c,v 1.58 2005/06/09 15:27:46 ru Exp $");
 
 /*
  * arp - display, set, and delete arp table entries
diff --git a/usr.sbin/asf/Makefile b/usr.sbin/asf/Makefile
index b8e7e4b7d640..2d5d6aa12335 100644
--- a/usr.sbin/asf/Makefile
+++ b/usr.sbin/asf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/asf/Makefile,v 1.2 2003/06/08 08:38:11 jmallett Exp $
 
 PROG=	asf
 MAN=	asf.8
diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8
index 65d8762324b2..de62eda3a42c 100644
--- a/usr.sbin/asf/asf.8
+++ b/usr.sbin/asf/asf.8
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/asf/asf.8,v 1.7 2005/01/18 20:02:29 ru Exp $
 .\"
 .Dd June 8, 2003
 .Os
diff --git a/usr.sbin/asf/asf.c b/usr.sbin/asf/asf.c
index 2539011176dd..9e6c8427328c 100644
--- a/usr.sbin/asf/asf.c
+++ b/usr.sbin/asf/asf.c
@@ -24,7 +24,7 @@
  * software, even if advised of the possibility of such damage.
  */
 /* $Id: asf.c,v 1.4 2003/05/04 02:55:20 grog Exp grog $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/asf/asf.c,v 1.6.10.1 2005/10/03 23:45:01 grog Exp $ */
 
 #define MAXLINE 1024
 #include <ctype.h>
diff --git a/usr.sbin/atm/Makefile b/usr.sbin/atm/Makefile
index 2367085d25b6..448fe059979e 100644
--- a/usr.sbin/atm/Makefile
+++ b/usr.sbin/atm/Makefile
@@ -21,7 +21,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/Makefile,v 1.3 2001/07/20 06:19:37 obrien Exp $
 
 SUBDIR=	atmarpd \
 	scspd
diff --git a/usr.sbin/atm/Makefile.inc b/usr.sbin/atm/Makefile.inc
index 46723c133d51..8b7d65245ace 100644
--- a/usr.sbin/atm/Makefile.inc
+++ b/usr.sbin/atm/Makefile.inc
@@ -21,6 +21,6 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/Makefile.inc,v 1.4 2001/07/20 06:19:37 obrien Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile
index 1ed613cea6c9..9917f4f18da2 100644
--- a/usr.sbin/atm/atmarpd/Makefile
+++ b/usr.sbin/atm/atmarpd/Makefile
@@ -21,7 +21,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/Makefile,v 1.9 2001/07/20 06:19:37 obrien Exp $
 
 PROG=	atmarpd
 MAN=	atmarpd.8
diff --git a/usr.sbin/atm/atmarpd/atmarp_config.c b/usr.sbin/atm/atmarpd/atmarp_config.c
index d6d124e4f1b7..b34d3706ef32 100644
--- a/usr.sbin/atm/atmarpd/atmarp_config.c
+++ b/usr.sbin/atm/atmarpd/atmarp_config.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_config.c,v 1.4 2002/05/16 23:28:40 arr Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_config.c,v 1.4 2002/05/16 23:28:40 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_log.c b/usr.sbin/atm/atmarpd/atmarp_log.c
index 4f8d212ac98b..be6b11873ec6 100644
--- a/usr.sbin/atm/atmarpd/atmarp_log.c
+++ b/usr.sbin/atm/atmarpd/atmarp_log.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_log.c,v 1.4 2003/07/29 13:40:51 harti Exp $
  *
  */
 
@@ -65,7 +65,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_log.c,v 1.4 2003/07/29 13:40:51 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_scsp.c b/usr.sbin/atm/atmarpd/atmarp_scsp.c
index 6a22217f668b..adf99e21d997 100644
--- a/usr.sbin/atm/atmarpd/atmarp_scsp.c
+++ b/usr.sbin/atm/atmarpd/atmarp_scsp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_scsp.c,v 1.4 2002/05/16 23:28:40 arr Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_scsp.c,v 1.4 2002/05/16 23:28:40 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_subr.c b/usr.sbin/atm/atmarpd/atmarp_subr.c
index 6987a4b28e91..66c10af7d4d2 100644
--- a/usr.sbin/atm/atmarpd/atmarp_subr.c
+++ b/usr.sbin/atm/atmarpd/atmarp_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $
  *
  */
 
@@ -68,7 +68,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_timer.c b/usr.sbin/atm/atmarpd/atmarp_timer.c
index c1c6cd95c6d8..0165b045c8ad 100644
--- a/usr.sbin/atm/atmarpd/atmarp_timer.c
+++ b/usr.sbin/atm/atmarpd/atmarp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_timer.c,v 1.4 2002/05/16 23:28:40 arr Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_timer.c,v 1.4 2002/05/16 23:28:40 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_var.h b/usr.sbin/atm/atmarpd/atmarp_var.h
index 91a235fc844a..2436c3230673 100644
--- a/usr.sbin/atm/atmarpd/atmarp_var.h
+++ b/usr.sbin/atm/atmarpd/atmarp_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_var.h,v 1.4 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
diff --git a/usr.sbin/atm/atmarpd/atmarpd.8 b/usr.sbin/atm/atmarpd/atmarpd.8
index dc09d2487b99..000e90bac9c4 100644
--- a/usr.sbin/atm/atmarpd/atmarpd.8
+++ b/usr.sbin/atm/atmarpd/atmarpd.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.8,v 1.8 2005/02/09 18:04:40 ru Exp $
 .\"
 .\"
 .Dd August 4, 1998
diff --git a/usr.sbin/atm/atmarpd/atmarpd.c b/usr.sbin/atm/atmarpd/atmarpd.c
index 2cb5f70be8ee..79d55d2685c8 100644
--- a/usr.sbin/atm/atmarpd/atmarpd.c
+++ b/usr.sbin/atm/atmarpd/atmarpd.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.c,v 1.6 2003/07/29 13:40:52 harti Exp $
  *
  */
 
@@ -65,7 +65,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.c,v 1.6 2003/07/29 13:40:52 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index 7130c2bae5c1..bc914830feaf 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -21,7 +21,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/scspd/Makefile,v 1.13 2001/07/20 06:19:37 obrien Exp $
 
 PROG=	scspd
 MAN=	scspd.8
diff --git a/usr.sbin/atm/scspd/scsp_cafsm.c b/usr.sbin/atm/scspd/scsp_cafsm.c
index 05a1e244a9ce..9827439ae7fc 100644
--- a/usr.sbin/atm/scspd/scsp_cafsm.c
+++ b/usr.sbin/atm/scspd/scsp_cafsm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config.c b/usr.sbin/atm/scspd/scsp_config.c
index f69206964678..d5376d70df0b 100644
--- a/usr.sbin/atm/scspd/scsp_config.c
+++ b/usr.sbin/atm/scspd/scsp_config.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config_lex.c b/usr.sbin/atm/scspd/scsp_config_lex.c
index 20002b2c2b58..b64a13e62d02 100644
--- a/usr.sbin/atm/scspd/scsp_config_lex.c
+++ b/usr.sbin/atm/scspd/scsp_config_lex.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_lex.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_config_parse.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_lex.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config_parse.y b/usr.sbin/atm/scspd/scsp_config_parse.y
index b5c34b96c565..d525ec9172d1 100644
--- a/usr.sbin/atm/scspd/scsp_config_parse.y
+++ b/usr.sbin/atm/scspd/scsp_config_parse.y
@@ -24,7 +24,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -66,7 +66,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_hfsm.c b/usr.sbin/atm/scspd/scsp_hfsm.c
index 8010290f8470..32ddde524fea 100644
--- a/usr.sbin/atm/scspd/scsp_hfsm.c
+++ b/usr.sbin/atm/scspd/scsp_hfsm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.4 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -58,7 +58,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.4 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_if.c b/usr.sbin/atm/scspd/scsp_if.c
index 9d88f0a50e30..47eadfe0f854 100644
--- a/usr.sbin/atm/scspd/scsp_if.c
+++ b/usr.sbin/atm/scspd/scsp_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_if.h b/usr.sbin/atm/scspd/scsp_if.h
index 844ee2c82135..53c6347650a2 100644
--- a/usr.sbin/atm/scspd/scsp_if.h
+++ b/usr.sbin/atm/scspd/scsp_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.h,v 1.2 1999/08/28 01:15:33 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_input.c b/usr.sbin/atm/scspd/scsp_input.c
index 2e3fbb0b6768..a2844a7b172f 100644
--- a/usr.sbin/atm/scspd/scsp_input.c
+++ b/usr.sbin/atm/scspd/scsp_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_input.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_input.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_log.c b/usr.sbin/atm/scspd/scsp_log.c
index 8b76c3edf35a..7774ab8fceb1 100644
--- a/usr.sbin/atm/scspd/scsp_log.c
+++ b/usr.sbin/atm/scspd/scsp_log.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_log.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -67,7 +67,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_log.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_msg.c b/usr.sbin/atm/scspd/scsp_msg.c
index 63e0e40a5031..9d50599b7e32 100644
--- a/usr.sbin/atm/scspd/scsp_msg.c
+++ b/usr.sbin/atm/scspd/scsp_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_msg.h b/usr.sbin/atm/scspd/scsp_msg.h
index bedea8aefb3f..bb0e1094ce3b 100644
--- a/usr.sbin/atm/scspd/scsp_msg.h
+++ b/usr.sbin/atm/scspd/scsp_msg.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.h,v 1.3 2002/05/16 23:57:37 arr Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_output.c b/usr.sbin/atm/scspd/scsp_output.c
index c2ea657b84dc..83968e39deb6 100644
--- a/usr.sbin/atm/scspd/scsp_output.c
+++ b/usr.sbin/atm/scspd/scsp_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_output.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_output.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_print.c b/usr.sbin/atm/scspd/scsp_print.c
index eb9d6f5d870d..cde820820eba 100644
--- a/usr.sbin/atm/scspd/scsp_print.c
+++ b/usr.sbin/atm/scspd/scsp_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_print.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_print.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_socket.c b/usr.sbin/atm/scspd/scsp_socket.c
index 3cfa294867b7..77b2d9270f36 100644
--- a/usr.sbin/atm/scspd/scsp_socket.c
+++ b/usr.sbin/atm/scspd/scsp_socket.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_socket.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_socket.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_subr.c b/usr.sbin/atm/scspd/scsp_subr.c
index 58a5abfbc007..56f898523aa5 100644
--- a/usr.sbin/atm/scspd/scsp_subr.c
+++ b/usr.sbin/atm/scspd/scsp_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_timer.c b/usr.sbin/atm/scspd/scsp_timer.c
index 82e49fc4a361..68b7cd5d68e8 100644
--- a/usr.sbin/atm/scspd/scsp_timer.c
+++ b/usr.sbin/atm/scspd/scsp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.3 1999/08/28 01:15:34 peter Exp $
  *
  */
 
@@ -57,7 +57,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.3 1999/08/28 01:15:34 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_var.h b/usr.sbin/atm/scspd/scsp_var.h
index fbbddc74e5e3..14ef9b4f6741 100644
--- a/usr.sbin/atm/scspd/scsp_var.h
+++ b/usr.sbin/atm/scspd/scsp_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_var.h,v 1.4 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scspd.8 b/usr.sbin/atm/scspd/scspd.8
index fd468db20d67..1613fd473a0d 100644
--- a/usr.sbin/atm/scspd/scspd.8
+++ b/usr.sbin/atm/scspd/scspd.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/atm/scspd/scspd.8,v 1.8 2005/02/09 18:04:40 ru Exp $
 .\"
 .Dd August 21, 1998
 .Dt SCSPD 8
diff --git a/usr.sbin/atm/scspd/scspd.c b/usr.sbin/atm/scspd/scspd.c
index 30d7015d90b3..fad9eeb26016 100644
--- a/usr.sbin/atm/scspd/scspd.c
+++ b/usr.sbin/atm/scspd/scspd.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.c,v 1.6 2004/05/24 13:21:24 stefanf Exp $
  *
  */
 
@@ -65,7 +65,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.c,v 1.6 2004/05/24 13:21:24 stefanf Exp $");
 #endif
 
 
diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile
index 82d78241545e..5371b2ba0b18 100644
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/authpf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/authpf/Makefile,v 1.3 2005/05/04 08:57:12 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/authpf
 .PATH:	${.CURDIR}/../../contrib/pf/pfctl
diff --git a/usr.sbin/bluetooth/Makefile b/usr.sbin/bluetooth/Makefile
index 23c03f7b6a36..3c6267d01d33 100644
--- a/usr.sbin/bluetooth/Makefile
+++ b/usr.sbin/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/09/08 02:28:35 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/Makefile,v 1.6 2004/01/25 21:33:58 emax Exp $
 
 SUBDIR= \
 	bcmfw \
diff --git a/usr.sbin/bluetooth/Makefile.inc b/usr.sbin/bluetooth/Makefile.inc
index c0e05cfa1da6..a86a900383ad 100644
--- a/usr.sbin/bluetooth/Makefile.inc
+++ b/usr.sbin/bluetooth/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/Makefile.inc,v 1.1 2003/10/12 22:04:22 emax Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 
diff --git a/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt b/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
index e3a235e0d82e..417d5c074866 100644
--- a/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
+++ b/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt,v 1.1 2003/05/10 22:03:45 julian Exp $
 
 BCM firmware version 2.15
 Copyright (c) 2000-2002 Broadcom Corporation
diff --git a/usr.sbin/bluetooth/bcmfw/Makefile b/usr.sbin/bluetooth/bcmfw/Makefile
index 2427cf419aee..bfc7af1da410 100644
--- a/usr.sbin/bluetooth/bcmfw/Makefile
+++ b/usr.sbin/bluetooth/bcmfw/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/08/14 20:05:58 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bcmfw/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		bcmfw
 MAN=		bcmfw.8
diff --git a/usr.sbin/bluetooth/bcmfw/README b/usr.sbin/bluetooth/bcmfw/README
index 0d769d8e9036..e71f5df17000 100644
--- a/usr.sbin/bluetooth/bcmfw/README
+++ b/usr.sbin/bluetooth/bcmfw/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/bluetooth/bcmfw/README,v 1.2 2003/05/11 02:19:10 julian Exp $
 
 This directory will eventually also contain copies of the broadcom firmware.
 
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.8 b/usr.sbin/bluetooth/bcmfw/bcmfw.8
index e79935070725..061f3d2752b0 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.8
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bcmfw.8,v 1.7 2003/05/21 00:33:40 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/bcmfw/bcmfw.8,v 1.7 2005/01/18 20:02:30 ru Exp $
 .\"
 .Dd March 31, 2003
 .Dt BCMFW 8
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.c b/usr.sbin/bluetooth/bcmfw/bcmfw.c
index cd4679de009d..84fb9ea976cc 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.c
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bcmfw.c,v 1.4 2003/04/27 19:28:09 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bcmfw/bcmfw.c,v 1.2 2004/06/25 23:14:06 imp Exp $
  *
  * Based on Linux BlueZ BlueFW-0.9 package
  *
diff --git a/usr.sbin/bluetooth/bt3cfw/Makefile b/usr.sbin/bluetooth/bt3cfw/Makefile
index 90bf7517253e..608aa10c3208 100644
--- a/usr.sbin/bluetooth/bt3cfw/Makefile
+++ b/usr.sbin/bluetooth/bt3cfw/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/08/14 20:06:00 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bt3cfw/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		bt3cfw
 MAN=		bt3cfw.8
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
index 54df178741fd..f32c4bc0b05e 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
+++ b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bt3cfw.8,v 1.4 2003/05/21 00:34:51 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/bt3cfw/bt3cfw.8,v 1.7 2005/01/18 20:02:30 ru Exp $
 .\"
 .Dd November 11, 2002
 .Dt BT3CFW 8
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.c b/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
index aadb6b6b6762..3c395e709891 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
+++ b/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bt3cfw.c,v 1.2 2003/05/21 22:40:29 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bt3cfw/bt3cfw.c,v 1.5 2004/04/09 23:58:53 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile b/usr.sbin/bluetooth/bthidcontrol/Makefile
index 6c9eafb735c1..4b70802e8cd8 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/Makefile,v 1.1 2004/04/10 00:18:00 emax Exp $
 
 .PATH:	${.CURDIR}/../bthidd
 
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
index 4f0cdc8fd0e0..511ffe699ac6 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bthidcontrol.8,v 1.1 2004/02/13 21:44:41 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8,v 1.3 2005/01/18 20:02:30 ru Exp $
 .\"
 .Dd February 13, 2004
 .Dt BTHIDCONTROL 8
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
index 21539e324dc1..1695640ba5ab 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidcontrol.c,v 1.2 2004/02/13 21:44:41 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
index 50ed2fa1a830..6e7ae724d74b 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidcontrol.h,v 1.1 2004/02/12 23:25:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #ifndef __BTHIDCONTROL_H__
diff --git a/usr.sbin/bluetooth/bthidcontrol/hid.c b/usr.sbin/bluetooth/bthidcontrol/hid.c
index 78b41050221d..e7ce8078eb9e 100644
--- a/usr.sbin/bluetooth/bthidcontrol/hid.c
+++ b/usr.sbin/bluetooth/bthidcontrol/hid.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hid.c,v 1.3 2004/02/17 22:14:57 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/hid.c,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/sdp.c b/usr.sbin/bluetooth/bthidcontrol/sdp.c
index e39c8caae548..f78fcc15071a 100644
--- a/usr.sbin/bluetooth/bthidcontrol/sdp.c
+++ b/usr.sbin/bluetooth/bthidcontrol/sdp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp.c,v 1.3 2004/02/17 22:14:57 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/sdp.c,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile
index a60a4e96163f..b15a7c217119 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile
+++ b/usr.sbin/bluetooth/bthidd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.3 2004/08/17 21:49:46 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bthidd/Makefile,v 1.4 2004/12/21 08:47:31 ru Exp $
 
 PROG=		bthidd
 #MAN=		bthidd.8 bthidd.conf.5
diff --git a/usr.sbin/bluetooth/bthidd/bthid_config.h b/usr.sbin/bluetooth/bthidd/bthid_config.h
index 6be7c7eaab86..abb3a3764700 100644
--- a/usr.sbin/bluetooth/bthidd/bthid_config.h
+++ b/usr.sbin/bluetooth/bthidd/bthid_config.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthid_config.h,v 1.3 2004/02/17 22:05:02 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthid_config.h,v 1.2 2004/11/18 18:05:15 emax Exp $
  */
 
 #ifndef _BTHID_CONFIG_H_
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.c b/usr.sbin/bluetooth/bthidd/bthidd.c
index 7340a0c17cd1..debb3c95460c 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.c
+++ b/usr.sbin/bluetooth/bthidd/bthidd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidd.c,v 1.7 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.c,v 1.3 2004/11/18 18:05:15 emax Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
index e23dc1252f95..88665066c2f0 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
+++ b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.conf.sample,v 1.2 2004/11/18 18:05:15 emax Exp $
 
 device {
 	bdaddr			00:50:f2:e5:68:84;
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.h b/usr.sbin/bluetooth/bthidd/bthidd.h
index d4ebbc6ebd95..b8cb075b8d20 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.h
+++ b/usr.sbin/bluetooth/bthidd/bthidd.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidd.h,v 1.6 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.h,v 1.2 2004/11/18 18:05:15 emax Exp $
  */
 
 #ifndef _BTHIDD_H_
diff --git a/usr.sbin/bluetooth/bthidd/client.c b/usr.sbin/bluetooth/bthidd/client.c
index cc611bdd3b7e..4a377db92f7b 100644
--- a/usr.sbin/bluetooth/bthidd/client.c
+++ b/usr.sbin/bluetooth/bthidd/client.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: client.c,v 1.6 2004/02/26 21:57:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/client.c,v 1.2 2004/11/18 18:05:15 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/hid.c b/usr.sbin/bluetooth/bthidd/hid.c
index 4495dbc5f9b1..a2834a873a1e 100644
--- a/usr.sbin/bluetooth/bthidd/hid.c
+++ b/usr.sbin/bluetooth/bthidd/hid.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hid.c,v 1.4 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/hid.c,v 1.2 2004/11/18 18:05:15 emax Exp $
  */
 
 #include <sys/consio.h>
diff --git a/usr.sbin/bluetooth/bthidd/kbd.c b/usr.sbin/bluetooth/bthidd/kbd.c
index 888dedc0798b..f4490cfcd7fc 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.c
+++ b/usr.sbin/bluetooth/bthidd/kbd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kbd.c,v 1.2 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/kbd.c,v 1.1 2004/11/18 18:05:15 emax Exp $
  */
 
 #include <sys/consio.h>
diff --git a/usr.sbin/bluetooth/bthidd/kbd.h b/usr.sbin/bluetooth/bthidd/kbd.h
index 06e2cafeb8e2..961c2db5aa57 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.h
+++ b/usr.sbin/bluetooth/bthidd/kbd.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kbd.h,v 1.2 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/kbd.h,v 1.1 2004/11/18 18:05:15 emax Exp $
  */
 
 #ifndef _KBD_H_
diff --git a/usr.sbin/bluetooth/bthidd/lexer.l b/usr.sbin/bluetooth/bthidd/lexer.l
index 93ad39434e59..8899c17cff5c 100644
--- a/usr.sbin/bluetooth/bthidd/lexer.l
+++ b/usr.sbin/bluetooth/bthidd/lexer.l
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $Id: lexer.l,v 1.2 2004/02/13 21:46:20 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/lexer.l,v 1.2 2004/11/18 18:05:15 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/bthidd/parser.y b/usr.sbin/bluetooth/bthidd/parser.y
index eda82f649652..add15d9c7ac0 100644
--- a/usr.sbin/bluetooth/bthidd/parser.y
+++ b/usr.sbin/bluetooth/bthidd/parser.y
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $Id: parser.y,v 1.4 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/parser.y,v 1.4 2005/05/18 23:03:44 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/server.c b/usr.sbin/bluetooth/bthidd/server.c
index ad2c82835f43..682501d2ff9a 100644
--- a/usr.sbin/bluetooth/bthidd/server.c
+++ b/usr.sbin/bluetooth/bthidd/server.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: server.c,v 1.7 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/server.c,v 1.3 2005/05/18 23:03:44 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/session.c b/usr.sbin/bluetooth/bthidd/session.c
index eefd98ae9603..cecb200d1aa7 100644
--- a/usr.sbin/bluetooth/bthidd/session.c
+++ b/usr.sbin/bluetooth/bthidd/session.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: session.c,v 1.2 2004/11/17 21:59:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/session.c,v 1.2 2004/11/18 18:05:15 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile b/usr.sbin/bluetooth/hccontrol/Makefile
index 592247e11ad9..25bf2eefe653 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile
+++ b/usr.sbin/bluetooth/hccontrol/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:06:17 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hccontrol/Makefile,v 1.3 2003/10/12 22:04:23 emax Exp $
 
 PROG=		hccontrol
 MAN=		hccontrol.8
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.8 b/usr.sbin/bluetooth/hccontrol/hccontrol.8
index c94516a8f7af..8a49f62b0ef2 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.8
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hccontrol.8,v 1.6 2003/08/06 21:26:38 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hccontrol/hccontrol.8,v 1.8 2005/01/18 20:02:30 ru Exp $
 .\"
 .Dd June 14, 2002
 .Dt HCCONTROL 8
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.c b/usr.sbin/bluetooth/hccontrol/hccontrol.c
index 0bf55837e804..3b4317b31483 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.c
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hccontrol.c,v 1.5 2003/09/05 00:38:24 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/hccontrol.c,v 1.3 2003/10/12 22:04:23 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.h b/usr.sbin/bluetooth/hccontrol/hccontrol.h
index 4424f7678a5d..47d4a66efbbf 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.h
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hccontrol.h,v 1.2 2003/05/19 17:29:29 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/hccontrol.h,v 1.4 2004/04/09 23:58:53 emax Exp $
  */
 
 #ifndef _HCCONTROL_H_
diff --git a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
index 38f77eb9ab63..5cf5e74159c1 100644
--- a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
+++ b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: host_controller_baseband.c,v 1.4 2003/08/18 19:19:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c,v 1.6 2004/08/05 16:32:41 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/info.c b/usr.sbin/bluetooth/hccontrol/info.c
index 12b685bc2296..1cffbf75486c 100644
--- a/usr.sbin/bluetooth/hccontrol/info.c
+++ b/usr.sbin/bluetooth/hccontrol/info.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: info.c,v 1.3 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/info.c,v 1.3 2003/10/12 22:04:23 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c
index 1558cc5adbd3..cc1928aabe3e 100644
--- a/usr.sbin/bluetooth/hccontrol/link_control.c
+++ b/usr.sbin/bluetooth/hccontrol/link_control.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: link_control.c,v 1.4 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/link_control.c,v 1.9 2005/01/04 20:13:48 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/link_policy.c b/usr.sbin/bluetooth/hccontrol/link_policy.c
index 67b32d5a0d61..134fcbea193b 100644
--- a/usr.sbin/bluetooth/hccontrol/link_policy.c
+++ b/usr.sbin/bluetooth/hccontrol/link_policy.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: link_policy.c,v 1.3 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/link_policy.c,v 1.6 2004/08/05 16:32:41 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/node.c b/usr.sbin/bluetooth/hccontrol/node.c
index 863d5162fd44..b627d20231f7 100644
--- a/usr.sbin/bluetooth/hccontrol/node.c
+++ b/usr.sbin/bluetooth/hccontrol/node.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: node.c,v 1.6 2003/07/22 21:14:02 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/node.c,v 1.3 2003/10/12 22:04:23 emax Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/hccontrol/send_recv.c b/usr.sbin/bluetooth/hccontrol/send_recv.c
index 5c2aea9456b2..2c67372bc7f4 100644
--- a/usr.sbin/bluetooth/hccontrol/send_recv.c
+++ b/usr.sbin/bluetooth/hccontrol/send_recv.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: send_recv.c,v 1.2 2003/05/21 22:40:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/send_recv.c,v 1.5 2004/04/09 23:58:53 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/status.c b/usr.sbin/bluetooth/hccontrol/status.c
index 33645765cbd4..0caf81465add 100644
--- a/usr.sbin/bluetooth/hccontrol/status.c
+++ b/usr.sbin/bluetooth/hccontrol/status.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: status.c,v 1.2 2003/05/21 22:40:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/status.c,v 1.5 2004/04/09 23:58:53 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/util.c b/usr.sbin/bluetooth/hccontrol/util.c
index d4c1687f4279..b6e62450e570 100644
--- a/usr.sbin/bluetooth/hccontrol/util.c
+++ b/usr.sbin/bluetooth/hccontrol/util.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: util.c,v 1.2 2003/05/19 17:29:29 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/util.c,v 1.5 2004/04/09 23:58:53 emax Exp $
  */
  
 #include <sys/param.h>
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile b/usr.sbin/bluetooth/hcsecd/Makefile
index e544ed4e6180..6f710647bd51 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile
+++ b/usr.sbin/bluetooth/hcsecd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.8 2003/08/14 20:06:20 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hcsecd/Makefile,v 1.4 2004/09/14 20:04:33 emax Exp $
 
 PROG=		hcsecd
 MAN=		hcsecd.8 hcsecd.conf.5
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.8 b/usr.sbin/bluetooth/hcsecd/hcsecd.8
index 001f1d4bd36a..1aa7804e7f15 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.8
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hcsecd.8,v 1.8 2003/09/08 18:54:20 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.8,v 1.5 2005/01/18 20:02:30 ru Exp $
 .\"
 .Dd November 16, 2002
 .Dt HCSECD 8
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.c b/usr.sbin/bluetooth/hcsecd/hcsecd.c
index a1b72a3b34ae..2ca2bdecf461 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.c
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hcsecd.c,v 1.6 2003/08/18 19:19:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.c,v 1.3 2004/04/09 23:58:53 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf b/usr.sbin/bluetooth/hcsecd/hcsecd.conf
index 127ce04b74d6..67344bf371e0 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.conf
@@ -1,6 +1,6 @@
 #
 # $Id: hcsecd.conf,v 1.1 2002/11/24 20:22:39 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.conf,v 1.1 2003/05/10 21:50:35 julian Exp $
 #
 # HCI security daemon configuration file
 #
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5 b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
index 189ca66606c5..6de5f2603daf 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hcsecd.conf.5,v 1.1 2003/05/26 22:49:23 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5,v 1.2 2004/06/13 18:03:40 ru Exp $
 .\"
 .Dd May 26, 2003
 .Dt HCSECD.CONF 5
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.h b/usr.sbin/bluetooth/hcsecd/hcsecd.h
index acfc8875a011..8e1292d2e595 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.h
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hcsecd.h,v 1.3 2003/09/08 18:54:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.h,v 1.3 2004/04/09 23:58:53 emax Exp $
  */
 
 #ifndef _HCSECD_H_
diff --git a/usr.sbin/bluetooth/hcsecd/lexer.l b/usr.sbin/bluetooth/hcsecd/lexer.l
index 2430d7e2982c..8669afdd0365 100644
--- a/usr.sbin/bluetooth/hcsecd/lexer.l
+++ b/usr.sbin/bluetooth/hcsecd/lexer.l
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $Id: lexer.l,v 1.1 2002/11/24 20:22:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/lexer.l,v 1.1 2003/05/10 21:50:35 julian Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/bluetooth/hcsecd/parser.y b/usr.sbin/bluetooth/hcsecd/parser.y
index 385bff257b3a..07c357c34c82 100644
--- a/usr.sbin/bluetooth/hcsecd/parser.y
+++ b/usr.sbin/bluetooth/hcsecd/parser.y
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $Id: parser.y,v 1.5 2003/06/07 21:22:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/parser.y,v 1.4 2004/09/14 20:04:33 emax Exp $
  */
 
 #include <sys/fcntl.h>
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile b/usr.sbin/bluetooth/hcseriald/Makefile
index ed0bf3243820..597bdc411c36 100644
--- a/usr.sbin/bluetooth/hcseriald/Makefile
+++ b/usr.sbin/bluetooth/hcseriald/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/08/14 20:06:21 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hcseriald/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		hcseriald
 MAN=		hcseriald.8
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.8 b/usr.sbin/bluetooth/hcseriald/hcseriald.8
index 111b28cc60b6..fb50b654e865 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.8
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hcseriald.8,v 1.3 2003/05/21 00:47:26 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hcseriald/hcseriald.8,v 1.6 2004/11/02 20:12:06 emax Exp $
 .\"
 .Dd June 14, 2002
 .Dt HCSERIALD 8
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.c b/usr.sbin/bluetooth/hcseriald/hcseriald.c
index ee8d19c7a995..6d16da585fe5 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.c
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hcseriald.c,v 1.3 2003/05/21 22:40:32 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcseriald/hcseriald.c,v 1.5 2004/11/02 20:12:06 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/l2control/Makefile b/usr.sbin/bluetooth/l2control/Makefile
index 847ff4ba97d6..ca573f71b56c 100644
--- a/usr.sbin/bluetooth/l2control/Makefile
+++ b/usr.sbin/bluetooth/l2control/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:06:22 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/l2control/Makefile,v 1.3 2003/10/12 22:04:23 emax Exp $
 
 PROG=		l2control
 MAN=		l2control.8
diff --git a/usr.sbin/bluetooth/l2control/l2cap.c b/usr.sbin/bluetooth/l2control/l2cap.c
index c23106c3db3f..cf2697faaff0 100644
--- a/usr.sbin/bluetooth/l2control/l2cap.c
+++ b/usr.sbin/bluetooth/l2control/l2cap.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2cap.c,v 1.5 2003/05/16 19:52:37 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2control/l2cap.c,v 1.3 2003/10/12 22:04:23 emax Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/l2control/l2control.8 b/usr.sbin/bluetooth/l2control/l2control.8
index 794b6a72a9a6..78756e98ca9d 100644
--- a/usr.sbin/bluetooth/l2control/l2control.8
+++ b/usr.sbin/bluetooth/l2control/l2control.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: l2control.8,v 1.5 2003/05/21 00:53:00 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/l2control/l2control.8,v 1.6 2005/01/17 07:44:37 ru Exp $
 .\"
 .Dd June 14, 2002
 .Dt L2CONTROL 8
diff --git a/usr.sbin/bluetooth/l2control/l2control.c b/usr.sbin/bluetooth/l2control/l2control.c
index 585021c98433..a1641a7506be 100644
--- a/usr.sbin/bluetooth/l2control/l2control.c
+++ b/usr.sbin/bluetooth/l2control/l2control.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2control.c,v 1.6 2003/09/05 00:38:25 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2control/l2control.c,v 1.3 2003/10/12 22:04:23 emax Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/bluetooth/l2control/l2control.h b/usr.sbin/bluetooth/l2control/l2control.h
index 43d456164be8..354bf0a10167 100644
--- a/usr.sbin/bluetooth/l2control/l2control.h
+++ b/usr.sbin/bluetooth/l2control/l2control.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2control.h,v 1.1 2002/11/24 20:22:41 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2control/l2control.h,v 1.2 2003/05/10 21:50:36 julian Exp $
  */
 
 #ifndef _L2CONTROL_H_
diff --git a/usr.sbin/bluetooth/l2ping/Makefile b/usr.sbin/bluetooth/l2ping/Makefile
index bc130e33aac9..92b4f0847669 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile
+++ b/usr.sbin/bluetooth/l2ping/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/08/14 20:06:24 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/l2ping/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		l2ping
 MAN=		l2ping.8
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.8 b/usr.sbin/bluetooth/l2ping/l2ping.8
index 477f4ecc1a70..1b2bee2ed8de 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.8
+++ b/usr.sbin/bluetooth/l2ping/l2ping.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: l2ping.8,v 1.3 2003/05/21 01:00:19 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/l2ping/l2ping.8,v 1.10 2005/01/18 20:02:31 ru Exp $
 .\"
 .Dd June 14, 2002
 .Dt L2PING 8
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.c b/usr.sbin/bluetooth/l2ping/l2ping.c
index d7e1b1e03fac..4fe4c76b936d 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.c
+++ b/usr.sbin/bluetooth/l2ping/l2ping.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2ping.c,v 1.5 2003/05/16 19:54:40 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2ping/l2ping.c,v 1.6.8.1 2005/09/12 16:09:23 emax Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
index adac64eca14a..73c0bded3d02 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/rfcomm_pppd/Makefile,v 1.2 2003/10/12 22:04:24 emax Exp $
 
 .PATH:	${.CURDIR}/../../../usr.bin/bluetooth/rfcomm_sppd
 
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
index c40246111581..8fbfe3014fa6 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: rfcomm_pppd.8,v 1.7 2003/09/07 18:32:11 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8,v 1.10.2.1 2005/08/18 15:01:25 keramida Exp $
 .\"
 .Dd February 4, 2003
 .Dt RFCOMM_PPPD 8
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
index 79c48c1fd1be..0e8b57089015 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_pppd.c,v 1.5 2003/09/07 18:32:11 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c,v 1.5 2004/08/05 16:32:41 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile b/usr.sbin/bluetooth/sdpcontrol/Makefile
index c0ec8d423f74..245c03a675ba 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2003/09/08 02:27:27 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/Makefile,v 1.1 2003/10/12 22:04:24 emax Exp $
 
 PROG=		sdpcontrol
 MAN=		sdpcontrol.8
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
index d1b9ae5d60fc..b4dc81444c22 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sdpcontrol.8,v 1.1 2003/09/08 02:27:27 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8,v 1.6 2005/07/09 19:04:43 markus Exp $
 .\"
 .Dd September 7, 2003
 .Dt SDPCONTROL 8
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
index fca2015c9c02..fd9657b6efd8 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdpcontrol.c,v 1.1 2003/09/08 02:27:27 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c,v 1.4 2004/08/05 16:32:41 emax Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
index 4a1ee76f383d..513c14bfdb1b 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdpcontrol.h,v 1.1 2003/09/08 02:27:27 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h,v 1.1 2003/10/12 22:04:24 emax Exp $
  */
 
 #ifndef __SDPCONTROL_H__
diff --git a/usr.sbin/bluetooth/sdpcontrol/search.c b/usr.sbin/bluetooth/sdpcontrol/search.c
index 5b197659e0ab..bc41e94826c3 100644
--- a/usr.sbin/bluetooth/sdpcontrol/search.c
+++ b/usr.sbin/bluetooth/sdpcontrol/search.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: search.c,v 1.2 2003/09/08 17:35:15 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/search.c,v 1.4 2005/05/27 19:11:33 emax Exp $
  */
 
 #include <netinet/in.h>
diff --git a/usr.sbin/bluetooth/sdpd/Makefile b/usr.sbin/bluetooth/sdpd/Makefile
index db97aa9a1230..9926a6e2c7ad 100644
--- a/usr.sbin/bluetooth/sdpd/Makefile
+++ b/usr.sbin/bluetooth/sdpd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2004/01/20 21:27:55 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/sdpd/Makefile,v 1.2 2005/01/05 18:37:37 emax Exp $
 
 PROG=		sdpd
 MAN=		sdpd.8
diff --git a/usr.sbin/bluetooth/sdpd/bgd.c b/usr.sbin/bluetooth/sdpd/bgd.c
index 70dda891072f..bcdd1b11adb8 100644
--- a/usr.sbin/bluetooth/sdpd/bgd.c
+++ b/usr.sbin/bluetooth/sdpd/bgd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bgd.c,v 1.4 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/bgd.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/sdpd/dun.c b/usr.sbin/bluetooth/sdpd/dun.c
index e7aeb78d679e..5fe69313ebe4 100644
--- a/usr.sbin/bluetooth/sdpd/dun.c
+++ b/usr.sbin/bluetooth/sdpd/dun.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: dun.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/dun.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ftrn.c b/usr.sbin/bluetooth/sdpd/ftrn.c
index bcebfc79807f..abad5671899f 100644
--- a/usr.sbin/bluetooth/sdpd/ftrn.c
+++ b/usr.sbin/bluetooth/sdpd/ftrn.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ftrn.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/ftrn.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/irmc.c b/usr.sbin/bluetooth/sdpd/irmc.c
index d28a1205be67..5496e5841929 100644
--- a/usr.sbin/bluetooth/sdpd/irmc.c
+++ b/usr.sbin/bluetooth/sdpd/irmc.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: irmc.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/irmc.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/irmc_command.c b/usr.sbin/bluetooth/sdpd/irmc_command.c
index 10dafe0b1ed2..2f8195744183 100644
--- a/usr.sbin/bluetooth/sdpd/irmc_command.c
+++ b/usr.sbin/bluetooth/sdpd/irmc_command.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: irmc_command.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/irmc_command.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/lan.c b/usr.sbin/bluetooth/sdpd/lan.c
index a5612eda64a7..2b65f340ad40 100644
--- a/usr.sbin/bluetooth/sdpd/lan.c
+++ b/usr.sbin/bluetooth/sdpd/lan.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: lan.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/lan.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <arpa/inet.h>
diff --git a/usr.sbin/bluetooth/sdpd/log.c b/usr.sbin/bluetooth/sdpd/log.c
index b03f7e141d23..4db28b61db45 100644
--- a/usr.sbin/bluetooth/sdpd/log.c
+++ b/usr.sbin/bluetooth/sdpd/log.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: log.c,v 1.1 2004/01/07 23:15:00 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/log.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/sdpd/log.h b/usr.sbin/bluetooth/sdpd/log.h
index 8c9ce778cfdd..6bcfd3e88916 100644
--- a/usr.sbin/bluetooth/sdpd/log.h
+++ b/usr.sbin/bluetooth/sdpd/log.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: log.h,v 1.1 2004/01/07 23:15:00 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/log.h,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #ifndef _LOG_H_
diff --git a/usr.sbin/bluetooth/sdpd/main.c b/usr.sbin/bluetooth/sdpd/main.c
index 1df3bf0d5887..7ccaf3becd4c 100644
--- a/usr.sbin/bluetooth/sdpd/main.c
+++ b/usr.sbin/bluetooth/sdpd/main.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: main.c,v 1.8 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/main.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/select.h>
diff --git a/usr.sbin/bluetooth/sdpd/opush.c b/usr.sbin/bluetooth/sdpd/opush.c
index 36359daa98ef..1b1efe188937 100644
--- a/usr.sbin/bluetooth/sdpd/opush.c
+++ b/usr.sbin/bluetooth/sdpd/opush.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: opush.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/opush.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/profile.c b/usr.sbin/bluetooth/sdpd/profile.c
index 3ba0159de8db..bf71459533ac 100644
--- a/usr.sbin/bluetooth/sdpd/profile.c
+++ b/usr.sbin/bluetooth/sdpd/profile.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: profile.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/profile.c,v 1.2 2004/07/28 07:15:44 kan Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/profile.h b/usr.sbin/bluetooth/sdpd/profile.h
index 0ca42211de11..a78d180a8763 100644
--- a/usr.sbin/bluetooth/sdpd/profile.h
+++ b/usr.sbin/bluetooth/sdpd/profile.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: profile.h,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/profile.h,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #ifndef _PROFILE_H_
diff --git a/usr.sbin/bluetooth/sdpd/provider.c b/usr.sbin/bluetooth/sdpd/provider.c
index b0f5347018f8..cd8ca2d91475 100644
--- a/usr.sbin/bluetooth/sdpd/provider.c
+++ b/usr.sbin/bluetooth/sdpd/provider.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: provider.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/provider.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/provider.h b/usr.sbin/bluetooth/sdpd/provider.h
index b48bc8dfe427..5edd5d32bf11 100644
--- a/usr.sbin/bluetooth/sdpd/provider.h
+++ b/usr.sbin/bluetooth/sdpd/provider.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: provider.h,v 1.6 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/provider.h,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #ifndef _PROVIDER_H_
diff --git a/usr.sbin/bluetooth/sdpd/sar.c b/usr.sbin/bluetooth/sdpd/sar.c
index 4fc25d92b118..189ae2268e5b 100644
--- a/usr.sbin/bluetooth/sdpd/sar.c
+++ b/usr.sbin/bluetooth/sdpd/sar.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sar.c,v 1.2 2004/01/08 23:46:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sar.c,v 1.2 2004/02/26 20:44:55 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/scr.c b/usr.sbin/bluetooth/sdpd/scr.c
index f6f482d55fbb..d762fbc8c859 100644
--- a/usr.sbin/bluetooth/sdpd/scr.c
+++ b/usr.sbin/bluetooth/sdpd/scr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: scr.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/scr.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sd.c b/usr.sbin/bluetooth/sdpd/sd.c
index 52f6c953bd09..683a831c7622 100644
--- a/usr.sbin/bluetooth/sdpd/sd.c
+++ b/usr.sbin/bluetooth/sdpd/sd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sd.c,v 1.4 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sd.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sdpd.8 b/usr.sbin/bluetooth/sdpd/sdpd.8
index 571e9088f680..7706d324ed23 100644
--- a/usr.sbin/bluetooth/sdpd/sdpd.8
+++ b/usr.sbin/bluetooth/sdpd/sdpd.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sdpd.8,v 1.1 2004/01/13 19:31:54 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/sdpd/sdpd.8,v 1.3.2.1 2005/08/18 15:01:25 keramida Exp $
 .\"
 .Dd January 13, 2004
 .Dt SDPD 8
diff --git a/usr.sbin/bluetooth/sdpd/server.c b/usr.sbin/bluetooth/sdpd/server.c
index 14b2041cf220..2d22b089a138 100644
--- a/usr.sbin/bluetooth/sdpd/server.c
+++ b/usr.sbin/bluetooth/sdpd/server.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: server.c,v 1.6 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/server.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/select.h>
diff --git a/usr.sbin/bluetooth/sdpd/server.h b/usr.sbin/bluetooth/sdpd/server.h
index 6f8f08860768..59e06fcfa88e 100644
--- a/usr.sbin/bluetooth/sdpd/server.h
+++ b/usr.sbin/bluetooth/sdpd/server.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: server.h,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/server.h,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #ifndef _SERVER_H_
diff --git a/usr.sbin/bluetooth/sdpd/sp.c b/usr.sbin/bluetooth/sdpd/sp.c
index 31a9585a25e1..79a1e868f107 100644
--- a/usr.sbin/bluetooth/sdpd/sp.c
+++ b/usr.sbin/bluetooth/sdpd/sp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sp.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sp.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/srr.c b/usr.sbin/bluetooth/sdpd/srr.c
index a1f3ded86339..4388f9fbb490 100644
--- a/usr.sbin/bluetooth/sdpd/srr.c
+++ b/usr.sbin/bluetooth/sdpd/srr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: srr.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/srr.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ssar.c b/usr.sbin/bluetooth/sdpd/ssar.c
index eac92351c824..f15234b203ef 100644
--- a/usr.sbin/bluetooth/sdpd/ssar.c
+++ b/usr.sbin/bluetooth/sdpd/ssar.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ssar.c,v 1.4 2004/01/12 22:54:31 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/ssar.c,v 1.2 2005/01/05 18:37:37 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ssr.c b/usr.sbin/bluetooth/sdpd/ssr.c
index ac27548575cc..54ada37f1410 100644
--- a/usr.sbin/bluetooth/sdpd/ssr.c
+++ b/usr.sbin/bluetooth/sdpd/ssr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ssr.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/ssr.c,v 1.3 2005/01/05 18:37:37 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sur.c b/usr.sbin/bluetooth/sdpd/sur.c
index 6d7f778aa51a..e30fde7b679a 100644
--- a/usr.sbin/bluetooth/sdpd/sur.c
+++ b/usr.sbin/bluetooth/sdpd/sur.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sur.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sur.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/uuid-private.h b/usr.sbin/bluetooth/sdpd/uuid-private.h
index db8d13ba76a5..c6d5b80c00f7 100644
--- a/usr.sbin/bluetooth/sdpd/uuid-private.h
+++ b/usr.sbin/bluetooth/sdpd/uuid-private.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: uuid-private.h,v 1.1 2004/12/09 18:20:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/uuid-private.h,v 1.1 2005/01/05 18:37:37 emax Exp $
  */
 
 #ifndef _UUID_PRIVATE_H_
diff --git a/usr.sbin/bluetooth/sdpd/uuid.c b/usr.sbin/bluetooth/sdpd/uuid.c
index 1989bc5e797d..f37a3c28fd1f 100644
--- a/usr.sbin/bluetooth/sdpd/uuid.c
+++ b/usr.sbin/bluetooth/sdpd/uuid.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: uuid.c,v 1.1 2004/12/09 18:20:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/uuid.c,v 1.1 2005/01/05 18:37:37 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index dc02cad7b41d..9d95a9232554 100644
--- a/usr.sbin/boot0cfg/Makefile
+++ b/usr.sbin/boot0cfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/boot0cfg/Makefile,v 1.8.12.1 2005/08/16 22:45:33 phk Exp $
 
 PROG=	boot0cfg
 MAN=	boot0cfg.8
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index 220e9cd4ceb1..dc929b19ac82 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -22,7 +22,7 @@
 .\" 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/usr.sbin/boot0cfg/boot0cfg.8,v 1.29 2005/04/07 20:04:55 scottl Exp $
 .\"
 .Dd February 21, 1999
 .Dt BOOT0CFG 8
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 6fd0587ba7cb..e2218be5c1eb 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/boot0cfg/boot0cfg.c,v 1.19.2.1 2005/08/16 22:45:33 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/usr.sbin/boot98cfg/Makefile b/usr.sbin/boot98cfg/Makefile
index 9b0e70316315..15aabc9e18f3 100644
--- a/usr.sbin/boot98cfg/Makefile
+++ b/usr.sbin/boot98cfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/boot98cfg/Makefile,v 1.5.14.1 2005/08/19 12:43:55 nyan Exp $
 
 PROG=	boot98cfg
 MAN=	boot98cfg.8
diff --git a/usr.sbin/boot98cfg/boot98cfg.8 b/usr.sbin/boot98cfg/boot98cfg.8
index 96ebbcdd0fd3..88bb5b86cbd1 100644
--- a/usr.sbin/boot98cfg/boot98cfg.8
+++ b/usr.sbin/boot98cfg/boot98cfg.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/usr.sbin/boot98cfg/boot98cfg.8,v 1.12 2005/01/18 20:02:31 ru Exp $
 .\"
 .Dd July 10, 2000
 .Dt BOOT98CFG 8
diff --git a/usr.sbin/boot98cfg/boot98cfg.c b/usr.sbin/boot98cfg/boot98cfg.c
index 45c79c99793d..78ff345e335f 100644
--- a/usr.sbin/boot98cfg/boot98cfg.c
+++ b/usr.sbin/boot98cfg/boot98cfg.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/boot98cfg/boot98cfg.c,v 1.5.8.1 2005/08/19 12:43:55 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/diskpc98.h>
diff --git a/usr.sbin/bootparamd/Makefile b/usr.sbin/bootparamd/Makefile
index c4e3361ecfab..ec5f7b51c0fb 100644
--- a/usr.sbin/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/Makefile,v 1.2 2001/07/20 06:19:38 obrien Exp $
 
 SUBDIR=	bootparamd callbootd
 
diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc
index 1e4d46f113a5..e55d2e469d6d 100644
--- a/usr.sbin/bootparamd/Makefile.inc
+++ b/usr.sbin/bootparamd/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	5.1 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/Makefile.inc,v 1.2 2001/07/20 06:19:38 obrien Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index af8a0dcffdc7..987269d1d292 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/bootparamd/Makefile,v 1.15 2004/11/13 20:40:31 bz Exp $
 
 PROG=	bootparamd
 MAN=	bootparams.5 bootparamd.8
diff --git a/usr.sbin/bootparamd/bootparamd/README b/usr.sbin/bootparamd/bootparamd/README
index 508ee0f63401..c32819a81f81 100644
--- a/usr.sbin/bootparamd/bootparamd/README
+++ b/usr.sbin/bootparamd/bootparamd/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/bootparamd/bootparamd/README,v 1.2 2001/07/23 12:05:27 kris Exp $
 
 This directory contains a version of the rpc.bootparamd, which have been 
 written using the Sun's RPC protocol for bootparamd. To use it you must 
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index 6048a8f11fa1..0c47bc27e295 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.8
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.8
@@ -1,5 +1,5 @@
 .\" @(#)bootparamd.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.15 2005/01/18 20:02:31 ru Exp $
 .Dd December 14, 2000
 .Dt BOOTPARAMD 8
 .Os
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 238686bcdc1d..1a10874f2b4c 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.c,v 1.12 2004/11/13 20:40:31 bz Exp $";
 #endif /* not lint */
 
 #ifdef YP
diff --git a/usr.sbin/bootparamd/bootparamd/bootparams.5 b/usr.sbin/bootparamd/bootparamd/bootparams.5
index c7c6785f47e1..ef575a90b0b9 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparams.5
+++ b/usr.sbin/bootparamd/bootparamd/bootparams.5
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: Id: bootparams.5,v 1.2 1994/10/03 19:26:13 gwr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparams.5,v 1.11 2001/01/24 12:22:39 ru Exp $
 .\"
 .Dd October 2, 1994
 .Dt BOOTPARAMS 5
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index 4468232e63a0..47984d802daf 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/bootparamd/main.c,v 1.10 2004/06/08 12:11:19 stefanf Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index 5a08d608a4c8..37d52013bebf 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/callbootd/Makefile,v 1.14 2005/02/09 12:17:52 stefanf Exp $
 
 PROG=	callbootd
 NO_MAN=
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index 5ed460857b54..1fc2523d11bd 100644
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/callbootd/callbootd.c,v 1.10 2003/06/20 04:54:27 jmg Exp $";
 #endif /* not lint */
 
 #include "bootparam_prot.h"
diff --git a/usr.sbin/bsnmpd/Makefile b/usr.sbin/bsnmpd/Makefile
index c948108f4f41..7e680329b7c8 100644
--- a/usr.sbin/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/Makefile,v 1.2 2005/03/14 17:32:16 harti Exp $
 
 SUBDIR=	gensnmptree	\
 	bsnmpd		\
diff --git a/usr.sbin/bsnmpd/Makefile.inc b/usr.sbin/bsnmpd/Makefile.inc
index 265f86d1ed55..d2fca0e3f5a5 100644
--- a/usr.sbin/bsnmpd/Makefile.inc
+++ b/usr.sbin/bsnmpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/Makefile.inc,v 1.1 2003/11/10 09:22:40 harti Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index 334d435921a7..eb2c9873b298 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.11 2005/04/26 16:49:15 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile b/usr.sbin/bsnmpd/gensnmptree/Makefile
index c97ee7d17fad..6fdd9e133bc1 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/gensnmptree/Makefile,v 1.3 2005/01/28 16:08:09 ru Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile
index 9d59b9e3b566..d7f0607ee391 100644
--- a/usr.sbin/bsnmpd/modules/Makefile
+++ b/usr.sbin/bsnmpd/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile,v 1.8 2005/03/14 22:16:39 philip Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd
 
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index eb4a8676c616..bc882b753ab9 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.9.2.1 2005/07/22 17:29:01 kensmith Exp $
 
 SHLIB_MAJOR=	4
 WARNS?=		6
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
index 83c4e5c26bbc..7c2083986bcb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
@@ -26,7 +26,7 @@
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --  
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt,v 1.1 2004/08/09 16:36:04 harti Exp $
 --
 -- Private Begemot MIB for ATM interfaces on FreeBSD
 --
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
index b3725ee81d52..a96938bc6d0d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/Makefile,v 1.3 2005/05/25 12:04:44 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def b/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
index 6cc61d012184..8cb00580a567 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def,v 1.1 2004/08/09 16:36:04 harti Exp $
 #
 # SNMP module for ATM hardware interfaces.
 #
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
index 525e80548a5f..10ecbc15aec0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c,v 1.1 2004/08/09 16:36:04 harti Exp $
  *
  * SNMP module for ATM hardware interfaces - FreeBSD/Ng specific part.
  */
diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
index c677c533ef35..95e8691394d3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile,v 1.5 2004/01/23 16:22:49 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
index 1896fe696ed8..6631658bba26 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
@@ -27,7 +27,7 @@
 -- 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/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt,v 1.2 2003/11/15 15:26:34 harti Exp $
 --
 -- Private MIB for netgraph part of Begemot SNMP daemon.
 --
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
index d0323154be59..68f6751d3183 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile,v 1.6 2004/01/24 20:12:30 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def b/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
index eff59ff15c7c..9f6eba9feb80 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
@@ -27,7 +27,7 @@
 # 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/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def,v 1.1 2003/11/10 09:17:34 harti Exp $
 #
 # Definition of the tree implemented by snmp_netgraph.
 #
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
index 6f89d68a6210..a5ae6d470a1e 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
@@ -27,7 +27,7 @@
 .\" 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/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3,v 1.8.2.1 2005/08/18 15:01:26 keramida Exp $
 .\"
 .Dd November 14, 2003
 .Dt snmp_netgraph 3
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
index 4eccc2363431..e839f3ce866e 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
@@ -27,7 +27,7 @@
  * 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/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c,v 1.5 2005/05/23 11:24:39 harti Exp $
  *
  * Netgraph interface for SNMPd.
  */
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h
index 21e553c30916..e716acf77115 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h
@@ -27,7 +27,7 @@
  * 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/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h,v 1.1 2003/11/10 09:17:34 harti Exp $
  *
  * Netgraph interface for SNMPd. Exported stuff.
  */
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
index 72ebdb711676..3babe02a0567 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
@@ -6,7 +6,7 @@
 -- this stuff is worth it, you can buy me a beer in return.   -Philip Paeps
 -- ----------------------------------------------------------------------------
 --
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt,v 1.1 2005/03/14 22:16:39 philip Exp $
 -- 
 
 BEGEMOT-PF-MIB DEFINITIONS ::= BEGIN
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
index 18860668f7d9..072b83700a14 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile,v 1.1 2005/03/14 22:16:39 philip Exp $
 # 
 # Author: Philip Paeps <philip@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
index 5f65cde39077..9b24779f8ed4 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c,v 1.5.2.1 2005/09/01 13:52:12 philip Exp $
  */
 
 #include <bsnmp/snmpmod.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
index 003a3ec9acb9..0997a631ae5a 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def,v 1.1 2005/03/14 22:16:39 philip Exp $
 #
 
 (1 internet
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 32cf99d5edac..89bd32fb3e03 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/btxld/Makefile,v 1.11 2004/06/22 17:05:37 obrien Exp $
 
 PROG=	btxld
 MAN=	btxld.8
diff --git a/usr.sbin/btxld/btx.h b/usr.sbin/btxld/btx.h
index 86f0ede0759c..0c41bf567898 100644
--- a/usr.sbin/btxld/btx.h
+++ b/usr.sbin/btxld/btx.h
@@ -23,7 +23,7 @@
  * 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/usr.sbin/btxld/btx.h,v 1.2 1999/08/28 01:15:41 peter Exp $
  */
 
 #ifndef _BTX_H_
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index 5b514f619cbd..304f55f87cff 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/usr.sbin/btxld/btxld.8
@@ -22,7 +22,7 @@
 .\" 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/usr.sbin/btxld/btxld.8,v 1.7 2005/01/18 20:02:32 ru Exp $
 .\"
 .Dd September 12, 1998
 .Dt BTXLD 8
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index 7acf842a1bea..ebab17b75fc6 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/btxld/btxld.c,v 1.9 2005/02/19 21:32:21 ru Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 2790d5a9d168..0cae7c5ce2b4 100644
--- a/usr.sbin/btxld/elfh.c
+++ b/usr.sbin/btxld/elfh.c
@@ -23,7 +23,7 @@
  * 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/usr.sbin/btxld/elfh.c,v 1.5 2004/06/22 17:05:37 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/btxld/elfh.h b/usr.sbin/btxld/elfh.h
index a4ab1348ae9b..89160aec1f51 100644
--- a/usr.sbin/btxld/elfh.h
+++ b/usr.sbin/btxld/elfh.h
@@ -23,7 +23,7 @@
  * 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/usr.sbin/btxld/elfh.h,v 1.3 2000/01/04 14:10:36 marcel Exp $
  */
 
 #include <sys/elf32.h>
diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile
index 6f032737e927..7d235c8d9f84 100644
--- a/usr.sbin/burncd/Makefile
+++ b/usr.sbin/burncd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/burncd/Makefile,v 1.8 2002/12/30 10:57:41 obrien Exp $
 
 PROG=	burncd
 MAN=	burncd.8
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index 18c1bc46a11b..de159ed6815e 100644
--- a/usr.sbin/burncd/burncd.8
+++ b/usr.sbin/burncd/burncd.8
@@ -25,7 +25,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/usr.sbin/burncd/burncd.8,v 1.37.2.1 2005/07/17 15:03:36 brueffer Exp $
 .\"
 .Dd May 2, 2005
 .Os
diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c
index 2800f5236be5..f849723e2af6 100644
--- a/usr.sbin/burncd/burncd.c
+++ b/usr.sbin/burncd/burncd.c
@@ -25,7 +25,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/usr.sbin/burncd/burncd.c,v 1.45 2005/05/13 20:06:44 ru Exp $
  */
 
 #include <unistd.h>
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
index 40addadc52ef..b968089a7700 100644
--- a/usr.sbin/cdcontrol/Makefile
+++ b/usr.sbin/cdcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cdcontrol/Makefile,v 1.10 2003/04/04 17:49:13 obrien Exp $
 
 PROG= cdcontrol
 
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index 7f1e94a37804..2d6564442113 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.40 2005/01/18 20:02:32 ru Exp $
 .\"
 .Dd May 8, 2002
 .Dt CDCONTROL 1
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index edebd65056e9..10f457889437 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.48 2004/04/01 16:37:46 dwmalone Exp $");
 
 #include <sys/cdio.h>
 #include <sys/cdrio.h>
diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
index 1c52f4680f83..683d4f35ba1b 100644
--- a/usr.sbin/chkgrp/Makefile
+++ b/usr.sbin/chkgrp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chkgrp/Makefile,v 1.7 2001/07/20 06:19:39 obrien Exp $
 
 PROG=	chkgrp
 MAN=	chkgrp.8
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 581fd64c37e0..1c997fe4bece 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -24,7 +24,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/usr.sbin/chkgrp/chkgrp.8,v 1.16 2005/06/14 12:26:34 ru Exp $
 .\"
 .Dd May 26, 2005
 .Dt CHKGRP 8
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index eca26afa60f2..d1db0f6878b9 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/chkgrp/chkgrp.c,v 1.9.2.2 2005/10/03 21:39:21 cperciva Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 63c5a22f05da..4d0bb5dc2a3e 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chown/Makefile,v 1.12 2003/04/25 09:02:59 johan Exp $
 
 PROG=	chown
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1
index 0b3a7892ab87..81544e6c6b06 100644
--- a/usr.sbin/chown/chgrp.1
+++ b/usr.sbin/chown/chgrp.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chgrp.1	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.19 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd April 25, 2003
 .Dt CHGRP 1
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index f617f7355504..98c6fb2ed945 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chown/chown.8,v 1.25 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd April 25, 2003
 .Dt CHOWN 8
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index 0918265840e5..4a180b53cd2a 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/chown/chown.c,v 1.29 2004/08/07 04:19:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
index d28de6668e26..681cde1defbb 100644
--- a/usr.sbin/chroot/Makefile
+++ b/usr.sbin/chroot/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chroot/Makefile,v 1.7 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	chroot
 MAN=	chroot.8
diff --git a/usr.sbin/chroot/chroot.8 b/usr.sbin/chroot/chroot.8
index d847175b32c7..26d55af05922 100644
--- a/usr.sbin/chroot/chroot.8
+++ b/usr.sbin/chroot/chroot.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chroot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chroot/chroot.8,v 1.13 2004/08/07 04:19:37 imp Exp $
 .\"
 .Dd June 7, 2003
 .Dt CHROOT 8
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index f33db7a24588..f8b8e4120260 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/chroot/chroot.c,v 1.11 2004/08/07 04:19:37 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile
index 23430a8bb1af..5ee9b32ef9d2 100644
--- a/usr.sbin/ckdist/Makefile
+++ b/usr.sbin/ckdist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ckdist/Makefile,v 1.5 2001/07/20 06:19:39 obrien Exp $
 
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
diff --git a/usr.sbin/ckdist/ckdist.1 b/usr.sbin/ckdist/ckdist.1
index 9a5f9f948a37..c40408254ce7 100644
--- a/usr.sbin/ckdist/ckdist.1
+++ b/usr.sbin/ckdist/ckdist.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1997 Robert Nordier
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ckdist/ckdist.1,v 1.10 2005/01/18 20:02:32 ru Exp $
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c
index 92bcd0d81a43..56b2776a903a 100644
--- a/usr.sbin/ckdist/ckdist.c
+++ b/usr.sbin/ckdist/ckdist.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ckdist/ckdist.c,v 1.5 2003/03/13 23:34:18 robert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index 6f6ecce21efa..5e4c4dde66c7 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,5 +1,5 @@
 # 	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/config/Makefile,v 1.34 2004/05/11 15:42:44 cognet Exp $
 
 PROG=	config
 MAN=	config.8
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index 3cc2d3182f59..8d936ee0843c 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)config.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/config/config.8,v 1.43.4.1 2005/10/28 19:20:53 jhb Exp $
 .\"
 .Dd December 16, 2004
 .Dt CONFIG 8
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 216aa93115b0..6d6120fee0cd 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/config.h,v 1.56.4.1 2005/10/28 19:20:53 jhb Exp $
  */
 
 /*
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 58d6b0cc4a37..c27b7784454e 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -66,7 +66,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.y	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/config.y,v 1.66.4.1 2005/10/28 19:20:53 jhb Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index b4906e3cc39b..e3f385e052a6 100644
--- a/usr.sbin/config/configvers.h
+++ b/usr.sbin/config/configvers.h
@@ -6,6 +6,6 @@
  * The numbering scheme is inspired by the sys/conf/newvers.sh RELDATE
  * and <osreldate.h> system.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.35.4.1 2005/10/28 19:20:53 jhb Exp $
  */
 #define	CONFIGVERS	600003
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 39f3bd692379..373aaaa27856 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lang.l	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/lang.l,v 1.41 2005/02/10 10:46:27 des Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 3ff15750fa3a..95bcb591e09d 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/main.c,v 1.64.4.1 2005/10/28 19:20:53 jhb Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 9babe783e5b1..e4f56bee32bd 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkheaders.c,v 1.30 2004/08/30 23:03:56 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index d4b2466e3158..1354bf5b8b9f 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.81 2004/08/30 23:03:56 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index 3e2dcf71b3eb..89db272ee044 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -33,7 +33,7 @@
 static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkoptions.c,v 1.32 2004/08/07 04:19:37 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile
index 62f853cd2673..13df35704fd8 100644
--- a/usr.sbin/cron/Makefile
+++ b/usr.sbin/cron/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/Makefile,v 1.2 2001/07/20 06:19:42 obrien Exp $
 
 SUBDIR=	lib cron crontab
 
diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc
index 900730b2e943..fbe0c53cd41c 100644
--- a/usr.sbin/cron/Makefile.inc
+++ b/usr.sbin/cron/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/Makefile.inc,v 1.4 2005/06/10 06:12:52 des Exp $
 
 LIBCRON= ${.OBJDIR}/../lib/libcron.a
 
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index d578da72daa5..dfe6ac7cf431 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/cron/Makefile,v 1.15 2001/07/20 06:19:40 obrien Exp $
 
 PROG=	cron
 MAN=	cron.8
diff --git a/usr.sbin/cron/cron/compat.h b/usr.sbin/cron/cron/compat.h
index 905c3aaf3bd9..956920f47773 100644
--- a/usr.sbin/cron/cron/compat.h
+++ b/usr.sbin/cron/cron/compat.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/compat.h,v 1.5 1999/08/28 01:15:49 peter Exp $
  */
 
 #ifndef __P
diff --git a/usr.sbin/cron/cron/config.h b/usr.sbin/cron/cron/config.h
index 6d77da27580d..5e7402822ea6 100644
--- a/usr.sbin/cron/cron/config.h
+++ b/usr.sbin/cron/cron/config.h
@@ -17,7 +17,7 @@
 
 /* config.h - configurables for Vixie Cron
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/config.h,v 1.8 1999/08/28 01:15:49 peter Exp $
  */
 
 #if !defined(_PATH_SENDMAIL)
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index eba639d81ffa..612b38ce6549 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/usr.sbin/cron/cron/cron.8
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/cron/cron.8,v 1.24 2005/02/13 23:45:51 ru Exp $
 .\"
 .Dd December 20, 1993
 .Dt CRON 8
diff --git a/usr.sbin/cron/cron/cron.c b/usr.sbin/cron/cron/cron.c
index 17c68949269a..5061b8705919 100644
--- a/usr.sbin/cron/cron/cron.c
+++ b/usr.sbin/cron/cron/cron.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/cron.c,v 1.15 2004/05/16 19:29:33 yar Exp $";
 #endif
 
 #define	MAIN_PROGRAM
diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h
index f7b2b7ac4877..1d29821cdb11 100644
--- a/usr.sbin/cron/cron/cron.h
+++ b/usr.sbin/cron/cron/cron.h
@@ -17,7 +17,7 @@
 
 /* cron.h - header for vixie's cron
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/cron.h,v 1.15 2004/05/16 19:29:33 yar Exp $
  *
  * vix 14nov88 [rest of log is in RCS]
  * vix 14jan87 [0 or 7 can be sunday; thanks, mwm@berkeley]
diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c
index 9ebf75d83999..e88bcb4e546c 100644
--- a/usr.sbin/cron/cron/database.c
+++ b/usr.sbin/cron/cron/database.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/database.c,v 1.8 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the log]
diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c
index 592ca50ebfc6..9299b350debf 100644
--- a/usr.sbin/cron/cron/do_command.c
+++ b/usr.sbin/cron/cron/do_command.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/do_command.c,v 1.22 2004/05/16 19:29:33 yar Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/job.c b/usr.sbin/cron/cron/job.c
index 6d1b1af6e474..3b9360d7cd60 100644
--- a/usr.sbin/cron/cron/job.c
+++ b/usr.sbin/cron/cron/job.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/job.c,v 1.6 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/pathnames.h b/usr.sbin/cron/cron/pathnames.h
index ba91bfdc61f9..0af56984c1e5 100644
--- a/usr.sbin/cron/cron/pathnames.h
+++ b/usr.sbin/cron/cron/pathnames.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/pathnames.h,v 1.5 1999/08/28 01:15:50 peter Exp $
  */
 
 #if (defined(BSD)) && (BSD >= 199103) || defined(__linux) || defined(AIX)
diff --git a/usr.sbin/cron/cron/popen.c b/usr.sbin/cron/cron/popen.c
index 806676da4429..272bf6a26418 100644
--- a/usr.sbin/cron/cron/popen.c
+++ b/usr.sbin/cron/cron/popen.c
@@ -28,7 +28,7 @@
 static char sccsid[] = "@(#)popen.c	5.7 (Berkeley) 2/14/89";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/popen.c,v 1.12 2002/02/06 02:00:07 bbraun Exp $";
 #endif /* not lint */
 
 #include "cron.h"
diff --git a/usr.sbin/cron/cron/user.c b/usr.sbin/cron/cron/user.c
index 16fd61723a86..7d43eed6b6b5 100644
--- a/usr.sbin/cron/cron/user.c
+++ b/usr.sbin/cron/cron/user.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/user.c,v 1.8 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 /* vix 26jan87 [log is in RCS file]
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index 6b9486dc1500..663ec2f85077 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/crontab/Makefile,v 1.14 2004/11/03 18:01:21 ru Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index b634d314a64d..93b659342826 100644
--- a/usr.sbin/cron/crontab/crontab.1
+++ b/usr.sbin/cron/crontab/crontab.1
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.1,v 1.15 2005/01/18 20:02:33 ru Exp $
 .\"
 .Dd December 29, 1993
 .Dt CRONTAB 1
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index 7ae8c2acd0e7..67735c7cdd9f 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.27.2.1 2005/08/04 19:58:48 brueffer Exp $
 .\"
 .Dd July 31, 2005
 .Dt CRONTAB 5
diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c
index 5d61ea71ba46..7eec7459d530 100644
--- a/usr.sbin/cron/crontab/crontab.c
+++ b/usr.sbin/cron/crontab/crontab.c
@@ -18,7 +18,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/crontab/crontab.c,v 1.22 2004/09/14 19:01:19 dds Exp $";
 #endif
 
 /* crontab - install and manage per-user crontab files
diff --git a/usr.sbin/cron/doc/CONVERSION b/usr.sbin/cron/doc/CONVERSION
index f30df7d19750..1d679c98bebe 100644
--- a/usr.sbin/cron/doc/CONVERSION
+++ b/usr.sbin/cron/doc/CONVERSION
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/CONVERSION,v 1.5 2001/02/06 11:21:45 asmodai Exp $
 
 Conversion of BSD 4.[23] crontab files:
 
diff --git a/usr.sbin/cron/doc/FEATURES b/usr.sbin/cron/doc/FEATURES
index 821d1f3a3af2..76e1b6f081e0 100644
--- a/usr.sbin/cron/doc/FEATURES
+++ b/usr.sbin/cron/doc/FEATURES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/FEATURES,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 Features of Vixie's cron relative to BSD 4.[23] and SysV crons:
 
diff --git a/usr.sbin/cron/doc/INSTALL b/usr.sbin/cron/doc/INSTALL
index 7f4c9974da64..fd49df3cc285 100644
--- a/usr.sbin/cron/doc/INSTALL
+++ b/usr.sbin/cron/doc/INSTALL
@@ -15,7 +15,7 @@
  * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
  */
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/INSTALL,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 Read the comments at the top of the Makefile, then edit the area marked
 'configurable stuff'.
diff --git a/usr.sbin/cron/doc/MAIL b/usr.sbin/cron/doc/MAIL
index 3549e94d575a..461fa420a785 100644
--- a/usr.sbin/cron/doc/MAIL
+++ b/usr.sbin/cron/doc/MAIL
@@ -3,7 +3,7 @@
   version of cron.  it is presented here for its entertainment value.
   --vix ]
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/MAIL,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 From ptsfa!lll-crg!ames!acornrc!bob Wed Dec 31 10:07:08 1986
 Date: Wed, 31 Dec 86 08:59:31 pst
diff --git a/usr.sbin/cron/doc/Makefile.vixie b/usr.sbin/cron/doc/Makefile.vixie
index 8df1301c689d..de40c702e818 100644
--- a/usr.sbin/cron/doc/Makefile.vixie
+++ b/usr.sbin/cron/doc/Makefile.vixie
@@ -17,7 +17,7 @@
 
 # Makefile for vixie's cron
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/doc/Makefile.vixie,v 1.5 1999/08/28 01:15:53 peter Exp $
 #
 # vix 03mar88 [moved to RCS, rest of log is in there]
 # vix 30mar87 [goodbye, time.c; hello, getopt]
diff --git a/usr.sbin/cron/doc/README b/usr.sbin/cron/doc/README
index eaced9e65d94..2a5ccd667995 100644
--- a/usr.sbin/cron/doc/README
+++ b/usr.sbin/cron/doc/README
@@ -69,4 +69,4 @@ have to go edit a couple of files... So, here's the checklist:
 	if you like it, change your /etc/{rc,rc.local} to use it instead of
 		the old one.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/README,v 1.4 1999/08/28 01:15:53 peter Exp $
diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile
index d11c511beec6..03eac4e193b5 100644
--- a/usr.sbin/cron/lib/Makefile
+++ b/usr.sbin/cron/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/lib/Makefile,v 1.7 2004/10/24 15:33:02 ru Exp $
 
 LIB=	cron
 INTERNALLIB=
diff --git a/usr.sbin/cron/lib/compat.c b/usr.sbin/cron/lib/compat.c
index 96860128882f..6bf92fd3d39f 100644
--- a/usr.sbin/cron/lib/compat.c
+++ b/usr.sbin/cron/lib/compat.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/cron/lib/compat.c,v 1.7 2000/12/09 09:35:44 obrien Exp $";
 #endif
 
 /* vix 30dec93 [broke this out of misc.c - see RCS log for history]
diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c
index 216e837a61b5..aa64c4f1478e 100644
--- a/usr.sbin/cron/lib/entry.c
+++ b/usr.sbin/cron/lib/entry.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/entry.c,v 1.16 2005/02/14 14:09:21 delphij Exp $";
 #endif
 
 /* vix 26jan87 [RCS'd; rest of log is in RCS file]
diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c
index fd358176b124..5abeddea42a6 100644
--- a/usr.sbin/cron/lib/env.c
+++ b/usr.sbin/cron/lib/env.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/env.c,v 1.12 2003/02/10 11:20:58 thomas Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/lib/misc.c b/usr.sbin/cron/lib/misc.c
index 5f6b89f2cec5..f390139390ba 100644
--- a/usr.sbin/cron/lib/misc.c
+++ b/usr.sbin/cron/lib/misc.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/misc.c,v 1.12 2005/02/09 13:02:43 stefanf Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the rest of the log]
diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile
index 6bf600fce66b..27da39fc6d98 100644
--- a/usr.sbin/crunch/Makefile
+++ b/usr.sbin/crunch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/Makefile,v 1.2 2001/07/20 06:19:43 obrien Exp $
 
 SUBDIR=	crunchgen crunchide
 
diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc
index f8ffe675db6e..0b3b5431dcfa 100644
--- a/usr.sbin/crunch/Makefile.inc
+++ b/usr.sbin/crunch/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/Makefile.inc,v 1.2 2001/07/20 06:19:43 obrien Exp $
 
 # modify to taste
 BINDIR?= /usr/bin
diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile
index 8d0a78b19027..e170394604ec 100644
--- a/usr.sbin/crunch/crunchgen/Makefile
+++ b/usr.sbin/crunch/crunchgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/crunchgen/Makefile,v 1.6 2001/07/20 06:19:42 obrien Exp $
 
 PROG=	crunchgen
 SRCS=	crunchgen.c crunched_skel.c
diff --git a/usr.sbin/crunch/crunchgen/crunched_main.c b/usr.sbin/crunch/crunchgen/crunched_main.c
index 2cf957670113..49bbe612ed8a 100644
--- a/usr.sbin/crunch/crunchgen/crunched_main.c
+++ b/usr.sbin/crunch/crunchgen/crunched_main.c
@@ -23,7 +23,7 @@
  *			   Computer Science Department
  *			   University of Maryland at College Park
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/crunch/crunchgen/crunched_main.c,v 1.8 2002/08/09 02:39:38 gshapiro Exp $
  */
 /*
  * crunched_main.c - main program for crunched binaries, it branches to a
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index 4333866ae1c5..60a55b55db9e 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -22,7 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.28 2002/05/30 07:51:22 ru Exp $
 .\"
 .Dd November 16, 2000
 .Dt CRUNCHGEN 1
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index ff8b6eca6119..7a8f2e5e0d29 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -23,7 +23,7 @@
  *			   Computer Science Department
  *			   University of Maryland at College Park
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.c,v 1.35 2005/01/20 10:49:03 ru Exp $
  */
 /*
  * ========================================================================
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile
index 945ed5b2f1e4..810ca5a3d67b 100644
--- a/usr.sbin/crunch/crunchide/Makefile
+++ b/usr.sbin/crunch/crunchide/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/crunchide/Makefile,v 1.7 2003/06/03 01:37:32 peter Exp $
 
 PROG=   crunchide
 SRCS=	crunchide.c
diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1
index ef9947dae56c..f5516751e595 100644
--- a/usr.sbin/crunch/crunchide/crunchide.1
+++ b/usr.sbin/crunch/crunchide/crunchide.1
@@ -22,7 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/crunch/crunchide/crunchide.1,v 1.12 2004/07/02 23:12:40 ru Exp $
 .\"
 .Dd June 14, 1994
 .Dt CRUNCHIDE 1
diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c
index f50d3e5075c4..c9c1d1d1a6f6 100644
--- a/usr.sbin/crunch/crunchide/crunchide.c
+++ b/usr.sbin/crunch/crunchide/crunchide.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: crunchide.c,v 1.8 1997/11/01 06:51:45 lukem Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/crunch/crunchide/crunchide.c,v 1.10 2002/05/25 13:39:20 ru Exp $ */
 /*
  * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 University of Maryland
diff --git a/usr.sbin/crunch/crunchide/exec_aout.c b/usr.sbin/crunch/crunchide/exec_aout.c
index a608c2331666..d78fad7ad18c 100644
--- a/usr.sbin/crunch/crunchide/exec_aout.c
+++ b/usr.sbin/crunch/crunchide/exec_aout.c
@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: exec_aout.c,v 1.6 1997/08/02 21:30:17 perry Exp $");
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/crunch/crunchide/exec_aout.c,v 1.5 2004/06/22 17:05:38 obrien Exp $");
 #endif
  
 #include <unistd.h>
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c
index 5558b1c8088e..f10a4ba295d6 100644
--- a/usr.sbin/crunch/crunchide/exec_elf32.c
+++ b/usr.sbin/crunch/crunchide/exec_elf32.c
@@ -34,7 +34,7 @@
 __RCSID("$NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $");
 #endif
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/crunch/crunchide/exec_elf32.c,v 1.14 2004/06/06 16:01:36 cognet Exp $");
  
 #ifndef ELFSIZE
 #define ELFSIZE         32
diff --git a/usr.sbin/crunch/crunchide/extern.h b/usr.sbin/crunch/crunchide/extern.h
index 4200bc3d4022..50eb27d47bc1 100644
--- a/usr.sbin/crunch/crunchide/extern.h
+++ b/usr.sbin/crunch/crunchide/extern.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: extern.h,v 1.5 1998/05/06 13:16:57 mycroft Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/crunch/crunchide/extern.h,v 1.4 2002/05/25 13:39:20 ru Exp $ */
 
 /*
  * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile
index 6dd49acc1a15..abb6984af5f1 100644
--- a/usr.sbin/crunch/examples/Makefile
+++ b/usr.sbin/crunch/examples/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/Makefile,v 1.7 2004/12/21 08:47:31 ru Exp $
 
 CRUNCHED=	fixit
 
diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf
index 1fb93856c7f1..d9c4853acf67 100644
--- a/usr.sbin/crunch/examples/filesystem.conf
+++ b/usr.sbin/crunch/examples/filesystem.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/filesystem.conf,v 1.8 1999/08/28 01:15:57 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin
 srcdirs /usr/src/sbin/i386
diff --git a/usr.sbin/crunch/examples/kcopy.conf b/usr.sbin/crunch/examples/kcopy.conf
index 3284e868c51b..f86366bc99b8 100644
--- a/usr.sbin/crunch/examples/kcopy.conf
+++ b/usr.sbin/crunch/examples/kcopy.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/kcopy.conf,v 1.7 1999/08/28 01:15:57 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin
 
diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf
index f8590ae5f712..eb2399942dad 100644
--- a/usr.sbin/crunch/examples/really-big.conf
+++ b/usr.sbin/crunch/examples/really-big.conf
@@ -5,7 +5,7 @@
 #
 #       This produces a 4608000 byte binary.  Pretty sick and twisted, eh?
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/really-big.conf,v 1.5 2001/06/01 11:25:40 ru Exp $
 #
 
 # =========================================================================
diff --git a/usr.sbin/ctm/Makefile b/usr.sbin/ctm/Makefile
index 630aab0940dd..a1e600ce8dbc 100644
--- a/usr.sbin/ctm/Makefile
+++ b/usr.sbin/ctm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile,v 1.7 1999/08/28 01:15:57 peter Exp $
 
 SUBDIR=	ctm ctm_rmail ctm_smail ctm_dequeue
 
diff --git a/usr.sbin/ctm/Makefile.inc b/usr.sbin/ctm/Makefile.inc
index c6c2c5aebdff..49b7f433b816 100644
--- a/usr.sbin/ctm/Makefile.inc
+++ b/usr.sbin/ctm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile.inc,v 1.4 1999/08/28 01:15:58 peter Exp $
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/ctm/README b/usr.sbin/ctm/README
index 94c779afcf85..2fdf4b734678 100644
--- a/usr.sbin/ctm/README
+++ b/usr.sbin/ctm/README
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/README,v 1.10 2002/03/25 14:12:09 phk Exp $
 #
 
 What will I not find in this file ?
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
index c0cf79a64d92..853eeabecd9e 100644
--- a/usr.sbin/ctm/ctm/Makefile
+++ b/usr.sbin/ctm/ctm/Makefile
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm/Makefile,v 1.18 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	ctm
 MAN=	ctm.1 ctm.5
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index 732b0b9a9685..77fddf939193 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.29 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index 678837e6182e..e73b76d2987a 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.5,v 1.18 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index 0ea4895ca401..ce4bf8ca724d 100644
--- a/usr.sbin/ctm/ctm/ctm.c
+++ b/usr.sbin/ctm/ctm/ctm.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm.c,v 1.21 2002/03/25 13:53:29 phk Exp $
  *
  * This is the client program of 'CTM'.  It will apply a CTM-patch to a
  * collection of files.
diff --git a/usr.sbin/ctm/ctm/ctm.h b/usr.sbin/ctm/ctm/ctm.h
index b733539bbd97..3c8138cf0afe 100644
--- a/usr.sbin/ctm/ctm/ctm.h
+++ b/usr.sbin/ctm/ctm/ctm.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm.h,v 1.18 2003/04/07 08:09:53 mckay Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c
index e3ec464030e2..90d734879ca7 100644
--- a/usr.sbin/ctm/ctm/ctm_ed.c
+++ b/usr.sbin/ctm/ctm/ctm_ed.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_ed.c,v 1.11 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_input.c b/usr.sbin/ctm/ctm/ctm_input.c
index 32166d311f12..d91a72900899 100644
--- a/usr.sbin/ctm/ctm/ctm_input.c
+++ b/usr.sbin/ctm/ctm/ctm_input.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_input.c,v 1.10 2003/04/07 08:09:53 mckay Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c
index 026a3204a44a..f0de3c1c6104 100644
--- a/usr.sbin/ctm/ctm/ctm_pass1.c
+++ b/usr.sbin/ctm/ctm/ctm_pass1.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass1.c,v 1.17 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c
index a0b857ab5dc0..9bc94faf62ba 100644
--- a/usr.sbin/ctm/ctm/ctm_pass2.c
+++ b/usr.sbin/ctm/ctm/ctm_pass2.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass2.c,v 1.20 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c
index 34c6d87c1d53..2f0d4a51a975 100644
--- a/usr.sbin/ctm/ctm/ctm_pass3.c
+++ b/usr.sbin/ctm/ctm/ctm_pass3.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass3.c,v 1.20 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_passb.c b/usr.sbin/ctm/ctm/ctm_passb.c
index ee3a69c5fbca..87f9e87dbeec 100644
--- a/usr.sbin/ctm/ctm/ctm_passb.c
+++ b/usr.sbin/ctm/ctm/ctm_passb.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Joseph Koshy
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_passb.c,v 1.6 2001/05/06 03:03:44 kris Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c
index 66389431d7e3..02bd536b74e6 100644
--- a/usr.sbin/ctm/ctm/ctm_syntax.c
+++ b/usr.sbin/ctm/ctm/ctm_syntax.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_syntax.c,v 1.11 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile
index 07a234f0599d..361331d25816 100644
--- a/usr.sbin/ctm/ctm_dequeue/Makefile
+++ b/usr.sbin/ctm/ctm_dequeue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm_dequeue/Makefile,v 1.5 2004/12/21 08:47:31 ru Exp $
 
 .PATH: ${.CURDIR}/../ctm_rmail
 
diff --git a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
index 783fd3f4a1a6..bb635b70b5d6 100644
--- a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
+++ b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c,v 1.11 2002/09/21 01:28:40 wollman Exp $
  */
 
 /*
diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile
index e2052b9228c7..b42349dab1ba 100644
--- a/usr.sbin/ctm/ctm_rmail/Makefile
+++ b/usr.sbin/ctm/ctm_rmail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm_rmail/Makefile,v 1.8 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	ctm_rmail
 MLINKS=	ctm_rmail.1 ctm_smail.1 \
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 5476e491f4ef..df20531adc6c 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -5,7 +5,7 @@
 .\"
 .\" Author: Stephen McKay
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.32 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
index a46a58aa8734..9ef5b948ff81 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
@@ -9,7 +9,7 @@
  * In return you should think about all the nice people who give away software.
  * Maybe you should write some free software too.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.c,v 1.17 2002/01/22 22:54:52 iedowse Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/ctm_rmail/error.c b/usr.sbin/ctm/ctm_rmail/error.c
index 56d3dc68d5f7..b755b5d9fb2f 100644
--- a/usr.sbin/ctm/ctm_rmail/error.c
+++ b/usr.sbin/ctm/ctm_rmail/error.c
@@ -14,7 +14,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ctm/ctm_rmail/error.c,v 1.3 2001/05/06 03:03:45 kris Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/ctm_rmail/error.h b/usr.sbin/ctm/ctm_rmail/error.h
index c631b6712ccb..ed71efb217f8 100644
--- a/usr.sbin/ctm/ctm_rmail/error.h
+++ b/usr.sbin/ctm/ctm_rmail/error.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ctm/ctm_rmail/error.h,v 1.2 2001/05/06 03:03:45 kris Exp $ */
 
 extern	void	err_set_log(char *log_file);
 extern	void	err_prog_name(char *name);
diff --git a/usr.sbin/ctm/ctm_rmail/options.h b/usr.sbin/ctm/ctm_rmail/options.h
index 86c1247b6487..7ba029607b68 100644
--- a/usr.sbin/ctm/ctm_rmail/options.h
+++ b/usr.sbin/ctm/ctm_rmail/options.h
@@ -49,7 +49,7 @@
  * Based on recollection of the original options.h produced at the University
  * of Queensland by Ross Patterson (and possibly others).
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_rmail/options.h,v 1.6 2002/04/22 13:44:43 des Exp $
  */
 
 static char *O_usage;
diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile
index 980e9bf02d3e..40d407ee86a4 100644
--- a/usr.sbin/ctm/ctm_smail/Makefile
+++ b/usr.sbin/ctm/ctm_smail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm_smail/Makefile,v 1.6 2004/12/21 08:47:31 ru Exp $
 
 .PATH: ${.CURDIR}/../ctm_rmail
 
diff --git a/usr.sbin/ctm/ctm_smail/ctm_smail.c b/usr.sbin/ctm/ctm_smail/ctm_smail.c
index a0dc03c8f59d..8ca090d10e81 100644
--- a/usr.sbin/ctm/ctm_smail/ctm_smail.c
+++ b/usr.sbin/ctm/ctm_smail/ctm_smail.c
@@ -11,7 +11,7 @@
  * In return you should think about all the nice people who give away software.
  * Maybe you should write some free software too.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_smail/ctm_smail.c,v 1.13 2003/07/13 06:38:13 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile
index cefd70448c68..262787b1b952 100644
--- a/usr.sbin/ctm/mkCTM/Makefile
+++ b/usr.sbin/ctm/mkCTM/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/Makefile,v 1.9 2005/01/28 16:08:10 ru Exp $
 
 PROG=	mkctm
 NO_MAN=
diff --git a/usr.sbin/ctm/mkCTM/dequeue b/usr.sbin/ctm/mkCTM/dequeue
index 697ec0b5be85..e24dd827c128 100755
--- a/usr.sbin/ctm/mkCTM/dequeue
+++ b/usr.sbin/ctm/mkCTM/dequeue
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/dequeue,v 1.4 1999/08/28 01:16:03 peter Exp $
 
 L=/home/ctm/log.dequeue
 /usr/sbin/ctm_dequeue -n 1 -l $L /home/ctm/queue/ctm-cvs-cur
diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM
index 02b154427e9a..1bad689b9826 100644
--- a/usr.sbin/ctm/mkCTM/mkCTM
+++ b/usr.sbin/ctm/mkCTM/mkCTM
@@ -1,6 +1,6 @@
 #!/usr/local/bin/tclsh7.4
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/mkCTM,v 1.21 2003/01/01 18:49:01 schweikh Exp $
 
 #############################################################################
 ### Do we already have this delta ?
diff --git a/usr.sbin/ctm/mkCTM/mkctm.c b/usr.sbin/ctm/mkCTM/mkctm.c
index d2c73e20809a..2693a6995318 100644
--- a/usr.sbin/ctm/mkCTM/mkctm.c
+++ b/usr.sbin/ctm/mkCTM/mkctm.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ctm/mkCTM/mkctm.c,v 1.13 2004/01/26 04:27:22 mckay Exp $ */
 
 /* Still missing:
  *
@@ -14,7 +14,7 @@
  *	dir1		"Soll"
  *	dir2		"Ist"
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/mkCTM/mkctm.c,v 1.13 2004/01/26 04:27:22 mckay Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile
index 34803934d623..e3ace45c9b4e 100644
--- a/usr.sbin/daemon/Makefile
+++ b/usr.sbin/daemon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/daemon/Makefile,v 1.2 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	daemon
 MAN=	daemon.8
diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8
index 74b5b81bc874..c233c188e2f0 100644
--- a/usr.sbin/daemon/daemon.8
+++ b/usr.sbin/daemon/daemon.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/daemon/daemon.8,v 1.6 2005/01/17 07:44:39 ru Exp $
 .\"
 .Dd August 30, 2001
 .Dt DAEMON 8
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index b30a7f40e0b9..223ad4856d89 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/daemon/daemon.c,v 1.3 2004/06/02 06:48:13 phk Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/dconschat/Makefile b/usr.sbin/dconschat/Makefile
index 47efe5274be1..86a4d272120f 100644
--- a/usr.sbin/dconschat/Makefile
+++ b/usr.sbin/dconschat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dconschat/Makefile,v 1.2 2005/01/27 14:52:46 delphij Exp $
 
 PROG=	dconschat
 MAN=	dconschat.8
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index 1feebd881ed4..590861b5cb85 100644
--- a/usr.sbin/dconschat/dconschat.8
+++ b/usr.sbin/dconschat/dconschat.8
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dconschat/dconschat.8,v 1.6 2005/01/18 20:02:33 ru Exp $
 .\"
 .\"
 .Dd February 11, 2003
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c
index e7dc004088c7..265016bf4395 100644
--- a/usr.sbin/dconschat/dconschat.c
+++ b/usr.sbin/dconschat/dconschat.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dconschat.c,v 1.76 2003/10/23 06:21:13 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/dconschat/dconschat.c,v 1.9 2005/03/11 14:20:09 stefanf Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile
index 52e4d6d279e2..ffe9f1b41372 100644
--- a/usr.sbin/devinfo/Makefile
+++ b/usr.sbin/devinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/devinfo/Makefile,v 1.6 2002/05/12 14:23:15 rwatson Exp $
 
 PROG=	devinfo
 MAN=	devinfo.8
diff --git a/usr.sbin/devinfo/devinfo.8 b/usr.sbin/devinfo/devinfo.8
index 70976db16441..6db5278fd58e 100644
--- a/usr.sbin/devinfo/devinfo.8
+++ b/usr.sbin/devinfo/devinfo.8
@@ -25,7 +25,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/usr.sbin/devinfo/devinfo.8,v 1.6 2002/09/20 02:26:58 imp Exp $
 .\"
 .Dd May 10, 2002
 .Os
diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c
index e1cb4bfd9903..f75f46e3ac65 100644
--- a/usr.sbin/devinfo/devinfo.c
+++ b/usr.sbin/devinfo/devinfo.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/devinfo/devinfo.c,v 1.5 2004/01/04 15:51:32 charnier Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.sbin/digictl/Makefile b/usr.sbin/digictl/Makefile
index 029dfee11e53..5d314247021d 100644
--- a/usr.sbin/digictl/Makefile
+++ b/usr.sbin/digictl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/digictl/Makefile,v 1.6 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	digictl
 MAN=	digictl.8
diff --git a/usr.sbin/digictl/digictl.8 b/usr.sbin/digictl/digictl.8
index 2ac98ea4e3b2..02f9a4c1e404 100644
--- a/usr.sbin/digictl/digictl.8
+++ b/usr.sbin/digictl/digictl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/digictl/digictl.8,v 1.7 2005/01/18 20:02:33 ru Exp $
 .Dd June 20, 2001
 .Dt DIGICTL 8
 .Os
diff --git a/usr.sbin/digictl/digictl.c b/usr.sbin/digictl/digictl.c
index 0aa5f68f2578..02b8ab7be59d 100644
--- a/usr.sbin/digictl/digictl.c
+++ b/usr.sbin/digictl/digictl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/digictl/digictl.c,v 1.5 2002/04/22 13:44:43 des Exp $
  */
 
 #include <errno.h>
diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile
index 5ffa27f6f0d8..d7fcec20d295 100644
--- a/usr.sbin/diskinfo/Makefile
+++ b/usr.sbin/diskinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/diskinfo/Makefile,v 1.3 2004/05/24 22:52:32 pjd Exp $
 
 PROG=	diskinfo
 MAN=	diskinfo.8
diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8
index dfc7040f349f..8ae385324778 100644
--- a/usr.sbin/diskinfo/diskinfo.8
+++ b/usr.sbin/diskinfo/diskinfo.8
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/diskinfo/diskinfo.8,v 1.7 2005/01/18 20:02:33 ru Exp $
 .\"
 .Dd November 9, 2004
 .Dt DISKINFO 8
diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c
index 2f033b69793f..0c101f6c701c 100644
--- a/usr.sbin/diskinfo/diskinfo.c
+++ b/usr.sbin/diskinfo/diskinfo.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/diskinfo/diskinfo.c,v 1.8 2005/01/11 10:53:09 ru Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile
index 0964188e0cb6..b992916c68de 100644
--- a/usr.sbin/dnssec-keygen/Makefile
+++ b/usr.sbin/dnssec-keygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dnssec-keygen/Makefile,v 1.2.4.1 2005/07/30 07:56:27 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile
index 73dcc75718cc..1d6309264c2c 100644
--- a/usr.sbin/dnssec-signzone/Makefile
+++ b/usr.sbin/dnssec-signzone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dnssec-signzone/Makefile,v 1.2.4.1 2005/07/30 07:56:27 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
index 93e3e0712228..6da435abf757 100644
--- a/usr.sbin/editmap/Makefile
+++ b/usr.sbin/editmap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/editmap/Makefile,v 1.3 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/editmap
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index e5a3b12559aa..fdac97098acb 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/edquota/Makefile,v 1.8 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	edquota
 MAN=	edquota.8
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index ff3d481231a9..fef0363fbf6a 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.23 2005/01/18 20:02:33 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index c73e7de06125..f75efd72653d 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)edquota.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.23 2004/08/07 04:27:50 imp Exp $");
 
 /*
  * Disk quota editor.
diff --git a/usr.sbin/edquota/pathnames.h b/usr.sbin/edquota/pathnames.h
index 53bfbfefeb96..98b5cd6d8ef7 100644
--- a/usr.sbin/edquota/pathnames.h
+++ b/usr.sbin/edquota/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/edquota/pathnames.h,v 1.2 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/eeprom/Makefile b/usr.sbin/eeprom/Makefile
index fa5f411d4428..7c95129bab3c 100644
--- a/usr.sbin/eeprom/Makefile
+++ b/usr.sbin/eeprom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/eeprom/Makefile,v 1.3 2004/05/22 16:56:04 marius Exp $
 
 .PATH: ${.CURDIR}/../ofwdump
 
diff --git a/usr.sbin/eeprom/eeprom.8 b/usr.sbin/eeprom/eeprom.8
index d5f82d68c04e..dbd8fa0603d7 100644
--- a/usr.sbin/eeprom/eeprom.8
+++ b/usr.sbin/eeprom/eeprom.8
@@ -34,7 +34,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: NetBSD: eeprom.8,v 1.11 2003/03/31 01:31:39 perry Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/eeprom/eeprom.8,v 1.5 2005/01/11 11:47:20 ru Exp $
 .\"
 .Dd August 15, 2004
 .Dt EEPROM 8 sparc64
diff --git a/usr.sbin/eeprom/eeprom.c b/usr.sbin/eeprom/eeprom.c
index ecd9267a0337..c47855b1915a 100644
--- a/usr.sbin/eeprom/eeprom.c
+++ b/usr.sbin/eeprom/eeprom.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/eeprom/eeprom.c,v 1.4 2004/05/22 16:56:04 marius Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/eeprom/ofw_options.c b/usr.sbin/eeprom/ofw_options.c
index 8bf51ea59803..c5591eff15a9 100644
--- a/usr.sbin/eeprom/ofw_options.c
+++ b/usr.sbin/eeprom/ofw_options.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/eeprom/ofw_options.c,v 1.3 2004/08/15 20:18:54 marius Exp $");
 
 /*
  * Handlers for Open Firmware /options node.
diff --git a/usr.sbin/eeprom/ofw_options.h b/usr.sbin/eeprom/ofw_options.h
index 5bc66567e31c..1ef25c583e26 100644
--- a/usr.sbin/eeprom/ofw_options.h
+++ b/usr.sbin/eeprom/ofw_options.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/eeprom/ofw_options.h,v 1.1 2004/05/22 16:56:04 marius Exp $
  */
 
 #ifndef OFW_OPTIONS_H
diff --git a/usr.sbin/elf2exe/Makefile b/usr.sbin/elf2exe/Makefile
index 69e362204b93..dc9fdc597b51 100644
--- a/usr.sbin/elf2exe/Makefile
+++ b/usr.sbin/elf2exe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/elf2exe/Makefile,v 1.7 2001/07/20 06:19:46 obrien Exp $
 
 PROG=	elf2exe
 MAN=	elf2exe.8
diff --git a/usr.sbin/elf2exe/elf2exe.8 b/usr.sbin/elf2exe/elf2exe.8
index 779cb5006055..c2c5fe38a05b 100644
--- a/usr.sbin/elf2exe/elf2exe.8
+++ b/usr.sbin/elf2exe/elf2exe.8
@@ -9,7 +9,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/elf2exe/elf2exe.8,v 1.12 2005/01/18 20:02:34 ru Exp $
 .\"
 .Dd July 26, 1999
 .Dt ELF2EXE 8 Alpha
diff --git a/usr.sbin/elf2exe/elf2exe.c b/usr.sbin/elf2exe/elf2exe.c
index d0959eb1400c..e6f4238a6e97 100644
--- a/usr.sbin/elf2exe/elf2exe.c
+++ b/usr.sbin/elf2exe/elf2exe.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/elf2exe/elf2exe.c,v 1.7 2000/07/12 00:31:50 kris Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile
index ae349752d689..49af4b1f0ef8 100644
--- a/usr.sbin/extattr/Makefile
+++ b/usr.sbin/extattr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/extattr/Makefile,v 1.1 2002/08/30 08:53:03 phk Exp $
 
 PROG=	rmextattr
 MAN=	rmextattr.8
diff --git a/usr.sbin/extattr/rmextattr.8 b/usr.sbin/extattr/rmextattr.8
index c51fa6d922fe..ca7203bb2e4f 100644
--- a/usr.sbin/extattr/rmextattr.8
+++ b/usr.sbin/extattr/rmextattr.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/extattr/rmextattr.8,v 1.4 2003/02/24 22:53:25 ru Exp $
 .\"
 .Dd August 30, 2000
 .Dt RMEXTATTR 8
diff --git a/usr.sbin/extattr/rmextattr.c b/usr.sbin/extattr/rmextattr.c
index 0c65d7b29bce..f18941ee3d0d 100644
--- a/usr.sbin/extattr/rmextattr.c
+++ b/usr.sbin/extattr/rmextattr.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/extattr/rmextattr.c,v 1.6 2003/06/05 04:30:00 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile
index 5eb1945d3b94..46cf7e25b73a 100644
--- a/usr.sbin/extattrctl/Makefile
+++ b/usr.sbin/extattrctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/extattrctl/Makefile,v 1.10 2003/04/04 17:49:14 obrien Exp $
 
 PROG=	extattrctl
 MAN=	extattrctl.8
diff --git a/usr.sbin/extattrctl/extattrctl.8 b/usr.sbin/extattrctl/extattrctl.8
index c5850ab4ef19..f33363a1164e 100644
--- a/usr.sbin/extattrctl/extattrctl.8
+++ b/usr.sbin/extattrctl/extattrctl.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/extattrctl/extattrctl.8,v 1.24 2005/02/09 18:04:40 ru Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for file system extended attribute.
diff --git a/usr.sbin/extattrctl/extattrctl.c b/usr.sbin/extattrctl/extattrctl.c
index 103fcd345a92..7f82daf6af19 100644
--- a/usr.sbin/extattrctl/extattrctl.c
+++ b/usr.sbin/extattrctl/extattrctl.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/extattrctl/extattrctl.c,v 1.19 2002/04/19 01:42:55 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile
index e1898ed333a4..f4267113b08b 100644
--- a/usr.sbin/faithd/Makefile
+++ b/usr.sbin/faithd/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/faithd/Makefile,v 1.10 2004/01/17 02:27:55 ru Exp $
 
 PROG=	faithd
 MAN=	faithd.8
diff --git a/usr.sbin/faithd/README b/usr.sbin/faithd/README
index 6628bf63dcbc..b521d4bfa49f 100644
--- a/usr.sbin/faithd/README
+++ b/usr.sbin/faithd/README
@@ -2,7 +2,7 @@ Configuring FAITH IPv6-to-IPv4 TCP relay
 
 Kazu Yamamoto and Jun-ichiro itojun Hagino
 $KAME: README,v 1.10 2003/01/06 21:40:33 sumikawa Exp $
-$FreeBSD$
+$FreeBSD: src/usr.sbin/faithd/README,v 1.8 2003/11/14 17:34:08 ume Exp $
 
 
 Introduction
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index 5d16989902fa..33642c744140 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/faithd/faithd.8,v 1.19 2005/01/17 07:44:39 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt FAITHD 8
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index 3df90a595370..8858921fb5aa 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/faithd.c,v 1.10 2003/11/14 17:34:08 ume Exp $
  */
 
 /*
diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h
index f4224321ddd0..58dce6a07657 100644
--- a/usr.sbin/faithd/faithd.h
+++ b/usr.sbin/faithd/faithd.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/faithd.h,v 1.5 2003/11/14 17:34:08 ume Exp $
  */
 
 extern char logname[];
diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c
index 19ad5eeb6c34..dcaaa54c04ee 100644
--- a/usr.sbin/faithd/ftp.c
+++ b/usr.sbin/faithd/ftp.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/ftp.c,v 1.12 2005/05/02 07:44:24 suz Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/prefix.c b/usr.sbin/faithd/prefix.c
index 138c948927f1..57678a3abfc0 100644
--- a/usr.sbin/faithd/prefix.c
+++ b/usr.sbin/faithd/prefix.c
@@ -1,5 +1,5 @@
 /*	$KAME: prefix.c,v 1.13 2003/09/02 22:50:17 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/faithd/prefix.c,v 1.4 2003/11/14 17:34:08 ume Exp $	*/
 
 /*
  * Copyright (C) 2000 WIDE Project.
diff --git a/usr.sbin/faithd/prefix.h b/usr.sbin/faithd/prefix.h
index 2a2963982ca9..87e5e38950e5 100644
--- a/usr.sbin/faithd/prefix.h
+++ b/usr.sbin/faithd/prefix.h
@@ -1,5 +1,5 @@
 /*	$KAME: prefix.h,v 1.4 2001/09/05 03:04:21 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/faithd/prefix.h,v 1.2 2002/04/19 04:46:24 suz Exp $	*/
 
 /*
  * Copyright (C) 2000 WIDE Project.
diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c
index 714df9a159c2..ca36e69ea337 100644
--- a/usr.sbin/faithd/tcp.c
+++ b/usr.sbin/faithd/tcp.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/tcp.c,v 1.5 2003/11/14 17:34:08 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/test/faithd.rb b/usr.sbin/faithd/test/faithd.rb
index 682f540db98a..0ff35630287e 100644
--- a/usr.sbin/faithd/test/faithd.rb
+++ b/usr.sbin/faithd/test/faithd.rb
@@ -4,7 +4,7 @@
 # functionality.
 #
 # $Id: faithd.rb,v 1.1.2.4 1999/05/10 17:06:30 itojun Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/faithd/test/faithd.rb,v 1.2 2003/11/14 17:34:08 ume Exp $
 
 require "socket"
 require "thread"
diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile
index e2b54aa06708..5c4cf8db00a2 100644
--- a/usr.sbin/fdcontrol/Makefile
+++ b/usr.sbin/fdcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdcontrol/Makefile,v 1.12 2005/01/08 15:46:05 delphij Exp $
 
 .PATH: ${.CURDIR}/../fdread
 
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index 286cb8be4e06..bbccc2833e82 100644
--- a/usr.sbin/fdcontrol/fdcontrol.8
+++ b/usr.sbin/fdcontrol/fdcontrol.8
@@ -24,7 +24,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.20 2004/07/02 23:12:41 ru Exp $
 .\"
 .Dd December 25, 2001
 .Os
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index 559ce020891e..b05240cc21eb 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.c,v 1.13 2005/01/08 15:46:05 delphij Exp $");
 
 #include <sys/fdcio.h>
 #include <sys/file.h>
diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile
index a172811ec055..4a08f2f712f5 100644
--- a/usr.sbin/fdformat/Makefile
+++ b/usr.sbin/fdformat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdformat/Makefile,v 1.13 2005/01/08 15:46:05 delphij Exp $
 
 .PATH: ${.CURDIR}/../fdread
 
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index dd5bbe18b1c3..0d934eb68c05 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -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/usr.sbin/fdformat/fdformat.1,v 1.29 2005/01/18 09:17:49 ru Exp $
 .\"
 .Dd December 25, 2001
 .Os
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 8e29e40fc857..a39c879ea6ea 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdformat/fdformat.c,v 1.22 2004/08/20 15:14:25 phk Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/fdread/Makefile b/usr.sbin/fdread/Makefile
index 2868a3c38f03..eff0ddb97ad7 100644
--- a/usr.sbin/fdread/Makefile
+++ b/usr.sbin/fdread/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdread/Makefile,v 1.5 2005/01/08 15:46:06 delphij Exp $
 
 PROG=	fdread
 SRCS=	fdread.c fdutil.c
diff --git a/usr.sbin/fdread/fdread.1 b/usr.sbin/fdread/fdread.1
index 20a79fc14531..7e7328a0c7ec 100644
--- a/usr.sbin/fdread/fdread.1
+++ b/usr.sbin/fdread/fdread.1
@@ -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/usr.sbin/fdread/fdread.1,v 1.8 2005/02/13 22:25:28 ru Exp $
 .\"
 .\"
 .Dd May 14, 2001
diff --git a/usr.sbin/fdread/fdread.c b/usr.sbin/fdread/fdread.c
index 8aee99bd0c70..8411bde7732e 100644
--- a/usr.sbin/fdread/fdread.c
+++ b/usr.sbin/fdread/fdread.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/usr.sbin/fdread/fdread.c,v 1.6 2005/01/08 15:46:06 delphij Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/fdread/fdutil.c b/usr.sbin/fdread/fdutil.c
index c1f4d8f18dfb..17a92423e625 100644
--- a/usr.sbin/fdread/fdutil.c
+++ b/usr.sbin/fdread/fdutil.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/usr.sbin/fdread/fdutil.c,v 1.8 2005/01/08 15:46:06 delphij Exp $
  */
 
 #include <dev/ic/nec765.h>
diff --git a/usr.sbin/fdread/fdutil.h b/usr.sbin/fdread/fdutil.h
index a09322850897..b7cb79a8396f 100644
--- a/usr.sbin/fdread/fdutil.h
+++ b/usr.sbin/fdread/fdutil.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/usr.sbin/fdread/fdutil.h,v 1.2 2001/12/15 19:09:04 joerg Exp $
  */
 
 
diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile
index ba6f047ff161..a60fe9699425 100644
--- a/usr.sbin/fdwrite/Makefile
+++ b/usr.sbin/fdwrite/Makefile
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdwrite/Makefile,v 1.11 2005/01/08 15:46:06 delphij Exp $
 
 PROG=	fdwrite
 WARNS?=	6
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 28df514f2645..a39d56c9c307 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.24 2005/02/13 22:25:28 ru Exp $
 .\"
 .\"
 .Dd September 16, 1993
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index 3c220916e84e..9094c35964bc 100644
--- a/usr.sbin/fdwrite/fdwrite.c
+++ b/usr.sbin/fdwrite/fdwrite.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdwrite/fdwrite.c,v 1.15 2005/01/08 15:46:06 delphij Exp $
  *
  */
 
diff --git a/usr.sbin/flowctl/Makefile b/usr.sbin/flowctl/Makefile
index d47993b0996d..b6785dcec72f 100644
--- a/usr.sbin/flowctl/Makefile
+++ b/usr.sbin/flowctl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/flowctl/Makefile,v 1.2 2004/09/17 22:37:45 glebius Exp $
 #
 
 PROG=	flowctl
diff --git a/usr.sbin/flowctl/flowctl.8 b/usr.sbin/flowctl/flowctl.8
index e72486bbf800..2159adbf058b 100644
--- a/usr.sbin/flowctl/flowctl.8
+++ b/usr.sbin/flowctl/flowctl.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/flowctl/flowctl.8,v 1.3 2005/03/23 09:40:18 glebius Exp $
 .\"
 .Dd March 23, 2005
 .Os
diff --git a/usr.sbin/flowctl/flowctl.c b/usr.sbin/flowctl/flowctl.c
index 856fe583a3bb..94e1ec33db5c 100644
--- a/usr.sbin/flowctl/flowctl.c
+++ b/usr.sbin/flowctl/flowctl.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+    "@(#) $FreeBSD: src/usr.sbin/flowctl/flowctl.c,v 1.5 2005/03/23 09:40:18 glebius Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile
index 54c24c1f4481..43f98a5cfaad 100644
--- a/usr.sbin/fwcontrol/Makefile
+++ b/usr.sbin/fwcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fwcontrol/Makefile,v 1.4 2003/04/30 03:39:25 simokawa Exp $
 
 PROG=	fwcontrol
 SRCS=	fwcontrol.c fwcrom.c fwdv.c
diff --git a/usr.sbin/fwcontrol/fwcontrol.8 b/usr.sbin/fwcontrol/fwcontrol.8
index 6262565a0399..f1e212eec29b 100644
--- a/usr.sbin/fwcontrol/fwcontrol.8
+++ b/usr.sbin/fwcontrol/fwcontrol.8
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fwcontrol/fwcontrol.8,v 1.16 2005/01/18 20:02:34 ru Exp $
 .\"
 .Dd December 14, 2004
 .Dt FWCONTROL 8
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index e99473a19936..dab2075c5907 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/fwcontrol/fwcontrol.c,v 1.22 2005/05/20 12:50:47 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c
index 43f5a98ff80e..d08f5703ca45 100644
--- a/usr.sbin/fwcontrol/fwdv.c
+++ b/usr.sbin/fwcontrol/fwdv.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fwcontrol/fwdv.c,v 1.5 2003/04/17 03:38:03 simokawa Exp $
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/getfmac/Makefile b/usr.sbin/getfmac/Makefile
index ad496570afdd..58aebcd2721b 100644
--- a/usr.sbin/getfmac/Makefile
+++ b/usr.sbin/getfmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/getfmac/Makefile,v 1.4 2005/01/27 14:52:46 delphij Exp $
 
 PROG=   getfmac
 MAN=	getfmac.8
diff --git a/usr.sbin/getfmac/getfmac.8 b/usr.sbin/getfmac/getfmac.8
index f8ebb314c3db..5f933afdcb57 100644
--- a/usr.sbin/getfmac/getfmac.8
+++ b/usr.sbin/getfmac/getfmac.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/getfmac/getfmac.8,v 1.6 2003/01/15 03:12:48 chris Exp $
 .\"
 .Dd June 27, 2002
 .Dt GETFMAC 8
diff --git a/usr.sbin/getfmac/getfmac.c b/usr.sbin/getfmac/getfmac.c
index 7c03d5903e54..30263289a49a 100644
--- a/usr.sbin/getfmac/getfmac.c
+++ b/usr.sbin/getfmac/getfmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/getfmac/getfmac.c,v 1.3 2005/01/27 14:44:38 delphij Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/getpmac/Makefile b/usr.sbin/getpmac/Makefile
index 87e6d28889ca..1cf1d5d3450b 100644
--- a/usr.sbin/getpmac/Makefile
+++ b/usr.sbin/getpmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/getpmac/Makefile,v 1.5 2005/01/27 14:52:46 delphij Exp $
 
 PROG=   getpmac
 MAN=	getpmac.8
diff --git a/usr.sbin/getpmac/getpmac.8 b/usr.sbin/getpmac/getpmac.8
index 307c9628f890..0283c2bbaf91 100644
--- a/usr.sbin/getpmac/getpmac.8
+++ b/usr.sbin/getpmac/getpmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/getpmac/getpmac.8,v 1.4 2003/02/24 22:53:25 ru Exp $
 .\"
 .Dd January 14, 2003
 .Dt GETPMAC 8
diff --git a/usr.sbin/getpmac/getpmac.c b/usr.sbin/getpmac/getpmac.c
index 6e815584cdc7..3b3be1370752 100644
--- a/usr.sbin/getpmac/getpmac.c
+++ b/usr.sbin/getpmac/getpmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/getpmac/getpmac.c,v 1.3 2005/01/27 14:44:39 delphij Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile
index 843264a142ed..d376eac81135 100644
--- a/usr.sbin/gstat/Makefile
+++ b/usr.sbin/gstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/gstat/Makefile,v 1.6 2005/01/27 14:52:46 delphij Exp $
 
 PROG=	gstat
 MAN=	gstat.8
diff --git a/usr.sbin/gstat/gstat.8 b/usr.sbin/gstat/gstat.8
index 2dce5c317283..afba577d9efa 100644
--- a/usr.sbin/gstat/gstat.8
+++ b/usr.sbin/gstat/gstat.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/gstat/gstat.8,v 1.7 2005/05/27 00:21:12 keramida Exp $
 .\"
 .Dd March 3, 2003
 .Dt GSTAT 8
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c
index f4c7e119ab4b..86f8318802da 100644
--- a/usr.sbin/gstat/gstat.c
+++ b/usr.sbin/gstat/gstat.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/gstat/gstat.c,v 1.12 2005/01/05 18:41:54 le Exp $
  */
 
 
diff --git a/usr.sbin/i4b/Makefile b/usr.sbin/i4b/Makefile
index 01f76421a1fa..8aeecf77c305 100644
--- a/usr.sbin/i4b/Makefile
+++ b/usr.sbin/i4b/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/Makefile,v 1.8 2001/12/31 09:31:51 joerg Exp $
 
 SUBDIR=	dtmfdecode g711conv isdnd isdndebug isdndecode isdnmonitor isdnphone \
 	isdntel isdntelctl isdntest isdntrace man
diff --git a/usr.sbin/i4b/Makefile.inc b/usr.sbin/i4b/Makefile.inc
index 11954191e2ea..ee19662287a4 100644
--- a/usr.sbin/i4b/Makefile.inc
+++ b/usr.sbin/i4b/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/Makefile.inc,v 1.2 2001/07/20 06:19:50 obrien Exp $
 
 # if you don't like curses stuff in the daemon (i.e. don't intend
 # to ever run it in the foreground but are using the monitoring
diff --git a/usr.sbin/i4b/dtmfdecode/Makefile b/usr.sbin/i4b/dtmfdecode/Makefile
index 74a9df7cde9d..234a291d6ab8 100644
--- a/usr.sbin/i4b/dtmfdecode/Makefile
+++ b/usr.sbin/i4b/dtmfdecode/Makefile
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/dtmfdecode/Makefile,v 1.9 2001/07/20 06:19:47 obrien Exp $
 #
 #	last edit-date: [Tue Dec 14 21:17:46 1999]
 #
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1 b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
index 53f673af6e9c..f1cf0e90ab50 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: dtmfdecode.1,v 1.6 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfdecode.1,v 1.13 2004/07/02 23:12:42 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:53:13 1999]
 .\"
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
index 16c68e62e022..3b8763204c3d 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
@@ -8,7 +8,7 @@
  *
  * $Id: dtmfdecode.c,v 1.6 1999/12/13 21:25:24 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfdecode.c,v 1.5 2003/01/01 18:49:01 schweikh Exp $
  *
  * Extract DTMF signalling from ISDN4BSD A-law coded audio data
  *
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu b/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
index f4e0c07c5763..22c95db7af3e 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
+++ b/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu,v 1.1 1999/12/14 21:07:22 hm Exp $
 begin 666 dtmfsounds.al
 M5555U=74U-564-34UU%5U-?1UM'7UM37U=5555145%545%155%555%555=75
 M5575U=75U-15U5555575U575U=75U=75U=34U-35U-35U=75U=55U=5555%0
diff --git a/usr.sbin/i4b/g711conv/Makefile b/usr.sbin/i4b/g711conv/Makefile
index f24d6e8d568b..4572a7f8c17b 100644
--- a/usr.sbin/i4b/g711conv/Makefile
+++ b/usr.sbin/i4b/g711conv/Makefile
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/g711conv/Makefile,v 1.6 2001/07/20 06:19:48 obrien Exp $
 #
 #	last edit-date: [Thu May 20 11:58:43 1999]
 #
diff --git a/usr.sbin/i4b/g711conv/g711conv.1 b/usr.sbin/i4b/g711conv/g711conv.1
index 1a7b32813805..975dfaab824e 100644
--- a/usr.sbin/i4b/g711conv/g711conv.1
+++ b/usr.sbin/i4b/g711conv/g711conv.1
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: g711conv.1,v 1.3 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/g711conv/g711conv.1,v 1.12 2005/01/18 20:02:34 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:54:33 1999]
 .\"
diff --git a/usr.sbin/i4b/g711conv/g711conv.c b/usr.sbin/i4b/g711conv/g711conv.c
index f8087c0469ed..d9cacbdd1047 100644
--- a/usr.sbin/i4b/g711conv/g711conv.c
+++ b/usr.sbin/i4b/g711conv/g711conv.c
@@ -69,7 +69,7 @@
  *
  *	$Id: g711conv.c,v 1.5 1999/12/13 21:25:24 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/g711conv/g711conv.c,v 1.6 2003/06/08 06:24:46 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile
index ce6c51c464e6..2bb3947d3234 100644
--- a/usr.sbin/i4b/isdnd/Makefile
+++ b/usr.sbin/i4b/isdnd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdnd/Makefile,v 1.14 2004/08/13 14:21:49 ru Exp $
 
 PROG=	isdnd
 MAN=	isdnd.rc.5 isdnd.rates.5 isdnd.acct.5 isdnd.8
diff --git a/usr.sbin/i4b/isdnd/alias.c b/usr.sbin/i4b/isdnd/alias.c
index a775fc9f2803..859622f88d96 100644
--- a/usr.sbin/i4b/isdnd/alias.c
+++ b/usr.sbin/i4b/isdnd/alias.c
@@ -32,7 +32,7 @@
  *		
  *      $Id: alias.c,v 1.8 1999/12/13 21:25:24 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/alias.c,v 1.7 2000/10/09 14:22:38 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:45:19 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/config.h b/usr.sbin/i4b/isdnd/config.h
index a4b05f171bc8..e63c28ef2688 100644
--- a/usr.sbin/i4b/isdnd/config.h
+++ b/usr.sbin/i4b/isdnd/config.h
@@ -27,7 +27,7 @@
  *	i4b daemon - compile time configuration header file
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/config.h,v 1.8 2001/05/25 08:36:44 hm Exp $
  *
  *      last edit-date: [Mon May 21 11:21:15 2001]
  *
diff --git a/usr.sbin/i4b/isdnd/controller.c b/usr.sbin/i4b/isdnd/controller.c
index 16a60c8fb5c6..254b23e63d51 100644
--- a/usr.sbin/i4b/isdnd/controller.c
+++ b/usr.sbin/i4b/isdnd/controller.c
@@ -27,7 +27,7 @@
  *	i4b daemon - controller state support routines
  *	----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/controller.c,v 1.14 2001/12/22 09:38:24 gj Exp $
  *
  *      last edit-date: [Sun Oct 21 11:02:15 2001]
  *
diff --git a/usr.sbin/i4b/isdnd/curses.c b/usr.sbin/i4b/isdnd/curses.c
index 19e7af705649..d2e5bd8bb097 100644
--- a/usr.sbin/i4b/isdnd/curses.c
+++ b/usr.sbin/i4b/isdnd/curses.c
@@ -27,7 +27,7 @@
  *	i4b daemon - curses fullscreen output
  *	-------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/curses.c,v 1.9 2002/03/26 15:12:59 hm Exp $
  *
  *      last edit-date: [Tue Mar 26 14:35:33 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/dial.c b/usr.sbin/i4b/isdnd/dial.c
index 5ccbd33c1b50..b1bc74c5c823 100644
--- a/usr.sbin/i4b/isdnd/dial.c
+++ b/usr.sbin/i4b/isdnd/dial.c
@@ -27,7 +27,7 @@
  *	i4b daemon - dial handling routines
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/dial.c,v 1.9 2002/03/26 15:12:59 hm Exp $
  *
  *      last edit-date: [Tue Mar 26 14:35:19 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/exec.c b/usr.sbin/i4b/isdnd/exec.c
index 0c1254fac56e..35280e99d03b 100644
--- a/usr.sbin/i4b/isdnd/exec.c
+++ b/usr.sbin/i4b/isdnd/exec.c
@@ -27,7 +27,7 @@
  *	exec.h - supplemental program/script execution
  *	----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/exec.c,v 1.12 2003/06/07 18:45:45 imp Exp $
  *
  *      last edit-date: [Tue Mar 26 14:35:46 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/fsm.c b/usr.sbin/i4b/isdnd/fsm.c
index e555fa8a9e2d..cc0b30cb423e 100644
--- a/usr.sbin/i4b/isdnd/fsm.c
+++ b/usr.sbin/i4b/isdnd/fsm.c
@@ -27,7 +27,7 @@
  *	FSM for isdnd
  *	-------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/fsm.c,v 1.9 2002/03/26 15:12:59 hm Exp $
  *
  *      last edit-date: [Tue Mar 26 14:35:56 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/holiday.c b/usr.sbin/i4b/isdnd/holiday.c
index 5bf9582cb394..694e41958c9c 100644
--- a/usr.sbin/i4b/isdnd/holiday.c
+++ b/usr.sbin/i4b/isdnd/holiday.c
@@ -27,7 +27,7 @@
  *	isdnd - holiday file handling
  *      =============================
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/holiday.c,v 1.3 2001/05/02 08:53:34 hm Exp $
  *
  *      last edit-date: [Wed May  2 09:42:56 2001]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 60e00b300e16..a6ecb51f075c 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.8,v 1.29 2000/05/02 11:50:28 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.23 2005/01/18 20:02:34 ru Exp $
 .\"
 .\"	last edit-date: [Wed May  2 10:48:30 2001]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.acct.5 b/usr.sbin/i4b/isdnd/isdnd.acct.5
index b2db667db742..546a8e279a95 100644
--- a/usr.sbin/i4b/isdnd/isdnd.acct.5
+++ b/usr.sbin/i4b/isdnd/isdnd.acct.5
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.acct.5,v 1.11 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.15 2004/07/02 23:12:42 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:58:12 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h
index e4a0ffc2d97c..6e403fbe2739 100644
--- a/usr.sbin/i4b/isdnd/isdnd.h
+++ b/usr.sbin/i4b/isdnd/isdnd.h
@@ -27,7 +27,7 @@
  *	i4b daemon - main header file
  *	-----------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.h,v 1.18 2002/08/12 07:52:39 hm Exp $
  *
  *      last edit-date: [Sun Aug 11 12:31:44 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.rates.5 b/usr.sbin/i4b/isdnd/isdnd.rates.5
index b4542e07591b..d043aa3aa35a 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rates.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rates.5
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.rates.5,v 1.10 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.15 2004/07/02 23:12:42 ru Exp $
 .\"
 .\"     last edit-date: [Mon Dec 13 22:59:31 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index d3d2ed894d0b..5e876a1da33b 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.35.2.1 2005/08/18 15:01:26 keramida Exp $
 .\"
 .\"     last edit-date: [Sun Aug 11 20:07:38 2002]
 .\"
diff --git a/usr.sbin/i4b/isdnd/log.c b/usr.sbin/i4b/isdnd/log.c
index 7876f13c86a8..8002aaca023e 100644
--- a/usr.sbin/i4b/isdnd/log.c
+++ b/usr.sbin/i4b/isdnd/log.c
@@ -27,7 +27,7 @@
  *	i4b daemon - logging routines
  *	-----------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/log.c,v 1.9 2001/12/27 08:41:10 hm Exp $
  *
  *      last edit-date: [Wed Dec 26 12:49:45 2001]
  *
diff --git a/usr.sbin/i4b/isdnd/main.c b/usr.sbin/i4b/isdnd/main.c
index 74e1e6321fc3..02557f79538b 100644
--- a/usr.sbin/i4b/isdnd/main.c
+++ b/usr.sbin/i4b/isdnd/main.c
@@ -27,7 +27,7 @@
  *	i4b daemon - main program entry
  *	-------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/main.c,v 1.16 2001/12/27 08:41:10 hm Exp $
  *
  *      last edit-date: [Wed Dec 26 12:51:00 2001]
  *
diff --git a/usr.sbin/i4b/isdnd/monitor.c b/usr.sbin/i4b/isdnd/monitor.c
index 45952eb251b8..994c658b78a8 100644
--- a/usr.sbin/i4b/isdnd/monitor.c
+++ b/usr.sbin/i4b/isdnd/monitor.c
@@ -33,7 +33,7 @@
  *	i4b daemon - network monitor server module
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/monitor.c,v 1.12 2002/03/26 15:12:59 hm Exp $
  *
  *      last edit-date: [Tue Mar 26 14:37:03 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/msghdl.c b/usr.sbin/i4b/isdnd/msghdl.c
index 2687e480f934..8ba3f2beb207 100644
--- a/usr.sbin/i4b/isdnd/msghdl.c
+++ b/usr.sbin/i4b/isdnd/msghdl.c
@@ -27,7 +27,7 @@
  *	i4b daemon - message from kernel handling routines
  *	--------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/msghdl.c,v 1.12 2002/08/12 07:52:39 hm Exp $
  *
  *      last edit-date: [Sun Aug 11 12:37:16 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/pathnames.h b/usr.sbin/i4b/isdnd/pathnames.h
index 44f9c6d9ca41..2e7ab0651bc7 100644
--- a/usr.sbin/i4b/isdnd/pathnames.h
+++ b/usr.sbin/i4b/isdnd/pathnames.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pathnames.h,v 1.11 2000/10/09 11:17:07 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pathnames.h,v 1.7 2000/10/09 14:22:38 hm Exp $
  *
  *      last edit-date: [Mon Oct  2 22:55:28 2000]
  *
diff --git a/usr.sbin/i4b/isdnd/pcause.c b/usr.sbin/i4b/isdnd/pcause.c
index 99aa089846be..bf9262682f42 100644
--- a/usr.sbin/i4b/isdnd/pcause.c
+++ b/usr.sbin/i4b/isdnd/pcause.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause.c,v 1.13 2000/10/09 12:53:29 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pcause.c,v 1.8 2000/10/09 14:22:38 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:48:07 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/process.c b/usr.sbin/i4b/isdnd/process.c
index f5460438d89a..f196c28d6169 100644
--- a/usr.sbin/i4b/isdnd/process.c
+++ b/usr.sbin/i4b/isdnd/process.c
@@ -29,7 +29,7 @@
  *
  *	$Id: process.c,v 1.8 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/process.c,v 1.7 2000/10/09 14:22:38 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:48:19 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rates.c b/usr.sbin/i4b/isdnd/rates.c
index 29aaef41789f..8c21a0e7450f 100644
--- a/usr.sbin/i4b/isdnd/rates.c
+++ b/usr.sbin/i4b/isdnd/rates.c
@@ -37,7 +37,7 @@
  *
  *	$Id: rates.c,v 1.11 2000/10/09 12:53:29 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rates.c,v 1.8 2000/10/09 14:22:39 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:48:31 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_config.c b/usr.sbin/i4b/isdnd/rc_config.c
index 65047472abd5..b77423715fe5 100644
--- a/usr.sbin/i4b/isdnd/rc_config.c
+++ b/usr.sbin/i4b/isdnd/rc_config.c
@@ -27,7 +27,7 @@
  *	i4b daemon - config file processing
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_config.c,v 1.17 2002/08/12 07:52:39 hm Exp $
  *
  *      last edit-date: [Sun Aug 11 12:30:49 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_parse.y b/usr.sbin/i4b/isdnd/rc_parse.y
index 6427500f9075..8830762524dd 100644
--- a/usr.sbin/i4b/isdnd/rc_parse.y
+++ b/usr.sbin/i4b/isdnd/rc_parse.y
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration parser
  *	-----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_parse.y,v 1.12 2002/08/12 07:52:39 hm Exp $
  *
  *      last edit-date: [Sun Aug 11 12:27:28 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_scan.l b/usr.sbin/i4b/isdnd/rc_scan.l
index 988a4fb7c42b..381885ad4ac5 100644
--- a/usr.sbin/i4b/isdnd/rc_scan.l
+++ b/usr.sbin/i4b/isdnd/rc_scan.l
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration lexical analyzer
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_scan.l,v 1.13 2002/08/12 07:52:39 hm Exp $
  *
  *      last edit-date: [Sun Aug 11 12:27:50 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/support.c b/usr.sbin/i4b/isdnd/support.c
index 337c215b9702..fe76690effdb 100644
--- a/usr.sbin/i4b/isdnd/support.c
+++ b/usr.sbin/i4b/isdnd/support.c
@@ -27,7 +27,7 @@
  *	i4b daemon - misc support routines
  *	----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/support.c,v 1.16 2003/07/31 09:13:22 hm Exp $
  *
  *      last edit-date: [Thu Jul 31 11:05:16 2003]
  *
diff --git a/usr.sbin/i4b/isdnd/timer.c b/usr.sbin/i4b/isdnd/timer.c
index 34c0c430ab11..d0c90a5f4ae6 100644
--- a/usr.sbin/i4b/isdnd/timer.c
+++ b/usr.sbin/i4b/isdnd/timer.c
@@ -27,7 +27,7 @@
  *	i4b daemon - timer/timing support routines
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/timer.c,v 1.9 2002/03/26 15:12:59 hm Exp $
  *
  *      last edit-date: [Tue Mar 26 14:38:24 2002]
  *
diff --git a/usr.sbin/i4b/isdndebug/Makefile b/usr.sbin/i4b/isdndebug/Makefile
index 5a31de955365..ab80369241d1 100644
--- a/usr.sbin/i4b/isdndebug/Makefile
+++ b/usr.sbin/i4b/isdndebug/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdndebug/Makefile,v 1.5 2001/07/20 06:19:48 obrien Exp $
 
 PROG=	isdndebug
 MAN= 	isdndebug.8
diff --git a/usr.sbin/i4b/isdndebug/isdndebug.8 b/usr.sbin/i4b/isdndebug/isdndebug.8
index 0a9f24ca2398..faede48a2823 100644
--- a/usr.sbin/i4b/isdndebug/isdndebug.8
+++ b/usr.sbin/i4b/isdndebug/isdndebug.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdndebug.8,v 1.11 2000/05/31 08:15:29 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.18 2004/07/02 23:12:43 ru Exp $
 .\"
 .\"	last edit-date: [Wed May 31 10:15:07 2000]
 .\"
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index 0620b3b4b74f..52866adaa534 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -27,7 +27,7 @@
  *	main.c - i4b set debug options
  *	------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndebug/main.c,v 1.11 2001/05/25 08:36:45 hm Exp $
  *
  *      last edit-date: [Mon May 21 10:09:23 2001]
  *
diff --git a/usr.sbin/i4b/isdndecode/Makefile b/usr.sbin/i4b/isdndecode/Makefile
index 9dbd971b83cb..83f5f104e93c 100644
--- a/usr.sbin/i4b/isdndecode/Makefile
+++ b/usr.sbin/i4b/isdndecode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdndecode/Makefile,v 1.5 2001/07/20 06:19:48 obrien Exp $
 
 PROG=	isdndecode
 MAN=	isdndecode.8
diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h
index 83bab000165b..2827ecac26b7 100644
--- a/usr.sbin/i4b/isdndecode/decode.h
+++ b/usr.sbin/i4b/isdndecode/decode.h
@@ -29,7 +29,7 @@
  *
  *	$Id: decode.h,v 1.6 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/decode.h,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:49:50 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/facility.c b/usr.sbin/i4b/isdndecode/facility.c
index c4502a8daf2b..50dc338de9f2 100644
--- a/usr.sbin/i4b/isdndecode/facility.c
+++ b/usr.sbin/i4b/isdndecode/facility.c
@@ -29,7 +29,7 @@
  *
  *	$Id: facility.c,v 1.5 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Feb 21 16:15:43 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/facility.h b/usr.sbin/i4b/isdndecode/facility.h
index f4cfe10e2520..ef1bb80fbd28 100644
--- a/usr.sbin/i4b/isdndecode/facility.h
+++ b/usr.sbin/i4b/isdndecode/facility.h
@@ -29,7 +29,7 @@
  *
  *	$Id: facility.h,v 1.5 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.h,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Feb 21 16:16:04 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/isdndecode.8 b/usr.sbin/i4b/isdndecode/isdndecode.8
index 628bcbe38bb5..e658c26faf3f 100644
--- a/usr.sbin/i4b/isdndecode/isdndecode.8
+++ b/usr.sbin/i4b/isdndecode/isdndecode.8
@@ -26,7 +26,7 @@
 .\"
 .\"	last edit-date: [Mon Feb 21 16:15:09 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.17 2005/01/18 20:02:34 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt ISDNDECODE 8
diff --git a/usr.sbin/i4b/isdndecode/layer1.c b/usr.sbin/i4b/isdndecode/layer1.c
index c08b628e9a45..e1b0cc988115 100644
--- a/usr.sbin/i4b/isdndecode/layer1.c
+++ b/usr.sbin/i4b/isdndecode/layer1.c
@@ -29,7 +29,7 @@
  *
  *	$Id: layer1.c,v 1.4 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer1.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:50:34 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer2.c b/usr.sbin/i4b/isdndecode/layer2.c
index 1e5398680188..49ebd2df20c1 100644
--- a/usr.sbin/i4b/isdndecode/layer2.c
+++ b/usr.sbin/i4b/isdndecode/layer2.c
@@ -29,7 +29,7 @@
  *
  *	$Id: layer2.c,v 1.5 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer2.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:50:41 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer3.c b/usr.sbin/i4b/isdndecode/layer3.c
index 12a763319565..152104218e1c 100644
--- a/usr.sbin/i4b/isdndecode/layer3.c
+++ b/usr.sbin/i4b/isdndecode/layer3.c
@@ -27,7 +27,7 @@
  *	layer3.c - decode and print layer 3 (Q.931) information
  *	-------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3.c,v 1.9 2002/03/26 15:13:02 hm Exp $
  *
  *      last edit-date: [Tue Mar 26 14:39:02 2002]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer3_subr.c b/usr.sbin/i4b/isdndecode/layer3_subr.c
index 6fcedd24439d..23fa645992a0 100644
--- a/usr.sbin/i4b/isdndecode/layer3_subr.c
+++ b/usr.sbin/i4b/isdndecode/layer3_subr.c
@@ -29,7 +29,7 @@
  *
  *	$Id: layer3_subr.c,v 1.8 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3_subr.c,v 1.8 2001/04/26 08:40:35 kris Exp $
  *
  *      last edit-date: [Mon Feb 21 15:45:16 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/main.c b/usr.sbin/i4b/isdndecode/main.c
index 76afab109d47..997a3e0b9a23 100644
--- a/usr.sbin/i4b/isdndecode/main.c
+++ b/usr.sbin/i4b/isdndecode/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.13 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/main.c,v 1.10 2003/06/07 18:43:09 imp Exp $
  *
  *      last edit-date: [Mon Feb 21 16:19:30 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.c b/usr.sbin/i4b/isdndecode/pcause.c
index 610a9609c179..ac3d0da8513f 100644
--- a/usr.sbin/i4b/isdndecode/pcause.c
+++ b/usr.sbin/i4b/isdndecode/pcause.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause.c,v 1.5 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/pcause.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:20 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.h b/usr.sbin/i4b/isdndecode/pcause.h
index 2c1c7f403e5b..d30cbc8f9573 100644
--- a/usr.sbin/i4b/isdndecode/pcause.h
+++ b/usr.sbin/i4b/isdndecode/pcause.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause.h,v 1.4 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/pcause.h,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:32 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/Makefile b/usr.sbin/i4b/isdnmonitor/Makefile
index ed241c16afb4..1cf2ca486c0d 100644
--- a/usr.sbin/i4b/isdnmonitor/Makefile
+++ b/usr.sbin/i4b/isdnmonitor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdnmonitor/Makefile,v 1.9 2004/08/13 14:21:49 ru Exp $
 
 PROG=	isdnmonitor
 MAN=	isdnmonitor.8
diff --git a/usr.sbin/i4b/isdnmonitor/curses.c b/usr.sbin/i4b/isdnmonitor/curses.c
index 1e7eec15b68d..55e6356455f2 100644
--- a/usr.sbin/i4b/isdnmonitor/curses.c
+++ b/usr.sbin/i4b/isdnmonitor/curses.c
@@ -29,7 +29,7 @@
  *
  *	$Id: curses.c,v 1.10 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/curses.c,v 1.2 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:47 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
index 46e1a377f92a..bcb8a71226dd 100644
--- a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
+++ b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnmonitor.8,v 1.8 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.19 2005/01/18 20:02:34 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:04:25 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnmonitor/main.c b/usr.sbin/i4b/isdnmonitor/main.c
index 1a0a1e89624b..c112376ed8d2 100644
--- a/usr.sbin/i4b/isdnmonitor/main.c
+++ b/usr.sbin/i4b/isdnmonitor/main.c
@@ -35,7 +35,7 @@
  *
  *	$Id: main.c,v 1.35 2000/08/24 11:48:57 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/main.c,v 1.8 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:11 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/monitor.h b/usr.sbin/i4b/isdnmonitor/monitor.h
index 4862c4835e3a..a1535398e92e 100644
--- a/usr.sbin/i4b/isdnmonitor/monitor.h
+++ b/usr.sbin/i4b/isdnmonitor/monitor.h
@@ -35,7 +35,7 @@
  *
  *	$Id: monitor.h,v 1.16 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/monitor.h,v 1.8 2003/01/01 18:49:01 schweikh Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:18 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/monprivate.h b/usr.sbin/i4b/isdnmonitor/monprivate.h
index ec6ec4d04ae1..0644d6868706 100644
--- a/usr.sbin/i4b/isdnmonitor/monprivate.h
+++ b/usr.sbin/i4b/isdnmonitor/monprivate.h
@@ -29,7 +29,7 @@
  *
  *	$Id: monprivate.h,v 1.10 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.2 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:25 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/Makefile b/usr.sbin/i4b/isdnphone/Makefile
index 3527e8cef36d..662046d98f48 100644
--- a/usr.sbin/i4b/isdnphone/Makefile
+++ b/usr.sbin/i4b/isdnphone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdnphone/Makefile,v 1.4 2001/07/20 06:19:50 obrien Exp $
 
 PROG=	isdnphone
 MAN=	isdnphone.8
diff --git a/usr.sbin/i4b/isdnphone/audio.c b/usr.sbin/i4b/isdnphone/audio.c
index 2dc88d6afc2e..c7dbc933ea09 100644
--- a/usr.sbin/i4b/isdnphone/audio.c
+++ b/usr.sbin/i4b/isdnphone/audio.c
@@ -29,7 +29,7 @@
  *
  *	$Id: audio.c,v 1.5 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/audio.c,v 1.1 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:39 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/defs.h b/usr.sbin/i4b/isdnphone/defs.h
index 18da037afe90..59639ea24458 100644
--- a/usr.sbin/i4b/isdnphone/defs.h
+++ b/usr.sbin/i4b/isdnphone/defs.h
@@ -29,7 +29,7 @@
  *
  *	$Id: defs.h,v 1.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/defs.h,v 1.2 2000/10/13 11:55:13 bde Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:46 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/display.c b/usr.sbin/i4b/isdnphone/display.c
index 1dff9a16f3f9..6cd987e3ddb2 100644
--- a/usr.sbin/i4b/isdnphone/display.c
+++ b/usr.sbin/i4b/isdnphone/display.c
@@ -29,7 +29,7 @@
  *
  *	$Id: display.c,v 1.4 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/display.c,v 1.1 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:55 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/isdn.c b/usr.sbin/i4b/isdnphone/isdn.c
index 34719c727269..8cc0c0760440 100644
--- a/usr.sbin/i4b/isdnphone/isdn.c
+++ b/usr.sbin/i4b/isdnphone/isdn.c
@@ -29,7 +29,7 @@
  *
  *	$Id: isdn.c,v 1.4 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/isdn.c,v 1.1 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:05 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/isdnphone.8 b/usr.sbin/i4b/isdnphone/isdnphone.8
index 5ba4782ccd3c..214907e4cc24 100644
--- a/usr.sbin/i4b/isdnphone/isdnphone.8
+++ b/usr.sbin/i4b/isdnphone/isdnphone.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnphone/isdnphone.8,v 1.9 2002/08/27 14:46:22 hm Exp $
 .\"
 .\"	last edit-date: [Tue Aug 27 16:42:12 2002]
 .\"
diff --git a/usr.sbin/i4b/isdnphone/main.c b/usr.sbin/i4b/isdnphone/main.c
index 6b8466acae92..db7f3ea810ba 100644
--- a/usr.sbin/i4b/isdnphone/main.c
+++ b/usr.sbin/i4b/isdnphone/main.c
@@ -27,7 +27,7 @@
  *	isdnphone - main module
  *	=======================
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/main.c,v 1.4 2002/08/27 14:46:22 hm Exp $
  *
  *      last edit-date: [Tue Aug 27 16:38:55 2002]
  *
diff --git a/usr.sbin/i4b/isdntel/Makefile b/usr.sbin/i4b/isdntel/Makefile
index e3aff090b196..749143aab5ae 100644
--- a/usr.sbin/i4b/isdntel/Makefile
+++ b/usr.sbin/i4b/isdntel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntel/Makefile,v 1.7 2001/07/20 06:19:49 obrien Exp $
 
 PROG=	isdntel
 MAN=	isdntel.8
diff --git a/usr.sbin/i4b/isdntel/alias.c b/usr.sbin/i4b/isdntel/alias.c
index 0f4dae712a15..8a07e24d4e1c 100644
--- a/usr.sbin/i4b/isdntel/alias.c
+++ b/usr.sbin/i4b/isdntel/alias.c
@@ -29,7 +29,7 @@
  *
  *      $Id: alias.c,v 1.9 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/alias.c,v 1.7 2000/10/09 14:22:44 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:37 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/alias.h b/usr.sbin/i4b/isdntel/alias.h
index 813d5bd79095..a82fdc389406 100644
--- a/usr.sbin/i4b/isdntel/alias.h
+++ b/usr.sbin/i4b/isdntel/alias.h
@@ -29,7 +29,7 @@
  *
  *      $Id: alias.h,v 1.5 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/alias.h,v 1.7 2000/10/09 14:22:44 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:44 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h
index 9b5fd694c69b..a95372f3bd1e 100644
--- a/usr.sbin/i4b/isdntel/defs.h
+++ b/usr.sbin/i4b/isdntel/defs.h
@@ -29,7 +29,7 @@
  *
  *	$Id: defs.h,v 1.10 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/defs.h,v 1.7 2000/10/09 14:22:44 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:50 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/display.c b/usr.sbin/i4b/isdntel/display.c
index 53e6637d5155..bc1662871721 100644
--- a/usr.sbin/i4b/isdntel/display.c
+++ b/usr.sbin/i4b/isdntel/display.c
@@ -29,7 +29,7 @@
  *
  *	$Id: display.c,v 1.9 2000/07/19 08:56:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/display.c,v 1.7 2000/10/09 14:22:44 hm Exp $
  *
  *      last edit-date: [Wed Jul 19 10:08:06 2000]
  *
diff --git a/usr.sbin/i4b/isdntel/files.c b/usr.sbin/i4b/isdntel/files.c
index bf05b4237cd2..dbddaf00b8f6 100644
--- a/usr.sbin/i4b/isdntel/files.c
+++ b/usr.sbin/i4b/isdntel/files.c
@@ -29,7 +29,7 @@
  *
  *      $Id: files.c,v 1.8 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/files.c,v 1.8 2003/06/07 18:44:04 imp Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:06 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/isdntel.8 b/usr.sbin/i4b/isdntel/isdntel.8
index 430c9f2df6f9..d83f5fb1ee38 100644
--- a/usr.sbin/i4b/isdntel/isdntel.8
+++ b/usr.sbin/i4b/isdntel/isdntel.8
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Mon Dec 13 23:05:59 1999]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.18 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	$Id: isdntel.8,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
diff --git a/usr.sbin/i4b/isdntel/main.c b/usr.sbin/i4b/isdntel/main.c
index 6bea96662703..a08e6cd7304e 100644
--- a/usr.sbin/i4b/isdntel/main.c
+++ b/usr.sbin/i4b/isdntel/main.c
@@ -29,7 +29,7 @@
  *
  *      $Id: main.c,v 1.12 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/main.c,v 1.10 2003/06/07 18:42:05 imp Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:26 1999]
  *
diff --git a/usr.sbin/i4b/isdntelctl/Makefile b/usr.sbin/i4b/isdntelctl/Makefile
index 41b771e9616e..bd841fafcdfc 100644
--- a/usr.sbin/i4b/isdntelctl/Makefile
+++ b/usr.sbin/i4b/isdntelctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntelctl/Makefile,v 1.5 2001/07/20 06:19:49 obrien Exp $
 
 PROG=	isdntelctl
 MAN= 	isdntelctl.8
diff --git a/usr.sbin/i4b/isdntelctl/isdntelctl.8 b/usr.sbin/i4b/isdntelctl/isdntelctl.8
index 4afaf00a9f7c..1d5a1f8dd9f4 100644
--- a/usr.sbin/i4b/isdntelctl/isdntelctl.8
+++ b/usr.sbin/i4b/isdntelctl/isdntelctl.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntelctl.8,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.17 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:06:45 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c
index 3d7566392364..bf8c52d1ce35 100644
--- a/usr.sbin/i4b/isdntelctl/main.c
+++ b/usr.sbin/i4b/isdntelctl/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.12 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntelctl/main.c,v 1.10 2000/12/09 09:35:45 obrien Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:50 1999]
  *
diff --git a/usr.sbin/i4b/isdntest/Makefile b/usr.sbin/i4b/isdntest/Makefile
index 88b491a8c8c9..8081a042c9d3 100644
--- a/usr.sbin/i4b/isdntest/Makefile
+++ b/usr.sbin/i4b/isdntest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntest/Makefile,v 1.7 2003/04/13 14:21:56 bde Exp $
 
 PROG=	isdntest
 MAN=	isdntest.8
diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8
index 243d70b1b134..760665c3fb2e 100644
--- a/usr.sbin/i4b/isdntest/isdntest.8
+++ b/usr.sbin/i4b/isdntest/isdntest.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntest.8,v 1.10 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntest/isdntest.8,v 1.17 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:07:23 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c
index 2d80e2ed3ebb..94b1d269cfd8 100644
--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.16 2000/03/13 16:18:38 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntest/main.c,v 1.8 2000/10/09 14:22:45 hm Exp $
  *
  *      last edit-date: [Mon Mar 13 17:19:26 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/1tr6.c b/usr.sbin/i4b/isdntrace/1tr6.c
index db2bc7177a4a..4c27aaf33bc0 100644
--- a/usr.sbin/i4b/isdntrace/1tr6.c
+++ b/usr.sbin/i4b/isdntrace/1tr6.c
@@ -29,7 +29,7 @@
  *
  *	$Id: 1tr6.c,v 1.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/1tr6.c,v 1.7 2000/10/09 14:22:46 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:55:31 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/Makefile b/usr.sbin/i4b/isdntrace/Makefile
index eae0919b299b..107543402a7a 100644
--- a/usr.sbin/i4b/isdntrace/Makefile
+++ b/usr.sbin/i4b/isdntrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntrace/Makefile,v 1.7 2001/07/20 06:19:49 obrien Exp $
 
 PROG=	isdntrace
 MAN=	isdntrace.8
diff --git a/usr.sbin/i4b/isdntrace/cable.txt b/usr.sbin/i4b/isdntrace/cable.txt
index 21a1cdb830b3..48ed5f02512c 100644
--- a/usr.sbin/i4b/isdntrace/cable.txt
+++ b/usr.sbin/i4b/isdntrace/cable.txt
@@ -5,7 +5,7 @@
  *
  *	$Id: cable.txt,v 1.4 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/cable.txt,v 1.7 2000/10/09 14:22:48 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:55:42 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/isdntrace.8 b/usr.sbin/i4b/isdntrace/isdntrace.8
index 166f42063a5a..6c8b895ac05d 100644
--- a/usr.sbin/i4b/isdntrace/isdntrace.8
+++ b/usr.sbin/i4b/isdntrace/isdntrace.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntrace.8,v 1.14 2000/02/13 15:26:52 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.21 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Wed Nov  1 15:52:28 2000]
 .\"
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.c b/usr.sbin/i4b/isdntrace/pcause_1tr6.c
index b319d7452e34..062e3a06a54f 100644
--- a/usr.sbin/i4b/isdntrace/pcause_1tr6.c
+++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_1tr6.c,v 1.6 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_1tr6.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:03 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.h b/usr.sbin/i4b/isdntrace/pcause_1tr6.h
index 67f50deedc85..23ce02b28ddf 100644
--- a/usr.sbin/i4b/isdntrace/pcause_1tr6.h
+++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_1tr6.h,v 1.5 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_1tr6.h,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:10 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.c b/usr.sbin/i4b/isdntrace/pcause_q850.c
index 57eaf32dc955..5fd6dd1b7cfc 100644
--- a/usr.sbin/i4b/isdntrace/pcause_q850.c
+++ b/usr.sbin/i4b/isdntrace/pcause_q850.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_q850.c,v 1.6 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_q850.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:18 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.h b/usr.sbin/i4b/isdntrace/pcause_q850.h
index ea21770ca3b7..4413d5513d74 100644
--- a/usr.sbin/i4b/isdntrace/pcause_q850.h
+++ b/usr.sbin/i4b/isdntrace/pcause_q850.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_q850.h,v 1.5 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_q850.h,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:25 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q921.c b/usr.sbin/i4b/isdntrace/q921.c
index e8c14dc67110..b3df045dead3 100644
--- a/usr.sbin/i4b/isdntrace/q921.c
+++ b/usr.sbin/i4b/isdntrace/q921.c
@@ -32,7 +32,7 @@
  *
  *	$Id: q921.c,v 1.4 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q921.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:56:46 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q931.c b/usr.sbin/i4b/isdntrace/q931.c
index d69453eb9f91..e8d88cade1ec 100644
--- a/usr.sbin/i4b/isdntrace/q931.c
+++ b/usr.sbin/i4b/isdntrace/q931.c
@@ -27,7 +27,7 @@
  *	q931.c - print Q.931 traces
  *	---------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931.c,v 1.8 2001/10/18 08:03:23 hm Exp $
  *
  *      last edit-date: [Wed Oct 17 14:49:16 2001]
  *
diff --git a/usr.sbin/i4b/isdntrace/q931_util.c b/usr.sbin/i4b/isdntrace/q931_util.c
index 9f82283d39d9..be32b09ef03f 100644
--- a/usr.sbin/i4b/isdntrace/q931_util.c
+++ b/usr.sbin/i4b/isdntrace/q931_util.c
@@ -29,7 +29,7 @@
  *
  *	$Id: q931_util.c,v 1.11 2000/02/15 12:48:14 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931_util.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Tue Feb 15 13:52:09 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.c b/usr.sbin/i4b/isdntrace/q932_fac.c
index 0a0099d3edce..ce47506caa09 100644
--- a/usr.sbin/i4b/isdntrace/q932_fac.c
+++ b/usr.sbin/i4b/isdntrace/q932_fac.c
@@ -29,7 +29,7 @@
  *
  *	$Id: q932_fac.c,v 1.8 2000/02/24 16:32:46 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Thu Feb 24 17:36:47 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.h b/usr.sbin/i4b/isdntrace/q932_fac.h
index 563de3a6a28d..a85a1809cce3 100644
--- a/usr.sbin/i4b/isdntrace/q932_fac.h
+++ b/usr.sbin/i4b/isdntrace/q932_fac.h
@@ -29,7 +29,7 @@
  *
  *	$Id: q932_fac.h,v 1.7 2000/02/18 16:27:39 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.h,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Fri Feb 18 17:26:07 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.c b/usr.sbin/i4b/isdntrace/trace.c
index 2ba1ca59ed5b..07af98e075c1 100644
--- a/usr.sbin/i4b/isdntrace/trace.c
+++ b/usr.sbin/i4b/isdntrace/trace.c
@@ -37,7 +37,7 @@
  *
  *	$Id: trace.c,v 1.19 2000/08/28 07:06:42 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.c,v 1.10 2003/06/07 18:35:45 imp Exp $
  *
  *      last edit-date: [Mon Aug 28 09:03:46 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h
index 81fa415f9df2..acb098e06cfe 100644
--- a/usr.sbin/i4b/isdntrace/trace.h
+++ b/usr.sbin/i4b/isdntrace/trace.h
@@ -37,7 +37,7 @@
  *
  *	$Id: trace.h,v 1.12 2000/02/14 16:25:22 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.h,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Mon Feb 14 14:43:40 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/unknownl3.c b/usr.sbin/i4b/isdntrace/unknownl3.c
index 8967a6a9b037..b976bca0a696 100644
--- a/usr.sbin/i4b/isdntrace/unknownl3.c
+++ b/usr.sbin/i4b/isdntrace/unknownl3.c
@@ -29,7 +29,7 @@
  *
  *	$Id: unknownl3.c,v 1.2 2000/02/13 15:26:52 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/unknownl3.c,v 1.1 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Sun Feb 13 14:16:44 2000]
  *
diff --git a/usr.sbin/i4b/man/Makefile b/usr.sbin/i4b/man/Makefile
index 561e5fe46fd5..67ef6ac0a6eb 100644
--- a/usr.sbin/i4b/man/Makefile
+++ b/usr.sbin/i4b/man/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/man/Makefile,v 1.9 2001/12/22 09:38:53 gj Exp $
 MAN=	i4b.4 i4bcapi.4 i4bctl.4 i4bing.4 i4bipr.4 i4bisppp.4 i4bq921.4 \
 	i4bq931.4 i4brbch.4 i4btel.4 i4btrc.4 iavc.4 isic.4 ifpi.4 \
 	ifpi2.4 ifpnp.4 ihfc.4 itjc.4 iwic.4
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index f2e031a368bb..2e3d99f327a8 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4b.4,v 1.14 2002/12/11 15:37:55 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:07:13 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bcapi.4 b/usr.sbin/i4b/man/i4bcapi.4
index 95d2bba06886..ef710d69e62a 100644
--- a/usr.sbin/i4b/man/i4bcapi.4
+++ b/usr.sbin/i4b/man/i4bcapi.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bcapi.4,v 1.3 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Fri May 25 09:38:45 2001]
 .\"
diff --git a/usr.sbin/i4b/man/i4bctl.4 b/usr.sbin/i4b/man/i4bctl.4
index 20b42e83edbb..3beec8559241 100644
--- a/usr.sbin/i4b/man/i4bctl.4
+++ b/usr.sbin/i4b/man/i4bctl.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bctl.4,v 1.11 2002/07/28 18:21:47 hm Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:21:03 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bing.4 b/usr.sbin/i4b/man/i4bing.4
index 0322088e09eb..5640078d28bd 100644
--- a/usr.sbin/i4b/man/i4bing.4
+++ b/usr.sbin/i4b/man/i4bing.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bing.4,v 1.8 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:21:13 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index 6bbc1faea49b..26e046e8d050 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bipr.4,v 1.14 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:29:08 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index 7ef4a96f8ce4..b9fafad8c8bd 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bisppp.4,v 1.16 2005/01/21 10:35:40 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:43:22 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4
index ecd729333779..8c1b6dad6a25 100644
--- a/usr.sbin/i4b/man/i4bq921.4
+++ b/usr.sbin/i4b/man/i4bq921.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq921.4,v 1.13 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:49:44 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4
index 937840d77121..22a4b53f7b86 100644
--- a/usr.sbin/i4b/man/i4bq931.4
+++ b/usr.sbin/i4b/man/i4bq931.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq931.4,v 1.13 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:11:55 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4
index aaa6044b0349..b38c12b7537f 100644
--- a/usr.sbin/i4b/man/i4brbch.4
+++ b/usr.sbin/i4b/man/i4brbch.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4brbch.4,v 1.14 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:52:34 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index d8e17f4cda3c..54c305573794 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btel.4,v 1.17 2005/01/21 10:35:40 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:14:06 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index cbd6a7f44cae..91583a843ae0 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btrc.4,v 1.15 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:21:03 2002]
 .\"
diff --git a/usr.sbin/i4b/man/iavc.4 b/usr.sbin/i4b/man/iavc.4
index e737e645a28a..e5008509f39d 100644
--- a/usr.sbin/i4b/man/iavc.4
+++ b/usr.sbin/i4b/man/iavc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/iavc.4,v 1.4 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:37:51 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ifpi.4 b/usr.sbin/i4b/man/ifpi.4
index f2f3cdf20f2f..8a5c82f2dcb1 100644
--- a/usr.sbin/i4b/man/ifpi.4
+++ b/usr.sbin/i4b/man/ifpi.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ifpi.4,v 1.8 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:38:40 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ifpi2.4 b/usr.sbin/i4b/man/ifpi2.4
index 4889079c7635..38733045882f 100644
--- a/usr.sbin/i4b/man/ifpi2.4
+++ b/usr.sbin/i4b/man/ifpi2.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ifpi2.4,v 1.5 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:38:22 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ifpnp.4 b/usr.sbin/i4b/man/ifpnp.4
index bf892189057b..7e8d7356c37e 100644
--- a/usr.sbin/i4b/man/ifpnp.4
+++ b/usr.sbin/i4b/man/ifpnp.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Ust: src/i4b/man/ifpnp.4,v 1.4 2000/04/18 08:26:31 ust Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ifpnp.4,v 1.8 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:39:35 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ihfc.4 b/usr.sbin/i4b/man/ihfc.4
index 4d91391acb94..ddd35d0b45f3 100644
--- a/usr.sbin/i4b/man/ihfc.4
+++ b/usr.sbin/i4b/man/ihfc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ihfc.4,v 1.11 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:47:55 2002]
 .\"
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index e545c08f4c77..5a202fa05731 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/isic.4,v 1.20 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 20:14:24 2002]
 .\"
diff --git a/usr.sbin/i4b/man/itjc.4 b/usr.sbin/i4b/man/itjc.4
index be4f9fe46c0d..39b27c41e9fd 100644
--- a/usr.sbin/i4b/man/itjc.4
+++ b/usr.sbin/i4b/man/itjc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/itjc.4,v 1.5 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Fri Jan 12 10:07:04 2001]
 .\"
diff --git a/usr.sbin/i4b/man/iwic.4 b/usr.sbin/i4b/man/iwic.4
index 8d9b4df7bae8..98d6a15cf567 100644
--- a/usr.sbin/i4b/man/iwic.4
+++ b/usr.sbin/i4b/man/iwic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/iwic.4,v 1.9 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:49:47 2002]
 .\"
diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile
index a5911dc8f3b8..e41b2474dcaf 100644
--- a/usr.sbin/ifmcstat/Makefile
+++ b/usr.sbin/ifmcstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ifmcstat/Makefile,v 1.8 2004/09/13 08:14:55 dd Exp $
 
 PROG=	ifmcstat
 MAN=	ifmcstat.8
diff --git a/usr.sbin/ifmcstat/ifmcstat.8 b/usr.sbin/ifmcstat/ifmcstat.8
index fc02b44df369..3780e3efcf30 100644
--- a/usr.sbin/ifmcstat/ifmcstat.8
+++ b/usr.sbin/ifmcstat/ifmcstat.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.6 2005/02/09 18:04:40 ru Exp $
 .\"
 .Dd May 21, 1998
 .Dt IFMCSTAT 8
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index feb289d90ae5..0603fac1f68b 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.c,v 1.12 2004/09/13 08:14:55 dd Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index afe4c5113580..892fb8ba3279 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/inetd/Makefile,v 1.29 2003/10/30 22:56:44 peter Exp $
 
 PROG=	inetd
 MAN=	inetd.8
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index 96eeb3357fa4..ffae2d5cac99 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/inetd/builtins.c,v 1.43 2002/07/22 13:58:58 fanf Exp $");
 
 #include <sys/filio.h>
 #include <sys/ioccom.h>
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 75e57101981f..1235b0fc3ad6 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.81 2005/06/10 20:52:35 nectar Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 62929d5bce23..e01af661e0fd 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)from: inetd.c	8.4 (Berkeley) 4/13/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/inetd/inetd.c,v 1.129 2005/05/13 16:31:10 ume Exp $");
 
 /*
  * Inetd - Internet super-server
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index 8c05ed9456d9..601a9e08ea7c 100644
--- a/usr.sbin/inetd/inetd.h
+++ b/usr.sbin/inetd/inetd.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/inetd.h,v 1.14 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h
index d4fd81d12faa..28e3759941f6 100644
--- a/usr.sbin/inetd/pathnames.h
+++ b/usr.sbin/inetd/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/pathnames.h,v 1.7 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index 558b09bbd6cc..bb35c2dd1efa 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/iostat/Makefile,v 1.14 2004/02/04 10:20:43 ru Exp $
 
 PROG=	iostat
 MAN=	iostat.8
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index be66c7cde74b..d937399454bf 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/iostat/iostat.8,v 1.27 2005/05/26 17:54:16 keramida Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 724756ebe32e..a3ceeffa1a8f 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.28 2003/03/15 21:59:06 phk Exp $
  */
 /*
  * Parts of this program are derived from the original FreeBSD iostat
diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile
index cd2510eb0e19..2822bc6176de 100644
--- a/usr.sbin/ip6addrctl/Makefile
+++ b/usr.sbin/ip6addrctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ip6addrctl/Makefile,v 1.1 2003/10/30 17:46:40 ume Exp $
 
 PROG=	ip6addrctl
 MAN=	ip6addrctl.8
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8
index 59154d447b1e..105bfc64db0a 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.8
+++ b/usr.sbin/ip6addrctl/ip6addrctl.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ip6addrctl/ip6addrctl.8,v 1.3 2005/01/17 07:44:41 ru Exp $
 .\"
 .Dd September 25, 2001
 .Dt IP6ADDRCTL 8
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c
index 12802b468d6b..e32b68e0d81a 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.c
+++ b/usr.sbin/ip6addrctl/ip6addrctl.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ip6addrctl/ip6addrctl.c,v 1.3 2003/12/26 17:04:44 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
index a2b3759de5f7..4c1cab8c2967 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
+++ b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
@@ -1,7 +1,7 @@
 # default policy table based on RFC 3484.
 # usage: ip6addrctl install path_to_this_file
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ip6addrctl/ip6addrctl.conf.sample,v 1.2 2003/12/26 17:10:58 ume Exp $
 #
 #Format:
 #Prefix       Precedence Label
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 812cbc96c765..ccdebe1b1dc8 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jail/Makefile,v 1.10 2004/11/17 10:01:48 delphij Exp $
 
 PROG=	jail
 MAN=	jail.8
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 53e9d367f763..ce3bc784ed65 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -31,7 +31,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/jail/jail.8,v 1.67.2.3 2005/09/24 01:59:39 keramida Exp $
 .\"
 .Dd August 7, 2005
 .Dt JAIL 8
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 84cab5515366..ef1154264528 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/jail/jail.c,v 1.20 2004/11/17 10:01:48 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/jail.h>
diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile
index 87e99262eef9..97cbc785dbd2 100644
--- a/usr.sbin/jexec/Makefile
+++ b/usr.sbin/jexec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jexec/Makefile,v 1.1 2003/04/09 03:04:12 mike Exp $
 
 PROG=	jexec
 MAN=	jexec.8
diff --git a/usr.sbin/jexec/jexec.8 b/usr.sbin/jexec/jexec.8
index a5749c1f3f23..e5632556ebbd 100644
--- a/usr.sbin/jexec/jexec.8
+++ b/usr.sbin/jexec/jexec.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/jexec/jexec.8,v 1.2 2003/05/31 18:24:40 ru Exp $
 .\"
 .Dd April 8, 2003
 .Dt JEXEC 8
diff --git a/usr.sbin/jexec/jexec.c b/usr.sbin/jexec/jexec.c
index 089a896d5c16..eb28bd8e19b1 100644
--- a/usr.sbin/jexec/jexec.c
+++ b/usr.sbin/jexec/jexec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/jexec/jexec.c,v 1.2 2003/07/04 19:14:27 bmilekic Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile
index 3968946ce642..d0b499b7dde9 100644
--- a/usr.sbin/jls/Makefile
+++ b/usr.sbin/jls/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jls/Makefile,v 1.1 2003/04/09 03:04:12 mike Exp $
 
 PROG=	jls
 MAN=	jls.8
diff --git a/usr.sbin/jls/jls.8 b/usr.sbin/jls/jls.8
index 4dc68c77ad28..71aa152348c2 100644
--- a/usr.sbin/jls/jls.8
+++ b/usr.sbin/jls/jls.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/jls/jls.8,v 1.1 2003/04/09 03:04:12 mike Exp $
 .\"
 .Dd April 8, 2003
 .Dt JLS 8
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 23a39468a9d1..e63761b90ae8 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/jls/jls.c,v 1.3.12.1 2005/08/19 11:09:11 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index ca1b6e697bd4..5bd41be7eb8c 100644
--- a/usr.sbin/kbdcontrol/Makefile
+++ b/usr.sbin/kbdcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdcontrol/Makefile,v 1.11 2003/04/04 17:49:14 obrien Exp $
 
 PROG=	kbdcontrol
 MAN=	kbdcontrol.1 kbdmap.5
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 1fcc7971dbd4..42b61f2e7a8c 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)kbdcontrol.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.36.2.2 2005/08/06 14:45:18 markus Exp $
 .\"
 .Dd January 7, 2005
 .Dt KBDCONTROL 1
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 7607ff472d77..f6a9f2dbfb08 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.c,v 1.48.8.1 2005/07/21 17:04:02 emax Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.sbin/kbdcontrol/kbdmap.5 b/usr.sbin/kbdcontrol/kbdmap.5
index 5d9776d9a039..2a283941a384 100644
--- a/usr.sbin/kbdcontrol/kbdmap.5
+++ b/usr.sbin/kbdcontrol/kbdmap.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdcontrol/kbdmap.5,v 1.7 2004/08/21 12:58:09 simon Exp $
 .\"
 .Dd September 11, 2000
 .Dt KBDMAP 5
diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h
index 17e10c266f0e..459da39693ed 100644
--- a/usr.sbin/kbdcontrol/lex.h
+++ b/usr.sbin/kbdcontrol/lex.h
@@ -25,7 +25,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/usr.sbin/kbdcontrol/lex.h,v 1.14 2002/07/11 21:13:37 alfred Exp $
  */
 
 #define TNOP		256
diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l
index 7d9fd53fa04b..f2dd9319f361 100644
--- a/usr.sbin/kbdcontrol/lex.l
+++ b/usr.sbin/kbdcontrol/lex.l
@@ -25,7 +25,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/usr.sbin/kbdcontrol/lex.l,v 1.15 2002/07/11 21:12:18 alfred Exp $
  */
 
 %{
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index ec493416a573..66e298a2f09a 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdmap/Makefile,v 1.14 2005/01/28 16:08:10 ru Exp $
 
 PROG=	kbdmap
 LINKS=	${BINDIR}/kbdmap ${BINDIR}/vidfont
diff --git a/usr.sbin/kbdmap/TODO b/usr.sbin/kbdmap/TODO
index cef30f79ba1b..fadc755727b0 100644
--- a/usr.sbin/kbdmap/TODO
+++ b/usr.sbin/kbdmap/TODO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/kbdmap/TODO,v 1.2 2000/09/13 09:16:57 dwmalone Exp $
 
 o remember some hackers to translate Languages.phrases into
   Norwegian, Russian, Danish, Swedish
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index d1d767601b5e..92b1d96277ae 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.33 2005/01/18 20:02:36 ru Exp $
 .Dd July 3, 2002
 .Dt KBDMAP 1
 .Os
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index b99b057c9a11..723aa34fe679 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.3 2005/06/30 05:31:01 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/kbdmap/kbdmap.h b/usr.sbin/kbdmap/kbdmap.h
index e57fa8c3c9af..7761c97438b9 100644
--- a/usr.sbin/kbdmap/kbdmap.h
+++ b/usr.sbin/kbdmap/kbdmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kbdmap/kbdmap.h,v 1.1 2002/07/03 14:56:08 markm Exp $
  */
 
 
diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile
index 7da462b4f3b5..3830f3086cc7 100644
--- a/usr.sbin/kernbb/Makefile
+++ b/usr.sbin/kernbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.10 2003/12/03 07:43:03 phk Exp $
 
 PROG=	kernbb
 MAN=	kernbb.8
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index 3d6fe0265744..f47b7406ea0e 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kernbb/kernbb.8,v 1.19 2004/08/07 04:27:50 imp Exp $
 .\"
 .Dd May 22, 1995
 .Dt KERNBB 8
diff --git a/usr.sbin/kernbb/kernbb.c b/usr.sbin/kernbb/kernbb.c
index 1ecd5ad794c4..c8ff57662e3d 100644
--- a/usr.sbin/kernbb/kernbb.c
+++ b/usr.sbin/kernbb/kernbb.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.17 2004/05/29 01:22:53 tjr Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 54075da67638..18a702c353b2 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/keyserv/Makefile,v 1.14 2004/08/06 07:27:06 cperciva Exp $
 
 PROG=	keyserv
 MAN=	keyserv.8
diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c
index 45f6f6e9de78..98518165fa9c 100644
--- a/usr.sbin/keyserv/crypt_server.c
+++ b/usr.sbin/keyserv/crypt_server.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/crypt_server.c,v 1.9 2002/09/17 01:49:00 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv.8 b/usr.sbin/keyserv/keyserv.8
index 726f91cc00c4..8d42fe4a24c5 100644
--- a/usr.sbin/keyserv/keyserv.8
+++ b/usr.sbin/keyserv/keyserv.8
@@ -2,7 +2,7 @@
 .\"macro stdmacro
 .\" Copyright 1989 AT&T
 .\" @(#)keyserv.8c 1.8 89/03/29 SMI;
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/keyserv/keyserv.8,v 1.11 2002/08/13 16:07:27 ru Exp $
 .\".TH KEYSERV 8C "9 September 1987"
 .Dd September 14, 1992
 .Dt KEYSERV 8
diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 9a907a7f379a..8bff879794a4 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)keyserv.c	1.15	94/04/25 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/keyserv.c,v 1.11 2003/02/18 01:35:58 kris Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv.h b/usr.sbin/keyserv/keyserv.h
index 549a41bae253..8b7173c2bca2 100644
--- a/usr.sbin/keyserv/keyserv.h
+++ b/usr.sbin/keyserv/keyserv.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/keyserv/keyserv.h,v 1.4 2005/02/10 09:09:18 stefanf Exp $
  */
 extern void setmodulus __P((char *modx));
 
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index 566b1c79834c..9a0d041169b9 100644
--- a/usr.sbin/keyserv/setkey.c
+++ b/usr.sbin/keyserv/setkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)setkey.c	1.11	94/04/25 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/setkey.c,v 1.3 1999/08/28 01:16:41 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile
index bf19401b494d..a9e692523700 100644
--- a/usr.sbin/kgmon/Makefile
+++ b/usr.sbin/kgmon/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kgmon/Makefile,v 1.6 2004/08/30 03:12:49 marcel Exp $
 
 PROG=	kgmon
 MAN=	kgmon.8
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index b783d6fe19c0..05db6615e13d 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kgmon.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kgmon/kgmon.8,v 1.16 2005/01/18 20:02:36 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 05d478a6a599..029371e55672 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kgmon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.14 2004/08/30 03:11:46 marcel Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile
index 013c65fe33c9..b65f7e8979da 100644
--- a/usr.sbin/kgzip/Makefile
+++ b/usr.sbin/kgzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kgzip/Makefile,v 1.11 2003/06/11 21:36:06 obrien Exp $
 
 PROG=	kgzip
 MAN=	kgzip.8
diff --git a/usr.sbin/kgzip/aouthdr.c b/usr.sbin/kgzip/aouthdr.c
index 27541e6cae11..be49b15ca799 100644
--- a/usr.sbin/kgzip/aouthdr.c
+++ b/usr.sbin/kgzip/aouthdr.c
@@ -24,7 +24,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/usr.sbin/kgzip/aouthdr.c,v 1.1 2000/11/04 13:02:00 rnordier Exp $
  */
 
 #include <stddef.h>
diff --git a/usr.sbin/kgzip/aouthdr.h b/usr.sbin/kgzip/aouthdr.h
index 63c2dff66904..580d73433efe 100644
--- a/usr.sbin/kgzip/aouthdr.h
+++ b/usr.sbin/kgzip/aouthdr.h
@@ -24,7 +24,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/usr.sbin/kgzip/aouthdr.h,v 1.1 2000/11/04 13:02:00 rnordier Exp $
  */
 
 #include <a.out.h>
diff --git a/usr.sbin/kgzip/elfhdr.c b/usr.sbin/kgzip/elfhdr.c
index 12b1d5f5b340..7ff2ac98411b 100644
--- a/usr.sbin/kgzip/elfhdr.c
+++ b/usr.sbin/kgzip/elfhdr.c
@@ -23,7 +23,7 @@
  * 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/usr.sbin/kgzip/elfhdr.c,v 1.4 2004/06/22 17:05:39 obrien Exp $
  */
 
 #include <sys/endian.h>
diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h
index 57333b0ad47c..c16025aa6cd1 100644
--- a/usr.sbin/kgzip/elfhdr.h
+++ b/usr.sbin/kgzip/elfhdr.h
@@ -23,7 +23,7 @@
  * 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/usr.sbin/kgzip/elfhdr.h,v 1.4 2003/02/04 16:01:00 ru Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgz.h b/usr.sbin/kgzip/kgz.h
index 3cc8e13d4553..84c45b31bb89 100644
--- a/usr.sbin/kgzip/kgz.h
+++ b/usr.sbin/kgzip/kgz.h
@@ -23,7 +23,7 @@
  * 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/usr.sbin/kgzip/kgz.h,v 1.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #ifndef _KGZ_H_
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index 0ea4f0e796c1..d6f9eeff90d8 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.c
@@ -23,7 +23,7 @@
  * 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/usr.sbin/kgzip/kgzcmp.c,v 1.12 2004/09/01 20:42:38 julian Exp $
  */
 
 #define	_KERNEL
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 7f810d4e6460..cb79d711bf79 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/usr.sbin/kgzip/kgzip.8
@@ -22,7 +22,7 @@
 .\" 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/usr.sbin/kgzip/kgzip.8,v 1.10 2005/01/18 20:02:36 ru Exp $
 .\"
 .Dd July 19, 1999
 .Dt KGZIP 8
diff --git a/usr.sbin/kgzip/kgzip.c b/usr.sbin/kgzip/kgzip.c
index d6c48f2069e4..b21b35d3ba7b 100644
--- a/usr.sbin/kgzip/kgzip.c
+++ b/usr.sbin/kgzip/kgzip.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kgzip/kgzip.c,v 1.8 2003/06/11 21:37:19 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgzip.h b/usr.sbin/kgzip/kgzip.h
index f04f2a4cf14f..1377f34b3c12 100644
--- a/usr.sbin/kgzip/kgzip.h
+++ b/usr.sbin/kgzip/kgzip.h
@@ -23,7 +23,7 @@
  * 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/usr.sbin/kgzip/kgzip.h,v 1.3 2000/11/04 13:02:00 rnordier Exp $
  */
 
 #include "kgz.h"
diff --git a/usr.sbin/kgzip/kgzld.c b/usr.sbin/kgzip/kgzld.c
index 11a20a5a274e..be8437b61c23 100644
--- a/usr.sbin/kgzip/kgzld.c
+++ b/usr.sbin/kgzip/kgzld.c
@@ -23,7 +23,7 @@
  * 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/usr.sbin/kgzip/kgzld.c,v 1.5 2004/06/22 17:05:39 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/xio.c b/usr.sbin/kgzip/xio.c
index 64481ffb6ce5..a3774086f1fa 100644
--- a/usr.sbin/kgzip/xio.c
+++ b/usr.sbin/kgzip/xio.c
@@ -23,7 +23,7 @@
  * 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/usr.sbin/kgzip/xio.c,v 1.3 2000/11/20 20:35:35 rnordier Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile
index 33337fd8a180..d61081c36544 100644
--- a/usr.sbin/kldxref/Makefile
+++ b/usr.sbin/kldxref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kldxref/Makefile,v 1.7 2004/08/27 00:58:40 iedowse Exp $
 
 PROG=	kldxref
 MAN=	kldxref.8
diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index c6751c9d7a19..ce097eba4501 100644
--- a/usr.sbin/kldxref/ef.c
+++ b/usr.sbin/kldxref/ef.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef.c,v 1.8 2004/08/28 19:31:10 iedowse Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kldxref/ef.h b/usr.sbin/kldxref/ef.h
index 3843ebebbaef..3aab78fb118d 100644
--- a/usr.sbin/kldxref/ef.h
+++ b/usr.sbin/kldxref/ef.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/kldxref/ef.h,v 1.5 2004/08/28 19:31:10 iedowse Exp $ */
 
 #ifndef _EF_H_
 #define _EF_H_
diff --git a/usr.sbin/kldxref/ef_amd64.c b/usr.sbin/kldxref/ef_amd64.c
index 445640ae27af..8efeaa53c350 100644
--- a/usr.sbin/kldxref/ef_amd64.c
+++ b/usr.sbin/kldxref/ef_amd64.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_amd64.c,v 1.2 2004/08/28 19:31:10 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_i386.c b/usr.sbin/kldxref/ef_i386.c
index 0fc726af7ca6..c442930ede21 100644
--- a/usr.sbin/kldxref/ef_i386.c
+++ b/usr.sbin/kldxref/ef_i386.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_i386.c,v 1.2 2004/08/28 19:31:10 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_nop.c b/usr.sbin/kldxref/ef_nop.c
index cbbd43cc23c9..9f7623e0126d 100644
--- a/usr.sbin/kldxref/ef_nop.c
+++ b/usr.sbin/kldxref/ef_nop.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_nop.c,v 1.3 2004/08/28 19:31:10 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index 3ed4e40561b6..0e6ee50b941a 100644
--- a/usr.sbin/kldxref/ef_obj.c
+++ b/usr.sbin/kldxref/ef_obj.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_obj.c,v 1.3 2004/08/28 19:31:10 iedowse Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kldxref/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c
index aafd9c34b84e..819f2b951e67 100644
--- a/usr.sbin/kldxref/ef_powerpc.c
+++ b/usr.sbin/kldxref/ef_powerpc.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_powerpc.c,v 1.2 2005/03/03 06:38:00 grehan Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_sparc64.c b/usr.sbin/kldxref/ef_sparc64.c
index e5133f1d3996..54c56c7ae40a 100644
--- a/usr.sbin/kldxref/ef_sparc64.c
+++ b/usr.sbin/kldxref/ef_sparc64.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_sparc64.c,v 1.3 2004/08/28 19:31:10 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/fileformat b/usr.sbin/kldxref/fileformat
index 2eddcca4a14d..b7be2621695b 100644
--- a/usr.sbin/kldxref/fileformat
+++ b/usr.sbin/kldxref/fileformat
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/kldxref/fileformat,v 1.1 2001/09/11 01:13:15 peter Exp $
 
     linker.hints file consists from the one or more records. First record of
 file is special and determines its version:
diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8
index a6174b6bd194..8c6274fdc41d 100644
--- a/usr.sbin/kldxref/kldxref.8
+++ b/usr.sbin/kldxref/kldxref.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kldxref/kldxref.8,v 1.8 2004/06/01 09:34:04 ru Exp $
 .\"
 .Dd October 9, 2001
 .Dt KLDXREF 8
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index 3beed7acf829..17004e698180 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/kldxref.c,v 1.10 2004/08/27 00:58:40 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index 017aadf27726..7ddcd72752b4 100644
--- a/usr.sbin/lastlogin/Makefile
+++ b/usr.sbin/lastlogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lastlogin/Makefile,v 1.5 2001/07/20 06:20:31 obrien Exp $
 
 PROG=	lastlogin
 MAN=	lastlogin.8
diff --git a/usr.sbin/lastlogin/lastlogin.8 b/usr.sbin/lastlogin/lastlogin.8
index 03a587d0eccc..af9b07bc7692 100644
--- a/usr.sbin/lastlogin/lastlogin.8
+++ b/usr.sbin/lastlogin/lastlogin.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lastlogin/lastlogin.8,v 1.4 2004/07/02 23:12:46 ru Exp $
 .\"	$NetBSD: lastlogin.8,v 1.3 1998/02/06 06:20:39 perry Exp $
 .\"
 .\" Copyright (c) 1996 John M. Vinopal
diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c
index 21c82c3636dd..0323c5baf666 100644
--- a/usr.sbin/lastlogin/lastlogin.c
+++ b/usr.sbin/lastlogin/lastlogin.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.sbin/lastlogin/lastlogin.c,v 1.8 2002/07/11 18:26:39 alfred Exp $");
 __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $");
 #endif
 
diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile
index 3cd0eb64643a..267cf5a9a1db 100644
--- a/usr.sbin/lpr/Makefile
+++ b/usr.sbin/lpr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/Makefile,v 1.10 2003/06/12 03:32:21 gad Exp $
 
 SUBDIR=	common_source chkprintcap lp lpc lpd lpq lpr lprm lptest pac \
 	filters filters.ru SMM.doc
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index 18548825c9f3..e1ac2a743099 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/Makefile.inc,v 1.10 2005/06/10 06:12:52 des Exp $
 
 CFLAGS+= -DINET6
 
diff --git a/usr.sbin/lpr/SMM.doc/Makefile b/usr.sbin/lpr/SMM.doc/Makefile
index d80c8ce60d17..5120df600afa 100644
--- a/usr.sbin/lpr/SMM.doc/Makefile
+++ b/usr.sbin/lpr/SMM.doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/SMM.doc/Makefile,v 1.5 2004/10/24 15:33:03 ru Exp $
 
 BINDIR=	/usr/share/doc
 VOLUME=	smm/07.lpd
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index ffffffbb2bd1..663cbac3f4b9 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/chkprintcap/Makefile,v 1.12 2002/06/23 20:57:16 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index c2524a159c70..f64d61d90ebf 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.8,v 1.8 2004/07/02 23:12:46 ru Exp $
 .Dd November 30, 1997
 .Dt CHKPRINTCAP 8
 .Os
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c
index 91e8299d5826..b2889a3162db 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c
@@ -31,7 +31,7 @@ static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.c,v 1.8 2003/07/15 08:48:30 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.c b/usr.sbin/lpr/chkprintcap/skimprintcap.c
index da2828290b8b..2dbc7b62db43 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.c
@@ -32,7 +32,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/chkprintcap/skimprintcap.c,v 1.3 2003/07/15 08:48:30 gad Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.h b/usr.sbin/lpr/chkprintcap/skimprintcap.h
index af74b48a5a46..0be910cfa985 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.h
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/chkprintcap/skimprintcap.h,v 1.1 2001/12/15 23:35:55 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index 14db0b77b798..dc3e59ccf486 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/common_source/Makefile,v 1.11 2004/10/24 15:33:03 ru Exp $
 
 #
 # Library of internal routines for the print spooler suite.
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index d28ac1fcdd95..1804bb09c4ca 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)common.c	8.5 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.34 2004/12/31 00:36:28 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/ctlinfo.c b/usr.sbin/lpr/common_source/ctlinfo.c
index 20a153f7698b..bef89b4549be 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.c
+++ b/usr.sbin/lpr/common_source/ctlinfo.c
@@ -32,7 +32,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.c,v 1.10 2004/12/31 00:18:42 gad Exp $");
 
 /*
  * ctlinfo - This collection of routines will know everything there is to
diff --git a/usr.sbin/lpr/common_source/ctlinfo.h b/usr.sbin/lpr/common_source/ctlinfo.h
index 95fe57247842..4a1ac9f70370 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.h
+++ b/usr.sbin/lpr/common_source/ctlinfo.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.h,v 1.3 2003/07/14 05:15:21 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 6c03621d5710..f9d76987fc27 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)displayq.c	8.4 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.26 2004/12/31 00:36:28 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/lp.cdefs.h b/usr.sbin/lpr/common_source/lp.cdefs.h
index 19b13319fd7f..f9686d5b5785 100644
--- a/usr.sbin/lpr/common_source/lp.cdefs.h
+++ b/usr.sbin/lpr/common_source/lp.cdefs.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.cdefs.h,v 1.1 2003/07/14 05:13:55 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index 891ed2f1bda3..b009c6cb9e29 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	From: @(#)lp.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.h,v 1.25 2004/12/31 00:36:28 gad Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h
index 6f018b0756a1..abec49e8f509 100644
--- a/usr.sbin/lpr/common_source/lp.local.h
+++ b/usr.sbin/lpr/common_source/lp.local.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lp.local.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.local.h,v 1.4 2003/08/01 00:06:41 gad Exp $
  */
 
 /*
diff --git a/usr.sbin/lpr/common_source/matchjobs.c b/usr.sbin/lpr/common_source/matchjobs.c
index de572f86a249..c17cdcd8a0a4 100644
--- a/usr.sbin/lpr/common_source/matchjobs.c
+++ b/usr.sbin/lpr/common_source/matchjobs.c
@@ -33,7 +33,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.c,v 1.5 2004/12/31 00:36:28 gad Exp $");
 
 /*
  * movejobs.c - The lpc commands which move jobs around.
diff --git a/usr.sbin/lpr/common_source/matchjobs.h b/usr.sbin/lpr/common_source/matchjobs.h
index 6e4b9ffe2005..b67f951f170c 100644
--- a/usr.sbin/lpr/common_source/matchjobs.h
+++ b/usr.sbin/lpr/common_source/matchjobs.h
@@ -30,7 +30,7 @@
  * or FreeBSD, Inc.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.h,v 1.2 2003/07/14 05:15:21 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 2a1e0c80a5df..b5a977852613 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -39,7 +39,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.9 2005/05/13 16:43:28 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 0d3644b1b795..e5ca28840b74 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)printcap.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.11 2003/07/14 20:17:55 gad Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c
index b650e5c76c05..e7d2c536eb4d 100644
--- a/usr.sbin/lpr/common_source/request.c
+++ b/usr.sbin/lpr/common_source/request.c
@@ -31,7 +31,7 @@ static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.5 2003/07/14 20:20:58 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index d6fd6148ccdd..3d567d7ab70a 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)rmjob.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.21 2004/12/31 00:36:28 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/uio.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 08c2e6f54cf8..dcb1c9a9c3a4 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)startdaemon.c	8.2 (Berkeley) 4/17/94";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.12 2003/07/14 20:20:58 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile
index ee15541fae74..f8d01950f233 100644
--- a/usr.sbin/lpr/filters.ru/Makefile
+++ b/usr.sbin/lpr/filters.ru/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/Makefile,v 1.7 2002/04/22 10:46:12 ru Exp $
 
 SUBDIR=	koi2alt koi2855
 
diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc
index a312e73941ec..8ab5bc36259f 100644
--- a/usr.sbin/lpr/filters.ru/Makefile.inc
+++ b/usr.sbin/lpr/filters.ru/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/Makefile.inc,v 1.2 2001/07/20 06:19:55 obrien Exp $
 
 BINDIR=	/usr/libexec/lpr/ru
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile
index 361783ed24e4..d50b3a48dbd2 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $
 
 PROG=	koi2855
 NO_MAN=
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 8ecc3eff6dae..9485f25fc2d4 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
+++ b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
@@ -26,7 +26,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/koi2855.c,v 1.4 2003/07/15 07:01:01 gad Exp $");
 
 /*
  * KOI8-R -> CP855 conversion filter (Russian character sets)
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index e410d9a7cd9b..65b892a95e25 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $
 
 PROG=	koi2alt
 NO_MAN=
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
index a7a5b5dc5408..392bfdcd8722 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
+++ b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
@@ -25,7 +25,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c,v 1.3 2003/07/15 07:01:01 gad Exp $");
 
 /*
  * KOI8-R -> CP866 conversion filter (Russian character sets)
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index b55b536c1ce6..bf1573958dd4 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $
 
 BINDIR=	/usr/libexec/lpr
 
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 41879a2ee58d..4b397a9663b4 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)lpf.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/filters/lpf.c,v 1.9 2003/07/15 07:01:01 gad Exp $");
 
 /*
  * 	filter which reads the output of nroff and converts lines
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index 2fcec43ec80b..32cd076fef55 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lp/Makefile,v 1.8 2001/07/20 06:19:55 obrien Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index 8ed842d55e57..feb6f155f3e3 100644
--- a/usr.sbin/lpr/lp/lp.1
+++ b/usr.sbin/lpr/lp/lp.1
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.18 2004/07/02 23:12:46 ru Exp $
 .\"
 .Dd January 22, 1995
 .Dt LP 1
diff --git a/usr.sbin/lpr/lp/lp.sh b/usr.sbin/lpr/lp/lp.sh
index e7c06882c0f9..b0e91cf9b9cc 100644
--- a/usr.sbin/lpr/lp/lp.sh
+++ b/usr.sbin/lpr/lp/lp.sh
@@ -36,7 +36,7 @@
 #
 # Posix 1003.2 compliant print spooler interface.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lp/lp.sh,v 1.7 2000/03/08 10:02:11 sheldonh Exp $
 #
 
 ncopies=""
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index f050857dd031..761549774789 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpc/Makefile,v 1.12 2002/07/17 00:51:19 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 06ea4b0f7e8b..b78c694bbf4c 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/cmds.c,v 1.32 2003/07/14 22:24:28 gad Exp $");
 
 /*
  * lpc -- line printer control program -- commands:
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 21dc6e1c9903..5ca02f74a82d 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/cmdtab.c,v 1.11 2003/07/14 22:24:28 gad Exp $");
 
 #include "lpc.h"
 #include "extern.h"
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index fe82d460ade6..8d53150254a4 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -33,7 +33,7 @@
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/lpc/extern.h,v 1.12 2003/07/14 22:24:28 gad Exp $
  */
 
 
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index ea792413e38c..fd97ec293ab7 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpc.8	8.5 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.24 2005/02/13 22:25:28 ru Exp $
 .\"
 .Dd July 16, 2002
 .Dt LPC 8
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 5e6e52690e5b..9779efb85fc9 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lpc.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.30 2005/02/22 02:56:42 delphij Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h
index 73e4cc52764c..1a56150db115 100644
--- a/usr.sbin/lpr/lpc/lpc.h
+++ b/usr.sbin/lpr/lpc/lpc.h
@@ -32,7 +32,7 @@
  *
  *	@(#)lpc.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/lpc/lpc.h,v 1.5 2002/06/15 22:51:58 gad Exp $
  */
 
 /*
diff --git a/usr.sbin/lpr/lpc/movejobs.c b/usr.sbin/lpr/lpc/movejobs.c
index 60c9b38d5708..ea78ffbef51e 100644
--- a/usr.sbin/lpr/lpc/movejobs.c
+++ b/usr.sbin/lpr/lpc/movejobs.c
@@ -33,7 +33,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/movejobs.c,v 1.3 2003/07/14 22:24:28 gad Exp $");
 
 /*
  * movejobs.c - The lpc commands which move jobs around.
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 9af36556604c..57ac27660b43 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpd/Makefile,v 1.14 2002/06/23 20:57:17 gad Exp $
 
 PROG=	lpd
 MAN=	lpd.8
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index 14cb9e1bcffc..a4ccbd1dfb59 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      From: @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/lpd/extern.h,v 1.9 2003/07/14 15:54:40 gad Exp $
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index 7c7afab72f5d..eaac1454fca8 100644
--- a/usr.sbin/lpr/lpd/lpd.8
+++ b/usr.sbin/lpr/lpd/lpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.31 2005/02/13 22:25:28 ru Exp $
 .\"
 .Dd June 6, 2001
 .Dt LPD 8
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 51a228b7578a..67aaed97a4d7 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/lpd.c,v 1.41 2005/05/13 16:43:28 ume Exp $");
 
 /*
  * lpd -- line printer daemon.
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 5ebaabdbeef8..3a2349f1f856 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)lpdchar.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/lpdchar.c,v 1.7 2003/07/14 19:59:33 gad Exp $");
 
 /*
  *	Character set for line printer daemon
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 8a05212128a3..58a510aaf4c2 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/modes.c,v 1.10 2003/07/14 19:59:33 gad Exp $");
 
 #include <stddef.h>
 #include <string.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index ae5ffc55be08..776bc65943e3 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)printjob.c	8.7 (Berkeley) 5/10/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/printjob.c,v 1.63 2004/12/19 05:14:29 gad Exp $");
 
 /*
  * printjob -- print jobs in the queue.
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index ac4f9ee270a5..a5359569aa2b 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/recvjob.c,v 1.31 2003/08/21 03:43:48 gad Exp $");
 
 /*
  * Receive printer jobs from the network, queue them and
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 4df437e06c32..b0ea2aefd50c 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpq/Makefile,v 1.12 2002/06/23 20:57:17 gad Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index 3678256bb38d..1c257e42f6b9 100644
--- a/usr.sbin/lpr/lpq/lpq.1
+++ b/usr.sbin/lpr/lpq/lpq.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpq.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpq/lpq.1,v 1.12 2005/01/18 20:02:37 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt LPQ 1
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index e1809cfe643b..cffd0fe81ceb 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lpq.c	8.3 (Berkeley) 5/10/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpq/lpq.c,v 1.12 2003/07/15 08:48:30 gad Exp $");
 
 /*
  * Spool Queue examination program
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 1ff376de4cd4..63d8e9179008 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpr/Makefile,v 1.12 2002/06/23 20:57:18 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index 00146ac52d4b..17866730f2eb 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From @(#)lpr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.21 2005/01/18 20:02:37 ru Exp $
 .\" "
 .Dd June 6, 1993
 .Dt LPR 1
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 98e9cea4327a..3443841e5bb4 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)lpr.c	8.4 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpr/lpr.c,v 1.44 2003/07/15 08:40:31 gad Exp $");
 
 /*
  *      lpr -- off line print
diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5
index 1ea6fea53ba1..1f1f62515a03 100644
--- a/usr.sbin/lpr/lpr/printcap.5
+++ b/usr.sbin/lpr/lpr/printcap.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)printcap.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpr/printcap.5,v 1.33 2004/07/02 23:12:47 ru Exp $
 .\"
 .Dd October 11, 2000
 .Dt PRINTCAP 5
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index 44bc93ac27ec..63a9fe6277d8 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lprm/Makefile,v 1.13 2002/06/23 20:57:18 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index a19461448a81..11d04654d66e 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lprm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lprm/lprm.1,v 1.14 2005/01/18 20:02:37 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt LPRM 1
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 47f233c4802a..d88d2713bd04 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lprm.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lprm/lprm.c,v 1.10 2003/07/15 08:48:30 gad Exp $");
 
 /*
  * lprm - remove the current user's spool entry
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 65b1c7c8fef8..348930d1176a 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lptest/Makefile,v 1.6 2003/07/15 08:45:06 gad Exp $
 
 PROG=	lptest
 
diff --git a/usr.sbin/lpr/lptest/lptest.1 b/usr.sbin/lpr/lptest/lptest.1
index c34934e6a42f..7f36f09ce893 100644
--- a/usr.sbin/lpr/lptest/lptest.1
+++ b/usr.sbin/lpr/lptest/lptest.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lptest.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lptest/lptest.1,v 1.6 2002/04/20 12:26:36 charnier Exp $
 .\"
 .Dd December 30, 1993
 .Dt LPTEST 1
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index 304296392e92..994c27458fb1 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lptest.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lptest/lptest.c,v 1.6 2004/09/27 08:24:05 phk Exp $");
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index bd895a71a305..e2487a6cd865 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/pac/Makefile,v 1.11 2002/06/23 20:57:18 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/pac/pac.8 b/usr.sbin/lpr/pac/pac.8
index b6e10a0c739b..c693c707754a 100644
--- a/usr.sbin/lpr/pac/pac.8
+++ b/usr.sbin/lpr/pac/pac.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pac.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/pac/pac.8,v 1.9 2005/01/18 20:02:37 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt PAC 8
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 34a247f55109..3d21521efafa 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)pac.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/pac/pac.c,v 1.15 2003/07/15 08:48:30 gad Exp $");
 
 /*
  * Do Printer accounting summary.
diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile
index 3f7a939a7e17..17de12916f3b 100644
--- a/usr.sbin/lptcontrol/Makefile
+++ b/usr.sbin/lptcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lptcontrol/Makefile,v 1.7 2004/10/01 20:04:20 schweikh Exp $
 
 PROG=	lptcontrol
 MAN=	lptcontrol.8
diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8
index 772307884d8b..8bd6a308d7a2 100644
--- a/usr.sbin/lptcontrol/lptcontrol.8
+++ b/usr.sbin/lptcontrol/lptcontrol.8
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.23 2005/01/18 20:02:37 ru Exp $
 .Dd October 1, 2004
 .Dt LPTCONTROL 8
 .Os
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 62e5b85478ba..ff809d454798 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.c,v 1.16 2005/01/25 14:25:18 ssouhlal Exp $");
 
 #include <dev/ppbus/lptio.h>
 
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index 86137b09c697..9ab5c9e3fe6a 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 9/21/96
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mailstats/Makefile,v 1.11 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/mailstats
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 6d52dadf6fba..2d37478995cd 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mailwrapper/Makefile,v 1.13 2004/10/18 17:20:29 ru Exp $
 
 .if !defined(NO_MAILWRAPPER)
 PROG=	mailwrapper
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 36b5d8960d68..f865298bcc2b 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/usr.sbin/mailwrapper/mailwrapper.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: mailwrapper.8,v 1.6 1999/03/25 16:40:17 is Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.12 2004/07/02 23:12:48 ru Exp $
 .\"
 .\" Copyright (c) 1998
 .\" 	Perry E. Metzger.  All rights reserved.
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index c71bb3000e4d..152e8f6b6314 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.9 2003/07/06 12:44:11 charnier Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h
index d8ae498ce004..bb224646363e 100644
--- a/usr.sbin/mailwrapper/pathnames.h
+++ b/usr.sbin/mailwrapper/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/mailwrapper/pathnames.h,v 1.3 2000/01/10 03:20:13 imp Exp $ */
 
 /*
  * Copyright (c) 1998
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index 5d30c67ae634..8d728eb3a2f8 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/10/97
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/makemap/Makefile,v 1.12 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/makemap
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 9e0c12ecb9a9..1b99f6a3ab3f 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/manctl/Makefile,v 1.12 2001/04/07 11:21:28 ru Exp $
 
 SCRIPTS=manctl.sh
 MAN=	manctl.8
diff --git a/usr.sbin/manctl/manctl.8 b/usr.sbin/manctl/manctl.8
index b8e001dbc872..d906f8c54415 100644
--- a/usr.sbin/manctl/manctl.8
+++ b/usr.sbin/manctl/manctl.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/manctl/manctl.8,v 1.13 2002/07/14 14:44:10 charnier Exp $
 .Dd January 1, 1996
 .Dt MANCTL 8
 .Os
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index 23e20870ab95..1f435f18c87d 100644
--- a/usr.sbin/manctl/manctl.sh
+++ b/usr.sbin/manctl/manctl.sh
@@ -30,7 +30,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/manctl/manctl.sh,v 1.12 2001/01/20 04:30:41 jedgar Exp $
 #
 # manctl: 
 #	a utility for manipulating manual pages
diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile
index 25009dbb478f..0aa4c5bdf530 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/memcontrol/Makefile,v 1.6 2005/01/07 12:06:30 delphij Exp $
 
 PROG=	memcontrol
 MAN=	memcontrol.8
diff --git a/usr.sbin/memcontrol/memcontrol.8 b/usr.sbin/memcontrol/memcontrol.8
index ad0e5330671b..9fd6a7be8b30 100644
--- a/usr.sbin/memcontrol/memcontrol.8
+++ b/usr.sbin/memcontrol/memcontrol.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.10 2002/11/27 15:31:08 ru Exp $
 .\"
 .Dd September 15, 2002
 .Dt MEMCONTROL 8
diff --git a/usr.sbin/memcontrol/memcontrol.c b/usr.sbin/memcontrol/memcontrol.c
index b6cb25f000e1..6620f7d5274d 100644
--- a/usr.sbin/memcontrol/memcontrol.c
+++ b/usr.sbin/memcontrol/memcontrol.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/memcontrol/memcontrol.c,v 1.10 2005/03/29 20:17:47 anholt Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index 257fbeba4ca4..45e7d7ffbf88 100644
--- a/usr.sbin/mergemaster/Makefile
+++ b/usr.sbin/mergemaster/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/Makefile,v 1.9 2003/06/04 09:38:04 dougb Exp $
 
 SCRIPTS=mergemaster.sh
 MAN=	mergemaster.8
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 646fbd942b88..2a1fe3f1418a 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.32.2.1 2005/09/24 01:59:39 keramida Exp $
 .\"
 .Dd February 5, 2001
 .Dt MERGEMASTER 8
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 6ec345a5a78f..f6cffe195b86 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -8,7 +8,7 @@
 # Copyright 1998-2004 Douglas Barton
 # DougB@FreeBSD.org
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.51 2004/03/07 10:10:19 dougb Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
 
diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile
index e86fceec116e..df0e6884c5d5 100644
--- a/usr.sbin/mixer/Makefile
+++ b/usr.sbin/mixer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mixer/Makefile,v 1.10 2001/07/20 06:20:00 obrien Exp $
 
 PROG=	mixer
 MAN=	mixer.8
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index cb1e0ef44dc1..c0bd2cd71a8d 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.24 2005/06/14 12:26:35 ru Exp $
 .\"
 .Dd April 13, 2005
 .Dt MIXER 8
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index 35772c594ac1..feff0f5d6654 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.22 2005/04/13 07:11:54 mdodd Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 7100520ad4d3..66351deecb6e 100644
--- a/usr.sbin/mld6query/Makefile
+++ b/usr.sbin/mld6query/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mld6query/Makefile,v 1.5 2003/10/24 18:26:30 ume Exp $
 
 PROG=	mld6query
 MAN=	mld6query.8
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index 1f73203433e4..f8c8db5a7f01 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -1,5 +1,5 @@
 /*	$KAME: mld6.c,v 1.15 2003/04/02 11:29:54 suz Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/mld6query/mld6.c,v 1.3 2003/10/24 18:26:30 ume Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
diff --git a/usr.sbin/mld6query/mld6query.8 b/usr.sbin/mld6query/mld6query.8
index 8ec867f44f43..d6652db58eca 100644
--- a/usr.sbin/mld6query/mld6query.8
+++ b/usr.sbin/mld6query/mld6query.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mld6query/mld6query.8,v 1.6 2005/02/09 18:04:40 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt MLD6QUERY 8
diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile
index 95964a5854ff..ab2985ded66a 100644
--- a/usr.sbin/mlxcontrol/Makefile
+++ b/usr.sbin/mlxcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mlxcontrol/Makefile,v 1.5 2001/07/20 06:20:01 obrien Exp $
 
 PROG=	mlxcontrol
 MAN=	mlxcontrol.8
diff --git a/usr.sbin/mlxcontrol/command.c b/usr.sbin/mlxcontrol/command.c
index a3647676c330..5b72a5b8ef24 100644
--- a/usr.sbin/mlxcontrol/command.c
+++ b/usr.sbin/mlxcontrol/command.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/command.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/config.c b/usr.sbin/mlxcontrol/config.c
index a52565840de4..0efcbefc8851 100644
--- a/usr.sbin/mlxcontrol/config.c
+++ b/usr.sbin/mlxcontrol/config.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/config.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/interface.c b/usr.sbin/mlxcontrol/interface.c
index 5cbf7b609aa4..dfb0e58d00a9 100644
--- a/usr.sbin/mlxcontrol/interface.c
+++ b/usr.sbin/mlxcontrol/interface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/interface.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.8 b/usr.sbin/mlxcontrol/mlxcontrol.8
index 542f9948b4d7..f085741b1ac3 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.8
+++ b/usr.sbin/mlxcontrol/mlxcontrol.8
@@ -21,7 +21,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/usr.sbin/mlxcontrol/mlxcontrol.8,v 1.9 2005/01/18 20:02:38 ru Exp $
 .\"
 .Dd April 10, 2000
 .Dt MLXCONTROL 8
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.h b/usr.sbin/mlxcontrol/mlxcontrol.h
index ab0f2ab4f819..7e6c4dd2856a 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.h
+++ b/usr.sbin/mlxcontrol/mlxcontrol.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/mlxcontrol.h,v 1.4 2004/10/02 16:42:33 stefanf Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/mlxcontrol/util.c b/usr.sbin/mlxcontrol/util.c
index 37cd2b7e3143..96209b6a5d21 100644
--- a/usr.sbin/mlxcontrol/util.c
+++ b/usr.sbin/mlxcontrol/util.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/util.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mount_nwfs/Makefile b/usr.sbin/mount_nwfs/Makefile
index 8fbb9a8c3ba4..ba18c2a8ef91 100644
--- a/usr.sbin/mount_nwfs/Makefile
+++ b/usr.sbin/mount_nwfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_nwfs/Makefile,v 1.7 2004/02/23 20:21:21 johan Exp $
 
 PROG=	mount_nwfs
 SRCS=	mount_nwfs.c getmntopts.c
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.8 b/usr.sbin/mount_nwfs/mount_nwfs.8
index 3946f71615f0..c1852a252109 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.8
+++ b/usr.sbin/mount_nwfs/mount_nwfs.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mount_nwfs/mount_nwfs.8,v 1.21 2005/02/13 22:25:28 ru Exp $
 .Dd October 14, 1999
 .Dt MOUNT_NWFS 8
 .Os
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.c b/usr.sbin/mount_nwfs/mount_nwfs.c
index c784a9a53ae6..c80b4106f1e1 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.c
+++ b/usr.sbin/mount_nwfs/mount_nwfs.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mount_nwfs/mount_nwfs.c,v 1.8 2003/07/25 20:56:57 peter Exp $
  */
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mount_portalfs/Makefile b/usr.sbin/mount_portalfs/Makefile
index 610ac233b5b0..69ca31c2713c 100644
--- a/usr.sbin/mount_portalfs/Makefile
+++ b/usr.sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_portalfs/Makefile,v 1.19 2005/03/11 08:39:58 dds Exp $
 
 PROG=	mount_portalfs
 SRCS=	mount_portalfs.c activate.c conf.c cred.c getmntopts.c pt_conf.c \
diff --git a/usr.sbin/mount_portalfs/activate.c b/usr.sbin/mount_portalfs/activate.c
index 2d001789d799..b9fc4abbfa33 100644
--- a/usr.sbin/mount_portalfs/activate.c
+++ b/usr.sbin/mount_portalfs/activate.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/activate.c,v 1.11 2005/05/11 02:47:54 jmallett Exp $");
 
 #include <errno.h>
 #include <string.h>
diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c
index 5e0db79c970f..98c515914db1 100644
--- a/usr.sbin/mount_portalfs/conf.c
+++ b/usr.sbin/mount_portalfs/conf.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/conf.c,v 1.10 2004/08/07 04:27:50 imp Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/usr.sbin/mount_portalfs/cred.c b/usr.sbin/mount_portalfs/cred.c
index 9e5d9f3f222b..08f2d6e1abd0 100644
--- a/usr.sbin/mount_portalfs/cred.c
+++ b/usr.sbin/mount_portalfs/cred.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/cred.c,v 1.1 2005/03/11 08:39:58 dds Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.8 b/usr.sbin/mount_portalfs/mount_portalfs.8
index ffbcb0860796..4ad961ed5516 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.8
+++ b/usr.sbin/mount_portalfs/mount_portalfs.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mount_portalfs/mount_portalfs.8,v 1.19 2005/06/14 12:26:35 ru Exp $
 .\"
 .Dd March 11, 2005
 .Dt MOUNT_PORTALFS 8
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index 376e82751cf0..a8f680e6da15 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/mount_portalfs.c,v 1.23 2005/03/11 07:50:09 dds Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/mount_portalfs/pathnames.h b/usr.sbin/mount_portalfs/pathnames.h
index 9373c7d75de1..5dbf2cf22950 100644
--- a/usr.sbin/mount_portalfs/pathnames.h
+++ b/usr.sbin/mount_portalfs/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mount_portalfs/pathnames.h,v 1.6 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/mount_portalfs/portal.conf b/usr.sbin/mount_portalfs/portal.conf
index 398cfb29936d..bae6560df904 100644
--- a/usr.sbin/mount_portalfs/portal.conf
+++ b/usr.sbin/mount_portalfs/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_portalfs/portal.conf,v 1.5 2005/03/10 22:10:16 dds Exp $
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/usr.sbin/mount_portalfs/portald.h b/usr.sbin/mount_portalfs/portald.h
index ff4c3fd4451d..481127bc1587 100644
--- a/usr.sbin/mount_portalfs/portald.h
+++ b/usr.sbin/mount_portalfs/portald.h
@@ -32,7 +32,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mount_portalfs/portald.h,v 1.10 2005/03/11 08:39:58 dds Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/mount_portalfs/pt_conf.c b/usr.sbin/mount_portalfs/pt_conf.c
index 7f1e8175eaba..8291de89e8ec 100644
--- a/usr.sbin/mount_portalfs/pt_conf.c
+++ b/usr.sbin/mount_portalfs/pt_conf.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_conf.c,v 1.9 2005/03/10 22:10:16 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/mount_portalfs/pt_exec.c b/usr.sbin/mount_portalfs/pt_exec.c
index f679b422def9..03f656a0fbc5 100644
--- a/usr.sbin/mount_portalfs/pt_exec.c
+++ b/usr.sbin/mount_portalfs/pt_exec.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_exec.c,v 1.7 2004/08/07 04:27:50 imp Exp $");
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/usr.sbin/mount_portalfs/pt_file.c b/usr.sbin/mount_portalfs/pt_file.c
index 868d6ddec6f8..919697fc1dd4 100644
--- a/usr.sbin/mount_portalfs/pt_file.c
+++ b/usr.sbin/mount_portalfs/pt_file.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_file.c,v 1.12 2005/05/20 12:57:01 charnier Exp $");
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/mount_portalfs/pt_pipe.c b/usr.sbin/mount_portalfs/pt_pipe.c
index 285f193b4f17..0e5712158a7d 100644
--- a/usr.sbin/mount_portalfs/pt_pipe.c
+++ b/usr.sbin/mount_portalfs/pt_pipe.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_pipe.c,v 1.2 2005/03/11 08:39:58 dds Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index 4438a0bc04b0..4a13f28fdf15 100644
--- a/usr.sbin/mount_portalfs/pt_tcp.c
+++ b/usr.sbin/mount_portalfs/pt_tcp.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_tcp.c,v 1.12 2004/08/07 04:27:50 imp Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcplisten.c b/usr.sbin/mount_portalfs/pt_tcplisten.c
index 4463e402e962..c2d6dbfd5e79 100644
--- a/usr.sbin/mount_portalfs/pt_tcplisten.c
+++ b/usr.sbin/mount_portalfs/pt_tcplisten.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_tcplisten.c,v 1.4 2004/08/07 04:27:50 imp Exp $");
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile
index e60f6b20a54d..abaf534ca16c 100644
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_smbfs/Makefile,v 1.7 2005/05/04 15:05:46 takawata Exp $
 
 PROG=	mount_smbfs
 SRCS=	mount_smbfs.c getmntopts.c
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index d01516060934..0428c8978af8 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mountd/Makefile,v 1.15 2003/10/30 22:57:43 peter Exp $
 
 PROG=	mountd
 MAN=	exports.5 netgroup.5 mountd.8
diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5
index 133f48c0a959..81b8a2a4507f 100644
--- a/usr.sbin/mountd/exports.5
+++ b/usr.sbin/mountd/exports.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mountd/exports.5,v 1.27 2004/08/07 04:27:51 imp Exp $
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8
index 0e8e1f4dc7fd..5eb780ab0cf1 100644
--- a/usr.sbin/mountd/mountd.8
+++ b/usr.sbin/mountd/mountd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.27 2004/08/07 04:27:51 imp Exp $
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index bd57299033b9..f25a725437b5 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mountd.c	8.15 (Berkeley) 5/1/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.81 2005/05/13 16:31:11 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.sbin/mountd/netgroup.5 b/usr.sbin/mountd/netgroup.5
index c94f8807d565..a09487efeeab 100644
--- a/usr.sbin/mountd/netgroup.5
+++ b/usr.sbin/mountd/netgroup.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netgroup.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mountd/netgroup.5,v 1.14 2005/01/18 20:02:38 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt NETGROUP 5
diff --git a/usr.sbin/mountd/pathnames.h b/usr.sbin/mountd/pathnames.h
index 2b7397799ee4..41e46e40ed4c 100644
--- a/usr.sbin/mountd/pathnames.h
+++ b/usr.sbin/mountd/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mountd/pathnames.h,v 1.2 2004/08/07 04:27:51 imp Exp $
  */
 #include <paths.h>
 
diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile
index 07a389267ab5..b8daa1139517 100644
--- a/usr.sbin/moused/Makefile
+++ b/usr.sbin/moused/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/moused/Makefile,v 1.7 2004/11/03 18:01:21 ru Exp $
 
 PROG=	moused
 MAN=	moused.8
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 1d2ef8855a62..a527ba36e367 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.53 2005/04/13 07:25:45 mdodd Exp $
 .\"
 .Dd November 12, 2004
 .Dt MOUSED 8
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 45f05c9c15fc..5afab5a9954e 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -45,7 +45,7 @@
  **/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/moused/moused.c,v 1.70 2005/04/13 07:25:45 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/consio.h>
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index a9221f979c6d..2aa75f873af1 100644
--- a/usr.sbin/mptable/Makefile
+++ b/usr.sbin/mptable/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mptable/Makefile,v 1.7 2003/09/30 04:09:21 peter Exp $
 
 PROG=	mptable
 WARNS?=	6
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 445285b3fc01..d1aa278892a9 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/usr.sbin/mptable/mptable.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mptable/mptable.1,v 1.10 2005/02/13 22:25:29 ru Exp $
 .\"
 .Dd April 28, 1997
 .Dt MPTABLE 1
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 1ca6dfe150c5..6d60e5669028 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mptable/mptable.c,v 1.19 2005/02/06 12:54:54 obrien Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 43fe8b10ac70..3e1a3cb781b3 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/Makefile,v 1.5 1999/08/28 01:17:02 peter Exp $
 
 SUBDIR=	common mrouted mrinfo map-mbone mtrace testrsrr
 
diff --git a/usr.sbin/mrouted/Makefile.inc b/usr.sbin/mrouted/Makefile.inc
index 6ecd80dd0d3d..266f7fb92aad 100644
--- a/usr.sbin/mrouted/Makefile.inc
+++ b/usr.sbin/mrouted/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/Makefile.inc,v 1.8 2005/06/10 06:12:53 des Exp $
 
 CFLAGS+= -DRSRR -Dlog=logit
 
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 8b8ea9c7156a..af52643bae0c 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/callout.c,v 1.12 1999/08/28 01:17:03 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y
index 1827f6a011b1..75f3d7332578 100644
--- a/usr.sbin/mrouted/cfparse.y
+++ b/usr.sbin/mrouted/cfparse.y
@@ -4,7 +4,7 @@
  *
  * Written by Bill Fenner, NRL, 1994
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/cfparse.y,v 1.13 2004/05/16 22:08:16 stefanf Exp $
  * cfparse.y,v 3.8.4.30 1998/03/01 01:48:58 fenner Exp
  */
 #include <stdio.h>
diff --git a/usr.sbin/mrouted/common/Makefile b/usr.sbin/mrouted/common/Makefile
index 903b50b2404b..2468af142036 100644
--- a/usr.sbin/mrouted/common/Makefile
+++ b/usr.sbin/mrouted/common/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/common/Makefile,v 1.8 2004/10/24 15:33:04 ru Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c
index 9ca6f88891e3..985fcbc89da2 100644
--- a/usr.sbin/mrouted/config.c
+++ b/usr.sbin/mrouted/config.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/config.c,v 1.15 2002/08/18 07:05:00 sobomax Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 40b9cf0a7300..1777ac82b02c 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/defs.h,v 1.14 2004/11/08 23:26:36 imp Exp $
  * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/dvmrp.h b/usr.sbin/mrouted/dvmrp.h
index 2f11872216c0..ee7aa6b83812 100644
--- a/usr.sbin/mrouted/dvmrp.h
+++ b/usr.sbin/mrouted/dvmrp.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/dvmrp.h,v 1.9 1999/08/28 01:17:03 peter Exp $
  * dvmrp.h,v 3.8.4.5 1997/11/18 23:25:57 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index f3430355cb15..bc3a77ab0758 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/igmp.c,v 1.16 1999/08/28 01:17:04 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c
index 53aad7c63a94..dabeb77b5424 100644
--- a/usr.sbin/mrouted/inet.c
+++ b/usr.sbin/mrouted/inet.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/inet.c,v 1.11 1999/08/28 01:17:04 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c
index 716b4794180b..ebe7b0c441b5 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/usr.sbin/mrouted/kern.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/kern.c,v 1.12 1999/08/28 01:17:04 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 75589903ebbc..3cf25ee7b1fe 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/main.c,v 1.21 2004/07/11 17:37:33 stefanf Exp $";
 #endif
 
 #include <err.h>
diff --git a/usr.sbin/mrouted/map-mbone.8 b/usr.sbin/mrouted/map-mbone.8
index a6e9e5841c27..63e14750b33a 100644
--- a/usr.sbin/mrouted/map-mbone.8
+++ b/usr.sbin/mrouted/map-mbone.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mrouted/map-mbone.8,v 1.11 2002/07/14 14:44:24 charnier Exp $
 .\"
 .Dd May 8, 1995
 .Dt MAP-MBONE 8
diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile
index f99247b62500..2f874d27449f 100644
--- a/usr.sbin/mrouted/map-mbone/Makefile
+++ b/usr.sbin/mrouted/map-mbone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/map-mbone/Makefile,v 1.13 2003/04/16 14:53:50 bde Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c
index 8fdbad0687e0..32fef36cde8d 100644
--- a/usr.sbin/mrouted/mapper.c
+++ b/usr.sbin/mrouted/mapper.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/mapper.c,v 1.16 2002/09/09 15:45:28 nectar Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/mrouted/mrinfo.8 b/usr.sbin/mrouted/mrinfo.8
index 94f8f0a16755..6c9b9f30d8c6 100644
--- a/usr.sbin/mrouted/mrinfo.8
+++ b/usr.sbin/mrouted/mrinfo.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mrouted/mrinfo.8,v 1.15 2005/01/15 12:28:01 ru Exp $
 .\"
 .Dd May 8, 1995
 .Dt MRINFO 8
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index 1df65770eba5..2288b1483002 100644
--- a/usr.sbin/mrouted/mrinfo.c
+++ b/usr.sbin/mrouted/mrinfo.c
@@ -61,7 +61,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/mrinfo.c,v 1.18 2002/09/09 15:45:28 nectar Exp $";
 /*  original rcsid:
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 */
diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile
index f111aa981663..13041e8ad5ad 100644
--- a/usr.sbin/mrouted/mrinfo/Makefile
+++ b/usr.sbin/mrouted/mrinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mrinfo/Makefile,v 1.17 2003/04/16 14:53:51 bde Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index 5713914c4fd6..f2a0ae7b8cbe 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -1,6 +1,6 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.32 2005/02/15 09:27:00 ru Exp $
 .\"
 .Dd May 8, 1995
 .Dt MROUTED 8
diff --git a/usr.sbin/mrouted/mrouted.conf b/usr.sbin/mrouted/mrouted.conf
index e9cb04c3ed6e..02fcbdf1fee5 100644
--- a/usr.sbin/mrouted/mrouted.conf
+++ b/usr.sbin/mrouted/mrouted.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mrouted.conf,v 1.9 1999/08/28 01:17:06 peter Exp $
 # mrouted.conf,v 3.8 1995/11/29 22:40:47 fenner Rel
 #
 #   This is the configuration file for "mrouted", an IP multicast router.
diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile
index afd3af82342d..7ddb80ae1cb8 100644
--- a/usr.sbin/mrouted/mrouted/Makefile
+++ b/usr.sbin/mrouted/mrouted/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mrouted/Makefile,v 1.16 2001/07/20 06:20:02 obrien Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/mtrace.8 b/usr.sbin/mrouted/mtrace.8
index cd8d67dc70ac..4bbd308efb91 100644
--- a/usr.sbin/mrouted/mtrace.8
+++ b/usr.sbin/mrouted/mtrace.8
@@ -29,7 +29,7 @@
 .\" Copyright (c) 1988 The Regents of the University of California.
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mrouted/mtrace.8,v 1.24 2005/02/13 23:45:52 ru Exp $
 .\"
 .Dd May 8, 1995
 .Dt MTRACE 8
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index 9cb53e3dcc6c..4d34bbcb5bb9 100644
--- a/usr.sbin/mrouted/mtrace.c
+++ b/usr.sbin/mrouted/mtrace.c
@@ -113,7 +113,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/mtrace.c,v 1.21 2004/01/04 16:07:03 charnier Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile
index ee9adb7c7eb5..cce6dc2826cb 100644
--- a/usr.sbin/mrouted/mtrace/Makefile
+++ b/usr.sbin/mrouted/mtrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mtrace/Makefile,v 1.14 2001/09/13 06:48:16 ru Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/pathnames.h b/usr.sbin/mrouted/pathnames.h
index d4fb01d18a15..2fee141dda49 100644
--- a/usr.sbin/mrouted/pathnames.h
+++ b/usr.sbin/mrouted/pathnames.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/pathnames.h,v 1.7 1999/08/28 01:17:07 peter Exp $
  * pathnames.h,v 3.8 1995/11/29 22:36:57 fenner Rel
  */
 
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index acefaf921f71..77d77e56e976 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/prune.c,v 1.18 2000/10/09 06:08:00 kris Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/prune.h b/usr.sbin/mrouted/prune.h
index 375fada1116e..e5ed6ade7219 100644
--- a/usr.sbin/mrouted/prune.h
+++ b/usr.sbin/mrouted/prune.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/prune.h,v 1.10 1999/08/28 01:17:08 peter Exp $
  * prune.h,v 3.8.4.5 1998/02/27 22:45:43 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index b2695395ed92..df7038d94b3e 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/route.c,v 1.12 1999/08/28 01:17:08 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/route.h b/usr.sbin/mrouted/route.h
index 300202b967dd..77a4eead80c6 100644
--- a/usr.sbin/mrouted/route.h
+++ b/usr.sbin/mrouted/route.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/route.h,v 1.9 1999/08/28 01:17:09 peter Exp $
  * route.h,v 3.8.4.6 1997/07/01 23:02:35 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index 86d6e6eaf438..87e895b53c16 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/usr.sbin/mrouted/rsrr.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/rsrr.c,v 1.9 2001/04/17 07:32:37 kris Exp $";
 #endif /* not lint */
 
 #ifdef RSRR
diff --git a/usr.sbin/mrouted/testrsrr/Makefile b/usr.sbin/mrouted/testrsrr/Makefile
index 4f57dde7990b..390f100e625f 100644
--- a/usr.sbin/mrouted/testrsrr/Makefile
+++ b/usr.sbin/mrouted/testrsrr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/testrsrr/Makefile,v 1.8 2005/01/28 16:08:10 ru Exp $
 
 S=	${.CURDIR}/..
 .PATH: $S
diff --git a/usr.sbin/mrouted/testrsrr/testrsrr.c b/usr.sbin/mrouted/testrsrr/testrsrr.c
index 6dfe831b47ef..d57d6952aeaf 100644
--- a/usr.sbin/mrouted/testrsrr/testrsrr.c
+++ b/usr.sbin/mrouted/testrsrr/testrsrr.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/testrsrr/testrsrr.c,v 1.5 2004/05/24 12:44:00 stefanf Exp $
  */
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 423fa532225e..e96b4444e885 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/vif.c,v 1.15 1999/08/28 01:17:09 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/vif.h b/usr.sbin/mrouted/vif.h
index 5be618dea308..f1d09eb1e271 100644
--- a/usr.sbin/mrouted/vif.h
+++ b/usr.sbin/mrouted/vif.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/vif.h,v 1.10 1999/08/28 01:17:09 peter Exp $
  * vif.h,v 3.8.4.26 1998/01/14 21:21:19 fenner Exp
  */
 
diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile
index 95bbe12184a6..9f3d4843de04 100644
--- a/usr.sbin/mtest/Makefile
+++ b/usr.sbin/mtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtest/Makefile,v 1.3 2001/03/26 14:40:54 ru Exp $
 
 PROG=	mtest
 MAN=	mtest.8
diff --git a/usr.sbin/mtest/mtest.8 b/usr.sbin/mtest/mtest.8
index 4b1f299d4152..34f9525e3e28 100644
--- a/usr.sbin/mtest/mtest.8
+++ b/usr.sbin/mtest/mtest.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mtest/mtest.8,v 1.8 2004/07/02 23:12:49 ru Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd December 15, 1996
diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c
index f13bf492dfb5..44bf20cc339f 100644
--- a/usr.sbin/mtest/mtest.c
+++ b/usr.sbin/mtest/mtest.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtest/mtest.c,v 1.6 2003/07/06 12:44:11 charnier Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 2977c4722b57..d3de7b27a47d 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/Makefile,v 1.27 2005/03/29 11:44:17 tobez Exp $
 
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 44556d67a0ea..8567769dd0f2 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/compare.c,v 1.34 2005/03/29 11:44:17 tobez Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index f1b0313a746d..e06b837e0be5 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/create.c,v 1.37 2005/03/29 11:44:17 tobez Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/mtree/excludes.c
index 21a49b04f744..3614af54ef69 100644
--- a/usr.sbin/mtree/excludes.c
+++ b/usr.sbin/mtree/excludes.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/excludes.c,v 1.8 2003/10/21 08:27:05 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>		/* XXX for mtree.h */
diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h
index 4b6fb3c1839a..4c7adb2f68f8 100644
--- a/usr.sbin/mtree/extern.h
+++ b/usr.sbin/mtree/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mtree/extern.h,v 1.13 2004/01/11 19:38:48 phk Exp $
  */
 extern uint32_t crc_total;
 
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index 8f5344e68401..baae6c04de00 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif /*not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/misc.c,v 1.16 2005/03/29 11:44:17 tobez Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 371aab039efe..df90be3b9714 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mtree.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.52.2.1 2005/08/18 15:01:26 keramida Exp $
 .\"
 .Dd March 29, 2005
 .Dt MTREE 8
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index 76f623c23e2d..950f6a2a4486 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/mtree.c,v 1.29 2004/06/04 19:29:28 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/mtree.h b/usr.sbin/mtree/mtree.h
index b0d5415cdc4c..2b9979753828 100644
--- a/usr.sbin/mtree/mtree.h
+++ b/usr.sbin/mtree/mtree.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtree.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mtree/mtree.h,v 1.7 2005/03/29 11:44:17 tobez Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index ed9431692c73..0deb82d9d801 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/spec.c,v 1.22 2005/03/29 11:44:17 tobez Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/specspec.c b/usr.sbin/mtree/specspec.c
index f85882e0deef..bc5a468cdefb 100644
--- a/usr.sbin/mtree/specspec.c
+++ b/usr.sbin/mtree/specspec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/specspec.c,v 1.6 2005/03/29 11:44:17 tobez Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/usr.sbin/mtree/test/test00.sh b/usr.sbin/mtree/test/test00.sh
index fce801bcd20e..a2e4b2806639 100644
--- a/usr.sbin/mtree/test/test00.sh
+++ b/usr.sbin/mtree/test/test00.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test00.sh,v 1.3 2003/11/05 22:26:08 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test01.sh b/usr.sbin/mtree/test/test01.sh
index e4d3fc302bfe..d056b9128831 100644
--- a/usr.sbin/mtree/test/test01.sh
+++ b/usr.sbin/mtree/test/test01.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test01.sh,v 1.1 2003/10/30 12:01:32 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test02.sh b/usr.sbin/mtree/test/test02.sh
index a7aa9168382c..450ebb3d397f 100644
--- a/usr.sbin/mtree/test/test02.sh
+++ b/usr.sbin/mtree/test/test02.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test02.sh,v 1.1 2003/10/31 13:39:19 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test03.sh b/usr.sbin/mtree/test/test03.sh
index bb3a5b5397e0..52e08c31c3fd 100644
--- a/usr.sbin/mtree/test/test03.sh
+++ b/usr.sbin/mtree/test/test03.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test03.sh,v 1.2 2005/03/29 11:44:17 tobez Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test04.sh b/usr.sbin/mtree/test/test04.sh
index 38acda2bf469..453d14667fc2 100644
--- a/usr.sbin/mtree/test/test04.sh
+++ b/usr.sbin/mtree/test/test04.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test04.sh,v 1.1 2003/11/13 11:02:57 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index cc31ea4e3323..3983e9f2c375 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/verify.c,v 1.23.8.1 2005/09/03 11:04:25 brian Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile
index 0a631f91a567..e878e017fce0 100644
--- a/usr.sbin/named-checkconf/Makefile
+++ b/usr.sbin/named-checkconf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named-checkconf/Makefile,v 1.4.2.1 2005/07/30 07:56:28 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile
index 1a7d191d17da..3334f36c2fbe 100644
--- a/usr.sbin/named-checkzone/Makefile
+++ b/usr.sbin/named-checkzone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named-checkzone/Makefile,v 1.3.4.1 2005/07/30 07:56:28 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile
index 7ea9d0650964..fa1019df5881 100644
--- a/usr.sbin/named.reload/Makefile
+++ b/usr.sbin/named.reload/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.reload/Makefile,v 1.9 2004/09/21 19:01:47 des Exp $
 
 SCRIPTS=	named.reload.sh
 MAN=		named.reload.8
diff --git a/usr.sbin/named.reload/named.reload.8 b/usr.sbin/named.reload/named.reload.8
index 64587742350e..d416ee957258 100644
--- a/usr.sbin/named.reload/named.reload.8
+++ b/usr.sbin/named.reload/named.reload.8
@@ -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/usr.sbin/named.reload/named.reload.8,v 1.8 2004/09/21 19:01:47 des Exp $
 .\"
 .Dd September 21, 2004
 .Dt NAMED.RELOAD 8
diff --git a/usr.sbin/named.reload/named.reload.sh b/usr.sbin/named.reload/named.reload.sh
index d1ee3afeda9a..b4461af89396 100644
--- a/usr.sbin/named.reload/named.reload.sh
+++ b/usr.sbin/named.reload/named.reload.sh
@@ -24,7 +24,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/usr.sbin/named.reload/named.reload.sh,v 1.3 2004/09/21 19:01:47 des Exp $
 #
 
 rndc=/usr/sbin/rndc
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index fe294eaf2dfc..4b77d90dcd95 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile,v 1.40.2.1 2005/07/30 07:56:27 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/ndiscvt/Makefile b/usr.sbin/ndiscvt/Makefile
index 90ecebbdc552..6b1e920f88d0 100644
--- a/usr.sbin/ndiscvt/Makefile
+++ b/usr.sbin/ndiscvt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndiscvt/Makefile,v 1.7 2005/04/24 20:21:22 wpaul Exp $
 
 .PATH:	${.CURDIR}/../../sys/compat/ndis
 
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 8a8495671db5..d83817154817 100644
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ b/usr.sbin/ndiscvt/inf-parse.y
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf-parse.y,v 1.2 2004/01/02 04:31:06 wpaul Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index cc1508bba4a2..4d361041dd3e 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf-token.l,v 1.3 2004/01/11 21:10:35 mdodd Exp $");
 
 #include <regex.h>
 #include <ctype.h>
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index c3d965c82245..759ebf68edf0 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf.c,v 1.16 2005/05/15 19:46:14 wpaul Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/ndiscvt/inf.h b/usr.sbin/ndiscvt/inf.h
index 8d0b0c123de4..6367f3edab78 100644
--- a/usr.sbin/ndiscvt/inf.h
+++ b/usr.sbin/ndiscvt/inf.h
@@ -1,7 +1,7 @@
 /*
  * $Id: inf.h,v 1.3 2003/11/30 21:58:16 winter Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ndiscvt/inf.h,v 1.1 2003/12/11 22:38:14 wpaul Exp $
  */
 
 #define W_MAX	16
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index bcdf52a88181..36d1db99ff3d 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/usr.sbin/ndiscvt/ndiscvt.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ndiscvt/ndiscvt.8,v 1.7.2.1 2005/08/18 15:01:26 keramida Exp $
 .\"
 .Dd December 10, 2003
 .Dt NDISCVT 8
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 80eae836f080..aea8adec241c 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/ndiscvt.c,v 1.11.4.1 2005/10/27 17:08:57 wpaul Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/ndiscvt/ndisgen.8 b/usr.sbin/ndiscvt/ndisgen.8
index c293b6723d62..e019761377c8 100644
--- a/usr.sbin/ndiscvt/ndisgen.8
+++ b/usr.sbin/ndiscvt/ndisgen.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ndiscvt/ndisgen.8,v 1.2.4.1 2005/10/27 17:08:57 wpaul Exp $
 .\"
 .Dd April 24, 2005
 .Dt NDISGEN 8
diff --git a/usr.sbin/ndiscvt/ndisgen.sh b/usr.sbin/ndiscvt/ndisgen.sh
index 6de8fe6af9a2..b91196838eb5 100644
--- a/usr.sbin/ndiscvt/ndisgen.sh
+++ b/usr.sbin/ndiscvt/ndisgen.sh
@@ -30,7 +30,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndiscvt/ndisgen.sh,v 1.1.6.1 2005/10/27 17:08:57 wpaul Exp $
 #
 
 header () {
diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c
index 30e74bfc9e30..33de446bcf85 100644
--- a/usr.sbin/ndiscvt/windrv_stub.c
+++ b/usr.sbin/ndiscvt/windrv_stub.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/windrv_stub.c,v 1.2 2005/05/08 23:07:51 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index c35dfc7f5eaa..bef37530a5db 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -11,7 +11,7 @@
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndp/Makefile,v 1.5 2004/03/31 20:58:39 bms Exp $
 
 .PATH: ${.CURDIR}/../../contrib/tcpdump
 
diff --git a/usr.sbin/ndp/gnuc.h b/usr.sbin/ndp/gnuc.h
index c6412965c9db..5c6b29e3a309 100644
--- a/usr.sbin/ndp/gnuc.h
+++ b/usr.sbin/ndp/gnuc.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ndp/gnuc.h,v 1.1 2000/01/06 12:40:40 shin Exp $ */
 /* this is dummy to pacify gmt2local.c. */
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index 5c31c41676d1..b2fefc07d732 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.16 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt NDP 8
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index de3a80ac1dd9..0c8c4c9796b1 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.16 2004/08/07 04:27:51 imp Exp $	*/
 /*	$KAME: ndp.c,v 1.104 2003/06/27 07:48:39 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index 9c301a1b9d1d..3f20a9d9a607 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/newsyslog/Makefile,v 1.16 2004/03/12 16:03:26 trhodes Exp $
 
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
diff --git a/usr.sbin/newsyslog/extern.h b/usr.sbin/newsyslog/extern.h
index c350226f591a..51869292a551 100644
--- a/usr.sbin/newsyslog/extern.h
+++ b/usr.sbin/newsyslog/extern.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/newsyslog/extern.h,v 1.2 2003/09/23 00:00:26 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 3db563f2964c..03bc4c74ff40 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.51 2005/06/14 12:26:35 ru Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\"
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index 7b3a3aac8deb..fc23290d3e2a 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.101 2005/03/03 15:47:32 brooks Exp $");
 
 #define	OSF
 #ifndef COMPRESS_POSTFIX
diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5
index 16a3185ef89c..c74b6b7dbab6 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.5
+++ b/usr.sbin/newsyslog/newsyslog.conf.5
@@ -5,7 +5,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"     from: @(#)newsyslog.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.conf.5,v 1.4 2005/01/21 10:31:28 ru Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\"
diff --git a/usr.sbin/newsyslog/pathnames.h b/usr.sbin/newsyslog/pathnames.h
index 3d2c6ff29c8f..53139db4fa34 100644
--- a/usr.sbin/newsyslog/pathnames.h
+++ b/usr.sbin/newsyslog/pathnames.h
@@ -18,7 +18,7 @@ M.I.T. and the M.I.T. S.I.P.B. make no representations about
 the suitability of this software for any purpose.  It is
 provided "as is" without express or implied warranty.
 
- $FreeBSD$
+ $FreeBSD: src/usr.sbin/newsyslog/pathnames.h,v 1.3 2001/07/30 15:17:17 obrien Exp $
 
 */
 
diff --git a/usr.sbin/newsyslog/ptimes.c b/usr.sbin/newsyslog/ptimes.c
index 474c69daba53..15bed332c7ce 100644
--- a/usr.sbin/newsyslog/ptimes.c
+++ b/usr.sbin/newsyslog/ptimes.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/ptimes.c,v 1.5 2004/06/07 21:53:27 gad Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 21ca3f377a65..1170de1c4a49 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nfsd/Makefile,v 1.17 2004/11/06 18:15:44 delphij Exp $
 
 PROG=	nfsd
 MAN=	nfsd.8
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index 64c181e66c9c..8d06b703f5a0 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nfsd/nfsd.8,v 1.24 2005/01/17 07:44:42 ru Exp $
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 71578960ce7a..0fc354057c09 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/nfsd/nfsd.c,v 1.32 2005/01/23 21:34:00 rwatson Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index 364bbf7b8a7d..b039cf0b4536 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.14 2004/01/26 10:27:18 ru Exp $
 # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
 
 PROG=	ngctl
diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c
index 9b4c2b7b9414..008b0db70c05 100644
--- a/usr.sbin/ngctl/config.c
+++ b/usr.sbin/ngctl/config.c
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/config.c,v 1.3 2004/01/26 10:27:18 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c
index 460e6b26e334..b9ea3402768f 100644
--- a/usr.sbin/ngctl/connect.c
+++ b/usr.sbin/ngctl/connect.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/connect.c,v 1.3 2004/01/26 10:27:18 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c
index fbfce4ee628b..af3f54ab5db5 100644
--- a/usr.sbin/ngctl/debug.c
+++ b/usr.sbin/ngctl/debug.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/debug.c,v 1.2 2004/01/26 10:27:18 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/dot.c b/usr.sbin/ngctl/dot.c
index d5a43f5441ed..734d80f037e7 100644
--- a/usr.sbin/ngctl/dot.c
+++ b/usr.sbin/ngctl/dot.c
@@ -35,7 +35,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/dot.c,v 1.3 2004/01/27 21:52:52 ru Exp $
  */
 
 #include <inttypes.h>
diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c
index 6d3cc4f406c3..3d0ccf5063da 100644
--- a/usr.sbin/ngctl/list.c
+++ b/usr.sbin/ngctl/list.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/list.c,v 1.6 2005/02/09 16:17:33 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index fcd61dfd9ab5..1ce46d38ed6a 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.18 2005/02/04 20:09:11 maxim Exp $
  * $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $
  */
 
diff --git a/usr.sbin/ngctl/mkpeer.c b/usr.sbin/ngctl/mkpeer.c
index 621d318ecf40..eabcb72079c2 100644
--- a/usr.sbin/ngctl/mkpeer.c
+++ b/usr.sbin/ngctl/mkpeer.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/mkpeer.c,v 1.2 2004/01/26 10:27:18 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c
index c71815b5a423..d92dbb1a212a 100644
--- a/usr.sbin/ngctl/msg.c
+++ b/usr.sbin/ngctl/msg.c
@@ -35,7 +35,7 @@
  * OF SUCH DAMAGE.
  *
  * $Whistle: msg.c,v 1.2 1999/11/29 23:38:35 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/msg.c,v 1.5 2004/01/27 21:52:52 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c
index 3de136034785..21d9baa9d78f 100644
--- a/usr.sbin/ngctl/name.c
+++ b/usr.sbin/ngctl/name.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/name.c,v 1.2 2004/01/26 10:27:18 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index ce77069d3185..30bfdfb87eac 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.16 2005/01/17 07:44:42 ru Exp $
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h
index 1f7826e32a87..21fe1970033e 100644
--- a/usr.sbin/ngctl/ngctl.h
+++ b/usr.sbin/ngctl/ngctl.h
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/ngctl.h,v 1.12 2004/01/09 03:19:40 green Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c
index 834cc0c909d9..f78ec94f86b4 100644
--- a/usr.sbin/ngctl/rmhook.c
+++ b/usr.sbin/ngctl/rmhook.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/rmhook.c,v 1.3 2004/01/26 10:27:18 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c
index 6921ec45f7aa..4361d8da9d5a 100644
--- a/usr.sbin/ngctl/show.c
+++ b/usr.sbin/ngctl/show.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/show.c,v 1.4 2004/01/27 21:52:52 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c
index d391ba801e58..d67007797ca6 100644
--- a/usr.sbin/ngctl/shutdown.c
+++ b/usr.sbin/ngctl/shutdown.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/shutdown.c,v 1.2 1999/11/30 02:45:32 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c
index 8c10a854afb8..b676ac3c3d16 100644
--- a/usr.sbin/ngctl/status.c
+++ b/usr.sbin/ngctl/status.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/status.c,v 1.2 2004/01/26 10:27:18 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c
index 30c5c168c6ca..9ceaab525a03 100644
--- a/usr.sbin/ngctl/types.c
+++ b/usr.sbin/ngctl/types.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/types.c,v 1.4 2004/01/27 21:52:52 ru Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c
index d1bdca09427e..8b2b32685c0f 100644
--- a/usr.sbin/ngctl/write.c
+++ b/usr.sbin/ngctl/write.c
@@ -30,7 +30,7 @@
  * THIS SOFTWARE, EVEN IF ARCHIE L. COBBS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/write.c,v 1.1 2002/01/22 22:01:25 archie Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile
index 73f2df3bf935..8b060169b2b9 100644
--- a/usr.sbin/nghook/Makefile
+++ b/usr.sbin/nghook/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nghook/Makefile,v 1.8 2004/02/23 20:21:21 johan Exp $
 # $Whistle: Makefile,v 1.4 1999/01/16 04:44:33 archie Exp $
 
 PROG=	nghook
diff --git a/usr.sbin/nghook/main.c b/usr.sbin/nghook/main.c
index 700ca5e1a59d..391508ac01c2 100644
--- a/usr.sbin/nghook/main.c
+++ b/usr.sbin/nghook/main.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nghook/main.c,v 1.11 2003/10/24 10:01:36 harti Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index 7d2c7fa5f5cc..c0960ec42974 100644
--- a/usr.sbin/nghook/nghook.8
+++ b/usr.sbin/nghook/nghook.8
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.17 2005/01/18 20:02:39 ru Exp $
 .\" $Whistle: nghook.8,v 1.4 1999/01/20 03:19:45 archie Exp $
 .\"
 .Dd October 24, 2003
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index 0b4c0db25d1c..830123fa2e6f 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nologin/Makefile,v 1.13 2004/12/21 09:59:44 ru Exp $
 
 PROG=	nologin
 MAN=	nologin.5 nologin.8
diff --git a/usr.sbin/nologin/nologin.5 b/usr.sbin/nologin/nologin.5
index 961f5a39b1ed..69bd38ae2bbe 100644
--- a/usr.sbin/nologin/nologin.5
+++ b/usr.sbin/nologin/nologin.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nologin/nologin.5,v 1.14 2004/08/07 04:27:52 imp Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
diff --git a/usr.sbin/nologin/nologin.8 b/usr.sbin/nologin/nologin.8
index d03aa33d96b4..04078ff77e24 100644
--- a/usr.sbin/nologin/nologin.8
+++ b/usr.sbin/nologin/nologin.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nologin/nologin.8,v 1.14 2004/08/07 04:27:52 imp Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/usr.sbin/nologin/nologin.c b/usr.sbin/nologin/nologin.c
index 658637ef2ae8..788c90f0e0e3 100644
--- a/usr.sbin/nologin/nologin.c
+++ b/usr.sbin/nologin/nologin.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nologin/nologin.c,v 1.6 2005/01/04 20:07:12 delphij Exp $");
 
 #include <stdio.h>
 #include <syslog.h>
diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile
index 3ed705a22e15..113c85b184e1 100644
--- a/usr.sbin/ntp/Makefile
+++ b/usr.sbin/ntp/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ntpd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/Makefile,v 1.11 2004/12/21 08:47:33 ru Exp $
 
 SUBDIR=	libntp libparse ntpd ntpdc ntpq ntpdate ntptrace \
 	ntptime ntp-keygen sntp
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index 3a859109e461..759b855987ed 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/Makefile.inc,v 1.8 2005/06/10 06:12:53 des Exp $
 
 DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H
 NTPDEFS=   -DSYS_FREEBSD
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index ff6cb575e6d4..368ffe8e67ca 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ntp/config.h,v 1.13 2005/06/23 21:37:27 roberto Exp $ */
 
 /* Is adjtime() accurate? */
 /* #undef ADJTIME_IS_ACCURATE */
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 89646b23bb86..82e8a1ac7349 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/doc/Makefile,v 1.11 2005/05/25 16:30:43 sheldonh Exp $
 
 FILESDIR=	${SHAREDIR}/doc/ntp
 
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index f638a084eec6..cf04d0e0dbb3 100644
--- a/usr.sbin/ntp/doc/ntp.conf.5
+++ b/usr.sbin/ntp/doc/ntp.conf.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntp.conf.5,v 1.18 2005/06/09 11:25:50 keramida Exp $
 .\"
 .Dd January 13, 2000
 .Dt NTP.CONF 5
diff --git a/usr.sbin/ntp/doc/ntp.keys.5 b/usr.sbin/ntp/doc/ntp.keys.5
index dc9531ce245e..6b741b92a1b4 100644
--- a/usr.sbin/ntp/doc/ntp.keys.5
+++ b/usr.sbin/ntp/doc/ntp.keys.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntp.keys.5,v 1.6 2002/12/27 12:15:38 schweikh Exp $
 .\"
 .Dd January 13, 2000
 .Dt NTP.KEYS 5
diff --git a/usr.sbin/ntp/doc/ntpd.8 b/usr.sbin/ntp/doc/ntpd.8
index 580837108916..1bff6246622d 100644
--- a/usr.sbin/ntp/doc/ntpd.8
+++ b/usr.sbin/ntp/doc/ntpd.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.11 2005/02/13 22:25:29 ru Exp $
 .\"
 .Dd August 2, 2001
 .Dt NTPD 8
diff --git a/usr.sbin/ntp/doc/ntpdate.8 b/usr.sbin/ntp/doc/ntpdate.8
index 8d4b6d37defc..1bab4e74bf2b 100644
--- a/usr.sbin/ntp/doc/ntpdate.8
+++ b/usr.sbin/ntp/doc/ntpdate.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdate.8,v 1.9 2005/02/13 22:25:29 ru Exp $
 .\"
 .Dd January 6, 2000
 .Dt NTPDATE 8
diff --git a/usr.sbin/ntp/doc/ntpdc.8 b/usr.sbin/ntp/doc/ntpdc.8
index e0cecffe0976..5d9b7268ad16 100644
--- a/usr.sbin/ntp/doc/ntpdc.8
+++ b/usr.sbin/ntp/doc/ntpdc.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdc.8,v 1.12.8.1 2005/08/18 15:01:26 keramida Exp $
 .\"
 .Dd January 7, 2000
 .Dt NTPDC 8
diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8
index c2efc66c74f2..7b1ec8455476 100644
--- a/usr.sbin/ntp/doc/ntpq.8
+++ b/usr.sbin/ntp/doc/ntpq.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.17 2005/02/13 22:25:29 ru Exp $
 .\"
 .Dd January 7, 2000
 .Dt NTPQ 8
diff --git a/usr.sbin/ntp/doc/ntptime.8 b/usr.sbin/ntp/doc/ntptime.8
index f130307457f3..3ce0e3627e6f 100644
--- a/usr.sbin/ntp/doc/ntptime.8
+++ b/usr.sbin/ntp/doc/ntptime.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntptime.8,v 1.4 2002/07/14 14:44:40 charnier Exp $
 .\"
 .Dd January 7, 2000
 .Dt NTPTIME 8
diff --git a/usr.sbin/ntp/doc/ntptrace.8 b/usr.sbin/ntp/doc/ntptrace.8
index 554a3c0c27c8..687935baf79a 100644
--- a/usr.sbin/ntp/doc/ntptrace.8
+++ b/usr.sbin/ntp/doc/ntptrace.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntptrace.8,v 1.7 2004/07/02 23:12:51 ru Exp $
 .\"
 .Dd January 6, 2000
 .Dt NTPTRACE 8
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index 19039105bf2d..b1284eb166c5 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/libntp/Makefile,v 1.10 2004/10/24 15:33:04 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/libntp \
 	${.CURDIR}/../../../contrib/ntp/libisc
diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile
index 22d7ca38c4dc..841ababbbc8c 100644
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/libparse/Makefile,v 1.7 2004/10/24 15:33:04 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/libparse
 
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 7ccdee210be4..3874c54a4e6b 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntp-keygen/Makefile,v 1.6 2005/01/28 16:08:10 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/util \
        ${.CURDIR}/../../../contrib/ntp/ntpd
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 5b3fdba2d17b..9134abd20765 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpd/Makefile,v 1.13 2004/12/21 10:16:03 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd
 
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index a72f550049fe..ecd19cd0ef0f 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpdate/Makefile,v 1.6 2004/12/21 08:47:33 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate
 
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 730308cb6f10..e9cf6063dce1 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpdc/Makefile,v 1.10 2004/12/21 08:47:33 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc
 
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 613e02e513c0..8321d432921b 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpq/Makefile,v 1.10 2004/12/21 08:47:33 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpq
 
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index db5885ddceb3..59d0cd5187b7 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntptime/Makefile,v 1.6 2005/01/28 16:08:11 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/util
 
diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile
index 370149001bad..991fc05e8a6b 100644
--- a/usr.sbin/ntp/ntptrace/Makefile
+++ b/usr.sbin/ntp/ntptrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntptrace/Makefile,v 1.6 2004/12/21 08:47:34 ru Exp $
 
 .PATH:	${.CURDIR}/../scripts
 
diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver
index d54386d5fd6a..4f340ee043f4 100755
--- a/usr.sbin/ntp/scripts/mkver
+++ b/usr.sbin/ntp/scripts/mkver
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/mkver,v 1.9 2004/07/20 15:44:32 roberto Exp $
 #
 PROG=${1-UNKNOWN}
 
diff --git a/usr.sbin/ntp/scripts/ntptrace b/usr.sbin/ntp/scripts/ntptrace
index 8a895c4ba0be..4319623c5f9e 100644
--- a/usr.sbin/ntp/scripts/ntptrace
+++ b/usr.sbin/ntp/scripts/ntptrace
@@ -1,6 +1,6 @@
 #! /usr/local/bin/perl -w
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/ntptrace,v 1.1 2004/07/20 15:44:32 roberto Exp $
 
 # John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org
 
diff --git a/usr.sbin/ntp/scripts/ntpver b/usr.sbin/ntp/scripts/ntpver
index 6dbc510db8c2..f457be9a0379 100755
--- a/usr.sbin/ntp/scripts/ntpver
+++ b/usr.sbin/ntp/scripts/ntpver
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/ntpver,v 1.1 1999/12/13 14:09:56 roberto Exp $
 # print version string of NTP daemon
 # Copyright (c) 1997 by Ulrich Windl
 # Modified 970318: Harlan Stenn: rewritten...
diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile
index f7a9eb9a2996..3793c8b4ecc5 100644
--- a/usr.sbin/ntp/sntp/Makefile
+++ b/usr.sbin/ntp/sntp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/sntp/Makefile,v 1.3 2004/12/21 08:47:34 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/sntp
 
diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile
index b94ffd1bf59b..88063a89f72d 100644
--- a/usr.sbin/ofwdump/Makefile
+++ b/usr.sbin/ofwdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ofwdump/Makefile,v 1.4 2004/05/22 16:51:11 marius Exp $
 
 PROG=	ofwdump
 MAN=	ofwdump.8
diff --git a/usr.sbin/ofwdump/ofw_util.c b/usr.sbin/ofwdump/ofw_util.c
index 71361d452511..223ef16d10a3 100644
--- a/usr.sbin/ofwdump/ofw_util.c
+++ b/usr.sbin/ofwdump/ofw_util.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ofwdump/ofw_util.c,v 1.5 2004/05/22 16:51:11 marius Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/ofwdump/ofw_util.h b/usr.sbin/ofwdump/ofw_util.h
index af8f01f233b2..3c562bbac7d5 100644
--- a/usr.sbin/ofwdump/ofw_util.h
+++ b/usr.sbin/ofwdump/ofw_util.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ofwdump/ofw_util.h,v 1.3 2004/05/22 16:51:11 marius Exp $
  */
 
 #ifndef OFW_UTIL_H
diff --git a/usr.sbin/ofwdump/ofwdump.8 b/usr.sbin/ofwdump/ofwdump.8
index 995d93704d18..cc9712517583 100644
--- a/usr.sbin/ofwdump/ofwdump.8
+++ b/usr.sbin/ofwdump/ofwdump.8
@@ -21,7 +21,7 @@
 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ofwdump/ofwdump.8,v 1.5 2004/07/02 23:12:51 ru Exp $
 .\"
 .Dd October 18, 2002
 .Dt OFWDUMP 8 sparc64
diff --git a/usr.sbin/ofwdump/ofwdump.c b/usr.sbin/ofwdump/ofwdump.c
index ea25caa16daf..15eb85f9a1b1 100644
--- a/usr.sbin/ofwdump/ofwdump.c
+++ b/usr.sbin/ofwdump/ofwdump.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ofwdump/ofwdump.c,v 1.2 2004/05/22 16:51:11 marius Exp $");
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/openfirmio.h>
diff --git a/usr.sbin/ofwdump/pathnames.h b/usr.sbin/ofwdump/pathnames.h
index 32f5fe624db6..22b65f112582 100644
--- a/usr.sbin/ofwdump/pathnames.h
+++ b/usr.sbin/ofwdump/pathnames.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ofwdump/pathnames.h,v 1.1 2002/10/18 15:37:15 tmm Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/pccard/Makefile b/usr.sbin/pccard/Makefile
index 6dee3cdfa2c6..3e66a76e7b29 100644
--- a/usr.sbin/pccard/Makefile
+++ b/usr.sbin/pccard/Makefile
@@ -1,5 +1,5 @@
 # Makefile for pccardc/pccardd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/Makefile,v 1.6.14.1 2005/10/06 16:56:45 imp Exp $
 
 SUBDIR=	pccardc
 
diff --git a/usr.sbin/pccard/Makefile.inc b/usr.sbin/pccard/Makefile.inc
index cd8896df860c..6e51b325cdd5 100644
--- a/usr.sbin/pccard/Makefile.inc
+++ b/usr.sbin/pccard/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/Makefile.inc,v 1.9 2004/12/21 09:59:45 ru Exp $
 
 NO_SHARED?=	YES
 
diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index d0649a2dc42c..7dc2727f0ccd 100644
--- a/usr.sbin/pccard/pccardc/Makefile
+++ b/usr.sbin/pccard/pccardc/Makefile
@@ -1,6 +1,6 @@
 #	pccardc Makefile
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/pccardc/Makefile,v 1.16 2003/04/04 17:49:16 obrien Exp $
 
 .PATH: ${.CURDIR}/../pccardd
 
diff --git a/usr.sbin/pccard/pccardc/beep.c b/usr.sbin/pccard/pccardc/beep.c
index be62c56238a7..94825ed0e062 100644
--- a/usr.sbin/pccard/pccardc/beep.c
+++ b/usr.sbin/pccard/pccardc/beep.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/beep.c,v 1.3 2002/04/22 13:44:45 des Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pccard/pccardc/dumpcis.c b/usr.sbin/pccard/pccardc/dumpcis.c
index d5fc7579933f..309528754659 100644
--- a/usr.sbin/pccard/pccardc/dumpcis.c
+++ b/usr.sbin/pccard/pccardc/dumpcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/dumpcis.c,v 1.12 1999/08/28 01:17:31 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/dumpcisfile.c b/usr.sbin/pccard/pccardc/dumpcisfile.c
index 6a415ba44e50..621b264f2ad4 100644
--- a/usr.sbin/pccard/pccardc/dumpcisfile.c
+++ b/usr.sbin/pccard/pccardc/dumpcisfile.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/dumpcisfile.c,v 1.1 2003/02/25 22:14:38 green Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/enabler.c b/usr.sbin/pccard/pccardc/enabler.c
index 11ee0bb88208..5fe2cc1dd9ee 100644
--- a/usr.sbin/pccard/pccardc/enabler.c
+++ b/usr.sbin/pccard/pccardc/enabler.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/enabler.c,v 1.14 2003/07/18 21:53:42 dds Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardc.8 b/usr.sbin/pccard/pccardc/pccardc.8
index b47a19c6506f..26efbb9427ab 100644
--- a/usr.sbin/pccard/pccardc/pccardc.8
+++ b/usr.sbin/pccard/pccardc/pccardc.8
@@ -26,7 +26,7 @@
 .\"
 .\" Translated to English by Hiroki Sato <hrs@geocities.co.jp>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.8,v 1.20 2004/07/02 23:12:51 ru Exp $
 .\"
 .Dd November 14, 1998
 .Dt PCCARDC 8
diff --git a/usr.sbin/pccard/pccardc/pccardc.c b/usr.sbin/pccard/pccardc/pccardc.c
index c1f6eced7507..6781a0e3e927 100644
--- a/usr.sbin/pccard/pccardc/pccardc.c
+++ b/usr.sbin/pccard/pccardc/pccardc.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.c,v 1.13 2004/05/16 22:08:17 stefanf Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardmem.c b/usr.sbin/pccard/pccardc/pccardmem.c
index 0b1d1764c16d..818ff6c544b8 100644
--- a/usr.sbin/pccard/pccardc/pccardmem.c
+++ b/usr.sbin/pccard/pccardc/pccardmem.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/pccardmem.c,v 1.13 2003/06/09 06:16:18 imp Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/power.c b/usr.sbin/pccard/pccardc/power.c
index 59d43a57436a..9622f6151ec4 100644
--- a/usr.sbin/pccard/pccardc/power.c
+++ b/usr.sbin/pccard/pccardc/power.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pccard/pccardc/power.c,v 1.3 2002/04/22 13:44:45 des Exp $ */
 
 /*
  * Code cleanup, bug-fix and extension
diff --git a/usr.sbin/pccard/pccardc/printcis.c b/usr.sbin/pccard/pccardc/printcis.c
index f8a53b3cc867..8a89c23f224b 100644
--- a/usr.sbin/pccard/pccardc/printcis.c
+++ b/usr.sbin/pccard/pccardc/printcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/printcis.c,v 1.13 2001/05/07 21:51:54 dmlb Exp $";
 #endif /* not lint */
 
 /* 
diff --git a/usr.sbin/pccard/pccardc/rdmap.c b/usr.sbin/pccard/pccardc/rdmap.c
index 3ac81f930ca9..93f7ff8e8ed1 100644
--- a/usr.sbin/pccard/pccardc/rdmap.c
+++ b/usr.sbin/pccard/pccardc/rdmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdmap.c,v 1.12 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/rdreg.c b/usr.sbin/pccard/pccardc/rdreg.c
index a3171487998a..9d6b7bbc568b 100644
--- a/usr.sbin/pccard/pccardc/rdreg.c
+++ b/usr.sbin/pccard/pccardc/rdreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdreg.c,v 1.12 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrattr.c b/usr.sbin/pccard/pccardc/wrattr.c
index cc3df8ecbee8..6166a6518c36 100644
--- a/usr.sbin/pccard/pccardc/wrattr.c
+++ b/usr.sbin/pccard/pccardc/wrattr.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrattr.c,v 1.13 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrreg.c b/usr.sbin/pccard/pccardc/wrreg.c
index 5fda2a72f24c..84f608928222 100644
--- a/usr.sbin/pccard/pccardc/wrreg.c
+++ b/usr.sbin/pccard/pccardc/wrreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrreg.c,v 1.12 1999/08/28 01:17:34 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardd/Makefile b/usr.sbin/pccard/pccardd/Makefile
index b7fae27df8bc..da0907fe3ff6 100644
--- a/usr.sbin/pccard/pccardd/Makefile
+++ b/usr.sbin/pccard/pccardd/Makefile
@@ -1,5 +1,5 @@
 #	Makefile for pccardd
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/pccardd/Makefile,v 1.8 2003/04/04 17:49:16 obrien Exp $
 
 .PATH: ${.CURDIR}/../pccardc
 
diff --git a/usr.sbin/pccard/pccardd/cardd.c b/usr.sbin/pccard/pccardd/cardd.c
index c91ecd259d3d..8d6f59e52f5f 100644
--- a/usr.sbin/pccard/pccardd/cardd.c
+++ b/usr.sbin/pccard/pccardd/cardd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/cardd.c,v 1.80 2003/04/23 23:41:48 imp Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pccard/pccardd/cardd.h b/usr.sbin/pccard/pccardd/cardd.h
index ab7a0e1b4ea7..53925a397b6b 100644
--- a/usr.sbin/pccard/pccardd/cardd.h
+++ b/usr.sbin/pccard/pccardd/cardd.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/usr.sbin/pccard/pccardd/cardd.h,v 1.31 2003/08/03 06:17:06 imp Exp $
  *
  *	Common include file for PCMCIA daemon
  */
diff --git a/usr.sbin/pccard/pccardd/file.c b/usr.sbin/pccard/pccardd/file.c
index 93ad066d2f8b..8d4cfb915b16 100644
--- a/usr.sbin/pccard/pccardd/file.c
+++ b/usr.sbin/pccard/pccardd/file.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/file.c,v 1.36 2003/10/04 18:43:21 imp Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pccard/pccardd/pccard.conf.5 b/usr.sbin/pccard/pccardd/pccard.conf.5
index c3d496dd9b46..25d6759ccba9 100644
--- a/usr.sbin/pccard/pccardd/pccard.conf.5
+++ b/usr.sbin/pccard/pccardd/pccard.conf.5
@@ -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/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.27 2005/02/13 22:25:30 ru Exp $
 .\"
 .Dd November 2, 1994
 .Dt PCCARD.CONF 5
diff --git a/usr.sbin/pccard/pccardd/pccardd.8 b/usr.sbin/pccard/pccardd/pccardd.8
index 105552ba28ee..89637b7f06ed 100644
--- a/usr.sbin/pccard/pccardd/pccardd.8
+++ b/usr.sbin/pccard/pccardd/pccardd.8
@@ -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/usr.sbin/pccard/pccardd/pccardd.8,v 1.32 2005/02/13 22:25:30 ru Exp $
 .\"
 .Dd November 1, 1994
 .Dt PCCARDD 8
diff --git a/usr.sbin/pccard/pccardd/pccardd.c b/usr.sbin/pccard/pccardd/pccardd.c
index 11d07166b302..3199358718fb 100644
--- a/usr.sbin/pccard/pccardd/pccardd.c
+++ b/usr.sbin/pccard/pccardd/pccardd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.c,v 1.16 2003/12/26 10:01:29 maxim Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.sbin/pccard/pccardd/readcis.c b/usr.sbin/pccard/pccardd/readcis.c
index 73b72efb9eaf..c087ab61a6d2 100644
--- a/usr.sbin/pccard/pccardd/readcis.c
+++ b/usr.sbin/pccard/pccardd/readcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/readcis.c,v 1.26 2003/03/14 21:11:01 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pccard/pccardd/readcis.h b/usr.sbin/pccard/pccardd/readcis.h
index 8ebd74531fe2..a0b2e1726246 100644
--- a/usr.sbin/pccard/pccardd/readcis.h
+++ b/usr.sbin/pccard/pccardd/readcis.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/usr.sbin/pccard/pccardd/readcis.h,v 1.15 2003/02/25 22:14:38 green Exp $
  */
 
 struct tuple {
diff --git a/usr.sbin/pccard/pccardd/server.c b/usr.sbin/pccard/pccardd/server.c
index 8c6177eff4c2..2bfc9f6c0556 100644
--- a/usr.sbin/pccard/pccardd/server.c
+++ b/usr.sbin/pccard/pccardd/server.c
@@ -7,7 +7,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/server.c,v 1.3 2003/06/09 06:17:07 imp Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pccard/pccardd/util.c b/usr.sbin/pccard/pccardd/util.c
index 8f9a48df3b7c..cfdb5ad414da 100644
--- a/usr.sbin/pccard/pccardd/util.c
+++ b/usr.sbin/pccard/pccardd/util.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/util.c,v 1.17 2001/02/25 19:52:42 gj Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile
index d892a1282197..45ac32b856a6 100644
--- a/usr.sbin/pciconf/Makefile
+++ b/usr.sbin/pciconf/Makefile
@@ -1,5 +1,5 @@
 #	$ANA: Makefile,v 1.1.1.1 1996/09/25 21:12:57 wollman Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pciconf/Makefile,v 1.9 2001/07/20 06:20:07 obrien Exp $
 
 PROG=	pciconf
 MAN=	pciconf.8
diff --git a/usr.sbin/pciconf/pathnames.h b/usr.sbin/pciconf/pathnames.h
index 719615a478fc..b5cebb6f1dab 100644
--- a/usr.sbin/pciconf/pathnames.h
+++ b/usr.sbin/pciconf/pathnames.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pciconf/pathnames.h,v 1.2 2000/12/07 10:52:59 msmith Exp $ */
 #define	_PATH_DEVPCI	"/dev/pci"
 #define	_PATH_PCIVDB	"/usr/share/misc/pci_vendors"
diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8
index ea41bbad46b9..e95d46fd668c 100644
--- a/usr.sbin/pciconf/pciconf.8
+++ b/usr.sbin/pciconf/pciconf.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.26 2004/01/06 20:23:20 rwatson Exp $
 .\"
 .Dd February 7, 1997
 .Dt PCICONF 8
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index c36c692c3f06..2f612ad9f13f 100644
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pciconf/pciconf.c,v 1.24 2005/03/26 20:31:09 jmg Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pcvt/Makefile b/usr.sbin/pcvt/Makefile
index ab72a2d1647c..9364f4dcff1e 100644
--- a/usr.sbin/pcvt/Makefile
+++ b/usr.sbin/pcvt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Makefile,v 1.7.14.1 2005/08/16 22:40:54 phk Exp $
 
 SUBDIR= 	keycap cursor fontedit fonts kcon loadfont scon \
 		userkeys ispcvt
diff --git a/usr.sbin/pcvt/Makefile.inc b/usr.sbin/pcvt/Makefile.inc
index 7899d9c307d2..e0df0b1eb1fa 100644
--- a/usr.sbin/pcvt/Makefile.inc
+++ b/usr.sbin/pcvt/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Makefile.inc,v 1.8 2001/03/20 18:16:53 ru Exp $
 
 FONTDIR	=	/usr/share/misc/pcvtfonts
 
diff --git a/usr.sbin/pcvt/Misc/Doc/Makefile b/usr.sbin/pcvt/Misc/Doc/Makefile
index 11f540dfc50b..62d3e2e6e81d 100644
--- a/usr.sbin/pcvt/Misc/Doc/Makefile
+++ b/usr.sbin/pcvt/Misc/Doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Misc/Doc/Makefile,v 1.9 2004/12/21 08:46:56 ru Exp $
 
 NO_OBJ=
 FILES=	Acknowledgements Bibliography CharGen \
diff --git a/usr.sbin/pcvt/Misc/Doc/NotesAndHints b/usr.sbin/pcvt/Misc/Doc/NotesAndHints
index 8accc2f31986..3fe25a5d3a1d 100644
--- a/usr.sbin/pcvt/Misc/Doc/NotesAndHints
+++ b/usr.sbin/pcvt/Misc/Doc/NotesAndHints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Misc/Doc/NotesAndHints,v 1.6 2003/01/01 18:49:02 schweikh Exp $
 
 Random Notes and Hints                Last Edit-Date: [Sun Apr  2 18:28:09 1995]
 --------------------------------------------------------------------------------
diff --git a/usr.sbin/pcvt/Misc/Etc/Makefile b/usr.sbin/pcvt/Misc/Etc/Makefile
index 022520234cc7..7d7f0a224eb5 100644
--- a/usr.sbin/pcvt/Misc/Etc/Makefile
+++ b/usr.sbin/pcvt/Misc/Etc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Misc/Etc/Makefile,v 1.10 2004/12/21 08:46:56 ru Exp $
 
 NO_OBJ=
 FILES=	Termcap Terminfo pcvt.el xmodmap-german pcvt.sh
diff --git a/usr.sbin/pcvt/Misc/Etc/pcvt.sh b/usr.sbin/pcvt/Misc/Etc/pcvt.sh
index cc3b34b2b572..bffff699bc71 100644
--- a/usr.sbin/pcvt/Misc/Etc/pcvt.sh
+++ b/usr.sbin/pcvt/Misc/Etc/pcvt.sh
@@ -13,7 +13,7 @@
 #
 #	last edit-date: [Fri Mar 31 10:40:18 2000]
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Misc/Etc/pcvt.sh,v 1.1 2000/03/31 08:39:33 hm Exp $
 #
 #---------------------------------------------------------------------------
 
diff --git a/usr.sbin/pcvt/Misc/Makefile b/usr.sbin/pcvt/Misc/Makefile
index 442c7047ecac..3383b8ce7c55 100644
--- a/usr.sbin/pcvt/Misc/Makefile
+++ b/usr.sbin/pcvt/Misc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Misc/Makefile,v 1.7 2004/12/21 08:46:56 ru Exp $
 
 NO_OBJ=
 FILES=	README.FIRST
diff --git a/usr.sbin/pcvt/Misc/Makefile.inc b/usr.sbin/pcvt/Misc/Makefile.inc
index c7a2ebcc0ca8..442d60de8b27 100644
--- a/usr.sbin/pcvt/Misc/Makefile.inc
+++ b/usr.sbin/pcvt/Misc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Misc/Makefile.inc,v 1.5 2001/12/17 13:59:35 ru Exp $
 
 DISTRIBUTION=	doc
 BINDIR=		${SHAREDIR}/pcvt
diff --git a/usr.sbin/pcvt/Misc/README.FIRST b/usr.sbin/pcvt/Misc/README.FIRST
index a2701c7e261e..235f769b57ef 100644
--- a/usr.sbin/pcvt/Misc/README.FIRST
+++ b/usr.sbin/pcvt/Misc/README.FIRST
@@ -181,4 +181,4 @@ Have fun!
 
 Hellmuth
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pcvt/Misc/README.FIRST,v 1.6 2000/03/28 09:26:48 hm Exp $
diff --git a/usr.sbin/pcvt/cursor/Makefile b/usr.sbin/pcvt/cursor/Makefile
index fb068782e417..48db924977a0 100644
--- a/usr.sbin/pcvt/cursor/Makefile
+++ b/usr.sbin/pcvt/cursor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/cursor/Makefile,v 1.7 2001/03/26 14:41:05 ru Exp $
 
 PROG=	cursor
 
diff --git a/usr.sbin/pcvt/cursor/cursor.1 b/usr.sbin/pcvt/cursor/cursor.1
index b80a42715a42..4c0bce4227ff 100644
--- a/usr.sbin/pcvt/cursor/cursor.1
+++ b/usr.sbin/pcvt/cursor/cursor.1
@@ -24,7 +24,7 @@
 .\"
 .\" Last Edit-Date: [Mon Mar 27 16:33:23 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.11 2005/01/18 20:02:39 ru Exp $
 .\"
 .Dd March 27, 2000
 .Dt CURSOR 1
diff --git a/usr.sbin/pcvt/cursor/cursor.c b/usr.sbin/pcvt/cursor/cursor.c
index 01bdd102b376..8fb27134e44f 100644
--- a/usr.sbin/pcvt/cursor/cursor.c
+++ b/usr.sbin/pcvt/cursor/cursor.c
@@ -34,7 +34,7 @@
  */
 
 static char *id =
-	"@(#)cursor.c, 3.20, Last Edit-Date: [Tue Apr  4 12:27:54 1995]\n$FreeBSD$";
+	"@(#)cursor.c, 3.20, Last Edit-Date: [Tue Apr  4 12:27:54 1995]\n$FreeBSD: src/usr.sbin/pcvt/cursor/cursor.c,v 1.10 2001/01/19 23:11:18 kris Exp $";
 
 /*---------------------------------------------------------------------------*
  *
diff --git a/usr.sbin/pcvt/demo/Makefile b/usr.sbin/pcvt/demo/Makefile
index 067c99bd00b3..9bb843112c78 100644
--- a/usr.sbin/pcvt/demo/Makefile
+++ b/usr.sbin/pcvt/demo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/demo/Makefile,v 1.12 2005/01/28 16:08:11 ru Exp $
 
 PROG=	playvt
 NO_MAN=
diff --git a/usr.sbin/pcvt/demo/chardemo.vt.gz.uu b/usr.sbin/pcvt/demo/chardemo.vt.gz.uu
index f26c6fcd90f0..3782d8f876da 100644
--- a/usr.sbin/pcvt/demo/chardemo.vt.gz.uu
+++ b/usr.sbin/pcvt/demo/chardemo.vt.gz.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/demo/chardemo.vt.gz.uu,v 1.4 2000/08/15 09:17:50 kris Exp $
 begin 644 chardemo.vt.gz
 M'XL("):V^BX"`V-H87)D96UO+G9T`*7829,=5Q5%X3D1X!]0DZ(1($`F[VLR
 M\UI"IF3`1V",<=DT%IT0!MF6)6%D^N:OLW*OO!',J<E>\09U[N2;Y,6CBP>'
diff --git a/usr.sbin/pcvt/demo/colors.vt.gz.uu b/usr.sbin/pcvt/demo/colors.vt.gz.uu
index 456e6dcf01fb..f2441503b450 100644
--- a/usr.sbin/pcvt/demo/colors.vt.gz.uu
+++ b/usr.sbin/pcvt/demo/colors.vt.gz.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/demo/colors.vt.gz.uu,v 1.4 2000/08/15 09:17:50 kris Exp $
 begin 644 colors.vt.gz
 M'XL("):V^BX"`V-O;&]R<RYV=`#MU+UNG$`4!>!^I7T"FGD`Q^+^S)TB2N-8
 M;B(GA=UMM;*1C;(8":\E/W[,G(.SX0E2+,WE(#%\@N$T._.O7H;MYO;NR_6O
diff --git a/usr.sbin/pcvt/demo/playvt.c b/usr.sbin/pcvt/demo/playvt.c
index 17eeca9fa1a6..f88cd4e28eab 100644
--- a/usr.sbin/pcvt/demo/playvt.c
+++ b/usr.sbin/pcvt/demo/playvt.c
@@ -36,7 +36,7 @@ static char *id =
 	"@(#)playvt.c, 1.00, Last Edit-Date: [Sun Jan  1 18:32:22 1995]";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pcvt/demo/playvt.c,v 1.6 2001/03/01 06:22:43 imp Exp $";
 #endif /* not lint */
 
 /*---------------------------------------------------------------------------*
diff --git a/usr.sbin/pcvt/demo/sgr.vt.gz.uu b/usr.sbin/pcvt/demo/sgr.vt.gz.uu
index b2f0eef012f1..ec9acc656592 100644
--- a/usr.sbin/pcvt/demo/sgr.vt.gz.uu
+++ b/usr.sbin/pcvt/demo/sgr.vt.gz.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/demo/sgr.vt.gz.uu,v 1.4 2000/08/15 09:17:50 kris Exp $
 begin 644 sgr.vt.gz
 M'XL("):V^BX"`W-G<BYV=`"%44U/@T`0/2]_H9<Y:AH;MMT5#?&`L*D8^Q&H
 MIYYJNU0BA0:HO]]AV18L&"=D=LE[,^\]&*Q-VXP&ZU=CL#8/)!1OPEW!-'"6
diff --git a/usr.sbin/pcvt/fed/Makefile b/usr.sbin/pcvt/fed/Makefile
index ac1baa456a4f..48533cfa0b44 100644
--- a/usr.sbin/pcvt/fed/Makefile
+++ b/usr.sbin/pcvt/fed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/fed/Makefile,v 1.7 2001/07/20 06:20:08 obrien Exp $
 
 PROG=	fed
 SRCS=	fed.c select.c edit.c misc.c
diff --git a/usr.sbin/pcvt/fed/edit.c b/usr.sbin/pcvt/fed/edit.c
index 1d7e4e6a192c..166a97ab52f3 100644
--- a/usr.sbin/pcvt/fed/edit.c
+++ b/usr.sbin/pcvt/fed/edit.c
@@ -31,7 +31,7 @@
  *
  * 	edit.c, 3.00, last edit-date: [Mon Mar 27 16:35:47 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/fed/edit.c,v 1.5 2000/03/28 09:24:37 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/fed/fed.1 b/usr.sbin/pcvt/fed/fed.1
index f68ea8c36dc3..3caaee053c5f 100644
--- a/usr.sbin/pcvt/fed/fed.1
+++ b/usr.sbin/pcvt/fed/fed.1
@@ -24,7 +24,7 @@
 .\"
 .\" Last Edit-Date: [Mon Mar 27 16:57:41 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/fed/fed.1,v 1.6 2005/01/18 20:02:39 ru Exp $
 .\"
 .Dd March 27, 2000
 .Dt FED 8
diff --git a/usr.sbin/pcvt/fed/fed.c b/usr.sbin/pcvt/fed/fed.c
index 8c226b517de7..0d8df54d51ae 100644
--- a/usr.sbin/pcvt/fed/fed.c
+++ b/usr.sbin/pcvt/fed/fed.c
@@ -31,7 +31,7 @@
  *
  * 	last edit-date: [Mon Mar 27 16:36:45 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/fed/fed.c,v 1.5 2000/03/28 09:24:37 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/fed/fed.h b/usr.sbin/pcvt/fed/fed.h
index bf488abe5166..41b5596163ce 100644
--- a/usr.sbin/pcvt/fed/fed.h
+++ b/usr.sbin/pcvt/fed/fed.h
@@ -25,7 +25,7 @@
  *
  * 	last edit-date: [Mon Mar 27 16:37:27 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/fed/fed.h,v 1.5 2000/03/28 09:24:37 hm Exp $
  */
 
 #include <ncurses.h>
diff --git a/usr.sbin/pcvt/fed/misc.c b/usr.sbin/pcvt/fed/misc.c
index 5a0cbc900f4f..c7574921d67a 100644
--- a/usr.sbin/pcvt/fed/misc.c
+++ b/usr.sbin/pcvt/fed/misc.c
@@ -31,7 +31,7 @@
  *
  * 	last edit-date: [Mon Mar 27 16:38:12 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/fed/misc.c,v 1.5 2000/03/28 09:24:37 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/fed/select.c b/usr.sbin/pcvt/fed/select.c
index e4e44ca0cca8..47fdba2fbe22 100644
--- a/usr.sbin/pcvt/fed/select.c
+++ b/usr.sbin/pcvt/fed/select.c
@@ -31,7 +31,7 @@
  *
  * 	last edit-date: [Mon Mar 27 16:38:50 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/fed/select.c,v 1.5 2000/03/28 09:24:38 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/fontedit/Makefile b/usr.sbin/pcvt/fontedit/Makefile
index 4851169f28de..dc062103a968 100644
--- a/usr.sbin/pcvt/fontedit/Makefile
+++ b/usr.sbin/pcvt/fontedit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/fontedit/Makefile,v 1.6 2001/03/26 14:41:06 ru Exp $
 
 PROG=	fontedit
 
diff --git a/usr.sbin/pcvt/fontedit/fontedit.1 b/usr.sbin/pcvt/fontedit/fontedit.1
index d0b751554a24..561c342f9747 100644
--- a/usr.sbin/pcvt/fontedit/fontedit.1
+++ b/usr.sbin/pcvt/fontedit/fontedit.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/fontedit/fontedit.1,v 1.6 2002/04/20 12:26:45 charnier Exp $
 .\"
 .Dd January 16, 2001
 .Dt FONTEDIT 1
diff --git a/usr.sbin/pcvt/fontedit/fontedit.c b/usr.sbin/pcvt/fontedit/fontedit.c
index b1444c6d7730..82dd8cd3b38f 100644
--- a/usr.sbin/pcvt/fontedit/fontedit.c
+++ b/usr.sbin/pcvt/fontedit/fontedit.c
@@ -20,7 +20,7 @@
  *      Nov 21, 1987 - Fixed man page to say "Fontedit" instead of "Top"
  *      Nov 22, 1987 - Added BSD Compatible ioctl, turned cursor on/off
  *                     - eap@bucsf.bu.edu
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/fontedit/fontedit.c,v 1.6 2002/05/28 21:52:10 alfred Exp $
  */
 
 void clear_screen();
diff --git a/usr.sbin/pcvt/fonts/Makefile b/usr.sbin/pcvt/fonts/Makefile
index 8af01cc27250..d19053c0ce40 100644
--- a/usr.sbin/pcvt/fonts/Makefile
+++ b/usr.sbin/pcvt/fonts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/fonts/Makefile,v 1.11 2001/12/17 16:21:59 ru Exp $
 
 .SUFFIXES: .uu
 .uu:
diff --git a/usr.sbin/pcvt/ispcvt/Makefile b/usr.sbin/pcvt/ispcvt/Makefile
index 994b4062d2d1..0bc8e50e6ad8 100644
--- a/usr.sbin/pcvt/ispcvt/Makefile
+++ b/usr.sbin/pcvt/ispcvt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/ispcvt/Makefile,v 1.8 2001/03/26 14:41:07 ru Exp $
 
 PROG=	ispcvt
 MAN=	ispcvt.8
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.8 b/usr.sbin/pcvt/ispcvt/ispcvt.8
index 8e73e0929182..bbc875e3b037 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.8
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.8
@@ -24,7 +24,7 @@
 .\"
 .\" Last Edit-Date: [Mon Mar 27 16:31:54 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.17 2005/01/17 07:44:42 ru Exp $
 .\"
 .Dd March 27, 2000
 .Dt ISPCVT 8
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.c b/usr.sbin/pcvt/ispcvt/ispcvt.c
index 40979cac095d..4489957793b1 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.c
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.c
@@ -32,7 +32,7 @@
  *
  *	Last Edit-Date: [Fri Mar 31 10:24:43 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.c,v 1.11 2001/03/01 06:22:44 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile
index e4359c863aeb..d654b521521a 100644
--- a/usr.sbin/pcvt/kbdio/Makefile
+++ b/usr.sbin/pcvt/kbdio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/kbdio/Makefile,v 1.13 2004/12/21 08:47:34 ru Exp $
 
 PROG=	kbdio
 NO_MAN=
diff --git a/usr.sbin/pcvt/kbdio/kbdio.y b/usr.sbin/pcvt/kbdio/kbdio.y
index a3b23b078758..70ffcb83dd65 100644
--- a/usr.sbin/pcvt/kbdio/kbdio.y
+++ b/usr.sbin/pcvt/kbdio/kbdio.y
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pcvt/kbdio/kbdio.y,v 1.8 2005/05/31 20:07:46 stefanf Exp $");
 
 /*
  * $Log: kbdio.y,v $
diff --git a/usr.sbin/pcvt/kbdio/lex.l b/usr.sbin/pcvt/kbdio/lex.l
index 423e01812049..69767f277fa3 100644
--- a/usr.sbin/pcvt/kbdio/lex.l
+++ b/usr.sbin/pcvt/kbdio/lex.l
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pcvt/kbdio/lex.l,v 1.7 2005/05/31 20:07:46 stefanf Exp $");
 
 /*
  * $Log: lex.l,v $
diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index 564cd847b4c3..b471f96d7e0e 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/kcon/Makefile,v 1.13 2003/04/04 17:49:16 obrien Exp $
 
 PROG=	kcon
 DEVICE=	/dev/ttyv0
diff --git a/usr.sbin/pcvt/kcon/kcon.1 b/usr.sbin/pcvt/kcon/kcon.1
index 4b838dc86535..5e52695c6cc0 100644
--- a/usr.sbin/pcvt/kcon/kcon.1
+++ b/usr.sbin/pcvt/kcon/kcon.1
@@ -24,7 +24,7 @@
 .\"
 .\" Last Edit-Date: [Mon Mar 27 17:04:14 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.17 2005/01/18 20:02:39 ru Exp $
 .\"
 .Dd March 27, 2000
 .Dt KCON 1
diff --git a/usr.sbin/pcvt/kcon/kcon.c b/usr.sbin/pcvt/kcon/kcon.c
index 4318bf2ccbf8..257644426187 100644
--- a/usr.sbin/pcvt/kcon/kcon.c
+++ b/usr.sbin/pcvt/kcon/kcon.c
@@ -45,7 +45,7 @@
  *
  *	Last Edit-Date: [Mon Mar 27 17:03:50 2000]";
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/kcon/kcon.c,v 1.7 2001/03/01 06:22:44 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile
index 21613d263501..437cd6bcd8b6 100644
--- a/usr.sbin/pcvt/keycap/Makefile
+++ b/usr.sbin/pcvt/keycap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/keycap/Makefile,v 1.16 2005/01/28 16:22:46 ru Exp $
 
 LIB=	keycap
 MAN=	keycap.3
diff --git a/usr.sbin/pcvt/keycap/keycap.3 b/usr.sbin/pcvt/keycap/keycap.3
index 19348d20c420..3716080a3424 100644
--- a/usr.sbin/pcvt/keycap/keycap.3
+++ b/usr.sbin/pcvt/keycap/keycap.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" @(#)keycap.3, 3.00, Last Edit-Date: [Sun Jan  2 13:46:43 1994]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/keycap/keycap.3,v 1.11 2001/07/10 15:11:36 ru Exp $
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 3
diff --git a/usr.sbin/pcvt/keycap/keycap.c b/usr.sbin/pcvt/keycap/keycap.c
index 9c276a361c4f..ea756d75bfbb 100644
--- a/usr.sbin/pcvt/keycap/keycap.c
+++ b/usr.sbin/pcvt/keycap/keycap.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pcvt/keycap/keycap.c,v 1.5 2001/07/26 11:02:37 sheldonh Exp $";
 #endif
 
 static char *id =
diff --git a/usr.sbin/pcvt/keycap/keycap.src b/usr.sbin/pcvt/keycap/keycap.src
index a991264e2ea0..2ea02bedf3d3 100644
--- a/usr.sbin/pcvt/keycap/keycap.src
+++ b/usr.sbin/pcvt/keycap/keycap.src
@@ -40,7 +40,7 @@
 #
 #	Last Edit-Date: [Wed Apr 24 16:27:35 2002]
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/keycap/keycap.src,v 1.8 2002/04/24 14:30:56 hm Exp $
 #
 #---------------------------------------------------------------------------
 
diff --git a/usr.sbin/pcvt/keycap/man5/keycap.5 b/usr.sbin/pcvt/keycap/man5/keycap.5
index 7210b756b010..0ca817981384 100644
--- a/usr.sbin/pcvt/keycap/man5/keycap.5
+++ b/usr.sbin/pcvt/keycap/man5/keycap.5
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" @(#)keycap.5, 3.00, Last Edit-Date: [Sun Jan  2 13:45:59 1994]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/keycap/man5/keycap.5,v 1.17 2005/01/18 20:02:40 ru Exp $
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 5
diff --git a/usr.sbin/pcvt/loadfont/Makefile b/usr.sbin/pcvt/loadfont/Makefile
index 50646a7a7f0c..ab535a25508c 100644
--- a/usr.sbin/pcvt/loadfont/Makefile
+++ b/usr.sbin/pcvt/loadfont/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/loadfont/Makefile,v 1.7 2001/03/26 14:41:09 ru Exp $
 
 PROG=	loadfont
 
diff --git a/usr.sbin/pcvt/loadfont/loadfont.1 b/usr.sbin/pcvt/loadfont/loadfont.1
index 31e1d3e16e15..b016c8344df4 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.1
+++ b/usr.sbin/pcvt/loadfont/loadfont.1
@@ -24,7 +24,7 @@
 .\"
 .\" Last Edit-Date: [Mon Mar 27 17:07:57 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.17 2005/01/18 20:02:40 ru Exp $
 .\"
 .Dd March 27, 2000
 .Dt LOADFONT 1
diff --git a/usr.sbin/pcvt/loadfont/loadfont.c b/usr.sbin/pcvt/loadfont/loadfont.c
index acdd013a7976..16fadb880a5a 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.c
+++ b/usr.sbin/pcvt/loadfont/loadfont.c
@@ -39,7 +39,7 @@
  *
  *	Last Edit-Date: [Mon Mar 27 17:09:25 2000];
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.c,v 1.9 2001/03/01 06:22:45 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/scon/Makefile b/usr.sbin/pcvt/scon/Makefile
index dc7d02a06598..7ddfae036856 100644
--- a/usr.sbin/pcvt/scon/Makefile
+++ b/usr.sbin/pcvt/scon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/scon/Makefile,v 1.7 2001/03/26 14:41:10 ru Exp $
 
 PROG=	scon
 
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index 600f75ee19fe..7407685b4ddd 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -25,7 +25,7 @@
 .\"
 .\" Last Edit-Date: [Mon Mar 27 17:17:50 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.20 2005/02/13 23:45:52 ru Exp $
 .\"
 .Dd March 27, 2000
 .Dt SCON 1
diff --git a/usr.sbin/pcvt/scon/scon.c b/usr.sbin/pcvt/scon/scon.c
index 0d77f11da4cb..05253696ff36 100644
--- a/usr.sbin/pcvt/scon/scon.c
+++ b/usr.sbin/pcvt/scon/scon.c
@@ -33,7 +33,7 @@
  *
  *	Last Edit-Date: [Mon Mar 27 17:19:34 2000]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/scon/scon.c,v 1.8 2001/03/01 06:22:46 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/pcvt/userkeys/Makefile b/usr.sbin/pcvt/userkeys/Makefile
index 66fe02217239..4e68b98687dd 100644
--- a/usr.sbin/pcvt/userkeys/Makefile
+++ b/usr.sbin/pcvt/userkeys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/userkeys/Makefile,v 1.7 2001/03/26 14:41:10 ru Exp $
 
 PROG=	vt220keys
 
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.1 b/usr.sbin/pcvt/userkeys/vt220keys.1
index 35d80cacb0c5..9c284b151f94 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.1
+++ b/usr.sbin/pcvt/userkeys/vt220keys.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.1,v 1.12 2005/02/13 22:25:30 ru Exp $
 .\"
 .Dd January 16, 2001
 .Dt VT220KEYS 1
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.c b/usr.sbin/pcvt/userkeys/vt220keys.c
index e3fe90cac9fb..b0ae42225344 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.c
+++ b/usr.sbin/pcvt/userkeys/vt220keys.c
@@ -24,7 +24,7 @@
 
  	-hm	minor modifications for pcvt 2.0 release
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.c,v 1.8 2002/04/22 13:44:45 des Exp $
 */
 
 #include <stdio.h>
diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile
index 0ac0388a0ef2..bb6ae0224d5a 100644
--- a/usr.sbin/pcvt/vgaio/Makefile
+++ b/usr.sbin/pcvt/vgaio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/vgaio/Makefile,v 1.17 2001/07/20 06:20:09 obrien Exp $
 
 PROG=	vgaio
 MAN=	vgaio.8
diff --git a/usr.sbin/pcvt/vgaio/lex.l b/usr.sbin/pcvt/vgaio/lex.l
index 6cf85ece81a7..0c9d23624b35 100644
--- a/usr.sbin/pcvt/vgaio/lex.l
+++ b/usr.sbin/pcvt/vgaio/lex.l
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pcvt/vgaio/lex.l,v 1.6 2005/05/31 20:07:46 stefanf Exp $");
 
 /*
  * $Log: lex.l,v $
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index e7f3b246a615..382e4b4900ef 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.8
+++ b/usr.sbin/pcvt/vgaio/vgaio.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/vgaio/vgaio.8,v 1.15 2002/07/14 14:44:55 charnier Exp $
 .\" -hm updated 31.12.94
 .\"
 .Dd December 31, 1994
diff --git a/usr.sbin/pcvt/vgaio/vgaio.y b/usr.sbin/pcvt/vgaio/vgaio.y
index 32c014245af4..c60928a13826 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.y
+++ b/usr.sbin/pcvt/vgaio/vgaio.y
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pcvt/vgaio/vgaio.y,v 1.7 2005/05/31 20:07:46 stefanf Exp $");
 
 /*
  * $Log: vgaio.y,v $
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 875d078435ea..61ed4732999f 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/periodic/Makefile,v 1.4 2001/04/07 11:21:33 ru Exp $
 
 SCRIPTS=periodic.sh
 MAN=	periodic.8
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 4e9b676fe75d..700c16091b0a 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/periodic/periodic.8,v 1.30 2005/01/18 20:02:40 ru Exp $
 .\"
 .Dd November 28, 2001
 .Os
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index 73e8576581bd..debd5f4c0e0c 100644
--- a/usr.sbin/periodic/periodic.sh
+++ b/usr.sbin/periodic/periodic.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/periodic/periodic.sh,v 1.20 2002/05/14 01:15:35 brian Exp $
 #
 # Run nightly periodic scripts
 #
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index e74b5dca6a3a..53cb883c43b1 100644
--- a/usr.sbin/pkg_install/Makefile
+++ b/usr.sbin/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.16 2004/12/21 10:16:03 ru Exp $
 
 SUBDIR=	lib add create delete info ${_sign} version
 
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index e27d31a0362f..54316c075acb 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/Makefile.inc,v 1.13 2005/06/10 06:12:53 des Exp $
 
 LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
 
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 89988e78b220..335ce89fa9f2 100644
--- a/usr.sbin/pkg_install/add/Makefile
+++ b/usr.sbin/pkg_install/add/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.21 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_add
 SRCS=	main.c perform.c futil.c extract.c
diff --git a/usr.sbin/pkg_install/add/add.h b/usr.sbin/pkg_install/add/add.h
index d27877af5c7f..29e336fba9b9 100644
--- a/usr.sbin/pkg_install/add/add.h
+++ b/usr.sbin/pkg_install/add/add.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/add/add.h,v 1.11 2004/06/29 19:06:41 eik Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
index 2085f3d13091..35c664b37e19 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/extract.c,v 1.43 2005/06/14 15:05:42 krion Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c
index e0971408fbe8..b4d4af18919b 100644
--- a/usr.sbin/pkg_install/add/futil.c
+++ b/usr.sbin/pkg_install/add/futil.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/futil.c,v 1.14 2004/06/29 19:06:41 eik Exp $");
 
 #include <err.h>
 #include "lib.h"
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index e3a9eb42bc3e..43f798777ac9 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.61.2.1.2.1 2005/10/27 18:38:48 murray Exp $");
 
 #include <err.h>
 #include <sys/param.h>
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index a2225c229b01..d64a6af774b2 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/perform.c,v 1.77 2004/07/28 16:03:13 stefanf Exp $");
 
 #include <err.h>
 #include <paths.h>
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index d2ae1afb555e..9e1a3cf714dd 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -13,7 +13,7 @@
 .\"
 .\" Jordan K. Hubbard
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.66 2005/02/13 22:25:30 ru Exp $
 .\"
 .Dd March 1, 2004
 .Dt PKG_ADD 1
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index 42718c6f9273..4ce9bb916512 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/create/Makefile,v 1.22 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_create
 SRCS=	main.c perform.c pl.c
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h
index 33c3db742e13..d0477f1e8036 100644
--- a/usr.sbin/pkg_install/create/create.h
+++ b/usr.sbin/pkg_install/create/create.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/create/create.h,v 1.25 2005/06/06 03:24:14 sobomax Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index 4869bfd5c49e..71029f0f6b95 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.36 2005/06/06 03:24:14 sobomax Exp $");
 
 #include <err.h>
 #include "lib.h"
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 3f7ab47984f0..e05b220c38f9 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.80 2005/06/06 03:24:14 sobomax Exp $");
 
 #include "lib.h"
 #include "create.h"
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 62599ead73be..8e46c982d7f3 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.68 2005/06/27 17:10:21 jmg Exp $
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index 52a00821c616..b7113b3e1637 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/pl.c,v 1.27 2004/06/29 19:06:41 eik Exp $");
 
 #include "lib.h"
 #include "create.h"
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index c346ea705d79..077738fd5dc4 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/delete/Makefile,v 1.22 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_delete
 SRCS=	main.c perform.c
diff --git a/usr.sbin/pkg_install/delete/delete.h b/usr.sbin/pkg_install/delete/delete.h
index e0aeca52b154..cc6d6427353f 100644
--- a/usr.sbin/pkg_install/delete/delete.h
+++ b/usr.sbin/pkg_install/delete/delete.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/delete/delete.h,v 1.8 2004/06/29 19:06:41 eik Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index 3100ae35772b..8cea411ca742 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.26.10.1 2005/10/29 15:27:12 krion Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index 1e40db6d2f6a..2f31fe1746cb 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/perform.c,v 1.41 2004/06/29 19:06:41 eik Exp $");
 
 #include <err.h>
 #include "lib.h"
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 3f10b9c88998..e79b72a75525 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_delete.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.31 2005/02/13 22:25:30 ru Exp $
 .\"
 .Dd June 29, 2004
 .Dt PKG_DELETE 1
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 675f7ca454ac..432707538147 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/info/Makefile,v 1.20 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_info
 SRCS=	main.c perform.c show.c
diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h
index 6554db527803..afa4bb2a8065 100644
--- a/usr.sbin/pkg_install/info/info.h
+++ b/usr.sbin/pkg_install/info/info.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/info/info.h,v 1.28 2004/10/18 05:34:54 obrien Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index b22c54c3d3c0..5d2cbd74b4b4 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.47.4.1 2005/10/29 15:27:12 krion Exp $");
 
 #include "lib.h"
 #include "info.h"
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index 960641b5d4d5..623b94ae3d01 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/perform.c,v 1.53 2004/06/29 18:59:18 eik Exp $");
 
 #include "lib.h"
 #include "info.h"
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index a959742365d2..2ec33539e5d2 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_info.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.54 2005/02/13 22:25:30 ru Exp $
 .\"
 .Dd June 29, 2004
 .Dt PKG_INFO 1
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
index cb2c3df7819c..debeeeabb071 100644
--- a/usr.sbin/pkg_install/info/show.c
+++ b/usr.sbin/pkg_install/info/show.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/show.c,v 1.38.2.1 2005/09/27 13:37:53 krion Exp $");
 
 #include "lib.h"
 #include "info.h"
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
index 84a41b8d7f15..2c578ff67dd8 100644
--- a/usr.sbin/pkg_install/lib/Makefile
+++ b/usr.sbin/pkg_install/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/lib/Makefile,v 1.18 2004/10/24 15:33:07 ru Exp $
 
 LIB=	install
 INTERNALLIB=
diff --git a/usr.sbin/pkg_install/lib/deps.c b/usr.sbin/pkg_install/lib/deps.c
index 9df8448d490f..c2f309747c9a 100644
--- a/usr.sbin/pkg_install/lib/deps.c
+++ b/usr.sbin/pkg_install/lib/deps.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/deps.c,v 1.11 2004/06/29 18:59:19 eik Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
index 86285fb22e21..eacee9e7e81e 100644
--- a/usr.sbin/pkg_install/lib/exec.c
+++ b/usr.sbin/pkg_install/lib/exec.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/exec.c,v 1.10 2002/04/01 09:39:07 obrien Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index e406caa89704..4c5a2d178f73 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/file.c,v 1.68 2004/07/28 16:03:13 stefanf Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c
index 8e94f56eb0c7..2b69c4406023 100644
--- a/usr.sbin/pkg_install/lib/global.c
+++ b/usr.sbin/pkg_install/lib/global.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/global.c,v 1.10 2004/10/18 05:34:54 obrien Exp $");
 
 #include "lib.h"
 
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index cdbfe00fafa5..aed2588aeeed 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.56 2005/06/14 15:05:43 krion Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/lib/match.c b/usr.sbin/pkg_install/lib/match.c
index 2de0dc72476e..23c2d906e767 100644
--- a/usr.sbin/pkg_install/lib/match.c
+++ b/usr.sbin/pkg_install/lib/match.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/match.c,v 1.19.8.1 2005/09/27 13:39:06 krion Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
index 5b17624016d0..0ceab99328b6 100644
--- a/usr.sbin/pkg_install/lib/msg.c
+++ b/usr.sbin/pkg_install/lib/msg.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/msg.c,v 1.16 2002/04/01 09:39:07 obrien Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c
index 06379b69c7f9..b2a66e400947 100644
--- a/usr.sbin/pkg_install/lib/pen.c
+++ b/usr.sbin/pkg_install/lib/pen.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/pen.c,v 1.42 2004/07/28 16:03:13 stefanf Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/pkgwrap.c b/usr.sbin/pkg_install/lib/pkgwrap.c
index cbd15cd7b445..94783515bfcf 100644
--- a/usr.sbin/pkg_install/lib/pkgwrap.c
+++ b/usr.sbin/pkg_install/lib/pkgwrap.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/pkgwrap.c,v 1.1 2002/09/09 19:43:30 sobomax Exp $");
 
 #include "lib.h"
 #include <ctype.h>
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index e5aa6dc55f34..0e3304d3d98f 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.50 2005/06/27 17:10:22 jmg Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c
index 0d9e288b7579..c877a32617a2 100644
--- a/usr.sbin/pkg_install/lib/str.c
+++ b/usr.sbin/pkg_install/lib/str.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/str.c,v 1.15 2003/05/26 17:12:22 lioux Exp $");
 
 #include "lib.h"
 
diff --git a/usr.sbin/pkg_install/lib/url.c b/usr.sbin/pkg_install/lib/url.c
index 41017b4c8dea..5d31c5a5aec0 100644
--- a/usr.sbin/pkg_install/lib/url.c
+++ b/usr.sbin/pkg_install/lib/url.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/url.c,v 1.4 2004/06/29 19:06:42 eik Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/version.c b/usr.sbin/pkg_install/lib/version.c
index d9c4fe7e070c..8b5aab9f3734 100644
--- a/usr.sbin/pkg_install/lib/version.c
+++ b/usr.sbin/pkg_install/lib/version.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/version.c,v 1.5 2004/06/29 18:52:12 eik Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/sign/Makefile b/usr.sbin/pkg_install/sign/Makefile
index 35fe7ec83d57..414aa85a3a4e 100644
--- a/usr.sbin/pkg_install/sign/Makefile
+++ b/usr.sbin/pkg_install/sign/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/sign/Makefile,v 1.10 2004/08/12 20:06:00 ru Exp $
 # $OpenBSD: Makefile.bsd-wrapper,v 1.2 1999/10/07 16:30:32 espie Exp $
 
 PROG=	pkg_sign
diff --git a/usr.sbin/pkg_install/sign/README b/usr.sbin/pkg_install/sign/README
index 8e81fcdf052b..081515b8aff4 100644
--- a/usr.sbin/pkg_install/sign/README
+++ b/usr.sbin/pkg_install/sign/README
@@ -52,4 +52,4 @@ libraries on OpenBSD 2.7 and FreeBSD 5.0, your mileage may vary.
 --
 
 	Wes Peters, Dec 2000
-	$FreeBSD$
+	$FreeBSD: src/usr.sbin/pkg_install/sign/README,v 1.1 2001/02/06 06:46:42 wes Exp $
diff --git a/usr.sbin/pkg_install/sign/check.c b/usr.sbin/pkg_install/sign/check.c
index cfc3bfa17f06..469fe73c57d7 100644
--- a/usr.sbin/pkg_install/sign/check.c
+++ b/usr.sbin/pkg_install/sign/check.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/check.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 /* Simple code for a stand-alone package checker */
 #include <sys/types.h>
diff --git a/usr.sbin/pkg_install/sign/common.c b/usr.sbin/pkg_install/sign/common.c
index ec3235755ee4..3d4d0f090c57 100644
--- a/usr.sbin/pkg_install/sign/common.c
+++ b/usr.sbin/pkg_install/sign/common.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/common.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h
index e7c00766f33f..577236ad36ee 100644
--- a/usr.sbin/pkg_install/sign/extern.h
+++ b/usr.sbin/pkg_install/sign/extern.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/extern.h,v 1.2 2001/05/17 10:12:45 sobomax Exp $ */
 /* $OpenBSD: extern.h,v 1.3 1999/10/07 16:30:32 espie Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.sbin/pkg_install/sign/gzip.c b/usr.sbin/pkg_install/sign/gzip.c
index 33d9baebc074..fe582bf0f508 100644
--- a/usr.sbin/pkg_install/sign/gzip.c
+++ b/usr.sbin/pkg_install/sign/gzip.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/gzip.c,v 1.3 2002/04/01 09:39:07 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h
index 238010fe7709..b7c97274414e 100644
--- a/usr.sbin/pkg_install/sign/gzip.h
+++ b/usr.sbin/pkg_install/sign/gzip.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/gzip.h,v 1.2 2001/05/17 10:12:45 sobomax Exp $ */
 /* $OpenBSD: gzip.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.sbin/pkg_install/sign/main.c b/usr.sbin/pkg_install/sign/main.c
index c5068b77b1d1..9907cc8f368d 100644
--- a/usr.sbin/pkg_install/sign/main.c
+++ b/usr.sbin/pkg_install/sign/main.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/main.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h
index 99476f2f6811..77020f342427 100644
--- a/usr.sbin/pkg_install/sign/pgp.h
+++ b/usr.sbin/pkg_install/sign/pgp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/pgp.h,v 1.1 2001/02/06 06:46:42 wes Exp $ */
 /* $OpenBSD: pgp.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */
 /* Estimate size of pgp signature */
 #define MAXPGPSIGNSIZE	1024
diff --git a/usr.sbin/pkg_install/sign/pgp_check.c b/usr.sbin/pkg_install/sign/pgp_check.c
index 52b0345b48ac..0d0f890e76ae 100644
--- a/usr.sbin/pkg_install/sign/pgp_check.c
+++ b/usr.sbin/pkg_install/sign/pgp_check.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/pgp_check.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/usr.sbin/pkg_install/sign/pgp_sign.c b/usr.sbin/pkg_install/sign/pgp_sign.c
index 78992ff9d202..173b05e93e76 100644
--- a/usr.sbin/pkg_install/sign/pgp_sign.c
+++ b/usr.sbin/pkg_install/sign/pgp_sign.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/pgp_sign.c,v 1.5 2004/06/29 19:06:42 eik Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/usr.sbin/pkg_install/sign/pkg_sign.1 b/usr.sbin/pkg_install/sign/pkg_sign.1
index 661d20e3eab9..86aa3f255eac 100644
--- a/usr.sbin/pkg_install/sign/pkg_sign.1
+++ b/usr.sbin/pkg_install/sign/pkg_sign.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/sign/pkg_sign.1,v 1.10 2005/02/13 22:25:31 ru Exp $
 .\" $OpenBSD: pkg_sign.1,v 1.6 2000/04/15 02:15:20 aaron Exp $
 .\"
 .\" Copyright (c) 1999 Marc Espie.
diff --git a/usr.sbin/pkg_install/sign/sha1.c b/usr.sbin/pkg_install/sign/sha1.c
index 272ae310fb31..15ad9d834760 100644
--- a/usr.sbin/pkg_install/sign/sha1.c
+++ b/usr.sbin/pkg_install/sign/sha1.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/sha1.c,v 1.5 2004/06/29 19:06:42 eik Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/sign.c b/usr.sbin/pkg_install/sign/sign.c
index 073ffffed416..9f5bf11b9a39 100644
--- a/usr.sbin/pkg_install/sign/sign.c
+++ b/usr.sbin/pkg_install/sign/sign.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/sign.c,v 1.4 2004/06/29 19:06:42 eik Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/usr.sbin/pkg_install/sign/stand.c b/usr.sbin/pkg_install/sign/stand.c
index 703c58db5224..fc2f0116b635 100644
--- a/usr.sbin/pkg_install/sign/stand.c
+++ b/usr.sbin/pkg_install/sign/stand.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/stand.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 #include "stand.h"
 
diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h
index dbc3d693dbeb..ddc9e4416049 100644
--- a/usr.sbin/pkg_install/sign/stand.h
+++ b/usr.sbin/pkg_install/sign/stand.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/stand.h,v 1.2 2004/06/29 19:06:42 eik Exp $ */
 /* $OpenBSD: stand.h,v 1.2 1999/10/04 21:46:30 espie Exp $ */
 
 /* provided to cater for BSD idiosyncrasies */
diff --git a/usr.sbin/pkg_install/sign/x509.c b/usr.sbin/pkg_install/sign/x509.c
index 3fd3b3e607d4..670b2ca3e7d1 100644
--- a/usr.sbin/pkg_install/sign/x509.c
+++ b/usr.sbin/pkg_install/sign/x509.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/x509.c,v 1.4 2004/06/29 19:06:42 eik Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/tkpkg b/usr.sbin/pkg_install/tkpkg
index 9071155a289d..208993c55da7 100755
--- a/usr.sbin/pkg_install/tkpkg
+++ b/usr.sbin/pkg_install/tkpkg
@@ -1,5 +1,5 @@
 #!/usr/local/bin/wish -f
-#$FreeBSD$
+#$FreeBSD: src/usr.sbin/pkg_install/tkpkg,v 1.7 1999/08/29 15:54:49 peter Exp $
 #
 #$Log: tkpkg,v $
 #Revision 1.2  1994/12/06 00:51:21  jkh
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index 71168ee3d23f..bf4355f72730 100644
--- a/usr.sbin/pkg_install/version/Makefile
+++ b/usr.sbin/pkg_install/version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/version/Makefile,v 1.16 2004/08/12 20:06:01 ru Exp $
 
 PROG=	pkg_version
 SRCS=	main.c perform.c
diff --git a/usr.sbin/pkg_install/version/main.c b/usr.sbin/pkg_install/version/main.c
index a1148319f57f..1466197f3de8 100644
--- a/usr.sbin/pkg_install/version/main.c
+++ b/usr.sbin/pkg_install/version/main.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/main.c,v 1.5.2.1 2005/07/29 18:16:06 krion Exp $");
 
 #include "lib.h"
 #include "version.h"
diff --git a/usr.sbin/pkg_install/version/perform.c b/usr.sbin/pkg_install/version/perform.c
index c371dc11b659..342fa438522c 100644
--- a/usr.sbin/pkg_install/version/perform.c
+++ b/usr.sbin/pkg_install/version/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.12.2.1.2.1 2005/10/29 15:49:01 krion Exp $");
 
 #include "lib.h"
 #include "version.h"
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index c48343a5de3a..c9486efe0a29 100644
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ b/usr.sbin/pkg_install/version/pkg_version.1
@@ -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/usr.sbin/pkg_install/version/pkg_version.1,v 1.34.2.1 2005/07/29 18:16:06 krion Exp $
 .\"
 .Dd Jul 27, 2005
 .Dt PKG_VERSION 1
diff --git a/usr.sbin/pkg_install/version/test-pkg_version.sh b/usr.sbin/pkg_install/version/test-pkg_version.sh
index 95486c1f7bdf..2222a6ae9012 100755
--- a/usr.sbin/pkg_install/version/test-pkg_version.sh
+++ b/usr.sbin/pkg_install/version/test-pkg_version.sh
@@ -29,7 +29,7 @@
 # Regression testing for pkg_version
 # Originally from an idea by "Akinori MUSHA" <knu@iDaemons.org>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/version/test-pkg_version.sh,v 1.5.10.1 2005/10/29 15:49:01 krion Exp $
 #
 
 ECHO=echo
diff --git a/usr.sbin/pkg_install/version/version.h b/usr.sbin/pkg_install/version/version.h
index c93d503bfc90..8680dfc5dde2 100644
--- a/usr.sbin/pkg_install/version/version.h
+++ b/usr.sbin/pkg_install/version/version.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/version/version.h,v 1.4.2.1 2005/07/29 18:16:06 krion Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pmccontrol/Makefile b/usr.sbin/pmccontrol/Makefile
index 9dafe1c3fbd5..dedd330887c0 100644
--- a/usr.sbin/pmccontrol/Makefile
+++ b/usr.sbin/pmccontrol/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pmccontrol/Makefile,v 1.2 2005/04/19 14:43:59 jkoshy Exp $
 #
 
 PROG=	pmccontrol
diff --git a/usr.sbin/pmccontrol/pmccontrol.8 b/usr.sbin/pmccontrol/pmccontrol.8
index cff96296770a..a3b55a1f66fc 100644
--- a/usr.sbin/pmccontrol/pmccontrol.8
+++ b/usr.sbin/pmccontrol/pmccontrol.8
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pmccontrol/pmccontrol.8,v 1.2 2005/06/24 16:19:46 ru Exp $
 .\"
 .Dd December 15, 2003
 .Os
diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c
index 553dabaf34ac..56729d2a8a65 100644
--- a/usr.sbin/pmccontrol/pmccontrol.c
+++ b/usr.sbin/pmccontrol/pmccontrol.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pmccontrol/pmccontrol.c,v 1.4.2.1 2005/10/01 15:48:02 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile
index 102fe385cd16..42281d0a5db0 100644
--- a/usr.sbin/pmcstat/Makefile
+++ b/usr.sbin/pmcstat/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pmcstat/Makefile,v 1.3 2005/06/30 19:01:26 jkoshy Exp $
 #
 
 PROG=	pmcstat
diff --git a/usr.sbin/pmcstat/pmcstat.8 b/usr.sbin/pmcstat/pmcstat.8
index cb7a331b5b17..b5e5a236c347 100644
--- a/usr.sbin/pmcstat/pmcstat.8
+++ b/usr.sbin/pmcstat/pmcstat.8
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pmcstat/pmcstat.8,v 1.5.2.1 2005/07/17 19:32:27 rwatson Exp $
 .\"
 .Dd July 1, 2005
 .Os
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index a58fa1fa3d20..3e3ae78b91a9 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pmcstat/pmcstat.c,v 1.6.2.3 2005/09/13 15:23:26 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/event.h>
diff --git a/usr.sbin/pmcstat/pmcstat.h b/usr.sbin/pmcstat/pmcstat.h
index f0246f9aaf83..0fe2cbf3e255 100644
--- a/usr.sbin/pmcstat/pmcstat.h
+++ b/usr.sbin/pmcstat/pmcstat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pmcstat/pmcstat.h,v 1.2 2005/07/09 17:08:46 jkoshy Exp $
  */
 
 #ifndef	_PMCSTAT_H_
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c
index d4def0e29e1c..3dc5c2744d03 100644
--- a/usr.sbin/pmcstat/pmcstat_log.c
+++ b/usr.sbin/pmcstat/pmcstat_log.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pmcstat/pmcstat_log.c,v 1.3.2.1 2005/09/17 13:04:10 jkoshy Exp $");
 
 /*
  * Transform a hwpmc(4) log into human readable form and into gprof(1)
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index 1f435ce3bce9..57cfb6796b20 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pnpinfo/Makefile,v 1.11 2005/01/27 14:52:47 delphij Exp $
 
 .PATH: ${.CURDIR}/../../contrib/pnpinfo
 
diff --git a/usr.sbin/portsnap/Makefile b/usr.sbin/portsnap/Makefile
index 0f77bcb04872..6037ca2cff37 100644
--- a/usr.sbin/portsnap/Makefile
+++ b/usr.sbin/portsnap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/Makefile,v 1.1.2.1 2005/08/15 20:24:07 cperciva Exp $
 
 SUBDIR=	portsnap make_index phttpget
 
diff --git a/usr.sbin/portsnap/Makefile.inc b/usr.sbin/portsnap/Makefile.inc
index 5f6527edb373..ed36e89443cb 100644
--- a/usr.sbin/portsnap/Makefile.inc
+++ b/usr.sbin/portsnap/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/Makefile.inc,v 1.1.2.1 2005/08/15 20:24:07 cperciva Exp $
 
 LIBEXECDIR?=	/usr/libexec
 
diff --git a/usr.sbin/portsnap/make_index/Makefile b/usr.sbin/portsnap/make_index/Makefile
index 65b1a8e61063..f5c6ce5ef75e 100644
--- a/usr.sbin/portsnap/make_index/Makefile
+++ b/usr.sbin/portsnap/make_index/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/make_index/Makefile,v 1.1.2.1 2005/08/15 20:24:07 cperciva Exp $
 
 PROG=	make_index
 NO_MAN=
diff --git a/usr.sbin/portsnap/make_index/make_index.c b/usr.sbin/portsnap/make_index/make_index.c
index c02bba8b0deb..106c1ce4d82b 100644
--- a/usr.sbin/portsnap/make_index/make_index.c
+++ b/usr.sbin/portsnap/make_index/make_index.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/portsnap/make_index/make_index.c,v 1.2.2.2 2005/09/17 15:43:40 cperciva Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/portsnap/phttpget/Makefile b/usr.sbin/portsnap/phttpget/Makefile
index 154ff15f9520..980c868d58c0 100644
--- a/usr.sbin/portsnap/phttpget/Makefile
+++ b/usr.sbin/portsnap/phttpget/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/phttpget/Makefile,v 1.1.2.1 2005/08/15 20:24:08 cperciva Exp $
 
 PROG=	phttpget
 NO_MAN=
diff --git a/usr.sbin/portsnap/phttpget/phttpget.c b/usr.sbin/portsnap/phttpget/phttpget.c
index f967b7e52074..4b486bbc98df 100644
--- a/usr.sbin/portsnap/phttpget/phttpget.c
+++ b/usr.sbin/portsnap/phttpget/phttpget.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/portsnap/phttpget/phttpget.c,v 1.4.2.1 2005/08/15 20:24:08 cperciva Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.sbin/portsnap/portsnap/Makefile b/usr.sbin/portsnap/portsnap/Makefile
index 53ae4d7056ab..b230e06b8cdb 100644
--- a/usr.sbin/portsnap/portsnap/Makefile
+++ b/usr.sbin/portsnap/portsnap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/portsnap/Makefile,v 1.1.2.1 2005/08/15 20:24:08 cperciva Exp $
 
 SCRIPTS=portsnap.sh
 MAN8=	portsnap.8
diff --git a/usr.sbin/portsnap/portsnap/portsnap.8 b/usr.sbin/portsnap/portsnap/portsnap.8
index b8d9f2865eb2..853788e40329 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.8
+++ b/usr.sbin/portsnap/portsnap/portsnap.8
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.8,v 1.3.2.1 2005/08/15 20:24:08 cperciva Exp $
 .\"
 .Dd August 13, 2005
 .Dt PORTSNAP 8
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh
index 38098e7bb073..fa61efe6d5f5 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.sh
+++ b/usr.sbin/portsnap/portsnap/portsnap.sh
@@ -25,7 +25,7 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.8.2.1 2005/08/15 20:24:08 cperciva Exp $
 
 #### Usage function -- called from command-line handling code.
 
diff --git a/usr.sbin/powerd/Makefile b/usr.sbin/powerd/Makefile
index 6a4aaf84fd73..2fcf9a524f36 100644
--- a/usr.sbin/powerd/Makefile
+++ b/usr.sbin/powerd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/powerd/Makefile,v 1.2 2005/02/26 22:50:25 njl Exp $
 
 PROG=	powerd
 MAN=	powerd.8
diff --git a/usr.sbin/powerd/powerd.8 b/usr.sbin/powerd/powerd.8
index 771a917a9865..bb01f1550263 100644
--- a/usr.sbin/powerd/powerd.8
+++ b/usr.sbin/powerd/powerd.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/powerd/powerd.8,v 1.5.6.1 2005/10/25 20:07:51 njl Exp $
 .\"
 .Dd April 10, 2005
 .Dt POWERD 8
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index f299e5fad769..be6787db93f7 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/powerd/powerd.c,v 1.6.2.2.2.1 2005/10/25 20:07:51 njl Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 007e5e147f88..b4f0e8e04f05 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.109 2004/12/21 12:49:24 ru Exp $
 
 PROG=	ppp
 MAN=	ppp.8
diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes
index bf626e3010b9..85828b3520e1 100644
--- a/usr.sbin/ppp/README.changes
+++ b/usr.sbin/ppp/README.changes
@@ -23,7 +23,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/ppp/README.changes,v 1.24 2004/11/19 03:56:47 obrien Exp $
 
 This file summarises changes made to ppp that effect
 its configuration.
diff --git a/usr.sbin/ppp/README.devel b/usr.sbin/ppp/README.devel
index 318cd464d836..a7b27fedeb53 100644
--- a/usr.sbin/ppp/README.devel
+++ b/usr.sbin/ppp/README.devel
@@ -23,7 +23,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/ppp/README.devel,v 1.7 2002/08/26 20:48:07 brian Exp $
 
 This file summarises changes made to ppp that effect
 This program was originally written by Toshiharu OHNO <tony-o@iij.ad.jp>,
diff --git a/usr.sbin/ppp/README.nat b/usr.sbin/ppp/README.nat
index 9ff240a9f37c..2336f49e090f 100644
--- a/usr.sbin/ppp/README.nat
+++ b/usr.sbin/ppp/README.nat
@@ -22,7 +22,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/ppp/README.nat,v 1.7 2002/06/15 08:03:29 brian Exp $
 
 User PPP NAT (Packet Aliasing)
 
diff --git a/usr.sbin/ppp/acf.c b/usr.sbin/ppp/acf.c
index 6c3ec0583486..5736dd513ccf 100644
--- a/usr.sbin/ppp/acf.c
+++ b/usr.sbin/ppp/acf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/acf.c,v 1.7 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/acf.h b/usr.sbin/ppp/acf.h
index e32adbc1661c..6b0fc6131ccb 100644
--- a/usr.sbin/ppp/acf.h
+++ b/usr.sbin/ppp/acf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/acf.h,v 1.2 1999/08/28 01:18:14 peter Exp $
  */
 
 struct lcp;
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index 02dce51ab504..8f6660df8455 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/arp.c,v 1.46 2004/09/05 01:46:51 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h
index 81e3fa6e9db2..f624e1286e6f 100644
--- a/usr.sbin/ppp/arp.h
+++ b/usr.sbin/ppp/arp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/arp.h,v 1.12 2004/09/05 01:46:51 brian Exp $
  */
 
 struct sockaddr_dl;
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index a2a8e0442956..bf002d0f4c55 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ppp/async.c,v 1.29 2004/09/05 01:46:51 brian Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/ppp/async.h b/usr.sbin/ppp/async.h
index 309f597841e6..460cb80a57d3 100644
--- a/usr.sbin/ppp/async.h
+++ b/usr.sbin/ppp/async.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/async.h,v 1.8 2002/03/30 12:30:08 brian Exp $
  */
 
 #define HDLCSIZE	(MAX_MRU*2+6)
diff --git a/usr.sbin/ppp/atm.c b/usr.sbin/ppp/atm.c
index 6e0ce754c6f7..3f78c6153b65 100644
--- a/usr.sbin/ppp/atm.c
+++ b/usr.sbin/ppp/atm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/atm.c,v 1.10 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/atm.h b/usr.sbin/ppp/atm.h
index ccfad8d9fea7..f418674784a5 100644
--- a/usr.sbin/ppp/atm.h
+++ b/usr.sbin/ppp/atm.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/atm.h,v 1.2 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index b5038edfa215..58d729810a9e 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/auth.c,v 1.58 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index 3e1047d551a7..bd962eb9b51b 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/auth.h,v 1.21 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 912f8558ed0f..9a1d81b2f3c4 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/bundle.c,v 1.136 2004/11/29 17:11:14 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index e2f9e7fb3400..3bc4246827ca 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/bundle.h,v 1.52 2004/11/29 17:11:14 brian Exp $
  */
 
 #define	PHASE_DEAD		0	/* Link is dead */
diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index be68e484d17e..665df7d2dfb2 100644
--- a/usr.sbin/ppp/cbcp.c
+++ b/usr.sbin/ppp/cbcp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/cbcp.c,v 1.26 2005/02/15 10:59:54 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/cbcp.h b/usr.sbin/ppp/cbcp.h
index 46bf274f21c9..424085db92b1 100644
--- a/usr.sbin/ppp/cbcp.h
+++ b/usr.sbin/ppp/cbcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/cbcp.h,v 1.3 1999/08/28 01:18:19 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index f5bbf0c39c24..d484598bc975 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ccp.c,v 1.78 2004/10/11 09:45:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h
index bc867b63ddbb..2283e102d7fb 100644
--- a/usr.sbin/ppp/ccp.h
+++ b/usr.sbin/ppp/ccp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ccp.h,v 1.31 2002/06/12 00:33:17 brian Exp $
  */
 
 #define	CCP_MAXCODE	CODE_RESETACK
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 75de650c6ba5..0401ad718ccd 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap.c,v 1.86 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index 617555d82d44..e341ca1c109b 100644
--- a/usr.sbin/ppp/chap.h
+++ b/usr.sbin/ppp/chap.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap.h,v 1.22 2002/06/17 01:12:38 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c
index 24e959cb453e..3c014a0bbc68 100644
--- a/usr.sbin/ppp/chap_ms.c
+++ b/usr.sbin/ppp/chap_ms.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap_ms.c,v 1.20 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.sbin/ppp/chap_ms.h b/usr.sbin/ppp/chap_ms.h
index 8a69f93f215b..4a57f9f3b363 100644
--- a/usr.sbin/ppp/chap_ms.h
+++ b/usr.sbin/ppp/chap_ms.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap_ms.h,v 1.9 2004/09/05 01:46:51 brian Exp $
  */
 
 /* Max # of (Unicode) chars in an NT password */
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 04b267929780..648b4114d54d 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chat.c,v 1.80 2004/10/11 09:45:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h
index b8162bfd33dd..13385679e640 100644
--- a/usr.sbin/ppp/chat.h
+++ b/usr.sbin/ppp/chat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chat.h,v 1.16 2000/03/14 01:46:05 brian Exp $
  */
 
 #define CHAT_EXPECT 0
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 3be394649f7c..686b10542025 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/command.c,v 1.305 2005/02/08 10:38:24 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h
index 8eb1e38d243d..44d6829f1c60 100644
--- a/usr.sbin/ppp/command.h
+++ b/usr.sbin/ppp/command.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/command.h,v 1.23 2001/11/03 21:45:31 brian Exp $
  */
 
 struct cmdtab;
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index d47b11aa2154..321240db4f28 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/datalink.c,v 1.77 2004/10/11 09:45:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index 6fd7e9b878fe..f54fcb4b6622 100644
--- a/usr.sbin/ppp/datalink.h
+++ b/usr.sbin/ppp/datalink.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/datalink.h,v 1.16 2004/10/11 09:45:58 brian Exp $
  */
 
 #define DATALINK_CLOSED  (0)
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index 57c90047b753..70971db2df1d 100644
--- a/usr.sbin/ppp/deflate.c
+++ b/usr.sbin/ppp/deflate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/deflate.c,v 1.26 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/deflate.h b/usr.sbin/ppp/deflate.h
index a478b24cb1de..2cdc38e62a14 100644
--- a/usr.sbin/ppp/deflate.h
+++ b/usr.sbin/ppp/deflate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/deflate.h,v 1.4 1999/08/28 01:18:23 peter Exp $
  */
 
 extern const struct ccp_algorithm PppdDeflateAlgorithm;
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index dcd9e47e1a19..43435dddacb0 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/defs.c,v 1.48 2004/09/05 01:46:51 brian Exp $
  */
 
 
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index f56ee326698e..ea917988a05b 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/defs.h,v 1.68 2004/11/19 03:56:47 obrien Exp $
  */
 
 /* Check the following definitions for your machine environment */
diff --git a/usr.sbin/ppp/descriptor.h b/usr.sbin/ppp/descriptor.h
index a3c1b1075406..460b99824777 100644
--- a/usr.sbin/ppp/descriptor.h
+++ b/usr.sbin/ppp/descriptor.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/descriptor.h,v 1.8 2000/03/14 01:46:06 brian Exp $
  */
 
 #define PHYSICAL_DESCRIPTOR (1)
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index e4e154ad7f3e..979bcb2d92fa 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ether.c,v 1.30 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ether.h b/usr.sbin/ppp/ether.h
index 94511bdab104..1d4e057b6341 100644
--- a/usr.sbin/ppp/ether.h
+++ b/usr.sbin/ppp/ether.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ether.h,v 1.3 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/exec.c b/usr.sbin/ppp/exec.c
index 7c80034a6acd..d36e772f11ac 100644
--- a/usr.sbin/ppp/exec.c
+++ b/usr.sbin/ppp/exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/exec.c,v 1.29 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/exec.h b/usr.sbin/ppp/exec.h
index d4b338767fb3..34542c6d4f78 100644
--- a/usr.sbin/ppp/exec.h
+++ b/usr.sbin/ppp/exec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/exec.h,v 1.5 1999/11/06 22:50:53 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index f59848e0d1d6..ea720ab39b82 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/filter.c,v 1.52 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h
index ce67420d8cde..de86c9ab8612 100644
--- a/usr.sbin/ppp/filter.h
+++ b/usr.sbin/ppp/filter.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/filter.h,v 1.29 2004/09/05 01:46:51 brian Exp $
  */
 
 /* Operations - f_srcop, f_dstop */
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 78530b979ac4..dfc6fe9da20a 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/fsm.c,v 1.71 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index b35c623274e2..153b5b74f05a 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/fsm.h,v 1.28 2004/09/05 01:46:51 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 517c3c5132ec..e0444fb4723f 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/hdlc.c,v 1.51 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h
index b9211a654a75..d266f0fc7f9a 100644
--- a/usr.sbin/ppp/hdlc.h
+++ b/usr.sbin/ppp/hdlc.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/hdlc.h,v 1.24 2004/09/05 01:46:51 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/i4b.c b/usr.sbin/ppp/i4b.c
index 95c686fcf5c2..2559a8e4cf9d 100644
--- a/usr.sbin/ppp/i4b.c
+++ b/usr.sbin/ppp/i4b.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/i4b.c,v 1.15 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/i4b.h b/usr.sbin/ppp/i4b.h
index 3545c8485aa5..bb2cba2ce83e 100644
--- a/usr.sbin/ppp/i4b.h
+++ b/usr.sbin/ppp/i4b.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/i4b.h,v 1.5 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index 440d460e5301..85e9f03f75b3 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/id.c,v 1.23 2002/06/15 08:03:29 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/id.h b/usr.sbin/ppp/id.h
index 6125ab505754..dbdcfc8a1330 100644
--- a/usr.sbin/ppp/id.h
+++ b/usr.sbin/ppp/id.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/id.h,v 1.16 2004/09/07 06:28:00 marcel Exp $
  */
 
 #ifndef NOSUID
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index 5c7f7d0640b4..4606cbb5882e 100644
--- a/usr.sbin/ppp/iface.c
+++ b/usr.sbin/ppp/iface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iface.c,v 1.38 2005/01/10 11:12:10 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index 1fd0a70b17b4..f1fba9b3993a 100644
--- a/usr.sbin/ppp/iface.h
+++ b/usr.sbin/ppp/iface.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iface.h,v 1.8 2004/09/05 01:46:51 brian Exp $
  */
 
 struct ifa_msghdr;
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 5cd2272ff830..f0232e759178 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ip.c,v 1.104 2004/09/06 23:54:54 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index a4c417912f9f..07aeb5fbaa26 100644
--- a/usr.sbin/ppp/ip.h
+++ b/usr.sbin/ppp/ip.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ip.h,v 1.18 2001/08/14 16:05:51 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index e2da0e58526f..598d3618a10a 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipcp.c,v 1.123 2005/01/27 14:09:33 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index dc1ed9e193e6..19d6288f9141 100644
--- a/usr.sbin/ppp/ipcp.h
+++ b/usr.sbin/ppp/ipcp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipcp.h,v 1.35 2001/08/14 16:05:51 brian Exp $
  */
 
 #define	IPCP_MAXCODE	CODE_CODEREJ
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index a7fae6e54b32..cb2b99364b11 100644
--- a/usr.sbin/ppp/iplist.c
+++ b/usr.sbin/ppp/iplist.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iplist.c,v 1.10 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/iplist.h b/usr.sbin/ppp/iplist.h
index 5805a2cfbb77..7cc8ab8c2fc2 100644
--- a/usr.sbin/ppp/iplist.h
+++ b/usr.sbin/ppp/iplist.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iplist.h,v 1.4 1999/08/28 01:18:31 peter Exp $
  */
 
 struct iplist_cur {
diff --git a/usr.sbin/ppp/ipv6cp.c b/usr.sbin/ppp/ipv6cp.c
index 06b003b93fbd..57e1b3244d38 100644
--- a/usr.sbin/ppp/ipv6cp.c
+++ b/usr.sbin/ppp/ipv6cp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipv6cp.c,v 1.17 2005/01/27 14:09:33 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ipv6cp.h b/usr.sbin/ppp/ipv6cp.h
index 53f7153157ea..def454a78504 100644
--- a/usr.sbin/ppp/ipv6cp.h
+++ b/usr.sbin/ppp/ipv6cp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipv6cp.h,v 1.2 2002/08/29 02:44:58 brian Exp $
  */
 
 #ifndef NOINET6
diff --git a/usr.sbin/ppp/layer.h b/usr.sbin/ppp/layer.h
index 4ee59a10a6f2..919d8ab0fb9b 100644
--- a/usr.sbin/ppp/layer.h
+++ b/usr.sbin/ppp/layer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/layer.h,v 1.3 1999/08/28 01:18:31 peter Exp $
  */
 
 #define	LAYER_ASYNC	2
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index d0c15fce2540..6e0e1de07149 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lcp.c,v 1.109 2005/01/10 09:48:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index e0382a8406ba..56518e2f214b 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lcp.h,v 1.31 2004/12/13 12:51:19 brian Exp $
  */
 
 /* callback::opmask values */
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index dc5507d7278d..d8a6dc55573c 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/link.c,v 1.21 2004/09/05 01:46:51 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/link.h b/usr.sbin/ppp/link.h
index 822474b78992..e3450ae60448 100644
--- a/usr.sbin/ppp/link.h
+++ b/usr.sbin/ppp/link.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/link.h,v 1.11 2004/06/30 12:24:56 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index c90720b9724b..6f4d6ab837af 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/log.c,v 1.53 2004/07/17 01:07:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 0da4b8c26848..95f239974fc3 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/log.h,v 1.34 2004/07/17 01:07:52 brian Exp $
  */
 
 #define LogLOG		(0)
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index cb0474163820..ea03788b6181 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lqr.c,v 1.49 2004/12/13 12:51:19 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 13d378ffbe77..91a08eedd32f 100644
--- a/usr.sbin/ppp/lqr.h
+++ b/usr.sbin/ppp/lqr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lqr.h,v 1.18 2004/06/30 12:24:56 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 694b744eaa1e..53c9cda135c6 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/main.c,v 1.193 2004/12/21 11:12:05 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index 0c7399ae7ad8..479cfef63aae 100644
--- a/usr.sbin/ppp/main.h
+++ b/usr.sbin/ppp/main.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/main.h,v 1.13 2004/09/05 01:46:52 brian Exp $
  */
 
 extern void Cleanup(void);
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 4773224ea3ef..5291665dd402 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mbuf.c,v 1.46 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 980d649c25c9..a24e989f22a3 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mbuf.h,v 1.29 2004/09/05 01:46:52 brian Exp $
  */
 
 struct mbuf {
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 095f9bbc0780..bedc0da73c45 100644
--- a/usr.sbin/ppp/mp.c
+++ b/usr.sbin/ppp/mp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mp.c,v 1.55 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mp.h b/usr.sbin/ppp/mp.h
index 7cf5a8e85017..f2fa0c6a53da 100644
--- a/usr.sbin/ppp/mp.h
+++ b/usr.sbin/ppp/mp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mp.h,v 1.12 2004/09/05 01:46:52 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/mppe.c b/usr.sbin/ppp/mppe.c
index 141574ff275e..700ccec5d7cf 100644
--- a/usr.sbin/ppp/mppe.c
+++ b/usr.sbin/ppp/mppe.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mppe.c,v 1.28 2004/09/07 15:48:27 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mppe.h b/usr.sbin/ppp/mppe.h
index c70a60906ba1..a31eb5d05e41 100644
--- a/usr.sbin/ppp/mppe.h
+++ b/usr.sbin/ppp/mppe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mppe.h,v 1.2 2000/11/07 23:19:11 brian Exp $
  */
 
 #define MPPE_KEY_LEN	16
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index 4e764641e4cb..048c06736787 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.c,v 1.62 2004/10/11 09:45:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/nat_cmd.h b/usr.sbin/ppp/nat_cmd.h
index f4c3655f2c8c..f267f4c00098 100644
--- a/usr.sbin/ppp/nat_cmd.h
+++ b/usr.sbin/ppp/nat_cmd.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.h,v 1.20 2003/09/23 07:41:54 marcus Exp $
  */
 
 struct cmdargs;
diff --git a/usr.sbin/ppp/ncp.c b/usr.sbin/ppp/ncp.c
index 1c12fc5ca606..a07ac51a3205 100644
--- a/usr.sbin/ppp/ncp.c
+++ b/usr.sbin/ppp/ncp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncp.c,v 1.8 2004/10/11 10:21:53 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ncp.h b/usr.sbin/ppp/ncp.h
index 99580cfc6319..186987c9afeb 100644
--- a/usr.sbin/ppp/ncp.h
+++ b/usr.sbin/ppp/ncp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncp.h,v 1.2 2004/09/05 01:46:52 brian Exp $
  */
 
 struct port_range {
diff --git a/usr.sbin/ppp/ncpaddr.c b/usr.sbin/ppp/ncpaddr.c
index 0b1699939a9c..8b7c3e75908a 100644
--- a/usr.sbin/ppp/ncpaddr.c
+++ b/usr.sbin/ppp/ncpaddr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncpaddr.c,v 1.16 2005/05/13 16:31:11 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/ncpaddr.h b/usr.sbin/ppp/ncpaddr.h
index 8c6b88612326..8c3ff77fad02 100644
--- a/usr.sbin/ppp/ncpaddr.h
+++ b/usr.sbin/ppp/ncpaddr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncpaddr.h,v 1.3 2001/11/23 12:39:20 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/netgraph.c b/usr.sbin/ppp/netgraph.c
index 471dc0d15f59..bc1e01e263c4 100644
--- a/usr.sbin/ppp/netgraph.c
+++ b/usr.sbin/ppp/netgraph.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/netgraph.c,v 1.6 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/netgraph.h b/usr.sbin/ppp/netgraph.h
index a5b4082ed402..841455238d8d 100644
--- a/usr.sbin/ppp/netgraph.h
+++ b/usr.sbin/ppp/netgraph.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/netgraph.h,v 1.3 2004/09/05 01:46:52 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 8eda02041a2e..638a5df38504 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.c,v 1.51 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index 8e8d45734a88..db1b7912c82a 100644
--- a/usr.sbin/ppp/pap.h
+++ b/usr.sbin/ppp/pap.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.h,v 1.12 2001/06/13 21:52:19 brian Exp $
  */
 
 #define	PAP_REQUEST	1
diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index a96c1bace79a..a0ea902afc0d 100644
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/physical.c,v 1.59 2004/10/11 09:45:58 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/physical.h b/usr.sbin/ppp/physical.h
index f16e1a16139a..ac750c535940 100644
--- a/usr.sbin/ppp/physical.h
+++ b/usr.sbin/ppp/physical.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/physical.h,v 1.28 2004/09/05 01:46:52 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index e45dae6f5646..bb5de7118657 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -25,7 +25,7 @@ changecom(,)dnl
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ppp/ppp.8.m4,v 1.322 2005/05/06 16:13:32 brian Exp $
 .\"
 .Dd July 20, 2004
 .Dt PPP 8
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 43d5d9491434..f93383b96815 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pred.c,v 1.35 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h
index 1afb77a9a57f..d071971a3fb8 100644
--- a/usr.sbin/ppp/pred.h
+++ b/usr.sbin/ppp/pred.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pred.h,v 1.9 2001/06/13 21:52:19 brian Exp $
  */
 
 extern const struct ccp_algorithm Pred1Algorithm;
diff --git a/usr.sbin/ppp/probe.c b/usr.sbin/ppp/probe.c
index a33734cb5b16..06970655fab0 100644
--- a/usr.sbin/ppp/probe.c
+++ b/usr.sbin/ppp/probe.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/probe.c,v 1.6 2002/01/16 14:03:51 brian Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/ppp/probe.h b/usr.sbin/ppp/probe.h
index 5a7dce9e20d2..2a92cc0aefac 100644
--- a/usr.sbin/ppp/probe.h
+++ b/usr.sbin/ppp/probe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/probe.h,v 1.3 2001/08/15 13:53:38 brian Exp $
  */
 
 struct probe {
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index de331eff5436..532d4a9febca 100644
--- a/usr.sbin/ppp/prompt.c
+++ b/usr.sbin/ppp/prompt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/prompt.c,v 1.31 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index 048933825790..6f9c0af5e341 100644
--- a/usr.sbin/ppp/prompt.h
+++ b/usr.sbin/ppp/prompt.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/prompt.h,v 1.10 2002/08/27 20:11:58 brian Exp $
  */
 
 #define LOCAL_AUTH	0x01
diff --git a/usr.sbin/ppp/proto.c b/usr.sbin/ppp/proto.c
index 2c2c26db91a8..08c0270c349c 100644
--- a/usr.sbin/ppp/proto.c
+++ b/usr.sbin/ppp/proto.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/proto.c,v 1.7 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/proto.h b/usr.sbin/ppp/proto.h
index 8c9332769857..4fd0ef60abb9 100644
--- a/usr.sbin/ppp/proto.h
+++ b/usr.sbin/ppp/proto.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/proto.h,v 1.5 2001/12/09 01:29:12 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index 85183965e5d7..b73a56a9263e 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/radius.c,v 1.52 2005/01/27 14:09:33 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/radius.h b/usr.sbin/ppp/radius.h
index bba7e45f8441..418d42cc63a6 100644
--- a/usr.sbin/ppp/radius.h
+++ b/usr.sbin/ppp/radius.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/radius.h,v 1.21 2005/01/27 14:09:33 brian Exp $
  */
 
 #define	MPPE_POLICY_ALLOWED	1
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index fdc60020e5dc..9dea497d2c45 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/route.c,v 1.94 2005/01/10 11:12:36 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h
index edf66045e564..e83ae4c35ec7 100644
--- a/usr.sbin/ppp/route.h
+++ b/usr.sbin/ppp/route.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/route.h,v 1.19 2001/08/16 02:01:05 brian Exp $
  */
 
 struct bundle;
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 5be1357d17e5..ec44aba832a2 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/server.c,v 1.43 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/server.h b/usr.sbin/ppp/server.h
index 9fdc52c6b873..f010653622df 100644
--- a/usr.sbin/ppp/server.h
+++ b/usr.sbin/ppp/server.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/server.h,v 1.9 2001/03/08 23:51:50 brian Exp $
  */
 
 struct bundle;
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index a42194be0c71..13db583bd0b2 100644
--- a/usr.sbin/ppp/sig.c
+++ b/usr.sbin/ppp/sig.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sig.c,v 1.18 2002/05/22 21:08:58 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sig.h b/usr.sbin/ppp/sig.h
index 27d264c19370..f5893fa20dc6 100644
--- a/usr.sbin/ppp/sig.h
+++ b/usr.sbin/ppp/sig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sig.h,v 1.14 1999/08/28 01:18:44 peter Exp $
  */
 
 typedef void (*sig_type)(int);
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index 48928c77fc2a..5489699aa1fb 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -36,7 +36,7 @@
  * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/slcompress.c,v 1.39 2005/01/10 11:47:17 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 9c415cb25fa8..17ca3526e4a0 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -31,7 +31,7 @@
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/slcompress.h,v 1.17 2005/01/10 11:47:17 brian Exp $
  */
 
 #define MIN_VJ_STATES 3
diff --git a/usr.sbin/ppp/sync.c b/usr.sbin/ppp/sync.c
index 712e036cf10a..8b8bce3f4eff 100644
--- a/usr.sbin/ppp/sync.c
+++ b/usr.sbin/ppp/sync.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sync.c,v 1.8 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sync.h b/usr.sbin/ppp/sync.h
index 4f5bfee0805f..030521203312 100644
--- a/usr.sbin/ppp/sync.h
+++ b/usr.sbin/ppp/sync.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sync.h,v 1.2 1999/08/28 01:18:45 peter Exp $
  */
 
 extern struct layer synclayer;
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index 36cb4e9afa3a..77f06a1fac01 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/systems.c,v 1.68 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h
index 9091e730b1a7..6ce98d62b383 100644
--- a/usr.sbin/ppp/systems.h
+++ b/usr.sbin/ppp/systems.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/systems.h,v 1.17 2001/11/03 21:45:32 brian Exp $
  */
 
 struct prompt;
diff --git a/usr.sbin/ppp/tcp.c b/usr.sbin/ppp/tcp.c
index 4ace8821e88c..1ca49d1f4478 100644
--- a/usr.sbin/ppp/tcp.c
+++ b/usr.sbin/ppp/tcp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcp.c,v 1.19 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/tcp.h b/usr.sbin/ppp/tcp.h
index f6a823529e9e..ad4493547291 100644
--- a/usr.sbin/ppp/tcp.h
+++ b/usr.sbin/ppp/tcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcp.h,v 1.5 1999/11/06 22:50:58 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/tcpmss.c b/usr.sbin/ppp/tcpmss.c
index 38d2920f13fe..f3ae5901e2aa 100644
--- a/usr.sbin/ppp/tcpmss.c
+++ b/usr.sbin/ppp/tcpmss.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcpmss.c,v 1.8 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tcpmss.h b/usr.sbin/ppp/tcpmss.h
index ffd7b827963d..be0224b1da37 100644
--- a/usr.sbin/ppp/tcpmss.h
+++ b/usr.sbin/ppp/tcpmss.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcpmss.h,v 1.1 2000/11/28 13:18:35 brian Exp $
  */
 
 extern struct layer tcpmsslayer;
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index f6bc9b57d1d3..595c5e341e75 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/throughput.c,v 1.18 2002/08/27 20:11:58 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/throughput.h b/usr.sbin/ppp/throughput.h
index 21e5450fa005..9cb4de806dcd 100644
--- a/usr.sbin/ppp/throughput.h
+++ b/usr.sbin/ppp/throughput.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/throughput.h,v 1.10 2000/08/28 22:44:54 brian Exp $
  */
 
 #define SAMPLE_PERIOD 5		/* Default sample period */
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 77b2af7e4f44..2811179ef434 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/timer.c,v 1.47 2002/08/27 20:11:58 brian Exp $
  */
 
 #include <errno.h>
diff --git a/usr.sbin/ppp/timer.h b/usr.sbin/ppp/timer.h
index 02fcdd1b4bd1..439f47beb61a 100644
--- a/usr.sbin/ppp/timer.h
+++ b/usr.sbin/ppp/timer.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/timer.h,v 1.10 2001/06/13 21:52:19 brian Exp $
  */
 
 #define	TICKUNIT	100000			/* usec's per Unit */
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index 8d5d58bac28e..a57cef2abace 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tty.c,v 1.32 2004/09/13 19:04:03 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tty.h b/usr.sbin/ppp/tty.h
index 0991c8120862..515676b13c62 100644
--- a/usr.sbin/ppp/tty.h
+++ b/usr.sbin/ppp/tty.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tty.h,v 1.7 2004/09/05 01:46:52 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index 883cd5c4052e..7916e243c40b 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tun.c,v 1.28 2002/06/15 08:03:30 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tun.h b/usr.sbin/ppp/tun.h
index 1bb07122a1ac..9167239e9f07 100644
--- a/usr.sbin/ppp/tun.h
+++ b/usr.sbin/ppp/tun.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tun.h,v 1.10 2000/11/28 13:18:35 brian Exp $
  */
 
 struct tun_data {
diff --git a/usr.sbin/ppp/ua.h b/usr.sbin/ppp/ua.h
index dbd89e5be618..f3e299f08e86 100644
--- a/usr.sbin/ppp/ua.h
+++ b/usr.sbin/ppp/ua.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ua.h,v 1.3 1999/08/28 01:18:49 peter Exp $
  */
 
 #ifdef __i386__		/* Do any other archs not care about alignment ? */
diff --git a/usr.sbin/ppp/udp.c b/usr.sbin/ppp/udp.c
index d9f3252e7205..809e5d8c8d15 100644
--- a/usr.sbin/ppp/udp.c
+++ b/usr.sbin/ppp/udp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/udp.c,v 1.20 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/udp.h b/usr.sbin/ppp/udp.h
index c89e276b7e2e..49acfee6b57f 100644
--- a/usr.sbin/ppp/udp.h
+++ b/usr.sbin/ppp/udp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/udp.h,v 1.5 2004/09/05 01:46:52 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index f3c6b7124fb6..6181cbe3884b 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/vjcomp.c,v 1.40 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 2956122fd061..34457439857c 100644
--- a/usr.sbin/ppp/vjcomp.h
+++ b/usr.sbin/ppp/vjcomp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/vjcomp.h,v 1.8 1999/08/28 01:18:51 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 6cdcc3dc6cfb..156869082dbd 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppctl/Makefile,v 1.16 2004/01/31 17:28:09 marcel Exp $
 
 PROG=	pppctl
 MAN=	pppctl.8
diff --git a/usr.sbin/pppctl/pppctl.8 b/usr.sbin/pppctl/pppctl.8
index 245690f17f1f..c131dbb0f310 100644
--- a/usr.sbin/pppctl/pppctl.8
+++ b/usr.sbin/pppctl/pppctl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pppctl/pppctl.8,v 1.24 2005/02/13 22:25:31 ru Exp $
 .Dd June 26, 1997
 .Os
 .Dt PPPCTL 8
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index d8e7b42ca7fa..aeeb27589b2f 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pppctl/pppctl.c,v 1.33 2004/12/13 14:50:13 brian Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index c7b617442ecb..349c244587dd 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.29 2004/12/21 10:16:04 ru Exp $
 
 # I once used this extensively, but no longer have a modem.  Feel free
 # to ask me questions about it, but I disclaim ownership now.  -Peter
diff --git a/usr.sbin/pppd/RELNOTES b/usr.sbin/pppd/RELNOTES
index 1c1e392266f2..0359edee1374 100644
--- a/usr.sbin/pppd/RELNOTES
+++ b/usr.sbin/pppd/RELNOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppd/RELNOTES,v 1.7 2003/01/01 18:49:02 schweikh Exp $
 
 This is the README file for ppp-2.3, a package which implements the
 Point-to-Point Protocol (PPP) to provide Internet connections over
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index c98246172a7b..39228aa83b3c 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/auth.c,v 1.28 2003/10/26 06:01:06 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index 27b88659ba1b..834cb572cf45 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/cbcp.c,v 1.7 2004/12/06 15:49:52 delphij Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index fb21cfda3587..360fb5f3cede 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ccp.c,v 1.10 1999/08/28 01:19:00 peter Exp $";
 #endif
 
 #include <string.h>
diff --git a/usr.sbin/pppd/ccp.h b/usr.sbin/pppd/ccp.h
index a03ac4d4961e..8405ad345b4d 100644
--- a/usr.sbin/pppd/ccp.h
+++ b/usr.sbin/pppd/ccp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ccp.h,v 1.8 1999/08/28 01:19:00 peter Exp $
  */
 
 typedef struct ccp_options {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index c3acafbe8392..711b6808964b 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap.c,v 1.10 1999/08/28 01:19:01 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h
index 4a4f38383a34..4a7cd9c9a021 100644
--- a/usr.sbin/pppd/chap.h
+++ b/usr.sbin/pppd/chap.h
@@ -30,7 +30,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap.h,v 1.7 1999/08/28 01:19:01 peter Exp $
  */
 
 #ifndef __CHAP_INCLUDE__
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index c3e1f6ee44d1..9d3be9d6e237 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap_ms.c,v 1.8 2000/02/24 21:10:28 markm Exp $";
 #endif
 
 #ifdef CHAPMS
diff --git a/usr.sbin/pppd/chap_ms.h b/usr.sbin/pppd/chap_ms.h
index 7c0088308aa6..31f48732d8ca 100644
--- a/usr.sbin/pppd/chap_ms.h
+++ b/usr.sbin/pppd/chap_ms.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap_ms.h,v 1.5 1999/08/28 01:19:02 peter Exp $
  */
 
 #ifndef __CHAPMS_INCLUDE__
diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c
index 59c0281e16a0..e0eb980299d7 100644
--- a/usr.sbin/pppd/demand.c
+++ b/usr.sbin/pppd/demand.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/demand.c,v 1.5 1999/08/28 01:19:02 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index 0c49c7092d86..2af5d807f9b2 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/fsm.c,v 1.10 2002/12/30 21:18:14 schweikh Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h
index 7b43b7a08be2..67cb1c4d734f 100644
--- a/usr.sbin/pppd/fsm.h
+++ b/usr.sbin/pppd/fsm.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/fsm.h,v 1.7 1999/08/28 01:19:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 576b2006ab58..eb9d57d15078 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ipcp.c,v 1.12 1999/08/28 01:19:03 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h
index 2bc795d9a504..693e16b536b9 100644
--- a/usr.sbin/pppd/ipcp.h
+++ b/usr.sbin/pppd/ipcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipcp.h,v 1.10 1999/08/28 01:19:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index bdf24d1193df..203707d39a93 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -19,7 +19,7 @@
 
 #ifdef IPX_CHANGE
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ipxcp.c,v 1.6 2003/01/01 18:49:02 schweikh Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.h b/usr.sbin/pppd/ipxcp.h
index 0890181af7ec..6e825664b272 100644
--- a/usr.sbin/pppd/ipxcp.h
+++ b/usr.sbin/pppd/ipxcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipxcp.h,v 1.4 1999/08/28 01:19:04 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index 74009872011f..a4d0e29ac508 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/lcp.c,v 1.11 2003/04/07 13:34:00 fjoe Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h
index 2a19e2611b59..139b8d7ec33d 100644
--- a/usr.sbin/pppd/lcp.h
+++ b/usr.sbin/pppd/lcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/lcp.h,v 1.7 1999/08/28 01:19:05 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c
index 1e13d02dd371..bc7de4308313 100644
--- a/usr.sbin/pppd/magic.c
+++ b/usr.sbin/pppd/magic.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/magic.c,v 1.8 1999/08/28 01:19:05 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h
index 82f65cf55d4e..39496e6cdcfc 100644
--- a/usr.sbin/pppd/magic.h
+++ b/usr.sbin/pppd/magic.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/magic.h,v 1.7 1999/08/28 01:19:05 peter Exp $
  */
 
 void magic_init __P((void));	/* Initialize the magic number generator */
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index c2d0abfbc3c4..d4d4c9087a23 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/main.c,v 1.21 2003/05/12 18:51:31 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index d1e679b2aa43..622fb93bc7d4 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/options.c,v 1.24 2002/05/06 08:39:43 dwmalone Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/pppd/patchlevel.h b/usr.sbin/pppd/patchlevel.h
index bc49c5879a24..7c9d9c07db84 100644
--- a/usr.sbin/pppd/patchlevel.h
+++ b/usr.sbin/pppd/patchlevel.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pppd/patchlevel.h,v 1.10 1999/08/28 01:19:07 peter Exp $ */
 #define	PATCHLEVEL	5
 
 #define VERSION		"2.3"
diff --git a/usr.sbin/pppd/pathnames.h b/usr.sbin/pppd/pathnames.h
index 147ae38ab40f..af7ac9252699 100644
--- a/usr.sbin/pppd/pathnames.h
+++ b/usr.sbin/pppd/pathnames.h
@@ -1,7 +1,7 @@
 /*
  * define path names
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/pathnames.h,v 1.10 2001/07/31 16:09:29 asmodai Exp $
  */
 
 #ifdef HAVE_PATHS_H
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index 6becff62cdfa..d24cd0ddafc8 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.25.8.1 2005/08/18 15:01:27 keramida Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index 248556d381e8..005a0e754b60 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/pppd.h,v 1.13 1999/08/28 01:19:08 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 3ca43c0cb2ed..d41d889352f9 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/sys-bsd.c,v 1.20 2004/04/09 16:59:05 maxim Exp $";
 #endif
 /*	$NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $	*/
 
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 627c7d03d5db..2cda3ac14ea3 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/upap.c,v 1.8 1999/08/28 01:19:08 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h
index 2cfd86c8077f..7d1eaa38e985 100644
--- a/usr.sbin/pppd/upap.h
+++ b/usr.sbin/pppd/upap.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/upap.h,v 1.7 1999/08/28 01:19:09 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile
index da34dc9ae6ce..ab4da3dacf13 100644
--- a/usr.sbin/pppstats/Makefile
+++ b/usr.sbin/pppstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppstats/Makefile,v 1.11 2005/06/03 15:25:13 imp Exp $
 
 PROG=	pppstats
 MAN=	pppstats.8
diff --git a/usr.sbin/pppstats/pppstats.8 b/usr.sbin/pppstats/pppstats.8
index 5b28ea0a8f8d..3483b7fc64cc 100644
--- a/usr.sbin/pppstats/pppstats.8
+++ b/usr.sbin/pppstats/pppstats.8
@@ -1,4 +1,4 @@
-.\"	@(#) $FreeBSD$
+.\"	@(#) $FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.10 2000/03/03 09:11:28 sheldonh Exp $
 .TH PPPSTATS 8 "26 June 1995"
 .SH NAME
 pppstats \- print PPP statistics
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index d3b7b3d2ca16..efd30dafcbb0 100644
--- a/usr.sbin/pppstats/pppstats.c
+++ b/usr.sbin/pppstats/pppstats.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppstats/pppstats.c,v 1.14 2002/04/22 13:44:46 des Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index 81fd4d1a11ac..1accd82e950d 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 9/21/96
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/praliases/Makefile,v 1.11 2005/06/10 06:12:53 des Exp $
 
 SENDMAIL_DIR=	${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/praliases
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index 5cb35e707371..b9f385273be5 100644
--- a/usr.sbin/procctl/Makefile
+++ b/usr.sbin/procctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/procctl/Makefile,v 1.8 2001/07/20 06:20:15 obrien Exp $
 
 PROG=	procctl
 MAN=	procctl.8
diff --git a/usr.sbin/procctl/procctl.8 b/usr.sbin/procctl/procctl.8
index 1add286472f4..91ed25fc6627 100644
--- a/usr.sbin/procctl/procctl.8
+++ b/usr.sbin/procctl/procctl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.10 2002/07/14 14:45:06 charnier Exp $
 .Dd November 23, 1997
 .Dt PROCCTL 8
 .Os
diff --git a/usr.sbin/procctl/procctl.c b/usr.sbin/procctl/procctl.c
index 5bd1f21954c6..8ec932e2a7f4 100644
--- a/usr.sbin/procctl/procctl.c
+++ b/usr.sbin/procctl/procctl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/procctl/procctl.c,v 1.7 2003/05/03 21:06:38 obrien Exp $");
 
 /*
  * procctl -- clear the event mask, and continue, any specified processes.
diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile
index 8fd2ced9f38c..8ac6863dcd9f 100644
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pstat/Makefile,v 1.14 2005/03/21 18:11:31 keramida Exp $
 
 PROG=	pstat
 LINKS=	${BINDIR}/pstat ${BINDIR}/swapinfo
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 9aec51b472a4..fd387bc4f299 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pstat.8	8.5 (Berkeley) 5/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pstat/pstat.8,v 1.47 2005/03/21 16:36:05 keramida Exp $
 .\"
 .Dd March 21, 2005
 .Dt PSTAT 8
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 519f4d8bb37a..c89cf1fd6790 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)pstat.c	8.16 (Berkeley) 5/9/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.95 2005/04/09 14:59:10 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index 8937124f22f4..605cc9b371f9 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pw/Makefile,v 1.18 2003/04/04 17:49:17 obrien Exp $
 
 PROG=	pw
 MAN=	pw.conf.5 pw.8
diff --git a/usr.sbin/pw/README b/usr.sbin/pw/README
index bbb153988366..849946d8ab06 100644
--- a/usr.sbin/pw/README
+++ b/usr.sbin/pw/README
@@ -18,5 +18,5 @@ other bsd4.4 variants.
 
 Author and maintainer: David L. Nugent, <davidn@blaze.net.au>
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pw/README,v 1.6 2001/01/02 04:01:59 peter Exp $
 
diff --git a/usr.sbin/pw/bitmap.c b/usr.sbin/pw/bitmap.c
index bcfea7e2c887..01d8551a2f5d 100644
--- a/usr.sbin/pw/bitmap.c
+++ b/usr.sbin/pw/bitmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/bitmap.c,v 1.5 1999/08/28 01:19:15 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.sbin/pw/bitmap.h b/usr.sbin/pw/bitmap.h
index 4d6cfe43c18a..c9328a167c19 100644
--- a/usr.sbin/pw/bitmap.h
+++ b/usr.sbin/pw/bitmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/bitmap.h,v 1.5 2002/07/11 19:07:35 alfred Exp $
  */
 
 #ifndef _BITMAP_H_
diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index 1eba348f4dc0..e8f9447533fb 100644
--- a/usr.sbin/pw/cpdir.c
+++ b/usr.sbin/pw/cpdir.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/cpdir.c,v 1.7 2005/04/09 14:59:10 stefanf Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/edgroup.c b/usr.sbin/pw/edgroup.c
index 1cc46b4bdb48..f17a4226ae21 100644
--- a/usr.sbin/pw/edgroup.c
+++ b/usr.sbin/pw/edgroup.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/edgroup.c,v 1.9 2004/03/08 20:31:37 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/fileupd.c b/usr.sbin/pw/fileupd.c
index b88f4fa8539f..59ca3ad18a4d 100644
--- a/usr.sbin/pw/fileupd.c
+++ b/usr.sbin/pw/fileupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/fileupd.c,v 1.10 2004/03/08 20:31:37 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index edff76d1285c..36201105da18 100644
--- a/usr.sbin/pw/grupd.c
+++ b/usr.sbin/pw/grupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/grupd.c,v 1.10 2001/08/30 06:32:17 dd Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index 3f4c0105b75b..c49728c592c6 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/psdate.c,v 1.8 2004/06/17 14:07:16 robert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.h b/usr.sbin/pw/psdate.h
index a1e99d464531..56a74453f5d2 100644
--- a/usr.sbin/pw/psdate.h
+++ b/usr.sbin/pw/psdate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/psdate.h,v 1.5 2002/07/11 19:07:35 alfred Exp $
  */
 
 #ifndef _PSDATE_H_
diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8
index c6b18bc51894..089ebdc86d91 100644
--- a/usr.sbin/pw/pw.8
+++ b/usr.sbin/pw/pw.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.37 2005/01/18 20:02:41 ru Exp $
 .\"
 .Dd January 11, 2004
 .Dt PW 8
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index 4010e842f670..1435598b7403 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw.c,v 1.27 2004/01/11 18:28:08 iedowse Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/pw.conf.5 b/usr.sbin/pw/pw.conf.5
index 729d45a72003..fa3ceb0fa623 100644
--- a/usr.sbin/pw/pw.conf.5
+++ b/usr.sbin/pw/pw.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/usr.sbin/pw/pw.conf.5,v 1.15 2003/09/08 19:57:21 ru Exp $
 .\"
 .Dd December 9, 1996
 .Dt PW.CONF 5
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index a0f97e31a0c0..37cfee8f095e 100644
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/pw.h,v 1.14 2005/02/10 09:05:27 stefanf Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index 9377239c9906..b65a1b8c5ba3 100644
--- a/usr.sbin/pw/pw_conf.c
+++ b/usr.sbin/pw/pw_conf.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_conf.c,v 1.14 2001/08/20 15:09:34 brian Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 1c63a11722b2..0f2a2f93f605 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_group.c,v 1.14 2004/01/11 18:28:08 iedowse Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index fc85828b5bbf..e3a484900926 100644
--- a/usr.sbin/pw/pw_log.c
+++ b/usr.sbin/pw/pw_log.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_log.c,v 1.6 2000/06/22 16:48:41 ache Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 74a3ed09a7a9..8e570738cfdd 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_nis.c,v 1.6 1999/08/28 01:19:20 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 6db509a07bee..c0078ee01478 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.57.8.1 2005/08/05 19:39:25 pjd Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index 473cbb6c0c64..3b36c9876935 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_vpw.c,v 1.4 2004/06/17 14:07:16 robert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index 7e0e3cfb0c2a..1f3b89cea703 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pwupd.c,v 1.20 2004/10/03 14:40:27 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 728906500f41..0669e924720d 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/pwupd.h,v 1.8 2002/07/11 19:07:35 alfred Exp $
  */
 
 #ifndef _PWUPD_H_
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c
index 4ad590bc1aa2..9a0717daa401 100644
--- a/usr.sbin/pw/rm_r.c
+++ b/usr.sbin/pw/rm_r.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/rm_r.c,v 1.6 2001/06/24 20:25:20 dd Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index c3aaeb3398d8..1317452379b3 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pwd_mkdb/Makefile,v 1.10 2003/04/04 17:49:17 obrien Exp $
 
 .PATH: ${.CURDIR}/../../lib/libc/gen		# for pw_scan.c
 
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index 1265c595681d..102f5be053e4 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.26 2005/02/28 21:05:30 ru Exp $
 .\"
 .Dd February 28, 2005
 .Dt PWD_MKDB 8
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 3c8ca252a0c8..3001ac29535a 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.51 2005/06/15 10:13:04 dd Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index 07bcc7eff1cf..6f2466b65909 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/quot/Makefile,v 1.10 2003/04/04 17:49:17 obrien Exp $
 
 PROG=	quot
 MAN=	quot.8
diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8
index 5451f63e15c5..e718b6fae8d0 100644
--- a/usr.sbin/quot/quot.8
+++ b/usr.sbin/quot/quot.8
@@ -27,7 +27,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/usr.sbin/quot/quot.8,v 1.22 2005/01/18 20:02:41 ru Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 42e8f48021bd..8a70f017b779 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/quot/quot.c,v 1.23 2005/04/09 14:59:10 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index 3f88bd9da33c..ad283168eaf6 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/quotaon/Makefile,v 1.6 2002/07/11 21:23:33 alfred Exp $
 
 PROG=	quotaon
 LINKS=	${BINDIR}/quotaon ${BINDIR}/quotaoff
diff --git a/usr.sbin/quotaon/quotaon.8 b/usr.sbin/quotaon/quotaon.8
index 08e8d11bda25..e9fed91cc497 100644
--- a/usr.sbin/quotaon/quotaon.8
+++ b/usr.sbin/quotaon/quotaon.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotaon.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/quotaon/quotaon.8,v 1.11 2004/08/07 04:28:54 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt QUOTAON 8
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 4bdf98206491..d409fb019cb7 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)quotaon.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.10 2004/08/07 04:28:54 imp Exp $");
 
 /*
  * Turn quota on/off for a filesystem.
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index 7f34457697e3..1c0df6b01510 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rarpd/Makefile,v 1.14 2003/07/11 17:15:19 mux Exp $
 
 PROG=	rarpd
 MAN=	rarpd.8
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 8552b69689a8..20d8b8cca3cd 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -14,7 +14,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rarpd/rarpd.8,v 1.22 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd November 16, 2001
 .Dt RARPD 8
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index a500dd512a13..c16aca1b5de0 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -22,7 +22,7 @@ The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rarpd/rarpd.c,v 1.41 2004/08/07 04:28:54 imp Exp $");
 
 /*
  * rarpd - Reverse ARP Daemon
diff --git a/usr.sbin/raycontrol/Makefile b/usr.sbin/raycontrol/Makefile
index 50e747277f80..d7857a5405c2 100644
--- a/usr.sbin/raycontrol/Makefile
+++ b/usr.sbin/raycontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/raycontrol/Makefile,v 1.4 2001/07/20 06:20:31 obrien Exp $
 
 PROG=	raycontrol
 MAN=	raycontrol.8
diff --git a/usr.sbin/raycontrol/raycontrol.8 b/usr.sbin/raycontrol/raycontrol.8
index 26a910a141d4..ae3865962333 100644
--- a/usr.sbin/raycontrol/raycontrol.8
+++ b/usr.sbin/raycontrol/raycontrol.8
@@ -58,7 +58,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/raycontrol/raycontrol.8,v 1.13 2005/02/13 22:25:31 ru Exp $
 .\"
 .Dd March 21, 2000
 .Dt RAYCONTROL 8
diff --git a/usr.sbin/raycontrol/raycontrol.c b/usr.sbin/raycontrol/raycontrol.c
index 006fedabbb45..ef9cb2846a66 100644
--- a/usr.sbin/raycontrol/raycontrol.c
+++ b/usr.sbin/raycontrol/raycontrol.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/raycontrol/raycontrol.c,v 1.7 2004/04/04 19:38:08 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index 087e890ed356..ace069b09998 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/repquota/Makefile,v 1.8 2003/04/04 17:49:18 obrien Exp $
 
 PROG=	repquota
 MAN=	repquota.8
diff --git a/usr.sbin/repquota/repquota.8 b/usr.sbin/repquota/repquota.8
index b669fdf8266a..7e49cd882623 100644
--- a/usr.sbin/repquota/repquota.8
+++ b/usr.sbin/repquota/repquota.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)repquota.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/repquota/repquota.8,v 1.12 2005/01/18 20:02:42 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt REPQUOTA 8
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index f497953d4ed6..c0f505f36455 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)repquota.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.19 2004/12/19 18:02:45 maxim Exp $");
 
 /*
  * Quota report
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index 51438a18abc1..acbd0cce25fb 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$FreeBSD: src/usr.sbin/rip6query/Makefile,v 1.6 2001/07/20 06:20:16 obrien Exp $
 
 PROG=	rip6query
 MAN=	rip6query.8
diff --git a/usr.sbin/rip6query/rip6query.8 b/usr.sbin/rip6query/rip6query.8
index 9bcd4a508e38..ecfaef32132f 100644
--- a/usr.sbin/rip6query/rip6query.8
+++ b/usr.sbin/rip6query/rip6query.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: rip6query.8,v 1.2 2000/01/19 06:24:55 itojun Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rip6query/rip6query.8,v 1.7 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd October 7, 1999
 .Dt RIP6QUERY 8
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index b37772b09c0d..15b952798df2 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rip6query/rip6query.c,v 1.7 2005/05/13 16:31:11 ume Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index 579a02bb6689..5fa44ddaf0b7 100644
--- a/usr.sbin/rmt/Makefile
+++ b/usr.sbin/rmt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rmt/Makefile,v 1.10 2003/04/04 17:49:18 obrien Exp $
 
 PROG=	rmt
 MAN=	rmt.8
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index 8dfe24526995..b016c490f60c 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rmt.8	8.3 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rmt/rmt.8,v 1.17 2005/06/10 20:52:35 nectar Exp $
 .\"
 .Dd June 1, 1994
 .Dt RMT 8
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index af4f954e07b9..b06e9cc6e43c 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rmt.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rmt/rmt.c,v 1.13 2004/08/07 04:28:54 imp Exp $");
 
 /*
  * rmt
diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile
index e924f5c41d7f..0a6fa741993c 100644
--- a/usr.sbin/rndc-confgen/Makefile
+++ b/usr.sbin/rndc-confgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rndc-confgen/Makefile,v 1.4.2.1 2005/07/30 07:56:28 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
index 70c5d6d6d686..35265277b17e 100644
--- a/usr.sbin/rndc/Makefile
+++ b/usr.sbin/rndc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rndc/Makefile,v 1.5.2.1 2005/07/30 07:56:28 des Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 1bed21a5e1d3..c486a8231279 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/route6d/Makefile,v 1.11 2003/08/18 15:35:33 ume Exp $
 
 PROG=	route6d
 MAN=	route6d.8
diff --git a/usr.sbin/route6d/misc/chkrt b/usr.sbin/route6d/misc/chkrt
index 6ae01f37be04..4552e72ed4c7 100755
--- a/usr.sbin/route6d/misc/chkrt
+++ b/usr.sbin/route6d/misc/chkrt
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/route6d/misc/chkrt,v 1.2 2003/11/14 16:57:04 ume Exp $
 #
 $dump="/var/tmp/route6d_dump";
 $pidfile="/var/run/route6d.pid";
diff --git a/usr.sbin/route6d/misc/cksum.c b/usr.sbin/route6d/misc/cksum.c
index bff7e2d5f7f4..96682b7a5b5a 100644
--- a/usr.sbin/route6d/misc/cksum.c
+++ b/usr.sbin/route6d/misc/cksum.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/route6d/misc/cksum.c,v 1.1 1999/12/28 02:37:10 shin Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 121f5f2dc2ef..1e2a9669d4a1 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -14,7 +14,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/route6d/route6d.8,v 1.9 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd January 31, 1997
 .Dt ROUTE6D 8
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index f62c7f113849..39b80062a51e 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/route6d/route6d.c,v 1.34 2003/11/14 17:16:50 ume Exp $	*/
 /*	$KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/route6d/route6d.h b/usr.sbin/route6d/route6d.h
index 49a7d5a93760..f5152f5eec85 100644
--- a/usr.sbin/route6d/route6d.h
+++ b/usr.sbin/route6d/route6d.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/route6d/route6d.h,v 1.5 2003/11/14 17:16:12 ume Exp $	*/
 /*	$KAME: route6d.h,v 1.8 2003/05/28 09:11:13 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 961ad17d4bf9..d9881685d76d 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.12 2000/08/07 16:23:31 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.lockd/Makefile,v 1.19 2003/10/26 06:10:44 peter Exp $
 
 PROG=	rpc.lockd
 MAN=	rpc.lockd.8
diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c
index ef5d268dafe3..e9b1dee0aa2d 100644
--- a/usr.sbin/rpc.lockd/kern.c
+++ b/usr.sbin/rpc.lockd/kern.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.16 2005/05/20 13:01:47 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index 044966486d22..8f5e82239a84 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: lock_proc.c,v 1.7 2000/10/11 20:23:56 is Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lock_proc.c,v 1.18 2005/02/03 22:21:19 kuriyama Exp $ */
 /*
  * Copyright (c) 1995
  *	A.R. Gordon (andrew.gordon@net-tel.co.uk).  All rights reserved.
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 440b1a5fdd6d..c7809f4fc7ae 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.18 2004/07/16 19:30:59 mr Exp $ */
 
 /*
  * Copyright (c) 1995
diff --git a/usr.sbin/rpc.lockd/lockd.h b/usr.sbin/rpc.lockd/lockd.h
index 0a8e2e60b616..b47eb7d03e7a 100644
--- a/usr.sbin/rpc.lockd/lockd.h
+++ b/usr.sbin/rpc.lockd/lockd.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd.h,v 1.2 2000/06/07 14:34:40 bouyer Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd.h,v 1.5 2001/11/29 17:36:45 alfred Exp $ */
 
 /*
  * Copyright (c) 1995
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index ee9f33751ff6..77c8455893f2 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.17 2005/05/20 13:01:47 charnier Exp $");
 
 #define LOCKD_DEBUG
 
diff --git a/usr.sbin/rpc.lockd/lockd_lock.h b/usr.sbin/rpc.lockd/lockd_lock.h
index 62f6981151ed..e978f9206799 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.h
+++ b/usr.sbin/rpc.lockd/lockd_lock.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd_lock.h,v 1.2 2000/06/09 14:00:54 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.h,v 1.4 2002/03/21 22:52:45 alfred Exp $ */
 
 /* Headers and function declarations for file-locking utilities */
 
diff --git a/usr.sbin/rpc.lockd/rpc.lockd.8 b/usr.sbin/rpc.lockd/rpc.lockd.8
index 7c86bb6775cd..15f788bb551f 100644
--- a/usr.sbin/rpc.lockd/rpc.lockd.8
+++ b/usr.sbin/rpc.lockd/rpc.lockd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.16 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd September 24, 1995
 .Dt RPC.LOCKD 8
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index a751e5c6f4e4..b15cf45b0963 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -9,7 +9,7 @@ static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";
 static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";
 #else
 __RCSID("$NetBSD: test.c,v 1.2 1997/10/18 04:01:21 lukem Exp $");
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.sbin/rpc.lockd/test.c,v 1.5 2001/03/19 12:50:09 alfred Exp $";
 #endif
 #endif				/* not lint */
 
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index 6d8053c29bed..ab2f301dcff9 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.statd/Makefile,v 1.16 2003/10/26 06:14:10 peter Exp $
 
 PROG=	rpc.statd
 MAN=	rpc.statd.8
diff --git a/usr.sbin/rpc.statd/file.c b/usr.sbin/rpc.statd/file.c
index 991af887e045..28053466d395 100644
--- a/usr.sbin/rpc.statd/file.c
+++ b/usr.sbin/rpc.statd/file.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.statd/file.c,v 1.7 2003/10/26 06:14:10 peter Exp $
  *
  */
 
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index eed784959152..67fff5ca3a6a 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/procs.c,v 1.14 2003/10/26 06:14:10 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/rpc.statd/rpc.statd.8 b/usr.sbin/rpc.statd/rpc.statd.8
index 37147f5d4a7a..1790b54f5b2a 100644
--- a/usr.sbin/rpc.statd/rpc.statd.8
+++ b/usr.sbin/rpc.statd/rpc.statd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.statd/rpc.statd.8,v 1.13 2005/01/18 20:02:42 ru Exp $
 .\"
 .Dd September 19, 1995
 .Dt RPC.STATD 8
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index 507a027e6266..7eb46d1c8701 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -36,7 +36,7 @@
 /* The actual program logic is in the file procs.c			*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.statd/statd.c,v 1.12 2004/04/04 19:46:14 charnier Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/rpc.statd/statd.h b/usr.sbin/rpc.statd/statd.h
index a82d760f96f2..53032df1c22f 100644
--- a/usr.sbin/rpc.statd/statd.h
+++ b/usr.sbin/rpc.statd/statd.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/rpc.statd/statd.h,v 1.5 2002/07/11 17:55:14 alfred Exp $
  */
 
 
diff --git a/usr.sbin/rpc.statd/test.c b/usr.sbin/rpc.statd/test.c
index 6df15011db3b..8bf5affa636a 100644
--- a/usr.sbin/rpc.statd/test.c
+++ b/usr.sbin/rpc.statd/test.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/test.c,v 1.3 1999/08/28 01:19:39 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile
index 0a829c301cb5..7544fc42a1c6 100644
--- a/usr.sbin/rpc.umntall/Makefile
+++ b/usr.sbin/rpc.umntall/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.umntall/Makefile,v 1.5 2003/10/26 06:14:10 peter Exp $
 
 PROG=	rpc.umntall
 MAN=	rpc.umntall.8
diff --git a/usr.sbin/rpc.umntall/mounttab.c b/usr.sbin/rpc.umntall/mounttab.c
index b81334e1b272..0e5551b3ea7f 100644
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.umntall/mounttab.c,v 1.6 2003/05/03 21:06:39 obrien Exp $");
 
 #include <sys/syslog.h>
 
diff --git a/usr.sbin/rpc.umntall/mounttab.h b/usr.sbin/rpc.umntall/mounttab.h
index acf6c7968311..5095f8b99af4 100644
--- a/usr.sbin/rpc.umntall/mounttab.h
+++ b/usr.sbin/rpc.umntall/mounttab.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.umntall/mounttab.h,v 1.2 2001/07/22 12:17:51 iedowse Exp $
  */
 
 #define STRSIZ  (RPCMNT_NAMELEN+RPCMNT_PATHLEN+100)
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.8 b/usr.sbin/rpc.umntall/rpc.umntall.8
index 623663575532..1d79589ca700 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.8
+++ b/usr.sbin/rpc.umntall/rpc.umntall.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.umntall/rpc.umntall.8,v 1.12 2005/02/13 22:25:32 ru Exp $
 .\"
 .Dd November 17, 1999
 .Dt RPC.UMNTALL 8
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.c b/usr.sbin/rpc.umntall/rpc.umntall.c
index b79e4788a988..68e5d31fdc7e 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.c
+++ b/usr.sbin/rpc.umntall/rpc.umntall.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.umntall/rpc.umntall.c,v 1.13 2005/05/27 00:05:16 mux Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 1b76da46de89..94b8a74ba2f0 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.yppasswdd/Makefile,v 1.21 2004/10/18 21:29:20 ru Exp $
 
 RPCDIR=	${DESTDIR}/usr/include/rpcsvc
 
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index 376390866a84..c75b9dc615df 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.25 2005/02/13 23:45:53 ru Exp $
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
diff --git a/usr.sbin/rpc.yppasswdd/yppasswd_private.x b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
index a1d6be51f369..c696de8705bb 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x
+++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
@@ -32,7 +32,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswd_private.x,v 1.7 2003/05/03 21:06:39 obrien Exp $");
 #endif
 
 #ifdef RPC_HDR
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
index db15be228a6d..d0a9907829fc 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h,v 1.14 2002/07/11 21:28:16 alfred Exp $
  */
 
 #ifndef _YPPASSWDD_EXTERN_H
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index e4170bd0e471..959eae53bbc3 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_main.c,v 1.26 2005/05/02 14:02:43 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 04adf31ed85f..49dbab340e7e 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c,v 1.29 2003/06/15 21:24:45 mbr Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppwupdate b/usr.sbin/rpc.yppasswdd/yppwupdate
index a9db8f7e5b6c..6e7671b6a550 100644
--- a/usr.sbin/rpc.yppasswdd/yppwupdate
+++ b/usr.sbin/rpc.yppasswdd/yppwupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppwupdate,v 1.7 1999/08/28 01:19:42 peter Exp $
 #
 
 PATH=/bin:/usr/bin; export PATH
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index 4fe19c9c9cab..ca565b2e71f9 100644
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypupdated/Makefile,v 1.10 2004/12/21 08:47:34 ru Exp $
 
 .PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr
 
diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index 5cc0d7a56cff..36d680e303ae 100644
--- a/usr.sbin/rpc.ypupdated/update.c
+++ b/usr.sbin/rpc.ypupdated/update.c
@@ -33,7 +33,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/update.c,v 1.7 2002/02/06 15:26:05 des Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index 0552aab9d3ea..62ba0dc5d5f6 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbdelete.c,v 1.6 2003/05/03 21:06:39 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index 453ed2be06b3..1693b470befd 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbupdate.c,v 1.9 2004/10/17 19:33:32 stefanf Exp $");
 
 #include <sys/fcntl.h>
 
diff --git a/usr.sbin/rpc.ypupdated/ypupdate b/usr.sbin/rpc.ypupdated/ypupdate
index 4a26f4b6d72b..c779bb70bfe9 100755
--- a/usr.sbin/rpc.ypupdated/ypupdate
+++ b/usr.sbin/rpc.ypupdated/ypupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdate,v 1.2 1999/08/28 01:19:44 peter Exp $
 #
 
 LOG=yes
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_extern.h b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
index 2cacb9511e1f..976c75efd2c7 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_extern.h
+++ b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_extern.h,v 1.4 2002/02/15 00:46:32 des Exp $
  */
 
 #include <db.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index c13af7df4340..adb5057fbbaa 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_main.c,v 1.10 2004/05/24 12:28:27 stefanf Exp $");
 
 #include "ypupdate_prot.h"
 #include <stdio.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index c9a50dd36e0c..99436f8ef60a 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_server.c,v 1.7 2003/05/03 21:06:40 obrien Exp $");
 
 #include <stdio.h>
 #include <rpc/rpc.h>
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index 70729b12e67d..11dac4f809aa 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypxfrd/Makefile,v 1.11 2001/07/20 06:20:18 obrien Exp $
 
 .PATH: ${.CURDIR}/../../usr.sbin/ypserv
 
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index c8b0f4d22c1e..2d4c3725196c 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.16 2005/02/13 22:25:32 ru Exp $
 .\"
 .Dd June 2, 1996
 .Dt RPC.YPXFRD 8
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
index 5aba934a6ec4..59d497c844c6 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h,v 1.5 2002/02/06 13:30:28 des Exp $
  */
 
 #ifndef MAX_CHILDREN
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 8fa3e2205b43..4407ccb0c12a 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_main.c,v 1.14 2004/05/24 12:28:27 stefanf Exp $");
 
 #include "ypxfrd.h"
 #include <err.h>
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index 5f60712e9fef..4463379fc039 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_server.c,v 1.11 2003/05/03 21:06:40 obrien Exp $");
 
 #include "ypxfrd.h"
 
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index f597ce213096..ddfde0882dd2 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.5 2003/04/04 17:49:18 obrien Exp $
 
 LIBCDIR=        ${.CURDIR}/../../lib/libc
 LIBCRPCDIR=     ${LIBCDIR}/rpc
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c
index 192c9cac6255..fb15e9d7f825 100644
--- a/usr.sbin/rpcbind/check_bound.c
+++ b/usr.sbin/rpcbind/check_bound.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: check_bound.c,v 1.2 2000/06/22 08:09:26 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/check_bound.c,v 1.4 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c
index d74b369d180a..3957d763aa02 100644
--- a/usr.sbin/rpcbind/pmap_svc.c
+++ b/usr.sbin/rpcbind/pmap_svc.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: pmap_svc.c,v 1.2 2000/10/20 11:49:40 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/pmap_svc.c,v 1.4 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcb_stat.c b/usr.sbin/rpcbind/rpcb_stat.c
index b10ed508b0bd..c8080d0f76f6 100644
--- a/usr.sbin/rpcbind/rpcb_stat.c
+++ b/usr.sbin/rpcbind/rpcb_stat.c
@@ -1,6 +1,6 @@
 /*
  * $NetBSD: rpcb_stat.c,v 1.2 2000/07/04 20:27:40 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpcbind/rpcb_stat.c,v 1.4 2003/10/29 09:29:23 mbr Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcb_svc.c b/usr.sbin/rpcbind/rpcb_svc.c
index dc3cf05f27f5..5e7e57615b30 100644
--- a/usr.sbin/rpcbind/rpcb_svc.c
+++ b/usr.sbin/rpcbind/rpcb_svc.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcb_svc.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcb_svc.c,v 1.2 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c
index 8e2ed102b428..a47c4b479c72 100644
--- a/usr.sbin/rpcbind/rpcb_svc_4.c
+++ b/usr.sbin/rpcbind/rpcb_svc_4.c
@@ -1,6 +1,6 @@
 /*
  * $NetBSD: rpcb_svc_4.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpcbind/rpcb_svc_4.c,v 1.4 2002/10/07 02:56:59 alfred Exp $
  */
 
 /*
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index 0a72b662e43c..9c18a3f95500 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcb_svc_com.c,v 1.9 2002/11/08 00:16:39 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcb_svc_com.c,v 1.11 2003/10/29 09:30:37 mbr Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcbind.8 b/usr.sbin/rpcbind/rpcbind.8
index 923a0e2220cf..0ce0f36076d0 100644
--- a/usr.sbin/rpcbind/rpcbind.8
+++ b/usr.sbin/rpcbind/rpcbind.8
@@ -1,7 +1,7 @@
 .\" @(#)rpcbind.1m 1.19 92/09/14 SMI; from SVr4
 .\" Copyright 1989 AT&T
 .\" Copyright 1991 Sun Microsystems, Inc.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpcbind/rpcbind.8,v 1.7 2005/01/18 20:02:43 ru Exp $
 .Dd November 7, 2004
 .Dt RPCBIND 8
 .Os
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index 46370ec8cd5c..c0b4ad9fba61 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcbind.c,v 1.3 2002/11/08 00:16:40 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcbind.c,v 1.14 2004/11/07 04:32:51 dd Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h
index 2d52be359469..594bb20a3f2f 100644
--- a/usr.sbin/rpcbind/rpcbind.h
+++ b/usr.sbin/rpcbind/rpcbind.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcbind.h,v 1.1 2000/06/03 00:47:21 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcbind.h,v 1.2 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/security.c b/usr.sbin/rpcbind/security.c
index 8657247f60ac..3be6e35cbf9d 100644
--- a/usr.sbin/rpcbind/security.c
+++ b/usr.sbin/rpcbind/security.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: security.c,v 1.5 2000/06/08 09:01:05 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/security.c,v 1.6 2002/12/16 22:24:26 mbr Exp $ */
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index 4137ce2f003f..0e7ac5e56f81 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -1,6 +1,6 @@
 /*
  * $NetBSD: util.c,v 1.4 2000/08/03 00:04:30 fvdl Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpcbind/util.c,v 1.5 2002/10/07 02:56:59 alfred Exp $
  */
 
 /*-
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index 1962e1c422d7..fc2260b5f5e4 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -35,7 +35,7 @@
 
 /*
  * #ident	"@(#)warmstart.c	1.7	93/07/05 SMI"
- * $FreeBSD$/
+ * $FreeBSD: src/usr.sbin/rpcbind/warmstart.c,v 1.3 2003/01/01 18:49:03 schweikh Exp $/
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index c85911e09dfc..b5e244adb7b8 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rrenumd/Makefile,v 1.8 2004/06/21 16:10:00 phk Exp $
 
 PROG=	rrenumd
 MAN=	rrenumd.conf.5 rrenumd.8
diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l
index 6ad995341670..8fca588607d4 100644
--- a/usr.sbin/rrenumd/lexer.l
+++ b/usr.sbin/rrenumd/lexer.l
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/lexer.l,v 1.3 2001/06/11 12:39:20 ume Exp $
  */
 
 %{
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index d7c15abeb74f..e3b92754357a 100644
--- a/usr.sbin/rrenumd/parser.y
+++ b/usr.sbin/rrenumd/parser.y
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/parser.y,v 1.4 2002/10/27 17:46:53 wollman Exp $
  */
 
 %{
diff --git a/usr.sbin/rrenumd/rrenumd.8 b/usr.sbin/rrenumd/rrenumd.8
index 887c0e6934c3..0a7542fd2b39 100644
--- a/usr.sbin/rrenumd/rrenumd.8
+++ b/usr.sbin/rrenumd/rrenumd.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rrenumd/rrenumd.8,v 1.8 2005/02/09 18:04:42 ru Exp $
 .\"
 .Dd September 7, 1998
 .Dt RRENUMD 8
diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c
index 2f863d658539..d9c3d6a85f0b 100644
--- a/usr.sbin/rrenumd/rrenumd.c
+++ b/usr.sbin/rrenumd/rrenumd.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/rrenumd.c,v 1.8 2004/10/02 16:42:33 stefanf Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5
index 9ce2306cc51f..ba550d53a49b 100644
--- a/usr.sbin/rrenumd/rrenumd.conf.5
+++ b/usr.sbin/rrenumd/rrenumd.conf.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rrenumd/rrenumd.conf.5,v 1.19 2005/02/15 09:27:00 ru Exp $
 .\"
 .Dd November 5, 1998
 .Dt RRENUMD.CONF 5
diff --git a/usr.sbin/rrenumd/rrenumd.h b/usr.sbin/rrenumd/rrenumd.h
index df0280b2591e..fa3a9ce660b6 100644
--- a/usr.sbin/rrenumd/rrenumd.h
+++ b/usr.sbin/rrenumd/rrenumd.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/rrenumd.h,v 1.3 2001/06/11 12:39:21 ume Exp $
  */
 
 struct dst_list {
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index 7fa20987e59c..ed19691ac197 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rtadvd/Makefile,v 1.9 2004/06/21 16:09:29 phk Exp $
 
 PROG=	rtadvd
 MAN=	rtadvd.conf.5 rtadvd.8
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index a6c5f80319a4..dea3542e76b9 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/advcap.c,v 1.11 2004/08/07 04:28:54 imp Exp $	*/
 /*	$KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 372387130c42..b746055ec1f7 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/advcap.h,v 1.5 2003/08/11 15:46:37 ume Exp $	*/
 /*	$KAME: advcap.h,v 1.5 2003/06/09 05:40:54 t-momose Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 09e4eac659b5..1e21e2884607 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/config.c,v 1.24 2004/10/22 07:31:12 suz Exp $	*/
 /*	$KAME: config.c,v 1.84 2003/08/05 12:34:23 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index aeb1c2c9d457..ae4e86e661ae 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/config.h,v 1.6 2003/08/15 19:13:53 ume Exp $	*/
 /*	$KAME: config.h,v 1.8 2003/06/17 08:26:22 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c
index 7b9a2748d6ca..4c67ff884c01 100644
--- a/usr.sbin/rtadvd/dump.c
+++ b/usr.sbin/rtadvd/dump.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/dump.c,v 1.12 2003/08/15 19:13:53 ume Exp $	*/
 /*	$KAME: dump.c,v 1.32 2003/05/19 09:46:50 keiichi Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h
index cc3b472e4750..8defe6041998 100644
--- a/usr.sbin/rtadvd/dump.h
+++ b/usr.sbin/rtadvd/dump.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/dump.h,v 1.3 2001/06/11 12:39:22 ume Exp $	*/
 /*	$KAME: dump.h,v 1.1 2000/05/23 11:31:26 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 07d9e1f74b2c..f5a3e96c4af4 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/if.c,v 1.10 2003/09/20 09:41:13 suz Exp $	*/
 /*	$KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 07bb6eeb4b97..da7a887f0f14 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/if.h,v 1.5 2003/08/11 15:51:54 ume Exp $	*/
 /*	$KAME: if.h,v 1.10 2003/02/24 11:29:10 ono Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/pathnames.h b/usr.sbin/rtadvd/pathnames.h
index 3afee55fcc72..126c0cdc4d2a 100644
--- a/usr.sbin/rtadvd/pathnames.h
+++ b/usr.sbin/rtadvd/pathnames.h
@@ -1,4 +1,4 @@
 /*	$KAME: pathnames.h,v 1.2 2000/05/16 13:34:13 itojun Exp $	*/
-/* 	$FreeBSD$	*/
+/* 	$FreeBSD: src/usr.sbin/rtadvd/pathnames.h,v 1.5 2001/06/11 12:39:22 ume Exp $	*/
 
 #define _PATH_RTADVDCONF "/etc/rtadvd.conf"
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index 14a8ab9bdcc4..36e9a9301150 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rrenum.c,v 1.9 2004/03/10 08:46:39 bde Exp $	*/
 /*	$KAME: rrenum.c,v 1.12 2002/06/10 19:59:47 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index ce94015c2dcf..2109a85eb945 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rrenum.h,v 1.4 2001/06/11 12:39:22 ume Exp $	*/
 /*	$KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index d5c7061c5b92..d849254fc4c1 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtadvd/rtadvd.8,v 1.15 2005/02/09 18:04:42 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTADVD 8
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 8a5092e825f6..6ea9b54c57bd 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.c,v 1.23 2003/08/15 19:13:53 ume Exp $	*/
 /*	$KAME: rtadvd.c,v 1.82 2003/08/05 12:34:23 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/rtadvd.conf b/usr.sbin/rtadvd/rtadvd.conf
index 33ab7f3e46bc..bb0751f772af 100644
--- a/usr.sbin/rtadvd/rtadvd.conf
+++ b/usr.sbin/rtadvd/rtadvd.conf
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.conf,v 1.4 2003/08/15 19:13:53 ume Exp $
 #	$KAME: rtadvd.conf,v 1.13 2003/06/25 03:45:21 itojun Exp $
 #
 # Note: All of the following parameters have default values defined
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index dcc73cce95cf..e29dccfc5ee2 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtadvd/rtadvd.conf.5,v 1.15.2.1 2005/09/24 01:59:39 keramida Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTADVD.CONF 5
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index b1c505dd75aa..8b6041997c62 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.h,v 1.9 2003/08/15 19:13:53 ume Exp $	*/
 /*	$KAME: rtadvd.h,v 1.26 2003/08/05 12:34:23 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index 238bd8d5b722..c3d3a3acf8ed 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/timer.c,v 1.9 2004/10/22 07:31:12 suz Exp $	*/
 /*	$KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index d435bde5ab18..4bd30bef5f31 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/timer.h,v 1.6 2003/08/08 16:56:01 ume Exp $	*/
 /*	$KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $	*/
 
 /*
diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile
index ebc7bd1a37cc..37db3b4b32b8 100644
--- a/usr.sbin/rtprio/Makefile
+++ b/usr.sbin/rtprio/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rtprio/Makefile,v 1.8 2001/03/26 14:41:52 ru Exp $
 
 PROG=	rtprio
 LINKS=  ${BINDIR}/rtprio ${BINDIR}/idprio
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index 3141fba384e3..863768ba0c8b 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.29 2005/01/18 20:02:43 ru Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index 245f714fe9fe..1e4dccc80467 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rtprio/rtprio.c,v 1.10 2003/07/06 12:44:10 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/rtprio.h>
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 6ae47e99b105..dc0f878258c0 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rtsold/Makefile,v 1.11 2003/08/14 18:43:57 ume Exp $
 
 PROG=	rtsold
 MAN=	rtsold.8
diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index bdc8ec3b375d..62a0060c4944 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/dump.c,v 1.9 2004/01/14 17:16:19 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index 23e4e6fa02b3..89c9f8724cde 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/if.c,v 1.14 2004/01/14 17:42:03 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index b1cbc7985a41..ec4bb47330b2 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/probe.c,v 1.11 2004/01/14 17:16:19 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c
index 09d6774be79b..8f8f9ff5332f 100644
--- a/usr.sbin/rtsold/rtsock.c
+++ b/usr.sbin/rtsold/rtsock.c
@@ -1,5 +1,5 @@
 /*	$KAME: rtsock.c,v 1.3 2000/10/10 08:46:45 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtsold/rtsock.c,v 1.4 2004/03/17 20:10:59 ru Exp $	*/
 
 /*
  * Copyright (C) 2000 WIDE Project.
diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c
index dd9f4a1c8bdd..0d18668e9e99 100644
--- a/usr.sbin/rtsold/rtsol.c
+++ b/usr.sbin/rtsold/rtsol.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/rtsol.c,v 1.11 2004/01/14 17:16:19 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index 58926dd824bb..92f3ada02b00 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtsold/rtsold.8,v 1.15 2005/02/09 18:04:42 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTSOLD 8
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 7e73f384ef9d..28bda616014d 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/rtsold.c,v 1.21 2005/06/09 09:28:35 suz Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index e25ed955e98f..7ad09ebc3895 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/rtsold.h,v 1.8 2004/01/14 17:42:03 ume Exp $
  */
 
 struct ifinfo {
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index def0e6e14591..c20fd9b4ec8b 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rwhod/Makefile,v 1.7 2003/04/04 17:49:19 obrien Exp $
 
 PROG=	rwhod
 MAN=	rwhod.8
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 642eeebcee08..7fb5dabc90e2 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwhod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.23 2005/02/13 22:25:32 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 96fd9ec42e58..70e9199dfa38 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rwhod/rwhod.c,v 1.23 2005/06/03 17:38:33 ssouhlal Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 994e0dd3bd0d..14b50ed9f994 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sa/Makefile,v 1.10 2005/02/10 07:07:32 delphij Exp $
 
 PROG=	sa
 MAN=	sa.8
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index bc5f199e997e..f77282b5958f 100644
--- a/usr.sbin/sa/extern.h
+++ b/usr.sbin/sa/extern.h
@@ -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/usr.sbin/sa/extern.h,v 1.5 2002/07/11 22:11:20 alfred Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index 1796c9c0872d..9996a8d5831e 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -36,7 +36,7 @@ static const char copyright[] =
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sa/main.c,v 1.16 2005/02/10 12:43:16 delphij Exp $");
 
 /*
  * sa:	system accounting
diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h
index 7a7edf68caf6..8cb7f44ad8a8 100644
--- a/usr.sbin/sa/pathnames.h
+++ b/usr.sbin/sa/pathnames.h
@@ -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/usr.sbin/sa/pathnames.h,v 1.4 1999/08/28 01:19:52 peter Exp $
  */
 
 #define	_PATH_ACCT	"/var/account/acct"
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index 93dc24cf70e8..d038cca1ae58 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sa/pdb.c,v 1.11 2005/02/10 12:43:16 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/acct.h>
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index c122098110d2..c652509fa7d6 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.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/usr.sbin/sa/sa.8,v 1.19 2005/02/13 23:45:53 ru Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 991fc906b7ad..c3c33fca46b8 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sa/usrdb.c,v 1.14 2005/02/10 12:43:16 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index b5874d33f211..40c0b054108f 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.51.2.1 2005/08/20 01:39:08 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile
index 34b979bdf138..fd94c8e0a4fd 100644
--- a/usr.sbin/setfmac/Makefile
+++ b/usr.sbin/setfmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/setfmac/Makefile,v 1.7 2005/01/27 14:52:47 delphij Exp $
 
 PROG=   setfmac
 LINKS=	${BINDIR}/setfmac ${BINDIR}/setfsmac
diff --git a/usr.sbin/setfmac/setfmac.8 b/usr.sbin/setfmac/setfmac.8
index b541a4afe9e3..25e062bf4df5 100644
--- a/usr.sbin/setfmac/setfmac.8
+++ b/usr.sbin/setfmac/setfmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/setfmac/setfmac.8,v 1.10 2004/02/18 05:40:15 rwatson Exp $
 .Dd February 17, 2004
 .Dt SETFMAC 8
 .Os
diff --git a/usr.sbin/setfmac/setfmac.c b/usr.sbin/setfmac/setfmac.c
index f382cb272dd3..a305b4056866 100644
--- a/usr.sbin/setfmac/setfmac.c
+++ b/usr.sbin/setfmac/setfmac.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/setfmac/setfmac.c,v 1.8 2005/01/27 14:44:39 delphij Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/setfmac/setfsmac.8 b/usr.sbin/setfmac/setfsmac.8
index 7d4150f94476..fbc0d94e76a5 100644
--- a/usr.sbin/setfmac/setfsmac.8
+++ b/usr.sbin/setfmac/setfsmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/setfmac/setfsmac.8,v 1.6 2005/01/18 20:02:43 ru Exp $
 .\"
 .Dd February 17, 2004
 .Os
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index 91977e02e630..4bb7728ec6c6 100644
--- a/usr.sbin/setkey/Makefile
+++ b/usr.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/usr.sbin/setkey/Makefile,v 1.11 2003/11/05 09:47:54 ume Exp $
 
 PROG=	setkey
 MAN=	setkey.8
diff --git a/usr.sbin/setkey/parse.y b/usr.sbin/setkey/parse.y
index d6bb8c4fbd13..45ccd45213d6 100644
--- a/usr.sbin/setkey/parse.y
+++ b/usr.sbin/setkey/parse.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/setkey/parse.y,v 1.7 2004/05/13 15:46:28 ume Exp $	*/
 /*	$KAME: parse.y,v 1.82 2004/04/15 08:03:57 sakane Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/sample.cf b/usr.sbin/setkey/sample.cf
index c534fa10f1c4..3f06fa946ad6 100644
--- a/usr.sbin/setkey/sample.cf
+++ b/usr.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/usr.sbin/setkey/sample.cf,v 1.4 2003/11/05 09:47:54 ume Exp $
 
 # There are sample scripts for IPsec configuration by manual keying.
 # A security association is uniquely identified by a triple consisting
diff --git a/usr.sbin/setkey/scriptdump.pl b/usr.sbin/setkey/scriptdump.pl
index a1d8adb207bc..fd60c8515f4c 100644
--- a/usr.sbin/setkey/scriptdump.pl
+++ b/usr.sbin/setkey/scriptdump.pl
@@ -1,5 +1,5 @@
 #! @LOCALPREFIX@/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/setkey/scriptdump.pl,v 1.4 2001/08/06 19:40:01 ume Exp $
 
 if ($< != 0) {
 	print STDERR "must be root to invoke this\n";
diff --git a/usr.sbin/setkey/setkey.8 b/usr.sbin/setkey/setkey.8
index 36537c8670f2..937155d44185 100644
--- a/usr.sbin/setkey/setkey.8
+++ b/usr.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/usr.sbin/setkey/setkey.8,v 1.34 2005/02/09 18:04:42 ru Exp $
 .\"
 .Dd November 20, 2000
 .Dt SETKEY 8
diff --git a/usr.sbin/setkey/setkey.c b/usr.sbin/setkey/setkey.c
index 5bdd6df113e0..aedfa2e87b76 100644
--- a/usr.sbin/setkey/setkey.c
+++ b/usr.sbin/setkey/setkey.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/setkey/setkey.c,v 1.6 2003/11/05 09:47:54 ume Exp $	*/
 /*	$KAME: setkey.c,v 1.28 2003/06/27 07:15:45 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/test-pfkey.c b/usr.sbin/setkey/test-pfkey.c
index b1fb238c5a41..30b3cad2ee36 100644
--- a/usr.sbin/setkey/test-pfkey.c
+++ b/usr.sbin/setkey/test-pfkey.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/setkey/test-pfkey.c,v 1.2 2000/07/04 16:22:05 itojun Exp $	*/
 /*	$KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/test-policy.c b/usr.sbin/setkey/test-policy.c
index 27cd478fc939..0c6cfd0cb0a1 100644
--- a/usr.sbin/setkey/test-policy.c
+++ b/usr.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/usr.sbin/setkey/test-policy.c,v 1.1 2000/01/06 12:40:53 shin Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/setkey/token.l b/usr.sbin/setkey/token.l
index 74c1e17cbcef..4fdd46d469e2 100644
--- a/usr.sbin/setkey/token.l
+++ b/usr.sbin/setkey/token.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/setkey/token.l,v 1.11 2004/03/11 11:41:54 bde Exp $	*/
 /*	$KAME: token.l,v 1.43 2003/07/25 09:35:28 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/setkey/vchar.h b/usr.sbin/setkey/vchar.h
index f3251c7bfed3..16d5e544e3f2 100644
--- a/usr.sbin/setkey/vchar.h
+++ b/usr.sbin/setkey/vchar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/setkey/vchar.h,v 1.2 2000/07/04 16:22:05 itojun Exp $	*/
 /*	$KAME: vchar.h,v 1.2 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/setpmac/Makefile b/usr.sbin/setpmac/Makefile
index ae7ee026e9fd..3f63f477307d 100644
--- a/usr.sbin/setpmac/Makefile
+++ b/usr.sbin/setpmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/setpmac/Makefile,v 1.5 2005/01/27 14:52:47 delphij Exp $
 
 PROG=   setpmac
 MAN=	setpmac.8
diff --git a/usr.sbin/setpmac/setpmac.8 b/usr.sbin/setpmac/setpmac.8
index e84a8bc63228..76c82484f677 100644
--- a/usr.sbin/setpmac/setpmac.8
+++ b/usr.sbin/setpmac/setpmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/setpmac/setpmac.8,v 1.5 2004/07/02 23:12:56 ru Exp $
 .\"
 .Dd January 14, 2003
 .Os
diff --git a/usr.sbin/setpmac/setpmac.c b/usr.sbin/setpmac/setpmac.c
index bc096bbbc56a..f9198ab5bb90 100644
--- a/usr.sbin/setpmac/setpmac.c
+++ b/usr.sbin/setpmac/setpmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/setpmac/setpmac.c,v 1.2 2005/01/27 14:44:39 delphij Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/sicontrol/Makefile b/usr.sbin/sicontrol/Makefile
index 2f3a8883ba41..a3b73663dd22 100644
--- a/usr.sbin/sicontrol/Makefile
+++ b/usr.sbin/sicontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sicontrol/Makefile,v 1.7 2001/07/20 06:20:19 obrien Exp $
 
 PROG=	sicontrol
 MAN=	sicontrol.8
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index 5040d8ad093c..ef5c9409253e 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.20 2004/07/02 23:12:57 ru Exp $
 .\"
 .Dd September 26, 1995
 .Dt SICONTROL 8
diff --git a/usr.sbin/sicontrol/sicontrol.c b/usr.sbin/sicontrol/sicontrol.c
index 84e9782abc44..c093a94a35c1 100644
--- a/usr.sbin/sicontrol/sicontrol.c
+++ b/usr.sbin/sicontrol/sicontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sicontrol/sicontrol.c,v 1.15 2004/10/02 18:51:37 phk Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index 0236f1e8f453..954463383e5e 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sliplogin/Makefile,v 1.8 2004/11/03 18:01:21 ru Exp $
 
 PROG=	sliplogin
 MAN=	sliplogin.8
diff --git a/usr.sbin/sliplogin/pathnames.h b/usr.sbin/sliplogin/pathnames.h
index e318f92a3ed8..17c154ca3b31 100644
--- a/usr.sbin/sliplogin/pathnames.h
+++ b/usr.sbin/sliplogin/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)pathnames.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/sliplogin/pathnames.h,v 1.4 2004/08/07 04:28:55 imp Exp $
  */
 
 #ifndef COMPAT
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index 1f6960ba89bf..1cb1dd397004 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sliplogin.8	8.2 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.24 2005/01/18 20:02:43 ru Exp $
 .\"
 .Dd January 5, 1994
 .Dt SLIPLOGIN 8
diff --git a/usr.sbin/sliplogin/sliplogin.c b/usr.sbin/sliplogin/sliplogin.c
index dafdfd4983b9..a72015901c61 100644
--- a/usr.sbin/sliplogin/sliplogin.c
+++ b/usr.sbin/sliplogin/sliplogin.c
@@ -35,7 +35,7 @@ static char copyright[] =
 
 #ifndef lint
 static char sccsid[] = "@(#)sliplogin.c	8.2 (Berkeley) 2/1/94";
-static char rscid[] = "@(#)$FreeBSD$";
+static char rscid[] = "@(#)$FreeBSD: src/usr.sbin/sliplogin/sliplogin.c,v 1.16 2005/04/09 15:00:51 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile
index 650e2216aef0..99afcb44e530 100644
--- a/usr.sbin/slstat/Makefile
+++ b/usr.sbin/slstat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 4/23/91
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/slstat/Makefile,v 1.11 2003/04/04 17:49:19 obrien Exp $
 
 PROG=	slstat
 MAN=	slstat.8
diff --git a/usr.sbin/slstat/slstat.8 b/usr.sbin/slstat/slstat.8
index fa03c4df9171..195db10fbf09 100644
--- a/usr.sbin/slstat/slstat.8
+++ b/usr.sbin/slstat/slstat.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)slstat.8	6.8 (Berkeley) 6/20/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.17 2004/08/07 04:28:55 imp Exp $
 .\"
 .Dd October 11, 1996
 .Dt SLSTAT 8
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c
index ff017f4145e8..1bf6f2724830 100644
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/slstat/slstat.c,v 1.19 2005/06/10 16:49:24 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/smbmsg/Makefile b/usr.sbin/smbmsg/Makefile
index a581b2cd35d2..60fae0502e5c 100644
--- a/usr.sbin/smbmsg/Makefile
+++ b/usr.sbin/smbmsg/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/smbmsg/Makefile,v 1.2 2004/09/26 09:24:15 ru Exp $
 
 PROG=	smbmsg
 MAN=	smbmsg.8
diff --git a/usr.sbin/smbmsg/pathnames.h b/usr.sbin/smbmsg/pathnames.h
index aff7335fac66..f805ae9252b8 100644
--- a/usr.sbin/smbmsg/pathnames.h
+++ b/usr.sbin/smbmsg/pathnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/smbmsg/pathnames.h,v 1.1.1.1 2004/05/17 10:56:04 joerg Exp $
  */
 
 #define PATH_DEFAULTSMBDEV	"/dev/smb0"
diff --git a/usr.sbin/smbmsg/smbmsg.8 b/usr.sbin/smbmsg/smbmsg.8
index 0a57b3e4f158..84889f8985c7 100644
--- a/usr.sbin/smbmsg/smbmsg.8
+++ b/usr.sbin/smbmsg/smbmsg.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/smbmsg/smbmsg.8,v 1.4 2005/01/18 20:02:44 ru Exp $
 .\"
 .Dd May 16, 2004
 .Dt SMBMSG 8
diff --git a/usr.sbin/smbmsg/smbmsg.c b/usr.sbin/smbmsg/smbmsg.c
index 425b782d2d33..31c472d59dec 100644
--- a/usr.sbin/smbmsg/smbmsg.c
+++ b/usr.sbin/smbmsg/smbmsg.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/smbmsg/smbmsg.c,v 1.3 2004/05/27 13:31:16 joerg Exp $
  */
 
 /*
diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile
index 8e9245aa753a..ebacc4d5b548 100644
--- a/usr.sbin/spkrtest/Makefile
+++ b/usr.sbin/spkrtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spkrtest/Makefile,v 1.11 2002/05/16 18:51:57 markm Exp $
 
 SCRIPTS=spkrtest.sh
 MAN=	spkrtest.8
diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8
index 58eced5be0de..750eb06af851 100644
--- a/usr.sbin/spkrtest/spkrtest.8
+++ b/usr.sbin/spkrtest/spkrtest.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/spkrtest/spkrtest.8,v 1.12 2002/07/14 14:46:16 charnier Exp $
 .Dd July 23, 1995
 .Dt SPKRTEST 8
 .Os
diff --git a/usr.sbin/spkrtest/spkrtest.sh b/usr.sbin/spkrtest/spkrtest.sh
index c682b03f43ac..c3bc7ee7006e 100644
--- a/usr.sbin/spkrtest/spkrtest.sh
+++ b/usr.sbin/spkrtest/spkrtest.sh
@@ -29,7 +29,7 @@
 #
 # Inspired on spkrtest.pl, rewritten from scratch to remove perl dependency
 # $VER: spkrtest 0.3 (9.5.2002) Riccardo "VIC" Torrini <riccardo@torrini.org>
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spkrtest/spkrtest.sh,v 1.3 2002/05/16 18:51:57 markm Exp $
 #
 
 cleanExit() {
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index c2515e0c117e..1a5bb10fb788 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spray/Makefile,v 1.10 2001/07/20 06:20:19 obrien Exp $
 
 PROG=	spray
 MAN=	spray.8
diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8
index e10704886771..c1d95a074844 100644
--- a/usr.sbin/spray/spray.8
+++ b/usr.sbin/spray/spray.8
@@ -21,7 +21,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/usr.sbin/spray/spray.8,v 1.10 2002/07/14 14:46:18 charnier Exp $
 .\"
 .Dd July 10, 1995
 .Dt SPRAY 8
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index 0e072e20ab27..b294c9c0d344 100644
--- a/usr.sbin/spray/spray.c
+++ b/usr.sbin/spray/spray.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/spray/spray.c,v 1.10 2002/07/15 18:53:52 alfred Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index cb180932240c..13767c7cc0d1 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.134.2.1 2005/10/07 15:56:30 nyan Exp $
 
 .if ${MACHINE_ARCH} != "ia64"
 _wizard=	wizard.c
diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c
index 3e37b8ec0a71..ea879a31e586 100644
--- a/usr.sbin/sysinstall/anonFTP.c
+++ b/usr.sbin/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/anonFTP.c,v 1.35 2004/11/16 19:06:42 jhb Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 75151f430588..2d45e279c50c 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/cdrom.c,v 1.54 2005/03/02 22:27:21 jhb Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/command.c b/usr.sbin/sysinstall/command.c
index 33ebc352544a..35938a144cc5 100644
--- a/usr.sbin/sysinstall/command.c
+++ b/usr.sbin/sysinstall/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/command.c,v 1.20 2002/11/01 02:05:05 kuriyama Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index d41c4ea2b42c..278c8682eb65 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.233.2.1 2005/07/28 01:18:19 grehan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index 68d730552a2c..28722c0128f2 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/devices.c,v 1.160.2.1 2005/07/28 01:17:12 grehan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dhcp.c b/usr.sbin/sysinstall/dhcp.c
index fa35580e1235..91ff5706b687 100644
--- a/usr.sbin/sysinstall/dhcp.c
+++ b/usr.sbin/sysinstall/dhcp.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dhcp.c,v 1.5 2004/03/11 11:58:15 bde Exp $
  *
  * Copyright (c) 1999
  *	C. Stone.  All rights reserved.
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index a60ced521f87..be2e12c0ed67 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/disks.c,v 1.154 2005/03/30 13:03:33 nyan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 4896b235c146..15b57c602e82 100644
--- a/usr.sbin/sysinstall/dispatch.c
+++ b/usr.sbin/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dispatch.c,v 1.47 2004/08/30 21:03:09 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 649968d54bce..14e1f4c889ea 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.239.2.1 2005/08/30 20:01:32 murray Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 3d052b960c7f..d5331ee9888d 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$  */
+/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.65 2005/06/16 18:16:13 ru Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index d89f8ce2265c..013aaa6f4ddd 100644
--- a/usr.sbin/sysinstall/dmenu.c
+++ b/usr.sbin/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dmenu.c,v 1.45 2003/09/17 03:45:30 marcel Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c
index 5294972f0922..22935d515ece 100644
--- a/usr.sbin/sysinstall/doc.c
+++ b/usr.sbin/sysinstall/doc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/doc.c,v 1.32 2004/01/02 09:19:13 obrien Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/dos.c b/usr.sbin/sysinstall/dos.c
index 564e33ff4374..0d812ca913fa 100644
--- a/usr.sbin/sysinstall/dos.c
+++ b/usr.sbin/sysinstall/dos.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dos.c,v 1.25 2001/06/01 12:16:08 ru Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c
index 0101bde3ce01..f9b4dc39b9a1 100644
--- a/usr.sbin/sysinstall/floppy.c
+++ b/usr.sbin/sysinstall/floppy.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/floppy.c,v 1.39 2004/08/15 13:00:07 nyan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/ftp.c b/usr.sbin/sysinstall/ftp.c
index c971b79c05aa..373759e7639c 100644
--- a/usr.sbin/sysinstall/ftp.c
+++ b/usr.sbin/sysinstall/ftp.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/ftp.c,v 1.45 2002/10/14 13:06:13 nyan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/globals.c b/usr.sbin/sysinstall/globals.c
index 892d8528bc8a..ea59cb209e75 100644
--- a/usr.sbin/sysinstall/globals.c
+++ b/usr.sbin/sysinstall/globals.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/globals.c,v 1.27 2004/08/07 01:19:54 marcel Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/http.c b/usr.sbin/sysinstall/http.c
index 19c826465e08..8d6732d30532 100644
--- a/usr.sbin/sysinstall/http.c
+++ b/usr.sbin/sysinstall/http.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/http.c,v 1.7 2002/11/01 02:05:05 kuriyama Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index 338f939f5fa6..7e2cbf60dd78 100644
--- a/usr.sbin/sysinstall/index.c
+++ b/usr.sbin/sysinstall/index.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/index.c,v 1.106 2005/07/02 22:34:22 dwhite Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 7c21abfefec9..92183768a3fb 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.363 2005/03/02 22:48:13 jhb Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/install.cfg b/usr.sbin/sysinstall/install.cfg
index fb7ad8859795..c000be04406f 100644
--- a/usr.sbin/sysinstall/install.cfg
+++ b/usr.sbin/sysinstall/install.cfg
@@ -2,7 +2,7 @@
 # crate.cdrom.com.
 # It is included here merely as a sort-of-documented example.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sysinstall/install.cfg,v 1.11 2001/09/06 10:04:27 murray Exp $
 
 # Turn on extra debugging.
 debug=yes
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index aa7ec88a9742..8eb124e8f45b 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/installUpgrade.c,v 1.84 2003/03/08 12:07:13 markm Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/keymap.c b/usr.sbin/sysinstall/keymap.c
index 3c53a0070a17..800230190a4a 100644
--- a/usr.sbin/sysinstall/keymap.c
+++ b/usr.sbin/sysinstall/keymap.c
@@ -21,7 +21,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/usr.sbin/sysinstall/keymap.c,v 1.6 2000/10/08 21:33:51 phk Exp $
  *
  */
 
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index c5d81af978bf..171eecc68ed8 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/label.c,v 1.148.8.1 2005/08/17 13:53:11 cperciva Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/list.h b/usr.sbin/sysinstall/list.h
index 8300173e0660..5bb51bea4ec1 100644
--- a/usr.sbin/sysinstall/list.h
+++ b/usr.sbin/sysinstall/list.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/list.h,v 1.2 1999/08/28 01:34:15 peter Exp $
  *
  * Copyright (c) 1997 FreeBSD, Inc.
  * All rights reserved.
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c
index 695754b074fc..c2ffe707b0ac 100644
--- a/usr.sbin/sysinstall/main.c
+++ b/usr.sbin/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/main.c,v 1.71 2003/08/20 06:27:21 imp Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index cbdc01c04ed4..52b9b64b6ca6 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/media.c,v 1.121 2003/02/27 03:57:17 jwd Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 015419944bb4..7c93b63d4c94 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.410.2.1 2005/08/25 00:42:26 rodrigc Exp $";
 #endif
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c
index 07cbc81751d1..25bd6ebbc3e7 100644
--- a/usr.sbin/sysinstall/misc.c
+++ b/usr.sbin/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/misc.c,v 1.43 2003/01/06 17:11:46 obrien Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/modules.c b/usr.sbin/sysinstall/modules.c
index 859994a26e89..167272418d5a 100644
--- a/usr.sbin/sysinstall/modules.c
+++ b/usr.sbin/sysinstall/modules.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/modules.c,v 1.7 2003/08/20 06:24:12 imp Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/mouse.c b/usr.sbin/sysinstall/mouse.c
index 574fd7235974..83166a7d7c1a 100644
--- a/usr.sbin/sysinstall/mouse.c
+++ b/usr.sbin/sysinstall/mouse.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/mouse.c,v 1.9 2000/05/11 23:43:12 murray Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 4625ce2f7752..7b38f3b06b5d 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/msg.c,v 1.59 2001/09/11 20:42:07 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/network.c b/usr.sbin/sysinstall/network.c
index c57ad3de90a6..44dc0e36681b 100644
--- a/usr.sbin/sysinstall/network.c
+++ b/usr.sbin/sysinstall/network.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/network.c,v 1.51 2002/11/01 02:05:05 kuriyama Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c
index 87788eaced6f..396e78981de3 100644
--- a/usr.sbin/sysinstall/nfs.c
+++ b/usr.sbin/sysinstall/nfs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/nfs.c,v 1.25 2003/10/19 13:37:12 des Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 8e3a7d96ac84..57b07e8ff3e0 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/options.c,v 1.81 2003/10/19 13:37:12 des Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index 7f23fc3cfdb7..d515444eadcd 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/package.c,v 1.103 2004/01/02 09:52:14 obrien Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/pccard.c b/usr.sbin/sysinstall/pccard.c
index 0ddfad8b3d07..fcdc31d1a33e 100644
--- a/usr.sbin/sysinstall/pccard.c
+++ b/usr.sbin/sysinstall/pccard.c
@@ -1,7 +1,7 @@
 /*
  * PC Card support for sysinstall
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/pccard.c,v 1.19 2003/08/20 06:27:21 imp Exp $
  *
  * Copyright (c) 1997-1999
  *	Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>.  All rights reserved.
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index ba65292ef8ed..906057a603af 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sysinstall/sysinstall.8,v 1.69.2.1 2005/10/09 03:48:42 delphij Exp $
 .\"
 .Dd June 14, 2005
 .Dt SYSINSTALL 8
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index b5d80226c7b3..69270a41fbe5 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.264.2.1 2005/10/07 15:56:30 nyan Exp $
  */
 
 #ifndef _SYSINSTALL_H_INCLUDE
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 00abb4ef4940..c31d0ce1957e 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/system.c,v 1.124.2.1 2005/08/17 13:32:29 kensmith Exp $
  *
  * Jordan Hubbard
  *
diff --git a/usr.sbin/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c
index fd73da568e85..d52d834a95cc 100644
--- a/usr.sbin/sysinstall/tape.c
+++ b/usr.sbin/sysinstall/tape.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/tape.c,v 1.24 2002/11/01 02:05:05 kuriyama Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index babe6ab16bee..facf572d4c2a 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/tcpip.c,v 1.132 2005/07/11 03:57:04 scottl Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c
index 1d8e047bc12a..c26b77324f47 100644
--- a/usr.sbin/sysinstall/termcap.c
+++ b/usr.sbin/sysinstall/termcap.c
@@ -10,7 +10,7 @@
  * software, nor does the author assume any responsibility for damages
  * incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/termcap.c,v 1.30 2001/09/22 18:07:47 murray Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/ttys.c b/usr.sbin/sysinstall/ttys.c
index 0de954cceb39..c34521dffc85 100644
--- a/usr.sbin/sysinstall/ttys.c
+++ b/usr.sbin/sysinstall/ttys.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/ttys.c,v 1.4 2001/09/22 23:17:37 murray Exp $
  *
  * Copyright (c) 2001
  *      Andrey A. Chernov.  All rights reserved.
diff --git a/usr.sbin/sysinstall/ufs.c b/usr.sbin/sysinstall/ufs.c
index c9515ae82b28..ce19099332bb 100644
--- a/usr.sbin/sysinstall/ufs.c
+++ b/usr.sbin/sysinstall/ufs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/ufs.c,v 1.15 1999/08/28 01:34:21 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/usb.c b/usr.sbin/sysinstall/usb.c
index 4eedbd555f89..d7935da97de2 100644
--- a/usr.sbin/sysinstall/usb.c
+++ b/usr.sbin/sysinstall/usb.c
@@ -1,7 +1,7 @@
 /*
  * USB support for sysinstall
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/usb.c,v 1.1 2000/05/12 03:01:17 jhb Exp $
  *
  * Copyright (c) 2000 John Baldwin <jhb@FreeBSD.org>.  All rights reserved.
  *
diff --git a/usr.sbin/sysinstall/user.c b/usr.sbin/sysinstall/user.c
index ecee440fe788..c68b8d1fd253 100644
--- a/usr.sbin/sysinstall/user.c
+++ b/usr.sbin/sysinstall/user.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/user.c,v 1.19 2004/03/11 11:58:16 bde Exp $
  *
  * Copyright (c) 1996
  *      Jörg Wunsch. All rights reserved.
diff --git a/usr.sbin/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c
index e86104fd100a..cf745c0f4086 100644
--- a/usr.sbin/sysinstall/variable.c
+++ b/usr.sbin/sysinstall/variable.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/variable.c,v 1.37 2004/03/11 11:58:16 bde Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c
index 98e0a5caf997..921096c6bdb5 100644
--- a/usr.sbin/sysinstall/wizard.c
+++ b/usr.sbin/sysinstall/wizard.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/wizard.c,v 1.23 2004/08/02 23:18:48 marcel Exp $
  *
  */
 
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 028fda554cbe..40acd55d4b57 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/syslogd/Makefile,v 1.12 2004/02/05 22:44:25 ru Exp $
 
 .PATH: ${.CURDIR}/../../usr.bin/wall
 
diff --git a/usr.sbin/syslogd/pathnames.h b/usr.sbin/syslogd/pathnames.h
index 24fbc4cfa0ad..43dce0e935f9 100644
--- a/usr.sbin/syslogd/pathnames.h
+++ b/usr.sbin/syslogd/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/syslogd/pathnames.h,v 1.2 2004/08/07 04:28:55 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index 7ba62301a60b..8593cb299ffd 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.39.2.1 2005/08/18 15:01:27 keramida Exp $
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index afb9f8ace487..ebccf1aa7b14 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.60 2005/04/13 03:19:41 hrs Exp $
 .\"
 .Dd April 13, 2005
 .Dt SYSLOGD 8
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index e1c4ab1cf506..265f37af03ea 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/syslogd/syslogd.c,v 1.144.2.1 2005/10/04 12:50:11 cognet Exp $");
 
 /*
  *  syslogd -- log system messages
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index a9436514b4e8..b2d5ea15ff66 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdchk/Makefile,v 1.11 2004/12/21 10:49:28 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
 
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index 2370e9c1081e..37753f56a705 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdmatch/Makefile,v 1.9 2004/12/21 10:49:28 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
 
diff --git a/usr.sbin/tcpdrop/Makefile b/usr.sbin/tcpdrop/Makefile
index 44766eb9a0a3..8ce26733c912 100644
--- a/usr.sbin/tcpdrop/Makefile
+++ b/usr.sbin/tcpdrop/Makefile
@@ -1,5 +1,5 @@
 # $OpenBSD: Makefile,v 1.1 2004/04/26 19:51:20 markus Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdrop/Makefile,v 1.1 2005/02/06 10:47:12 maxim Exp $
 
 PROG=	tcpdrop
 MAN=	tcpdrop.8
diff --git a/usr.sbin/tcpdrop/tcpdrop.8 b/usr.sbin/tcpdrop/tcpdrop.8
index 5fd3a43e9506..0f2cefcbf857 100644
--- a/usr.sbin/tcpdrop/tcpdrop.8
+++ b/usr.sbin/tcpdrop/tcpdrop.8
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/tcpdrop/tcpdrop.8,v 1.4.2.1 2005/07/17 15:03:36 brueffer Exp $
 .\"
 .Dd March 21, 2004
 .Dt TCPDROP 8
diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c
index 68ef0ef1604b..3ab686bc93c6 100644
--- a/usr.sbin/tcpdrop/tcpdrop.c
+++ b/usr.sbin/tcpdrop/tcpdrop.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/tcpdrop/tcpdrop.c,v 1.2 2005/02/14 07:37:51 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index c549530613bd..70549c3c14ef 100644
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	0.1 (RGrimes) 4/4/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/Makefile,v 1.2 2001/07/20 06:20:21 obrien Exp $
 
 SUBDIR=	tcpdump tcpslice
 
diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc
index 1e4d46f113a5..500683eb776a 100644
--- a/usr.sbin/tcpdump/Makefile.inc
+++ b/usr.sbin/tcpdump/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	5.1 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/Makefile.inc,v 1.3 2001/07/20 06:20:21 obrien Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 8cce9ccc6463..1ea51ca1f2ab 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.43 2005/07/11 04:14:42 sam Exp $
 
 TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
 .PATH: ${TCPDUMP_DISTDIR}
diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h
index 303768e66ecf..a2207fdbad26 100644
--- a/usr.sbin/tcpdump/tcpdump/config.h
+++ b/usr.sbin/tcpdump/tcpdump/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/tcpdump/tcpdump/config.h,v 1.7 2005/07/11 04:14:42 sam Exp $ */
 /* This is an edited copy of the config.h generated by configure. */
 
 /* config.h.  Generated by configure.  */
diff --git a/usr.sbin/tcpdump/tcpslice/Makefile b/usr.sbin/tcpdump/tcpslice/Makefile
index 2c444596a8ee..81e4d3ff7863 100644
--- a/usr.sbin/tcpdump/tcpslice/Makefile
+++ b/usr.sbin/tcpdump/tcpslice/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	0.1 (RWGrimes) 3/24/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/tcpslice/Makefile,v 1.13 2001/07/20 06:20:21 obrien Exp $
 
 TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
 
diff --git a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
index 249454e6f044..125ed61feab7 100644
--- a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
+++ b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
@@ -20,7 +20,7 @@
  */
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#)$FreeBSD$ (LBL)";
+    "@(#)$FreeBSD: src/usr.sbin/tcpdump/tcpslice/gwtm2secs.c,v 1.4 1999/08/28 05:11:32 peter Exp $ (LBL)";
 #endif
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/search.c b/usr.sbin/tcpdump/tcpslice/search.c
index a460ffab2f7e..bdd3fad81e7b 100644
--- a/usr.sbin/tcpdump/tcpslice/search.c
+++ b/usr.sbin/tcpdump/tcpslice/search.c
@@ -20,7 +20,7 @@
  */
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#)$FreeBSD$ (LBL)";
+    "@(#)$FreeBSD: src/usr.sbin/tcpdump/tcpslice/search.c,v 1.4 1999/08/28 05:11:32 peter Exp $ (LBL)";
 #endif
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1
index 2efecc743324..05fc60606781 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.1
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.1
@@ -17,7 +17,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.15 2004/07/02 23:12:58 ru Exp $
 .\"
 .Dd October 14, 1991
 .Dt TCPSLICE 1
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.c b/usr.sbin/tcpdump/tcpslice/tcpslice.c
index adca2f547a88..bd01f33f441d 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.c
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.c
@@ -27,7 +27,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.12 2002/01/19 23:20:02 dillon Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/util.c b/usr.sbin/tcpdump/tcpslice/util.c
index 8904352b798c..bb57a7e0a60d 100644
--- a/usr.sbin/tcpdump/tcpslice/util.c
+++ b/usr.sbin/tcpdump/tcpslice/util.c
@@ -21,7 +21,7 @@
 
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#) $FreeBSD$ (LBL)";
+    "@(#) $FreeBSD: src/usr.sbin/tcpdump/tcpslice/util.c,v 1.3 1999/08/28 05:11:32 peter Exp $ (LBL)";
 #endif
 
 #include "tcpslice.h"
diff --git a/usr.sbin/timed/Makefile b/usr.sbin/timed/Makefile
index 2f56510bca1c..aa6668c0d7dc 100644
--- a/usr.sbin/timed/Makefile
+++ b/usr.sbin/timed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/Makefile,v 1.2 2001/07/20 06:20:23 obrien Exp $
 
 SUBDIR=	timed timedc
 
diff --git a/usr.sbin/timed/SMM.doc/timed/Makefile b/usr.sbin/timed/SMM.doc/timed/Makefile
index 9afa6c60d4d4..050b9f732659 100644
--- a/usr.sbin/timed/SMM.doc/timed/Makefile
+++ b/usr.sbin/timed/SMM.doc/timed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/SMM.doc/timed/Makefile,v 1.2 2001/07/20 06:20:22 obrien Exp $
 
 DIR=	smm/12.timed
 SRCS=	timed.ms
diff --git a/usr.sbin/timed/SMM.doc/timed/timed.ms b/usr.sbin/timed/SMM.doc/timed/timed.ms
index 412399ae41b3..04e47ce25a89 100644
--- a/usr.sbin/timed/SMM.doc/timed/timed.ms
+++ b/usr.sbin/timed/SMM.doc/timed/timed.ms
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/timed/SMM.doc/timed/timed.ms,v 1.3 2002/12/30 21:18:15 schweikh Exp $
 .\"
 .\" Copyright (c) 1986, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/timed/SMM.doc/timedop/Makefile b/usr.sbin/timed/SMM.doc/timedop/Makefile
index 7d52a32220c1..3d09ba3d4e57 100644
--- a/usr.sbin/timed/SMM.doc/timedop/Makefile
+++ b/usr.sbin/timed/SMM.doc/timedop/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/SMM.doc/timedop/Makefile,v 1.2 2001/07/20 06:20:22 obrien Exp $
 
 DIR=	smm/11.timedop
 SRCS=	timed.ms
diff --git a/usr.sbin/timed/timed/CHANGES b/usr.sbin/timed/timed/CHANGES
index 424ead2a514a..6da2d785e2ae 100644
--- a/usr.sbin/timed/timed/CHANGES
+++ b/usr.sbin/timed/timed/CHANGES
@@ -1,5 +1,5 @@
 #	@(#)CHANGES	5.1 (Berkeley) 5/11/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/timed/CHANGES,v 1.2 2001/02/18 10:44:00 asmodai Exp $
 
 This new version is almost identical to the timed and timedc code
 that has been shipped for years by a workstation vendor.
diff --git a/usr.sbin/timed/timed/Makefile b/usr.sbin/timed/timed/Makefile
index 6f73824fbd74..1ad93386c90d 100644
--- a/usr.sbin/timed/timed/Makefile
+++ b/usr.sbin/timed/timed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/timed/Makefile,v 1.5 2001/07/20 06:20:23 obrien Exp $
 #
 # optional flags are: MEASURE TESTING DEBUG
 
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 8bde7438a556..1557b8a5f402 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acksend.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/acksend.c,v 1.4 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 038dd56bf8b5..8e7d842591d1 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)byteorder.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/byteorder.c,v 1.4 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index 79f1f5ab19fa..86395de59ff6 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)candidate.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/candidate.c,v 1.5 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 50a7da27161f..23c75a60cd85 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cksum.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/cksum.c,v 1.3 1999/08/28 01:20:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index c7204bd3aef4..33790660c018 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)correct.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/correct.c,v 1.7 2002/07/11 20:10:07 robert Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/globals.h b/usr.sbin/timed/timed/globals.h
index 6fe0bd1cc5cf..6806d92de00a 100644
--- a/usr.sbin/timed/timed/globals.h
+++ b/usr.sbin/timed/timed/globals.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)globals.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/timed/timed/globals.h,v 1.6 2001/11/20 07:13:39 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index 0713155a3f61..17a4f1abc126 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)master.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/master.c,v 1.9 2002/07/11 20:01:36 robert Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index 3856a34c6fae..bd5c7b9309d8 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)measure.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/measure.c,v 1.7 2001/11/20 07:13:40 jhb Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index cbbde581e2a3..42f15156ecf4 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)networkdelta.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/networkdelta.c,v 1.4 2000/05/19 08:26:17 kris Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/pathnames.h b/usr.sbin/timed/timed/pathnames.h
index e5fdcdefb828..6c8c47409d12 100644
--- a/usr.sbin/timed/timed/pathnames.h
+++ b/usr.sbin/timed/timed/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/timed/timed/pathnames.h,v 1.2 2001/11/20 07:13:40 jhb Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 74a6f5f92600..c50faac18da0 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)readmsg.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/readmsg.c,v 1.9 2001/11/20 07:13:40 jhb Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index db4d2dd0be4d..2e3e796353c5 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)slave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/slave.c,v 1.9 2001/11/20 07:13:40 jhb Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index e368764c85f2..b23807b45260 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)timed.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/timed/timed/timed.8,v 1.16 2003/10/04 15:43:22 naddy Exp $
 .\"
 .Dd June 6, 1993
 .Dt TIMED 8
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 27344a3b9e05..80087be1afea 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)timed.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/timed/timed/timed.c,v 1.11 2003/07/06 10:37:00 charnier Exp $");
 
 #define TSPTYPES
 #include "globals.h"
diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile
index 5262f46d805d..81db242873da 100644
--- a/usr.sbin/timed/timedc/Makefile
+++ b/usr.sbin/timed/timedc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/timedc/Makefile,v 1.7 2001/09/13 06:48:16 ru Exp $
 
 .PATH: ${.CURDIR}/../timed
 
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 5d30fe370391..bd1a91a4a51b 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/timed/timedc/cmds.c,v 1.13 2004/02/04 21:59:29 johan Exp $");
 
 #include "timedc.h"
 #include <sys/file.h>
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index 8e4c3d5a0767..92faf1597768 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/cmdtab.c,v 1.3 1999/08/28 01:20:21 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 0f3fcea68747..bf5ac30a3d58 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)timedc.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/timed/timedc/timedc.8,v 1.16 2005/01/18 20:02:44 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TIMEDC 8
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 368b460513af..14d2e06a55ca 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)timedc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/timedc.c,v 1.5 2003/10/11 07:35:35 tjr Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/timedc.h b/usr.sbin/timed/timedc/timedc.h
index f6ee8a6ae74a..ab048f402156 100644
--- a/usr.sbin/timed/timedc/timedc.h
+++ b/usr.sbin/timed/timedc/timedc.h
@@ -32,7 +32,7 @@
  *
  *	@(#)timedc.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/timed/timedc/timedc.h,v 1.3 2001/11/20 07:13:40 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index 02c9b2d8b300..e441549fd3dc 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.21 2004/12/21 12:44:20 ru Exp $
 
 TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index ab4e52ce981a..acc4a410154c 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -11,7 +11,7 @@
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/traceroute6/Makefile,v 1.8 2003/10/24 18:26:30 ume Exp $
 
 PROG=	traceroute6
 MAN=	traceroute6.8
diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index 8b2fe0d63fa8..961f9f31f89e 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/traceroute6/traceroute6.8,v 1.14 2005/02/09 18:04:42 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt TRACEROUTE6 8
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index a854bde82523..8ec4078b33ee 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -76,7 +76,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)traceroute.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/traceroute6/traceroute6.c,v 1.16 2004/06/13 18:38:46 dwmalone Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile
index cf1680b2eec3..bb3fe0c742a0 100644
--- a/usr.sbin/trpt/Makefile
+++ b/usr.sbin/trpt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/trpt/Makefile,v 1.8 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	trpt
 MAN=	trpt.8
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 19cae4773067..9b7de7e71bf7 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)trpt.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/trpt/trpt.8,v 1.17 2005/02/13 22:25:33 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt TRPT 8
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 2d740baf05ab..2f5f72411a85 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)trpt.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/trpt/trpt.c,v 1.19 2004/08/07 04:28:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 0596967a07e2..2285920b7e85 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tzsetup/Makefile,v 1.17 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	tzsetup
 MAN=	tzsetup.8
diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8
index 562744c6b686..ecac2dc2a932 100644
--- a/usr.sbin/tzsetup/tzsetup.8
+++ b/usr.sbin/tzsetup/tzsetup.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/tzsetup/tzsetup.8,v 1.19 2005/01/18 20:02:44 ru Exp $
 .Dd January 24, 1996
 .Dt TZSETUP 8
 .Os
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index 6b1caf8b3149..876410840528 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/tzsetup/tzsetup.c,v 1.26 2004/08/10 05:34:23 murray Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ugidfw/Makefile b/usr.sbin/ugidfw/Makefile
index d89bc857f5bf..9246a7b1c998 100644
--- a/usr.sbin/ugidfw/Makefile
+++ b/usr.sbin/ugidfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ugidfw/Makefile,v 1.4 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	ugidfw
 MAN=	ugidfw.8
diff --git a/usr.sbin/ugidfw/ugidfw.8 b/usr.sbin/ugidfw/ugidfw.8
index eedd172784ca..f862adeb6dca 100644
--- a/usr.sbin/ugidfw/ugidfw.8
+++ b/usr.sbin/ugidfw/ugidfw.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ugidfw/ugidfw.8,v 1.8 2005/01/10 00:35:54 trhodes Exp $
 .\"
 .Dd February 24, 2004
 .Dt UGIDFW 8
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index 00bc15334502..7e69726eb3ed 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/ugidfw.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.4.2.1 2005/07/27 12:45:36 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/usr.sbin/usbd/Makefile b/usr.sbin/usbd/Makefile
index aadecee02830..180cccc72aca 100644
--- a/usr.sbin/usbd/Makefile
+++ b/usr.sbin/usbd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/usbd/Makefile,v 1.6 2001/05/18 13:41:42 ru Exp $
 
 PROG=	usbd
 MAN=	usbd.conf.5 usbd.8
diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8
index d6f9fa0654c0..02d4cab39ad1 100644
--- a/usr.sbin/usbd/usbd.8
+++ b/usr.sbin/usbd/usbd.8
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.21 2004/07/02 23:12:58 ru Exp $
 .\"
 .Dd July 12, 1998
 .Dt USBD 8
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index 30c1526bebc2..db28d0082ea3 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbd.c,v 1.4 1998/12/09 00:57:19 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/usbd/usbd.c,v 1.32 2005/07/01 15:49:52 jhb Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.sbin/usbd/usbd.conf.5 b/usr.sbin/usbd/usbd.conf.5
index 1c314b27fded..005baab5937e 100644
--- a/usr.sbin/usbd/usbd.conf.5
+++ b/usr.sbin/usbd/usbd.conf.5
@@ -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/usr.sbin/usbd/usbd.conf.5,v 1.15 2005/01/18 20:02:45 ru Exp $
 .\"
 .\" Many parts of this manual have been snarfed from the pccard.conf (5) man
 .\" page, copyright by Andrew McRae.
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 985bc7a61ab5..a3c9860ac3d4 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1998/07/12 20:40:45 augustss Exp $
-#	FreeBSD $FreeBSD$
+#	FreeBSD $FreeBSD: src/usr.sbin/usbdevs/Makefile,v 1.10 2001/07/20 06:20:25 obrien Exp $
 
 PROG=	usbdevs
 MAN=	usbdevs.8
diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index 3226dd5bd658..e9c9955050fa 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/usbdevs/usbdevs.8,v 1.11 2004/05/24 13:22:00 le Exp $
 .\"
 .Dd May 24, 2004
 .Dt USBDEVS 8
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 640dd512f7f2..e64e84c15bcc 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdevs.c,v 1.22 2003/11/12 13:31:08 grant Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/usbdevs/usbdevs.c,v 1.10 2004/05/24 13:22:00 le Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile
index 074f941d85b9..fad3243cd074 100644
--- a/usr.sbin/vidcontrol/Makefile
+++ b/usr.sbin/vidcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vidcontrol/Makefile,v 1.6 2005/01/13 03:59:44 delphij Exp $
 
 PROG=	vidcontrol
 SRCS=	vidcontrol.c decode.c
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index 27691d2cbc45..81b92da38699 100644
--- a/usr.sbin/vidcontrol/decode.c
+++ b/usr.sbin/vidcontrol/decode.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vidcontrol/decode.c,v 1.11 2005/01/13 03:59:44 delphij Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/vidcontrol/decode.h b/usr.sbin/vidcontrol/decode.h
index 1f1cba4a4720..8adff2617dfe 100644
--- a/usr.sbin/vidcontrol/decode.h
+++ b/usr.sbin/vidcontrol/decode.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/vidcontrol/decode.h,v 1.2 2001/04/09 17:24:29 sobomax Exp $ */
 
 int decode(FILE *fd, char *buffer, int len);
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index fb1aadac39a8..da838baa031a 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.57 2005/06/14 12:26:36 ru Exp $
 .\"
 .Dd May 29, 2005
 .Dt VIDCONTROL 1
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index eb307a3fdcdd..7fd1871abd50 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.52.2.1 2005/10/05 04:29:59 rodrigc Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile
index 69a9df9c5ba9..835ab3b0e432 100644
--- a/usr.sbin/vipw/Makefile
+++ b/usr.sbin/vipw/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vipw/Makefile,v 1.8 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	vipw
 MAN=	vipw.8
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index 19eafaf640f3..48a53c3af23b 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vipw/vipw.8,v 1.13.8.1 2005/09/24 01:59:40 keramida Exp $
 .\"
 .Dd June 6, 1993
 .Dt VIPW 8
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 4a0a70080dca..4a3750351384 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)vipw.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/vipw/vipw.c,v 1.16 2004/08/07 04:28:56 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/vnconfig/Makefile b/usr.sbin/vnconfig/Makefile
index 7bf699017682..2459d18e26d8 100644
--- a/usr.sbin/vnconfig/Makefile
+++ b/usr.sbin/vnconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vnconfig/Makefile,v 1.9 2004/12/21 08:47:35 ru Exp $
 
 PROG=	vnconfig
 NO_MAN=	# mdconfig supplies manpage
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index 294250d4b5a1..82f1a55f0d4d 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -9,7 +9,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vnconfig/vnconfig.c,v 1.23 2001/06/24 20:25:22 dd Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile
index e8a8ea6ab698..9b49766113a1 100644
--- a/usr.sbin/watch/Makefile
+++ b/usr.sbin/watch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/watch/Makefile,v 1.16 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	watch
 MAN=	watch.8
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index 99c6b6feab94..ea802dac683f 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watch/watch.8,v 1.30 2005/01/18 20:02:45 ru Exp $
 .\"
 .Dd November 24, 2001
 .Dt WATCH 8
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 732db3d27e54..d3f41c5cb314 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/watch/watch.c,v 1.31.8.1 2005/09/23 23:24:55 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
diff --git a/usr.sbin/watchdogd/Makefile b/usr.sbin/watchdogd/Makefile
index 68675c76e154..cd1f1a071349 100644
--- a/usr.sbin/watchdogd/Makefile
+++ b/usr.sbin/watchdogd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/watchdogd/Makefile,v 1.4 2004/02/28 20:56:34 phk Exp $
 
 PROG=	watchdogd
 LINKS=	${BINDIR}/watchdogd ${BINDIR}/watchdog
diff --git a/usr.sbin/watchdogd/watchdog.8 b/usr.sbin/watchdogd/watchdog.8
index 97b0040d23ef..04da91645fb1 100644
--- a/usr.sbin/watchdogd/watchdog.8
+++ b/usr.sbin/watchdogd/watchdog.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watchdogd/watchdog.8,v 1.6 2005/01/18 20:02:45 ru Exp $
 .\"
 .Dd February 28, 2004
 .Dt WATCHDOG 8
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index 07b649d38797..ff7a1120f6ee 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watchdogd/watchdogd.8,v 1.5 2005/01/18 20:02:45 ru Exp $
 .\"
 .Dd June 25, 2003
 .Dt WATCHDOGD 8
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 321fc5db79a8..cdd8923671dc 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/types.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/watchdogd/watchdogd.c,v 1.10 2005/03/19 01:46:37 marius Exp $");
 
 #include <sys/rtprio.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile
index b8ac802a7442..620af9bda298 100644
--- a/usr.sbin/wicontrol/Makefile
+++ b/usr.sbin/wicontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wicontrol/Makefile,v 1.10 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	wicontrol
 MAN=	wicontrol.8
diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index 1d23cebfdea2..77eddd46cdf2 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.47 2005/02/13 22:25:33 ru Exp $
 .\"
 .Dd March 4, 2003
 .Dt WICONTROL 8
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index 7557c0ba6b82..2237a90db7ff 100644
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.c
@@ -37,7 +37,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/wicontrol/wicontrol.c,v 1.38 2004/10/17 21:29:53 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile
index 8d3d0cc3e797..cf745f6c4084 100644
--- a/usr.sbin/wlconfig/Makefile
+++ b/usr.sbin/wlconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wlconfig/Makefile,v 1.8 2004/01/21 14:01:29 ru Exp $
 
 PROG=	wlconfig
 MAN=	wlconfig.8
diff --git a/usr.sbin/wlconfig/wlconfig.8 b/usr.sbin/wlconfig/wlconfig.8
index 99a29422f020..0471bc0f9286 100644
--- a/usr.sbin/wlconfig/wlconfig.8
+++ b/usr.sbin/wlconfig/wlconfig.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wlconfig/wlconfig.8,v 1.19 2004/07/02 23:12:59 ru Exp $
 .\"
 .Dd December 26, 1996
 .Os
diff --git a/usr.sbin/wlconfig/wlconfig.c b/usr.sbin/wlconfig/wlconfig.c
index f361b2cb99fb..2b8c8536f06a 100644
--- a/usr.sbin/wlconfig/wlconfig.c
+++ b/usr.sbin/wlconfig/wlconfig.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/wlconfig/wlconfig.c,v 1.11 2000/11/26 23:51:07 dannyboy Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/wpa/Makefile b/usr.sbin/wpa/Makefile
index 31b3c746cb41..93158c5c1f10 100644
--- a/usr.sbin/wpa/Makefile
+++ b/usr.sbin/wpa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/Makefile,v 1.2.4.1 2005/10/27 17:08:56 wpaul Exp $
 
 SUBDIR=	wpa_supplicant wpa_cli hostapd hostapd_cli ndis_events
 
diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index 8c6b79e955f7..8895c83cf442 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/Makefile.inc,v 1.1 2005/06/05 21:18:53 sam Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index 80ece1195182..cbaa817d5fd2 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/hostapd/Makefile,v 1.2 2005/06/17 05:37:08 sam Exp $
 
 HOSTAPD_DISTDIR?= ${.CURDIR}/../../../contrib/hostapd
 .PATH: ${.CURDIR}/.. ${HOSTAPD_DISTDIR}
diff --git a/usr.sbin/wpa/hostapd/driver_freebsd.c b/usr.sbin/wpa/hostapd/driver_freebsd.c
index ec9fdfa948d2..142c561a2190 100644
--- a/usr.sbin/wpa/hostapd/driver_freebsd.c
+++ b/usr.sbin/wpa/hostapd/driver_freebsd.c
@@ -12,7 +12,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/hostapd/driver_freebsd.c,v 1.2 2005/07/05 17:42:27 sam Exp $
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.sbin/wpa/hostapd/hostapd.8 b/usr.sbin/wpa/hostapd/hostapd.8
index 5483311e1245..2463ffd7001e 100644
--- a/usr.sbin/wpa/hostapd/hostapd.8
+++ b/usr.sbin/wpa/hostapd/hostapd.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/hostapd/hostapd.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
 .Dd June 16, 2005
 .Dt HOSTAPD 8
diff --git a/usr.sbin/wpa/hostapd/hostapd.conf.5 b/usr.sbin/wpa/hostapd/hostapd.conf.5
index 4631ead1f49f..a7d121d977d3 100644
--- a/usr.sbin/wpa/hostapd/hostapd.conf.5
+++ b/usr.sbin/wpa/hostapd/hostapd.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/usr.sbin/wpa/hostapd/hostapd.conf.5,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
 .Dd June 16, 2005
 .Dt HOSTAPD.CONF 5
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile
index 6c0a8973a21c..a314084bd4e5 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile
+++ b/usr.sbin/wpa/hostapd_cli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/hostapd_cli/Makefile,v 1.2 2005/06/17 05:38:43 sam Exp $
 
 HOSTAPD_DISTDIR?= ${.CURDIR}/../../../contrib/hostapd
 .PATH: ${HOSTAPD_DISTDIR}
diff --git a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
index 4362f9f02848..62fd5ad1ae50 100644
--- a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
+++ b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/hostapd_cli/hostapd_cli.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
 .Dd June 16, 2005
 .Dt HOSTAPD_CLI 8
diff --git a/usr.sbin/wpa/l2_packet.c b/usr.sbin/wpa/l2_packet.c
index 5304a9d51340..340e829a563c 100644
--- a/usr.sbin/wpa/l2_packet.c
+++ b/usr.sbin/wpa/l2_packet.c
@@ -12,7 +12,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/l2_packet.c,v 1.1.2.1 2005/07/30 01:19:10 sam Exp $
  */
 
 /*
diff --git a/usr.sbin/wpa/ndis_events/Makefile b/usr.sbin/wpa/ndis_events/Makefile
index 07caf5a48465..d3ea13bde991 100644
--- a/usr.sbin/wpa/ndis_events/Makefile
+++ b/usr.sbin/wpa/ndis_events/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/ndis_events/Makefile,v 1.1.4.1 2005/10/27 17:08:56 wpaul Exp $
 
 PROG=	ndis_events
 SRCS+=	ndis_events.c
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.8 b/usr.sbin/wpa/ndis_events/ndis_events.8
index d8c19be0d1b8..0691bad24ad9 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.8
+++ b/usr.sbin/wpa/ndis_events/ndis_events.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/ndis_events/ndis_events.8,v 1.3.4.1 2005/10/27 17:08:56 wpaul Exp $
 .\"
 .Dd October 10, 2005
 .Dt NDIS_EVENTS 8
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c
index d2dedff779cd..482361196b3e 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.c
+++ b/usr.sbin/wpa/ndis_events/ndis_events.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/wpa/ndis_events/ndis_events.c,v 1.4.4.1 2005/10/27 17:08:56 wpaul Exp $");
 
 /*
  * This program simulates the behavior of the ndis_events utility
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index 91b9511c1ee6..f746a61070a8 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/wpa_cli/Makefile,v 1.2 2005/06/17 03:08:59 sam Exp $
 
 WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../contrib/wpa_supplicant
 .PATH: ${WPA_SUPPLICANT_DISTDIR}
diff --git a/usr.sbin/wpa/wpa_cli/wpa_cli.8 b/usr.sbin/wpa/wpa_cli/wpa_cli.8
index 27fc9434c4a7..8eceb9c91834 100644
--- a/usr.sbin/wpa/wpa_cli/wpa_cli.8
+++ b/usr.sbin/wpa/wpa_cli/wpa_cli.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/wpa_cli/wpa_cli.8,v 1.2.2.1 2005/07/16 19:02:21 brueffer Exp $
 .\"
 .Dd June 16, 2005
 .Dt WPA_CLI 8
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 19e0b24667df..c3d139e6813c 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Makefile,v 1.3.4.1 2005/10/27 17:08:56 wpaul Exp $
 
 WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../contrib/wpa_supplicant
 .PATH: ${.CURDIR}/.. ${WPA_SUPPLICANT_DISTDIR}
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c
index 3334bbf2f79e..3265b2a5e911 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Packet32.c,v 1.2.4.1 2005/10/27 17:08:56 wpaul Exp $");
 
 /*
  * This file implements a small portion of the Winpcap API for the
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.h b/usr.sbin/wpa/wpa_supplicant/Packet32.h
index e0598e70d4fd..23ea88af0ecb 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.h
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Packet32.h,v 1.2.4.1 2005/10/27 17:08:56 wpaul Exp $
  */
 
 #ifndef _PACKET32_H_
diff --git a/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c b/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
index e69dcd5544a6..8babe85d32e6 100644
--- a/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
+++ b/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c,v 1.5.2.2 2005/09/03 17:45:54 sam Exp $
  */
 
 #include <stdlib.h>
diff --git a/usr.sbin/wpa/wpa_supplicant/ntddndis.h b/usr.sbin/wpa/wpa_supplicant/ntddndis.h
index 42e403d7bb12..0a3acffda888 100644
--- a/usr.sbin/wpa/wpa_supplicant/ntddndis.h
+++ b/usr.sbin/wpa/wpa_supplicant/ntddndis.h
@@ -2,7 +2,7 @@
 #define _NTDDNDIS_H_
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/ntddndis.h,v 1.2.4.1 2005/10/27 17:08:56 wpaul Exp $
  */
 
 /*
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
index 228a1760e655..8926fab04d7f 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
 .Dd June 16, 2005
 .Dt WPA_SUPPLICANT 8
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index 06bb2cd54b2b..6f3f6cff1520 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.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/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5,v 1.3.2.2 2005/08/18 15:01:27 keramida Exp $
 .\"
 .Dd June 16, 2005
 .Dt WPA_SUPPLICANT.CONF 5
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 973da6ee0559..66c29f6fa080 100644
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yp_mkdb/Makefile,v 1.9 2003/04/04 17:49:20 obrien Exp $
 
 .PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv
 
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 125123519c05..b28c4b20dd2a 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.18 2005/02/13 22:25:33 ru Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index 6c3014bdfc9c..cd0f13073050 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.c,v 1.16 2003/05/03 21:06:41 obrien Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index 915d001be4dc..7a22134c7b22 100644
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypbind/Makefile,v 1.9 2001/07/20 06:20:30 obrien Exp $
 
 PROG=	ypbind
 MAN=	ypbind.8
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index 1806c3c0f122..c9e15c5f17b1 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -66,7 +66,7 @@ static char *sccsid = "@(#)from: clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypbind/yp_ping.c,v 1.16 2003/05/03 21:06:41 obrien Exp $");
 
 /*
  * clnt_udp.c, Implements a UDP/IP based, client side RPC.
diff --git a/usr.sbin/ypbind/yp_ping.h b/usr.sbin/ypbind/yp_ping.h
index 80e6a7873011..6f820c2b8ef1 100644
--- a/usr.sbin/ypbind/yp_ping.h
+++ b/usr.sbin/ypbind/yp_ping.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ypbind/yp_ping.h,v 1.2 2002/02/06 13:30:29 des Exp $
  */
 
 extern int __yp_ping(struct in_addr *, int, char *, short *);
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 4608814d8640..922dbd552dbb 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.23 2005/02/13 22:25:33 ru Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index a3a7dc37587e..e8279bd5c03a 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypbind/ypbind.c,v 1.40 2004/10/17 19:33:33 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index 63763316ef8c..1b3c9d67135e 100644
--- a/usr.sbin/yppoll/Makefile
+++ b/usr.sbin/yppoll/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yppoll/Makefile,v 1.7 2001/03/26 14:42:18 ru Exp $
 
 PROG=	yppoll
 MAN=	yppoll.8
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index ad90d902e146..4c09185f2d00 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yppoll/yppoll.8,v 1.7 2002/07/14 14:47:06 charnier Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPPOLL 8
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index e35087c6baaf..0dff2638071b 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/yppoll/yppoll.c,v 1.12 2004/05/24 16:10:57 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index 7ce1c612e0e0..100b350c8de2 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yppush/Makefile,v 1.9 2001/07/20 06:20:30 obrien Exp $
 
 RPCDIR=	${.CURDIR}/../../include/rpcsvc
 .PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index 1acac3f7fc97..8c2d5600b41a 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.18 2005/01/18 20:02:45 ru Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPPUSH 8
diff --git a/usr.sbin/yppush/yppush_extern.h b/usr.sbin/yppush/yppush_extern.h
index 2a4fbccee2c6..32c667d98c89 100644
--- a/usr.sbin/yppush/yppush_extern.h
+++ b/usr.sbin/yppush/yppush_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/yppush/yppush_extern.h,v 1.5 2002/02/06 13:30:30 des Exp $
  */
 
 /* Privately defined error codes. */
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index 951f413c837a..3bc1d94007fe 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.20 2005/04/12 15:02:57 thomas Exp $");
 
 #include <errno.h>
 #include <signal.h>
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index c1b2df30478b..8b4cf012406b 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.24 2004/10/18 21:42:15 ru Exp $
 
 RPCDIR=	${.CURDIR}/../../include/rpcsvc
 .PATH: ${RPCDIR}
diff --git a/usr.sbin/ypserv/Makefile.yp b/usr.sbin/ypserv/Makefile.yp
index 0cb8a21d1ed8..612cfc6d2f7c 100644
--- a/usr.sbin/ypserv/Makefile.yp
+++ b/usr.sbin/ypserv/Makefile.yp
@@ -1,7 +1,7 @@
 #
 # Makefile for the NIS databases
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile.yp,v 1.36 2005/05/02 11:19:52 ume Exp $
 #
 # This Makefile should only be run on the NIS master server of a domain.
 # All updated maps will be pushed to all NIS slave servers listed in the
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index b9063092c2cc..b95c563f7fa6 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_access.c,v 1.22 2003/05/03 21:06:42 obrien Exp $");
 
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 61944dc44bbe..6122981df8ce 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_dblookup.c,v 1.25 2003/05/03 21:06:42 obrien Exp $");
 
 #include <db.h>
 #include <errno.h>
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index 4ea6a13a7e59..cfdc04889ba8 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_dnslookup.c,v 1.27 2005/05/20 13:04:10 charnier Exp $");
 
 /*
  * Do standard and reverse DNS lookups using the resolver library.
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index 8d488f3bdb6a..3a1e549fdd8e 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_error.c,v 1.10 2003/05/03 21:06:42 obrien Exp $");
 
 /*
  * error logging/reporting facilities
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index 2e574b6c3bfe..a7b93fed8377 100644
--- a/usr.sbin/ypserv/yp_extern.h
+++ b/usr.sbin/ypserv/yp_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ypserv/yp_extern.h,v 1.17 2005/05/02 09:34:07 ume Exp $
  */
 
 #include <db.h>
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index cfa45e4a3e3f..cd98c49d001e 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_main.c,v 1.28 2005/05/20 13:04:10 charnier Exp $");
 
 /*
  * ypserv startup function.
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index c76a804383c7..d5da7da84b51 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_server.c,v 1.39 2005/05/02 09:42:59 ume Exp $");
 
 #include "yp.h"
 #include "yp_extern.h"
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index 33d058ef9b87..4680c6af0fad 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_svc_udp.c,v 1.8 2003/05/03 21:06:42 obrien Exp $");
 
 #include <rpc/rpc.h>
 #include <rpc/svc_dg.h>
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index 2533fdae7d75..ec65d6adb48b 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.16 2004/07/04 20:55:50 ru Exp $
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
diff --git a/usr.sbin/ypserv/ypinit.sh b/usr.sbin/ypserv/ypinit.sh
index 1be7e0e3e186..a9fa9a55baa0 100644
--- a/usr.sbin/ypserv/ypinit.sh
+++ b/usr.sbin/ypserv/ypinit.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/ypinit.sh,v 1.4 2002/12/30 21:18:15 schweikh Exp $
 #
 # ypinit.sh - setup a master or slave server.
 # (Taken from OpenBSD and modified for FreeBSD.)
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 608b2028c57d..6dd08ddc6290 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.41 2005/02/13 23:45:54 ru Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index 10ed5f88fd78..c93e897491c1 100644
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypset/Makefile,v 1.4 2001/03/26 14:42:19 ru Exp $
 
 PROG=	ypset
 MAN=	ypset.8
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index 49ad6e0b67ae..21db3b6f9245 100644
--- a/usr.sbin/ypset/ypset.8
+++ b/usr.sbin/ypset/ypset.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypset/ypset.8,v 1.10 2002/07/14 14:47:13 charnier Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPSET 8
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 019c7241af9b..ffc06740af41 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypset/ypset.c,v 1.15 2004/10/17 19:33:33 stefanf Exp $");
 
 #include <err.h>
 #include <netdb.h>
diff --git a/usr.sbin/zic/Arts.htm b/usr.sbin/zic/Arts.htm
index baa84ed77431..e8f95394f0d5 100644
--- a/usr.sbin/zic/Arts.htm
+++ b/usr.sbin/zic/Arts.htm
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/usr.sbin/zic/Arts.htm,v 1.2 2000/05/29 20:23:04 charnier Exp $ -->
 <HTML>
 <HEAD>
 <TITLE>Time and the Arts</TITLE>
diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile
index 2496e821159b..41f4ee993f8f 100644
--- a/usr.sbin/zic/Makefile
+++ b/usr.sbin/zic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile,v 1.6 2001/07/18 11:30:46 dd Exp $
 
 # Vendor contact: tz@elsie.nci.nih.gov
 MAINTAINER=	wollman@FreeBSD.org
diff --git a/usr.sbin/zic/Makefile.inc b/usr.sbin/zic/Makefile.inc
index b915adff92ab..137bf6a1a205 100644
--- a/usr.sbin/zic/Makefile.inc
+++ b/usr.sbin/zic/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile.inc,v 1.4 1999/08/28 01:21:18 peter Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/zic/ialloc.c b/usr.sbin/zic/ialloc.c
index a069032eda51..c81ef8b9f5ac 100644
--- a/usr.sbin/zic/ialloc.c
+++ b/usr.sbin/zic/ialloc.c
@@ -6,7 +6,7 @@ static const char	elsieid[] = "@(#)ialloc.c	8.29";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/ialloc.c,v 1.6 2000/11/28 18:18:56 charnier Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/private.h b/usr.sbin/zic/private.h
index 315f33a4a2f1..47d9cb2b314b 100644
--- a/usr.sbin/zic/private.h
+++ b/usr.sbin/zic/private.h
@@ -13,7 +13,7 @@
  * I have removed all of the ifdef spaghetti which is not relevant to
  * zic from this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/zic/private.h,v 1.7 2004/06/20 21:41:11 stefanf Exp $
  */
 
 /*
diff --git a/usr.sbin/zic/scheck.c b/usr.sbin/zic/scheck.c
index 692bf1a07934..009ef1ec8200 100644
--- a/usr.sbin/zic/scheck.c
+++ b/usr.sbin/zic/scheck.c
@@ -6,7 +6,7 @@ static const char	elsieid[] = "@(#)scheck.c	8.15";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/scheck.c,v 1.7 2001/07/18 11:27:04 dd Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/zdump.8 b/usr.sbin/zic/zdump.8
index 3a685fd7ea0d..065a1d645ce9 100644
--- a/usr.sbin/zic/zdump.8
+++ b/usr.sbin/zic/zdump.8
@@ -1,6 +1,6 @@
 .\"
 .\"	@(#)zdump.8	7.3
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/zic/zdump.8,v 1.10 2004/06/20 21:41:11 stefanf Exp $
 .\"
 .Dd June 20, 2004
 .Dt ZDUMP 8
diff --git a/usr.sbin/zic/zdump.c b/usr.sbin/zic/zdump.c
index e63e94398834..f98d1177dd86 100644
--- a/usr.sbin/zic/zdump.c
+++ b/usr.sbin/zic/zdump.c
@@ -2,7 +2,7 @@ static const char	elsieid[] = "@(#)zdump.c	7.31";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.9 2004/06/20 21:41:11 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile
index 127946f7c438..68c893b32f8c 100644
--- a/usr.sbin/zic/zdump/Makefile
+++ b/usr.sbin/zic/zdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/zdump/Makefile,v 1.10 2003/04/04 17:49:21 obrien Exp $
 
 .PATH: ${.CURDIR}/..
 
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index c293cefb6e5a..b2a60aa6c6fa 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/zic/zic.8,v 1.19 2005/02/13 23:45:54 ru Exp $
 .Dd June 20, 2004
 .Dt ZIC 8
 .Os
diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c
index 4e235b00bb42..12659d048332 100644
--- a/usr.sbin/zic/zic.c
+++ b/usr.sbin/zic/zic.c
@@ -2,7 +2,7 @@ static const char	elsieid[] = "@(#)zic.c	7.116";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zic.c,v 1.17 2004/10/19 20:30:09 ru Exp $";
 #endif /* not lint */
 
 #include "private.h"
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index c98799cf5bbe..cd24fe65004c 100644
--- a/usr.sbin/zic/zic/Makefile
+++ b/usr.sbin/zic/zic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/zic/Makefile,v 1.11 2003/04/04 17:49:21 obrien Exp $
 
 .PATH: ${.CURDIR}/..
 
diff --git a/usr.sbin/zzz/Makefile b/usr.sbin/zzz/Makefile
index 8c4a9beb763a..45011a38e53a 100644
--- a/usr.sbin/zzz/Makefile
+++ b/usr.sbin/zzz/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zzz/Makefile,v 1.1 2003/07/14 16:31:34 njl Exp $
 
 SCRIPTS=zzz.sh
 MAN=	zzz.8
diff --git a/usr.sbin/zzz/zzz.8 b/usr.sbin/zzz/zzz.8
index 583d5fd963ae..c70efb7a887c 100644
--- a/usr.sbin/zzz/zzz.8
+++ b/usr.sbin/zzz/zzz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/zzz/zzz.8,v 1.4 2004/06/13 18:03:44 ru Exp $
 .\"
 .Dd July 13, 2003
 .Dt ZZZ 8
diff --git a/usr.sbin/zzz/zzz.sh b/usr.sbin/zzz/zzz.sh
index ef9527bb76b3..9bd25001bb22 100644
--- a/usr.sbin/zzz/zzz.sh
+++ b/usr.sbin/zzz/zzz.sh
@@ -7,7 +7,7 @@
 #
 # Mark Santcroos <marks@ripe.net>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zzz/zzz.sh,v 1.2 2003/07/25 17:11:15 njl Exp $
 
 PATH=/sbin:/usr/sbin:/usr/bin:/bin